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/impl/handler/DefaultInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
index 98673cf..a4ca067 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
@@ -152,7 +152,7 @@
}
private void dstIpRule(Instance instance, long vni, boolean install) {
- Ip4Address tunnelIp = nodeManager.dpIp(instance.deviceId()).getIp4Address();
+ Ip4Address tunnelIp = nodeManager.dataIp(instance.deviceId()).getIp4Address();
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
@@ -177,11 +177,12 @@
pipeline.processFlowRule(install, flowRule);
for (CordVtnNode node : nodeManager.completeNodes()) {
- if (node.intBrId().equals(instance.deviceId())) {
+ if (node.integrationBridgeId().equals(instance.deviceId())) {
continue;
}
- ExtensionTreatment tunnelDst = pipeline.tunnelDstTreatment(node.intBrId(), tunnelIp);
+ ExtensionTreatment tunnelDst =
+ pipeline.tunnelDstTreatment(node.integrationBridgeId(), tunnelIp);
if (tunnelDst == null) {
continue;
}
@@ -189,8 +190,8 @@
treatment = DefaultTrafficTreatment.builder()
.setEthDst(instance.mac())
.setTunnelId(vni)
- .extension(tunnelDst, node.intBrId())
- .setOutput(nodeManager.tunnelPort(node.intBrId()))
+ .extension(tunnelDst, node.integrationBridgeId())
+ .setOutput(nodeManager.tunnelPort(node.integrationBridgeId()))
.build();
flowRule = DefaultFlowRule.builder()
@@ -198,7 +199,7 @@
.withSelector(selector)
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
- .forDevice(node.intBrId())
+ .forDevice(node.integrationBridgeId())
.forTable(CordVtnPipeline.TABLE_DST_IP)
.makePermanent()
.build();
@@ -248,7 +249,7 @@
.withSelector(selector)
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
- .forDevice(node.intBrId())
+ .forDevice(node.integrationBridgeId())
.forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
.makePermanent()
.build();
@@ -273,7 +274,7 @@
.withSelector(selector)
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_LOW)
- .forDevice(node.intBrId())
+ .forDevice(node.integrationBridgeId())
.forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
.makePermanent()
.build();
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 1f96023..648c341 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.dpPort(vsgVm.deviceId()),
+ nodeManager.dataPort(vsgVm.deviceId()),
vtnPort.addressPairs().keySet(),
true);
@@ -159,7 +159,7 @@
}
populateVsgRules(vsgVm, getStag(vtnPort),
- nodeManager.dpPort(vsgVm.deviceId()),
+ nodeManager.dataPort(vsgVm.deviceId()),
vtnPort.addressPairs().keySet(),
false);
}
@@ -229,11 +229,11 @@
instanceService.addNestedInstance(hostId, hostDesc);
}
- private void populateVsgRules(Instance vsgVm, VlanId stag, PortNumber dpPort,
+ private void populateVsgRules(Instance vsgVm, VlanId stag, PortNumber dataPort,
Set<IpAddress> vsgWanIps, boolean install) {
// for traffics with s-tag, strip the tag and take through the vSG VM
TrafficSelector selector = DefaultTrafficSelector.builder()
- .matchInPort(dpPort)
+ .matchInPort(dataPort)
.matchVlanId(stag)
.build();
@@ -261,7 +261,7 @@
.build();
treatment = DefaultTrafficTreatment.builder()
- .setOutput(dpPort)
+ .setOutput(dataPort)
.build();
flowRule = DefaultFlowRule.builder()