commit 776789f4b3077561dfb4a346d34a1891d1f692e0
author Daniel Ginsburg <daniel.ginsburg@harmonicinc.com> Mon Apr 30 19:27:19 2018 -0400
committer Charles Chan <charles@opennetworking.org> Wed May 09 21:49:51 2018 +0000
tree f55e3c5a8ca0c0012d1896b800842be88e7a5287
parent 60ce2225dfaae01482b7347733b2949dcdd817f8

Avoid programming TMAC entries for BSOD vlans

When an interfaces is defined with tagged VLAN(s) and no IP addresses, do not install TMAC entries for that VLAN(s).

Change-Id: I5beeb38c0b21cdd69a0da90943f768c3aeddb720

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 64fe2fc..90da4b4 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -998,7 +998,23 @@
 
     private boolean processSinglePortFiltersInternal(DeviceId deviceId, PortNumber portnum,
                                                       boolean pushVlan, VlanId vlanId, boolean install) {
-        FilteringObjective.Builder fob = buildFilteringObjective(deviceId, portnum, pushVlan, vlanId);
+        boolean doTMAC = true;
+
+        if (!pushVlan) {
+            // Skip the tagged vlans belonging to an interface without an IP address
+            Set<Interface> ifaces = srManager.interfaceService
+                    .getInterfacesByPort(new ConnectPoint(deviceId, portnum))
+                    .stream()
+                    .filter(intf -> intf.vlanTagged().contains(vlanId) && intf.ipAddressesList().isEmpty())
+                    .collect(Collectors.toSet());
+            if (!ifaces.isEmpty()) {
+                log.debug("processSinglePortFiltersInternal: skipping TMAC for vlan {} at {}/{} - no IP",
+                          vlanId, deviceId, portnum);
+                doTMAC = false;
+            }
+        }
+
+        FilteringObjective.Builder fob = buildFilteringObjective(deviceId, portnum, pushVlan, vlanId, doTMAC);
         if (fob == null) {
             // error encountered during build
             return false;
@@ -1019,7 +1035,7 @@
     }
 
     private FilteringObjective.Builder buildFilteringObjective(DeviceId deviceId, PortNumber portnum,
-                                                               boolean pushVlan, VlanId vlanId) {
+                                                               boolean pushVlan, VlanId vlanId, boolean doTMAC) {
         MacAddress deviceMac;
         try {
             deviceMac = config.getDeviceMac(deviceId);
@@ -1028,9 +1044,15 @@
             return null;
         }
         FilteringObjective.Builder fob = DefaultFilteringObjective.builder();
-        fob.withKey(Criteria.matchInPort(portnum))
-            .addCondition(Criteria.matchEthDst(deviceMac))
-            .withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
+
+        if (doTMAC) {
+            fob.withKey(Criteria.matchInPort(portnum))
+                    .addCondition(Criteria.matchEthDst(deviceMac))
+                    .withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
+        } else {
+            fob.withKey(Criteria.matchInPort(portnum))
+                    .withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
+        }
 
         TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();