commit 666cd6dfc3c2a5fbce0f02a600ad902fb24d5014
author sangho <sangho@onlab.us> Tue Apr 14 16:27:13 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 27 19:53:42 2015 +0000
tree 4ee49524ac2076d153d647807f4bbdf10e12182c
parent 0d886fcaf6fb25e4e48a7dc636e477798e0ed149

ONOS-1521 : Supports Leaf-Spine topology (tested with 4 x 4 )
- Supports ECMPNotSupportedInTransitRouter option
- Adds Leaf-Spine config file
- Removes the temporary NetworkConfigHanlder class
- Removes the grouphandler dependency
- Removes the grouphandler app
Change-Id: I8c70e81bfb4062e251b25c0fa23ef2c92419a75c

apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java

diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 08d6220..956fc1e 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -99,15 +99,14 @@
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected MastershipService mastershipService;
-    protected NetworkConfigHandler networkConfigHandler = null;
     protected ArpHandler arpHandler = null;
     protected IcmpHandler icmpHandler = null;
     protected IpHandler ipHandler = null;
     protected RoutingRulePopulator routingRulePopulator = null;
     protected ApplicationId appId;
+    protected DeviceConfiguration deviceConfiguration = null;
 
     private DefaultRoutingHandler defaultRoutingHandler = null;
-    private DeviceConfiguration deviceConfiguration = null;
     private InternalPacketProcessor processor = new InternalPacketProcessor();
     private InternalEventHandler eventHandler = new InternalEventHandler();
 
@@ -129,8 +128,6 @@
         appId = coreService.registerApplication("org.onosproject.segmentrouting");
         networkConfigService.init();
         deviceConfiguration = new DeviceConfiguration(networkConfigService);
-        networkConfigHandler = new NetworkConfigHandler(this,
-                                                        deviceConfiguration);
         arpHandler = new ArpHandler(this);
         icmpHandler = new IcmpHandler(this);
         ipHandler = new IpHandler(this);
@@ -150,8 +147,8 @@
                             appId, deviceConfiguration, linkService, groupService);
                 groupHandler.createGroups();
                 groupHandlerMap.put(device.id(), groupHandler);
-                log.debug("Initiating default group handling for {}", device.id());
                 defaultRoutingHandler.populateTtpRules(device.id());
+                log.debug("Initiating default group handling for {}", device.id());
             } else {
                 log.debug("Activate: Local role {} "
                                 + "is not MASTER for device {}",
@@ -162,7 +159,6 @@
         }
 
         defaultRoutingHandler.startPopulationProcess();
-
         log.info("Started");
     }