CORD-380 Added host provider for cordvtn service
- Renamed CordVtnConfigManager to CordVtnNodeManager
- Moved all node bootstrap logic to CordVtnNodeManager
- CordVtnService now provides VM add/remove and service dependency create/remove
- Made CordVtn implement HostProvider so that it can inject/eject VM to the system
Change-Id: I0011ac692ecea240d2d7fe48b3e7a1db4973b76e
diff --git a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeListCommand.java b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeListCommand.java
index 51641c4..48e1112 100644
--- a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeListCommand.java
+++ b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/cli/CordVtnNodeListCommand.java
@@ -21,7 +21,7 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.cordvtn.CordVtnService;
+import org.onosproject.cordvtn.CordVtnNodeManager;
import org.onosproject.cordvtn.CordVtnNode;
import java.util.Collections;
@@ -36,12 +36,12 @@
@Override
protected void execute() {
- CordVtnService service = AbstractShellCommand.get(CordVtnService.class);
- List<CordVtnNode> nodes = service.getNodes();
+ CordVtnNodeManager nodeManager = AbstractShellCommand.get(CordVtnNodeManager.class);
+ List<CordVtnNode> nodes = nodeManager.getNodes();
Collections.sort(nodes, CordVtnNode.CORDVTN_NODE_COMPARATOR);
if (outputJson()) {
- print("%s", json(service, nodes));
+ print("%s", json(nodeManager, nodes));
} else {
for (CordVtnNode node : nodes) {
print("hostname=%s, ovsdb=%s, br-int=%s, phyPort=%s, localIp=%s, init=%s",
@@ -50,13 +50,13 @@
node.intBrId().toString(),
node.phyPortName(),
node.localIp().toString(),
- getState(service, node));
+ getState(nodeManager, node));
}
- print("Total %s nodes", service.getNodeCount());
+ print("Total %s nodes", nodeManager.getNodeCount());
}
}
- private JsonNode json(CordVtnService service, List<CordVtnNode> nodes) {
+ private JsonNode json(CordVtnNodeManager nodeManager, List<CordVtnNode> nodes) {
ObjectMapper mapper = new ObjectMapper();
ArrayNode result = mapper.createArrayNode();
for (CordVtnNode node : nodes) {
@@ -67,12 +67,12 @@
.put("brInt", node.intBrId().toString())
.put("phyPort", node.phyPortName())
.put("localIp", node.localIp().toString())
- .put("init", getState(service, node)));
+ .put("init", getState(nodeManager, node)));
}
return result;
}
- private String getState(CordVtnService service, CordVtnNode node) {
- return service.getNodeInitState(node) ? "COMPLETE" : "INCOMPLETE";
+ private String getState(CordVtnNodeManager nodeManager, CordVtnNode node) {
+ return nodeManager.getNodeInitState(node) ? "COMPLETE" : "INCOMPLETE";
}
}