[SEBA-636] Modify Segmentrouting to not program multicast tree on unconfigured devices (OLT)
Change-Id: I0a2e46545c9e3d6bc3d3a2b1335af8a39f2cae87
(cherry picked from commit ece19c7d517fb9eae47b4a836455ddec3f0b1484)
diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
index 16f3b94..6d3f938 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
@@ -141,6 +141,10 @@
void addFilterToDevice(DeviceId deviceId, PortNumber port, VlanId assignedVlan,
IpAddress mcastIp, McastRole mcastRole) {
+ if (!srManager.deviceConfiguration().isConfigured(deviceId)) {
+ log.debug("skip update of fitering objective for unconfigured device: {}", deviceId);
+ return;
+ }
MacAddress routerMac = getRouterMac(deviceId, port);
if (MacAddress.NONE.equals(routerMac)) {
@@ -170,6 +174,10 @@
void removeFilterToDevice(DeviceId deviceId, PortNumber port, VlanId assignedVlan,
IpAddress mcastIp, McastRole mcastRole) {
+ if (!srManager.deviceConfiguration().isConfigured(deviceId)) {
+ log.debug("skip update of fitering objective for unconfigured device: {}", deviceId);
+ return;
+ }
MacAddress routerMac = getRouterMac(deviceId, port);
if (MacAddress.NONE.equals(routerMac)) {