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/CordVtnPipeline.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
index 8aa0946..2aa9f1f 100644
--- a/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
@@ -115,26 +115,26 @@
* Installs table miss rule to a give device.
*
* @param node cordvtn node
- * @param dpPort data plane port number
+ * @param dataPort data plane port number
* @param tunnelPort tunnel port number
*/
- public void initPipeline(CordVtnNode node, PortNumber dpPort, PortNumber tunnelPort) {
+ public void initPipeline(CordVtnNode node, PortNumber dataPort, PortNumber tunnelPort) {
checkNotNull(node);
- processTableZero(node.intBrId(), dpPort, node.dpIp().ip());
- processInPortTable(node.intBrId(), tunnelPort, dpPort);
- processAccessTypeTable(node.intBrId(), dpPort);
- processVlanTable(node.intBrId(), dpPort);
+ processTableZero(node.integrationBridgeId(), dataPort, node.dataIp().ip());
+ processInPortTable(node.integrationBridgeId(), tunnelPort, dataPort);
+ processAccessTypeTable(node.integrationBridgeId(), dataPort);
+ processVlanTable(node.integrationBridgeId(), dataPort);
}
- private void processTableZero(DeviceId deviceId, PortNumber dpPort, IpAddress dpIp) {
+ private void processTableZero(DeviceId deviceId, PortNumber dataPort, IpAddress dataIp) {
// take vxlan packet out onto the physical port
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchInPort(PortNumber.LOCAL)
.build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .setOutput(dpPort)
+ .setOutput(dataPort)
.build();
FlowRule flowRule = DefaultFlowRule.builder()
@@ -151,7 +151,7 @@
// take a vxlan encap'd packet through the Linux stack
selector = DefaultTrafficSelector.builder()
- .matchInPort(dpPort)
+ .matchInPort(dataPort)
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPProtocol(IPv4.PROTOCOL_UDP)
.matchUdpDst(TpPort.tpPort(VXLAN_UDP_PORT))
@@ -175,9 +175,9 @@
// take a packet to the data plane ip through Linux stack
selector = DefaultTrafficSelector.builder()
- .matchInPort(dpPort)
+ .matchInPort(dataPort)
.matchEthType(Ethernet.TYPE_IPV4)
- .matchIPDst(dpIp.toIpPrefix())
+ .matchIPDst(dataIp.toIpPrefix())
.build();
treatment = DefaultTrafficTreatment.builder()
@@ -198,9 +198,9 @@
// take an arp packet from physical through Linux stack
selector = DefaultTrafficSelector.builder()
- .matchInPort(dpPort)
+ .matchInPort(dataPort)
.matchEthType(Ethernet.TYPE_ARP)
- .matchArpTpa(dpIp.getIp4Address())
+ .matchArpTpa(dataIp.getIp4Address())
.build();
treatment = DefaultTrafficTreatment.builder()
@@ -261,7 +261,7 @@
processFlowRule(true, flowRule);
}
- private void processInPortTable(DeviceId deviceId, PortNumber tunnelPort, PortNumber dpPort) {
+ private void processInPortTable(DeviceId deviceId, PortNumber tunnelPort, PortNumber dataPort) {
checkNotNull(tunnelPort);
TrafficSelector selector = DefaultTrafficSelector.builder()
@@ -285,7 +285,7 @@
processFlowRule(true, flowRule);
selector = DefaultTrafficSelector.builder()
- .matchInPort(dpPort)
+ .matchInPort(dataPort)
.build();
treatment = DefaultTrafficTreatment.builder()
@@ -305,12 +305,12 @@
processFlowRule(true, flowRule);
}
- private void processAccessTypeTable(DeviceId deviceId, PortNumber dpPort) {
+ private void processAccessTypeTable(DeviceId deviceId, PortNumber dataPort) {
TrafficSelector selector = DefaultTrafficSelector.builder()
.build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .setOutput(dpPort)
+ .setOutput(dataPort)
.build();
FlowRule flowRule = DefaultFlowRule.builder()
@@ -326,7 +326,7 @@
processFlowRule(true, flowRule);
}
- private void processVlanTable(DeviceId deviceId, PortNumber dpPort) {
+ private void processVlanTable(DeviceId deviceId, PortNumber dataPort) {
// for traffic going out to WAN, strip vid 500 and take through data plane interface
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchVlanId(VLAN_WAN)
@@ -334,7 +334,7 @@
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
.popVlan()
- .setOutput(dpPort)
+ .setOutput(dataPort)
.build();
FlowRule flowRule = DefaultFlowRule.builder()