CORD-247 Add host management network interface to integration bridge
- Node can have management network connectivity by adding "hostManagementIface"
field to the network config "nodes" block, it's optional field
- Added Builder of CordVtnNode
- Improved cordvtn-node-check result
- Some renamings, intBrId -> integrationBridgeId, dpIp -> dataIp,
dpIntf -> dataIface, and dpPort -> dataPort
Change-Id: Iad16237e7f118886d5f3fa5a46f9e9f9649fe997
diff --git a/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java
index b8aa2cd..0b25e7b 100644
--- a/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java
@@ -47,12 +47,12 @@
print("%s", json(nodeManager, nodes));
} else {
for (CordVtnNode node : nodes) {
- print("hostname=%s, hostMgmtIp=%s, dpIp=%s, br-int=%s, dpIntf=%s, init=%s",
+ print("hostname=%s, hostMgmtIp=%s, dataIp=%s, br-int=%s, dataIface=%s, init=%s",
node.hostname(),
node.hostMgmtIp().cidr(),
- node.dpIp().cidr(),
- node.intBrId().toString(),
- node.dpIntf(),
+ node.dataIp().cidr(),
+ node.integrationBridgeId().toString(),
+ node.dataIface(),
getState(nodeManager, node));
}
print("Total %s nodes", nodeManager.getNodeCount());
@@ -66,9 +66,9 @@
result.add(mapper.createObjectNode()
.put("hostname", node.hostname())
.put("hostManagementIp", node.hostMgmtIp().cidr())
- .put("dataPlaneIp", node.dpIp().cidr())
- .put("bridgeId", node.intBrId().toString())
- .put("dataPlaneInterface", node.dpIntf())
+ .put("dataPlaneIp", node.dataIp().cidr())
+ .put("bridgeId", node.integrationBridgeId().toString())
+ .put("dataPlaneInterface", node.dataIface())
.put("init", getState(nodeManager, node)));
}
return result;