NETVIRT-1142: Fix mistakenly switched port pair ports

When translating a port pair to data plane locators, the ingress port
was set as the reverse DPL and the egress port as forward DPL which is
inverse as to what it should be: the ingress port is the forward DPL and
the egress port is the reverse DPL.

Change-Id: I1251aaad0ce3fee336b8544858ce43c5b057c4f0
JIRA: NETVIRT-1142
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java
index a3e07dc53bc253090a7cd271bb50ecbf516272a3..5dd042f617379d5be9f26b2a844f34dcebe663cc 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java
@@ -61,22 +61,22 @@ public final class PortPairGroupTranslator {
 
         DataPlaneLocatorBuilder forwardDplBuilder = new DataPlaneLocatorBuilder();
         forwardDplBuilder.setTransport(Mac.class);
-        String forwardPort = portPair.getEgress().getValue();
+        String forwardPort = portPair.getIngress().getValue();
         LogicalInterface forwardInterface = new LogicalInterfaceBuilder().setInterfaceName(forwardPort).build();
         forwardDplBuilder.setLocatorType(forwardInterface);
         SffDataPlaneLocatorBuilder sffForwardDplBuilder = new SffDataPlaneLocatorBuilder();
         sffForwardDplBuilder.setDataPlaneLocator(forwardDplBuilder.build());
-        String forwardDplName = portPair.getName() + DPL_EGRESS_SUFFIX;
+        String forwardDplName = portPair.getName() + DPL_INGRESS_SUFFIX;
         sffForwardDplBuilder.setName(new SffDataPlaneLocatorName(forwardDplName));
 
         DataPlaneLocatorBuilder reverseDplBuilder = new DataPlaneLocatorBuilder();
         reverseDplBuilder.setTransport(Mac.class);
-        String reversePort = portPair.getIngress().getValue();
+        String reversePort = portPair.getEgress().getValue();
         LogicalInterface reverseInterface = new LogicalInterfaceBuilder().setInterfaceName(reversePort).build();
         reverseDplBuilder.setLocatorType(reverseInterface);
         SffDataPlaneLocatorBuilder sffReverseDplBuilder = new SffDataPlaneLocatorBuilder();
         sffReverseDplBuilder.setDataPlaneLocator(reverseDplBuilder.build());
-        String reverseDplName = portPair.getName() + DPL_INGRESS_SUFFIX;
+        String reverseDplName = portPair.getName() + DPL_EGRESS_SUFFIX;
         sffReverseDplBuilder.setName(new SffDataPlaneLocatorName(reverseDplName));
 
         List<SffDataPlaneLocator> sffDataPlaneLocator = new ArrayList<>();

diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java
index 5ced2296440c78c6cf644bc78756f3f4c09d143a..e45267ecbfbe6209472d86e4176332402f641b37 100644 (file)
--- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java
+++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java
@@ -82,19 +82,19 @@ public final class PortPairTranslator {
 
         //Build forward DPL
         SfDataPlaneLocatorBuilder sfForwardDplBuilder = new SfDataPlaneLocatorBuilder();
-        sfForwardDplBuilder.setName(new SfDataPlaneLocatorName(portPair.getName() + DPL_EGRESS_SUFFIX));
+        sfForwardDplBuilder.setName(new SfDataPlaneLocatorName(portPair.getName() + DPL_INGRESS_SUFFIX));
         sfForwardDplBuilder.setTransport(transportTypeClass == null ? Mac.class : transportTypeClass);
         sfForwardDplBuilder.setServiceFunctionForwarder(new SffName(SfcMdsalHelper.NETVIRT_LOGICAL_SFF_NAME));
-        String forwardPort = portPair.getEgress().getValue();
+        String forwardPort = portPair.getIngress().getValue();
         LogicalInterface forwardInterface = new LogicalInterfaceBuilder().setInterfaceName(forwardPort).build();
         sfForwardDplBuilder.setLocatorType(forwardInterface);
 
         //Build reverse DPL
         SfDataPlaneLocatorBuilder sfReverseDplBuilder = new SfDataPlaneLocatorBuilder();
-        sfReverseDplBuilder.setName(new SfDataPlaneLocatorName(portPair.getName() + DPL_INGRESS_SUFFIX));
+        sfReverseDplBuilder.setName(new SfDataPlaneLocatorName(portPair.getName() + DPL_EGRESS_SUFFIX));
         sfReverseDplBuilder.setTransport(transportTypeClass == null ? Mac.class : transportTypeClass);
         sfReverseDplBuilder.setServiceFunctionForwarder(new SffName(SfcMdsalHelper.NETVIRT_LOGICAL_SFF_NAME));
-        String reversePort = portPair.getIngress().getValue();
+        String reversePort = portPair.getEgress().getValue();
         LogicalInterface reverseInterface = new LogicalInterfaceBuilder().setInterfaceName(reversePort).build();
         sfReverseDplBuilder.setLocatorType(reverseInterface);