commit aac79e9f51943ca31588f2edca39f014e1542799
author pier <pier@opennetworking.org> Fri Oct 04 15:40:34 2019 +0200
committer pier <pier@opennetworking.org> Wed Nov 27 21:30:33 2019 +0100
tree db0f74d30684235bed1af719bf8b0d87eded0c84
parent 572d4a963dfa7c2a660fe14bfde7afeec290dce5

Fix noMorePorts logic which did not consider PW_VLAN

Change-Id: Iadacf753c8e202f1327113eb795e998dccf1390b

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

diff --git a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index f19b68c..1397774 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -1694,9 +1694,9 @@
         return enabledPorts.stream().noneMatch(cp ->
             // Given vlanId is included in the vlan-tagged configuration
             srManager.interfaceService.getTaggedVlanId(cp).contains(vlanId) ||
-            // Given vlanId is INTERNAL_VLAN and the interface is not configured
+            // Given vlanId is INTERNAL_VLAN or PSEUDOWIRE_VLAN and the interface is not configured
             (srManager.interfaceService.getTaggedVlanId(cp).isEmpty() && srManager.getInternalVlanId(cp) == null &&
-                    vlanId.equals(srManager.getDefaultInternalVlan())) ||
+                (vlanId.equals(srManager.getDefaultInternalVlan()) || vlanId.equals(srManager.getPwTransportVlan()))) ||
             // interface is configured and either vlan-untagged or vlan-native matches given vlanId
             (srManager.getInternalVlanId(cp) != null && srManager.getInternalVlanId(cp).equals(vlanId))
         );