Revert "CORD-247 Add host management network interface to integration bridge"
This reverts commit 3ef5249acd9f3ff82dd1c18ec0a09038709c7f3f.
Change-Id: I053e97d49bbef14e764a776cd37dd9d13ddea39e
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()