commit 0592c3dabb682ae9113b4417125dbd3673287fe2
author Hyunsun Moon <hyunsun.moon@gmail.com> Thu Jun 23 14:47:52 2016 -0700
committer Jonathan Hart <jono@onlab.us> Thu Jun 23 14:54:09 2016 -0700
tree 9d3b9cde2710920e216c0fdc69b2bb2532b3cd60
parent 315b9a6ee030fcda18ca47f7c99eacb5a19d9779

Revert "CORD-247 Add host management network interface to integration bridge"

This reverts commit 3ef5249acd9f3ff82dd1c18ec0a09038709c7f3f.

Change-Id: I053e97d49bbef14e764a776cd37dd9d13ddea39e

src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java

diff --git a/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnNodeListCommand.java
index 0b25e7b..b8aa2cd 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, dataIp=%s, br-int=%s, dataIface=%s, init=%s",
+                print("hostname=%s, hostMgmtIp=%s, dpIp=%s, br-int=%s, dpIntf=%s, init=%s",
                       node.hostname(),
                       node.hostMgmtIp().cidr(),
-                      node.dataIp().cidr(),
-                      node.integrationBridgeId().toString(),
-                      node.dataIface(),
+                      node.dpIp().cidr(),
+                      node.intBrId().toString(),
+                      node.dpIntf(),
                       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.dataIp().cidr())
-                               .put("bridgeId", node.integrationBridgeId().toString())
-                               .put("dataPlaneInterface", node.dataIface())
+                               .put("dataPlaneIp", node.dpIp().cidr())
+                               .put("bridgeId", node.intBrId().toString())
+                               .put("dataPlaneInterface", node.dpIntf())
                                .put("init", getState(nodeManager, node)));
         }
         return result;