mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 09:51:38 +02:00
Code Issues Projects Releases Wiki Activity

[ONOS-6615] Configuration service doesn't add rest and netconf devices together

Browse Source 
Change-Id: I40daa2800109e2ed7e42b4cc6507a200b4d440a8
This commit is contained in:
Palash Kala 2017-06-09 21:18:19 +09:00 committed by Jian Li
parent a439afe320
commit c3ffad9073
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
View File

@ -166,7 +166,7 @@ public class NetconfDeviceProvider extends AbstractProvider
}, },
new ConfigFactory<ApplicationId, NetconfProviderConfig>(APP_SUBJECT_FACTORY, new ConfigFactory<ApplicationId, NetconfProviderConfig>(APP_SUBJECT_FACTORY,
NetconfProviderConfig.class, NetconfProviderConfig.class,
"devices", "netconf_devices",
true) { true) {
@Override @Override
public NetconfProviderConfig createConfig() { public NetconfProviderConfig createConfig() {

2
providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
View File

@ -129,7 +129,7 @@ public class RestDeviceProvider extends AbstractProvider
protected final List<ConfigFactory> factories = ImmutableList.of( protected final List<ConfigFactory> factories = ImmutableList.of(
new ConfigFactory<ApplicationId, RestProviderConfig>(APP_SUBJECT_FACTORY, new ConfigFactory<ApplicationId, RestProviderConfig>(APP_SUBJECT_FACTORY,
RestProviderConfig.class, RestProviderConfig.class,
"devices", "rest_devices",
true) { true) {
@Override @Override
public RestProviderConfig createConfig() { public RestProviderConfig createConfig() {

2
providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
View File

@ -109,7 +109,7 @@ public class SnmpDeviceProvider extends AbstractProvider
protected final List<ConfigFactory> factories = ImmutableList.of( protected final List<ConfigFactory> factories = ImmutableList.of(
new ConfigFactory<ApplicationId, SnmpProviderConfig>(APP_SUBJECT_FACTORY, new ConfigFactory<ApplicationId, SnmpProviderConfig>(APP_SUBJECT_FACTORY,
SnmpProviderConfig.class, SnmpProviderConfig.class,
"devices", "snmp_devices",
true) { true) {
@Override @Override
public SnmpProviderConfig createConfig() { public SnmpProviderConfig createConfig() {

2
tools/test/configs/bmv2-cfg.json
View File

@ -1,7 +1,7 @@
{ {
"apps":{ "apps":{
"org.onosproject.bmv2":{ "org.onosproject.bmv2":{
"devices":[{ "bmv2_devices":[{
"ip":"192.168.57.100", "ip":"192.168.57.100",
"port":9090 "port":9090
}] }]

2
tools/test/configs/netconf-cfg-old.json
View File

@ -8,7 +8,7 @@
}, },
"apps":{ "apps":{
"org.onosproject.netconf":{ "org.onosproject.netconf":{
"devices":[{ "netconf_devices":[{
"username":"mininet", "username":"mininet",
"password":"mininet", "password":"mininet",
"ip":"192.168.56.104", "ip":"192.168.56.104",

2
tools/test/configs/restSB-cfg-old.json
View File

@ -8,7 +8,7 @@
}, },
"apps": { "apps": {
"org.onosproject.restsb": { "org.onosproject.restsb": {
"devices": [{ "rest_devices": [{
"username": "dev", "username": "dev",
"password": "", "password": "",
"ip": "127.0.0.1", "ip": "127.0.0.1",