Modified onos.properties and IFloodlightModule so that it loads SegmentRoutingManager and use sr.conf
Change-Id: Ib63fb045ac140f4de0d179e1033bcc8bf9cbb24e
diff --git a/conf/onos.properties b/conf/onos.properties
index 10afac0..a42eab9 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -7,7 +7,9 @@
net.onrc.onos.core.intent.runtime.PlanInstallModule,\
net.onrc.onos.core.registry.ZookeeperRegistry, \
net.onrc.onos.core.metrics.OnosMetricsModule, \
-net.onrc.onos.apps.websocket.WebSocketModule
+net.onrc.onos.apps.websocket.WebSocketModule, \
+net.onrc.onos.core.main.config.DefaultConfiguration, \
+net.onrc.onos.apps.segmentrouting.SegmentRoutingManager
net.floodlightcontroller.restserver.RestApiServer.port = 8080
net.floodlightcontroller.core.FloodlightProvider.openflowport = 6633
net.floodlightcontroller.core.FloodlightProvider.workerthreads = 16
@@ -20,4 +22,4 @@
# Uncomment and list all the ZooKeeper instances after localhost on multi-instance deployment.
#net.onrc.onos.core.registry.ZookeeperRegistry.connectionString = localhost:2181,otherhost:2181
# Specify a network configuration file to be used by the NetworkConfigManager
-#net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/my_network.conf
+net.onrc.onos.core.configmanager.NetworkConfigManager.networkConfigFile = conf/sr.conf
diff --git a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
index 5c61f6e..1748caf 100644
--- a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
+++ b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
@@ -28,4 +28,4 @@
net.onrc.onos.core.matchaction.MatchActionModule
net.onrc.onos.core.flowmanager.FlowManagerModule
net.onrc.onos.core.configmanager.NetworkConfigManager
-net.onrc.onos.apps.segmentrouting.ArpHandler
+net.onrc.onos.apps.segmentrouting.SegmentRoutingManager