Fixed bundle so fabric manager activates properly
Change-Id: I32123f322d778f82171b0a0b741f187318aa7ba3
diff --git a/local/ce-fabric/features.xml b/local/ce-fabric/features.xml
index 83ba135..8111572 100644
--- a/local/ce-fabric/features.xml
+++ b/local/ce-fabric/features.xml
@@ -18,5 +18,6 @@
<feature name="${project.artifactId}" version="${project.version}"
description="${project.description}">
<bundle>mvn:com.google.code.gson/gson/2.6.2</bundle>
+ <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
</feature>
</features>
diff --git a/local/ce-fabric/pom.xml b/local/ce-fabric/pom.xml
index 32fd3a0..d7d2da3 100644
--- a/local/ce-fabric/pom.xml
+++ b/local/ce-fabric/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.opencord.ce</groupId>
<artifactId>bigswitch</artifactId>
- <version>${parent.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
diff --git a/local/ce-fabric/src/main/java/org/opencord/ce/local/fabric/CarrierEthernetFabricManager.java b/local/ce-fabric/src/main/java/org/opencord/ce/local/fabric/CarrierEthernetFabricManager.java
index 249031b..66fb6db 100644
--- a/local/ce-fabric/src/main/java/org/opencord/ce/local/fabric/CarrierEthernetFabricManager.java
+++ b/local/ce-fabric/src/main/java/org/opencord/ce/local/fabric/CarrierEthernetFabricManager.java
@@ -92,7 +92,7 @@
private final ConfigFactory<ApplicationId, CarrierEthernetFabricConfig> configFactory =
new ConfigFactory<ApplicationId, CarrierEthernetFabricConfig>(APP_SUBJECT_FACTORY,
- CarrierEthernetFabricConfig.class, "segmentrouting_ctl", false) {
+ CarrierEthernetFabricConfig.class, "segmentrouting_ctl") {
@Override
public CarrierEthernetFabricConfig createConfig() {
return new CarrierEthernetFabricConfig();
@@ -111,7 +111,7 @@
private DeviceId deviceId;
@Activate
- protected void activate() {
+ public void activate() {
appId = coreService.registerApplication(APP_NAME);
cfgService.addListener(cfgListener);
cfgService.registerConfigFactory(configFactory);
@@ -120,7 +120,7 @@
}
@Deactivate
- protected void deactivate() {
+ public void deactivate() {
cfgService.removeListener(cfgListener);
cfgService.unregisterConfigFactory(configFactory);
log.info("Stopped");