commit 0be3f0f6ee5722272c043f191e48901019d3b19e
author Pier Luigi <pierventre@hotmail.com> Mon Jan 30 09:47:36 2017 -0800
committer Ray Milkey <ray@onlab.us> Fri Feb 10 18:09:15 2017 +0000
tree 1a0a26c185ddb8e0ff19d608039e69e2b66fecab
parent ac3e1d96f7aa4a8c12bebf75e2a367051754b782

[CORD-640] PW clean up.

Changes:
- Re-enable the pop mpls action for PW;
- OFDPA 3.0 has some changes in the pipeline
which don't allow the VLAN pop in the PW termination;

Change-Id: I42b5a3fe4b703d9c9af083768fb6b2decd6f54d7

src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java

diff --git a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 14ce83d..758e4cc 100644
--- a/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -394,7 +394,7 @@
 
         TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder();
         List<ForwardingObjective.Builder> fwdObjBuilders = Lists.newArrayList();
-        // For the transport of VPWS we can use two or three MPLS label
+        // For the transport of Pwaas we can use two or three MPLS label
         sbuilder.matchEthType(Ethernet.MPLS_UNICAST);
         sbuilder.matchMplsLabel(MplsLabel.mplsLabel(segmentId));
         sbuilder.matchMplsBos(isMplsBos);
@@ -507,7 +507,7 @@
             return false;
         }
         fwdObjs.addAll(fwdObjsMpls);
-        // Generates the transit rules used by the MPLS VPWS. For now it is
+        // Generates the transit rules used by the MPLS Pwaas. For now it is
         // the only case !BoS supported.
         fwdObjsMpls = handleMpls(targetSwId, destSwId, nextHops, segmentId, routerIp, false);
         if (fwdObjsMpls.isEmpty()) {