Homogenizing field names across NETCONF and RESTSB device config
Change-Id: Ia04594e36fec3be37150c3e81f3027b54e1b5c75
diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfProviderConfig.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfProviderConfig.java
index 07533d0..625322f 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfProviderConfig.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfProviderConfig.java
@@ -36,7 +36,7 @@
private static final String IP = "ip";
private static final int DEFAULT_TCP_PORT = 830;
private static final String PORT = "port";
- private static final String NAME = "name";
+ private static final String NAME = "username";
private static final String PASSWORD = "password";
public Set<NetconfDeviceAddress> getDevicesAddresses() throws ConfigException {
diff --git a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
index 2222540..c471022 100644
--- a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
+++ b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
@@ -108,7 +108,7 @@
private final ConfigFactory factory =
new ConfigFactory<ApplicationId, RestProviderConfig>(APP_SUBJECT_FACTORY,
RestProviderConfig.class,
- "restDevices",
+ "devices",
true) {
@Override
public RestProviderConfig createConfig() {
diff --git a/tools/test/configs/netconf-cfg.json b/tools/test/configs/netconf-cfg.json
index 29bdb46..aff0604 100644
--- a/tools/test/configs/netconf-cfg.json
+++ b/tools/test/configs/netconf-cfg.json
@@ -9,11 +9,11 @@
"apps":{
"org.onosproject.netconf":{
"devices":[{
- "name":"mininet",
+ "username":"mininet",
"password":"mininet",
"ip":"10.1.9.24",
"port":830
}]
}
}
-}
\ No newline at end of file
+}
diff --git a/tools/test/configs/restSB-cfg.json b/tools/test/configs/restSB-cfg.json
index 944d40a..f7aa152 100644
--- a/tools/test/configs/restSB-cfg.json
+++ b/tools/test/configs/restSB-cfg.json
@@ -8,8 +8,8 @@
},
"apps": {
"org.onosproject.restsb": {
- "restDevices": [{
- "name": "dev",
+ "devices": [{
+ "username": "dev",
"password": "",
"ip": "127.0.0.1",
"port": 8080,