Move address-bindings config to new config system
Change-Id: I6d87ddbf98789dbe8355c453a3263f50fbc5d99c
diff --git a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
index d225248..89bf1c7 100644
--- a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
@@ -63,7 +63,7 @@
if (isNullOrEmpty(configKey)) {
addSubject(root, s);
} else {
- root = getSubjectConfig(getConfig(s, configKey));
+ root = getSubjectConfig(getConfig(s, subjectKey, configKey));
}
}
}
@@ -93,8 +93,8 @@
return config != null ? config.node() : null;
}
- private Config getConfig(Object s, String ck) {
- Class<? extends Config> configClass = service.getConfigClass(ck);
+ private Config getConfig(Object s, String subjectKey, String ck) {
+ Class<? extends Config> configClass = service.getConfigClass(subjectKey, ck);
return configClass != null ? service.getConfig(s, configClass) : null;
}
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
index d161a6e..3ce45b9 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
@@ -15,10 +15,7 @@
*/
package org.onosproject.cli.net;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
+import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cli.Comparators;
@@ -26,7 +23,9 @@
import org.onosproject.net.host.InterfaceIpAddress;
import org.onosproject.net.host.PortAddresses;
-import com.google.common.collect.Lists;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
/**
* Lists all configured address port bindings.