commit 7fef257a9232327ed55f77d9a869fa4ef8ae9ccc
author Jian Li <pyguni@gmail.com> Fri Aug 24 21:03:13 2018 +0900
committer Jian Li <pyguni@gmail.com> Tue Aug 28 12:30:55 2018 +0000
tree 80de15976a1693944aecef18a06ddc735645819d
parent b9971206004b0dfd6e05b2658796fbe5f759d7e0

Fix: resolve IAE caused by Property definitions not found at provider

Change-Id: I03c851bdf02203612f288c3de8c0ebba9905ed6d
(cherry picked from commit 8f65b7e10565cf8d769d26d6239a516cd226cdf9)

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenStackSwitchingDirectPortProvider.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenStackSwitchingDirectPortProvider.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenStackSwitchingDirectPortProvider.java
index f661f5a..7a8bf4b 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenStackSwitchingDirectPortProvider.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenStackSwitchingDirectPortProvider.java
@@ -20,7 +20,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.cluster.ClusterService;
 import org.onosproject.cluster.LeadershipService;
 import org.onosproject.cluster.NodeId;
@@ -40,7 +39,6 @@
 import org.onosproject.openstacknode.api.OpenstackNodeEvent;
 import org.onosproject.openstacknode.api.OpenstackNodeListener;
 import org.onosproject.openstacknode.api.OpenstackNodeService;
-import org.onosproject.ovsdb.controller.OvsdbController;
 import org.openstack4j.model.network.Port;
 import org.openstack4j.model.network.State;
 import org.slf4j.Logger;
@@ -84,18 +82,12 @@
     protected ClusterService clusterService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OvsdbController ovsdbController;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected InstancePortService instancePortService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ComponentConfigService componentConfigService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected MastershipService mastershipService;
 
     private final OpenstackNetworkListener openstackNetworkListener = new InternalOpenstackNetworkListener();
@@ -110,7 +102,6 @@
         localNodeId = clusterService.getLocalNode().id();
         leadershipService.runForLeadership(appId.name());
         osNetworkService.addListener(openstackNetworkListener);
-        componentConfigService.registerProperties(getClass());
         osNodeService.addListener(internalNodeListener);
 
         log.info("Started");
@@ -120,7 +111,6 @@
     void deactivate() {
         leadershipService.withdraw(appId.name());
         osNetworkService.removeListener(openstackNetworkListener);
-        componentConfigService.unregisterProperties(getClass(), false);
         osNodeService.removeListener(internalNodeListener);
 
         log.info("Stopped");