| commit | b3e9704d495d069cb572a2dd7e5a936c35e5d1d6 | [log] [tgz] |
|---|---|---|
| author | Konstantinos Kanonakis <kanonakisk@gmail.com> | Tue Nov 15 11:33:07 2016 -0600 |
| committer | Thomas Vachuska <tom@onlab.us> | Wed Nov 30 21:27:59 2016 +0000 |
| tree | 27a6c7bfcce677506e1c332e184bf5a01ba997f6 | |
| parent | 3cd8555704ae83ce3da7dbf381591e66c7c31e5c [diff] |
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() {