From c3ffad90738adb2334f40a9dc0d3e79279eb11fb Mon Sep 17 00:00:00 2001 From: Palash Kala Date: Fri, 9 Jun 2017 21:18:19 +0900 Subject: [PATCH] [ONOS-6615] Configuration service doesn't add rest and netconf devices together Change-Id: I40daa2800109e2ed7e42b4cc6507a200b4d440a8 --- .../provider/netconf/device/impl/NetconfDeviceProvider.java | 2 +- .../provider/rest/device/impl/RestDeviceProvider.java | 2 +- .../provider/snmp/device/impl/SnmpDeviceProvider.java | 2 +- tools/test/configs/bmv2-cfg.json | 2 +- tools/test/configs/netconf-cfg-old.json | 2 +- tools/test/configs/restSB-cfg-old.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java index 72fc13f69d..2d0063e09d 100644 --- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java +++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java @@ -166,7 +166,7 @@ public class NetconfDeviceProvider extends AbstractProvider }, new ConfigFactory(APP_SUBJECT_FACTORY, NetconfProviderConfig.class, - "devices", + "netconf_devices", true) { @Override public NetconfProviderConfig createConfig() { 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 e628a4e318..ec5f247705 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 @@ -129,7 +129,7 @@ public class RestDeviceProvider extends AbstractProvider protected final List factories = ImmutableList.of( new ConfigFactory(APP_SUBJECT_FACTORY, RestProviderConfig.class, - "devices", + "rest_devices", true) { @Override public RestProviderConfig createConfig() { diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java index fb77c708b3..c4ad21d1d4 100644 --- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java +++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java @@ -109,7 +109,7 @@ public class SnmpDeviceProvider extends AbstractProvider protected final List factories = ImmutableList.of( new ConfigFactory(APP_SUBJECT_FACTORY, SnmpProviderConfig.class, - "devices", + "snmp_devices", true) { @Override public SnmpProviderConfig createConfig() { diff --git a/tools/test/configs/bmv2-cfg.json b/tools/test/configs/bmv2-cfg.json index 20f4010475..dc71153300 100644 --- a/tools/test/configs/bmv2-cfg.json +++ b/tools/test/configs/bmv2-cfg.json @@ -1,7 +1,7 @@ { "apps":{ "org.onosproject.bmv2":{ - "devices":[{ + "bmv2_devices":[{ "ip":"192.168.57.100", "port":9090 }] diff --git a/tools/test/configs/netconf-cfg-old.json b/tools/test/configs/netconf-cfg-old.json index e9910b4cdb..e80aa50b8a 100644 --- a/tools/test/configs/netconf-cfg-old.json +++ b/tools/test/configs/netconf-cfg-old.json @@ -8,7 +8,7 @@ }, "apps":{ "org.onosproject.netconf":{ - "devices":[{ + "netconf_devices":[{ "username":"mininet", "password":"mininet", "ip":"192.168.56.104", diff --git a/tools/test/configs/restSB-cfg-old.json b/tools/test/configs/restSB-cfg-old.json index f7aa152cc4..9d1181ead8 100644 --- a/tools/test/configs/restSB-cfg-old.json +++ b/tools/test/configs/restSB-cfg-old.json @@ -8,7 +8,7 @@ }, "apps": { "org.onosproject.restsb": { - "devices": [{ + "rest_devices": [{ "username": "dev", "password": "", "ip": "127.0.0.1",