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
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);
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 614709f..c356f5e 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -345,8 +345,6 @@
"purgeOnDisconnection", "true");
compCfgService.preSetProperty("org.onosproject.net.flow.impl.FlowRuleManager",
"purgeOnDisconnection", "true");
- compCfgService.preSetProperty("org.onosproject.vrouter.Vrouter",
- "fibInstallerEnabled", "false");
compCfgService.preSetProperty("org.onosproject.provider.host.impl.HostLocationProvider",
"requestInterceptsEnabled", "false");
compCfgService.preSetProperty("org.onosproject.incubator.net.neighbour.impl.NeighbourResolutionManager",
diff --git a/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java b/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
index d694996..fac2cbb 100644
--- a/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
+++ b/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
@@ -21,7 +21,6 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.incubator.component.ComponentService;
@@ -47,9 +46,6 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
private ComponentService componentService;
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- private ComponentConfigService componentConfigService;
-
private ApplicationId appId;
private List<String> baseComponents = Lists.newArrayList(DIRECT_HOST_MGR);
@@ -57,11 +53,6 @@
@Activate
protected void activate() {
appId = coreService.registerApplication(APP_NAME);
-
- componentConfigService.preSetProperty(
- "org.onosproject.incubator.store.routing.impl.RouteStoreImpl",
- "distributed", "true");
-
baseComponents.forEach(name -> componentService.activate(appId, name));
log.info("Started");
@@ -69,10 +60,6 @@
@Deactivate
protected void deactivate() {
- componentConfigService.preSetProperty(
- "org.onosproject.incubator.store.routing.impl.RouteStoreImpl",
- "distributed", "false");
-
log.info("Stopped");
}
}