commit e7926850ae8b55692a3fa9fa5b836c923d0e4c12
author Charles Chan <rascov@gmail.com> Thu Feb 02 11:41:19 2017 -0800
committer Jonathan Hart <jono@onlab.us> Mon Feb 06 16:33:55 2017 +0000
tree df9f99db27f66e3e8da2792e401325655e4f453e
parent 63819f6cee219c00a98c16925db8cd67fc6cfb39

Component config changes after vRouter becomes separate apps

- SR no longer needs to turn SSFI off using component config since SSFI is now an ONOS app.
- Distributed Route Store is now enabled by FpmManager instead of vRouter

Change-Id: Ia5665ffc9bdb4cd126868b3c829aedda713b53f4

apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmManager.java

diff --git a/apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmManager.java b/apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmManager.java
index 0ca21e6..bb1448f 100644
--- a/apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmManager.java
+++ b/apps/routing/fpm/src/main/java/org/onosproject/routing/fpm/FpmManager.java
@@ -94,6 +94,10 @@
 
     @Activate
     protected void activate(ComponentContext context) {
+        componentConfigService.preSetProperty(
+                "org.onosproject.incubator.store.routing.impl.RouteStoreImpl",
+                "distributed", "true");
+
         componentConfigService.registerProperties(getClass());
         modified(context);
         startServer();
@@ -102,6 +106,10 @@
 
     @Deactivate
     protected void deactivate() {
+        componentConfigService.preSetProperty(
+                "org.onosproject.incubator.store.routing.impl.RouteStoreImpl",
+                "distributed", "false");
+
         stopServer();
         fpmRoutes.clear();
         componentConfigService.unregisterProperties(getClass(), false);