Bugfix and improvement of SR config loading

Change-Id: If17af7ff1fbd3cb712e59cce930ef11146bdbf2e

@@ -137,12 +137,7 @@ public class NetworkConfigEventHandler {
         if (config == null) {
         if (config == null) {
             return ImmutableSet.of();
             return ImmutableSet.of();
         }
         }
-
-        HashSet<MacAddress> macAddresses = new HashSet<>();
-        config.vRouterMacs().forEach(mac -> {
-            macAddresses.add(mac);
-        });
-        return ImmutableSet.copyOf(macAddresses);
+        return ImmutableSet.copyOf(config.vRouterMacs());
     }
     }
 
 
     private boolean isEdge(DeviceId deviceId) {
     private boolean isEdge(DeviceId deviceId) {

@@ -59,7 +59,6 @@ public class DeviceConfiguration implements DeviceProperties {
     private final Map<VlanId, List<ConnectPoint>> xConnects = new ConcurrentHashMap<>();
     private final Map<VlanId, List<ConnectPoint>> xConnects = new ConcurrentHashMap<>();
     private ApplicationId appId;
     private ApplicationId appId;
     private NetworkConfigService cfgService;
     private NetworkConfigService cfgService;
-    private SegmentRoutingAppConfig appConfig;
 
 
     private class SegmentRouterInfo {
     private class SegmentRouterInfo {
         int nodeSid;
         int nodeSid;
@@ -107,9 +106,6 @@ public class DeviceConfiguration implements DeviceProperties {
             allSegmentIds.add(info.nodeSid);
             allSegmentIds.add(info.nodeSid);
         });
         });
 
 
-        // Read SegmentRoutingAppConfig
-        appConfig = cfgService.getConfig(appId, SegmentRoutingAppConfig.class);
-
         // Read gatewayIps and subnets from port subject.
         // Read gatewayIps and subnets from port subject.
         Set<ConnectPoint> portSubjects =
         Set<ConnectPoint> portSubjects =
             cfgService.getSubjects(ConnectPoint.class, InterfaceConfig.class);
             cfgService.getSubjects(ConnectPoint.class, InterfaceConfig.class);
@@ -367,9 +363,13 @@ public class DeviceConfiguration implements DeviceProperties {
 
 
             ImmutableSet.Builder<Ip4Prefix> builder = ImmutableSet.builder();
             ImmutableSet.Builder<Ip4Prefix> builder = ImmutableSet.builder();
             builder.addAll(srinfo.subnets.values());
             builder.addAll(srinfo.subnets.values());
-            if (appConfig != null && deviceId.equals(appConfig.vRouterId())) {
+            SegmentRoutingAppConfig appConfig =
+                    cfgService.getConfig(appId, SegmentRoutingAppConfig.class);
+            if (appConfig != null) {
+                if (deviceId.equals(appConfig.vRouterId().orElse(null))) {
                     builder.add(Ip4Prefix.valueOf("0.0.0.0/0"));
                     builder.add(Ip4Prefix.valueOf("0.0.0.0/0"));
                 }
                 }
+            }
             return builder.build();
             return builder.build();
         }
         }
         return null;
         return null;
@@ -493,10 +493,14 @@ public class DeviceConfiguration implements DeviceProperties {
     }
     }
 
 
     public Set<ConnectPoint> suppressSubnet() {
     public Set<ConnectPoint> suppressSubnet() {
+        SegmentRoutingAppConfig appConfig =
+                cfgService.getConfig(appId, SegmentRoutingAppConfig.class);
         return (appConfig != null) ? appConfig.suppressSubnet() : ImmutableSet.of();
         return (appConfig != null) ? appConfig.suppressSubnet() : ImmutableSet.of();
     }
     }
 
 
     public Set<ConnectPoint> suppressHost() {
     public Set<ConnectPoint> suppressHost() {
+        SegmentRoutingAppConfig appConfig =
+                cfgService.getConfig(appId, SegmentRoutingAppConfig.class);
         return (appConfig != null) ? appConfig.suppressHost() : ImmutableSet.of();
         return (appConfig != null) ? appConfig.suppressHost() : ImmutableSet.of();
     }
     }
 }
 }