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/impl/handler/VsgInstanceHandler.java

diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java
index 648c341..1f96023 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java
@@ -114,7 +114,7 @@
                 return;
             }
             populateVsgRules(vsgVm, getStag(vtnPort),
-                             nodeManager.dataPort(vsgVm.deviceId()),
+                             nodeManager.dpPort(vsgVm.deviceId()),
                              vtnPort.addressPairs().keySet(),
                              true);
 
@@ -159,7 +159,7 @@
         }
 
         populateVsgRules(vsgVm, getStag(vtnPort),
-                         nodeManager.dataPort(vsgVm.deviceId()),
+                         nodeManager.dpPort(vsgVm.deviceId()),
                          vtnPort.addressPairs().keySet(),
                          false);
     }
@@ -229,11 +229,11 @@
         instanceService.addNestedInstance(hostId, hostDesc);
     }
 
-    private void populateVsgRules(Instance vsgVm, VlanId stag, PortNumber dataPort,
+    private void populateVsgRules(Instance vsgVm, VlanId stag, PortNumber dpPort,
                                   Set<IpAddress> vsgWanIps, boolean install) {
         // for traffics with s-tag, strip the tag and take through the vSG VM
         TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchInPort(dataPort)
+                .matchInPort(dpPort)
                 .matchVlanId(stag)
                 .build();
 
@@ -261,7 +261,7 @@
                 .build();
 
         treatment = DefaultTrafficTreatment.builder()
-                .setOutput(dataPort)
+                .setOutput(dpPort)
                 .build();
 
         flowRule = DefaultFlowRule.builder()