commit 02ffa7120dafe7be1f0979ddaa667ac33f837b2b
author fahadnaeemkhan <fahadnaeemkhan@gmail.com> Fri Dec 01 19:49:45 2017 -0800
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Dec 05 14:33:19 2017 -0800
tree 69729cb25c2717f23e9b889110359daadcc63ca9
parent 28d4657304002017feb8a9b77c56a2238cf58ed6

added OAuth2 authentication for REST protocol

Change-Id: I3b8f3943ea043587730870a0b861760a4d6f3aa7

providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestProviderConfig.java

diff --git a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestProviderConfig.java b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestProviderConfig.java
index e04be6f..21d9774 100644
--- a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestProviderConfig.java
+++ b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestProviderConfig.java
@@ -21,15 +21,17 @@
 import com.google.common.collect.Sets;
 import org.onlab.packet.IpAddress;
 import org.onosproject.core.ApplicationId;
-import org.onosproject.net.config.ConfigException;
 import org.onosproject.net.config.Config;
+import org.onosproject.net.config.ConfigException;
 import org.onosproject.protocol.rest.DefaultRestSBDevice;
 import org.onosproject.protocol.rest.RestSBDevice;
+import org.onosproject.protocol.rest.RestSBDevice.AuthenticationScheme;
 
 import java.util.Set;
 
 /**
  * Configuration for RestSB provider.
+ *
  * @deprecated 1.10.0 Kingfisher. Please Use RestDeviceConfig
  */
 @Deprecated
@@ -48,6 +50,8 @@
     private static final String MANUFACTURER = "manufacturer";
     private static final String HWVERSION = "hwVersion";
     private static final String SWVERSION = "swVersion";
+    private static final String AUTHENTICATION_SCHEME = "authenticationScheme";
+    private static final String TOKEN = "token";
 
     public Set<RestSBDevice> getDevicesAddresses() throws ConfigException {
         Set<RestSBDevice> devicesAddresses = Sets.newHashSet();
@@ -65,11 +69,14 @@
                 String manufacturer = node.path(MANUFACTURER).asText();
                 String hwVersion = node.path(HWVERSION).asText();
                 String swVersion = node.path(SWVERSION).asText();
+                AuthenticationScheme authenticationScheme = AuthenticationScheme.valueOf(node.path(
+                        AUTHENTICATION_SCHEME).asText().toUpperCase());
+                String token = node.path(TOKEN).asText();
 
                 devicesAddresses.add(new DefaultRestSBDevice(ipAddr, port, username,
-                                                             password, protocol,
-                                                             url, false, testUrl, manufacturer,
-                                                             hwVersion, swVersion));
+                        password, protocol,
+                        url, false, testUrl, manufacturer,
+                        hwVersion, swVersion, authenticationScheme, token));
             }
         } catch (IllegalArgumentException e) {
             throw new ConfigException(CONFIG_VALUE_ERROR, e);