commit 8e406511e98d7f28fce794cbb41b713a12802cd5
author Ray Milkey <ray@opennetworking.org> Wed Oct 24 15:56:50 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Oct 29 23:43:14 2018 +0000
tree 16a2737910822fb36fd7987717d4b6cbe72ee77b
parent 6a17acd1cb91d48078cc5015e562e3ef65a9f1ad

openstack and routing app OSGi property migration

Change-Id: I855020959456f059911284bb7d8ade376cbc20c5

apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/OpenstackVtapManager.java

diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/OpenstackVtapManager.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/OpenstackVtapManager.java
index a2c1a0a..439b084 100644
--- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/OpenstackVtapManager.java
+++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/impl/OpenstackVtapManager.java
@@ -123,6 +123,8 @@
 import static org.onosproject.openstacknode.api.Constants.INTEGRATION_BRIDGE;
 import static org.onosproject.openstacknode.api.NodeState.COMPLETE;
 import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.COMPUTE;
+import static org.onosproject.openstackvtap.impl.OsgiPropertyConstants.TUNNEL_NICIRA;
+import static org.onosproject.openstackvtap.impl.OsgiPropertyConstants.TUNNEL_NICRA_DEFAULT;
 import static org.onosproject.openstackvtap.util.OpenstackVtapUtil.containsIp;
 import static org.onosproject.openstackvtap.util.OpenstackVtapUtil.dumpStackTrace;
 import static org.onosproject.openstackvtap.util.OpenstackVtapUtil.getGroupKey;
@@ -135,7 +137,13 @@
 /**
  * Provides implementation of the openstack vtap and openstack vtap network APIs.
  */
-@Component(immediate = true, service = { OpenstackVtapService.class, OpenstackVtapAdminService.class })
+@Component(
+    immediate = true,
+    service = { OpenstackVtapService.class, OpenstackVtapAdminService.class },
+    property = {
+        TUNNEL_NICIRA + ":Boolean=" + TUNNEL_NICRA_DEFAULT
+    }
+)
 public class OpenstackVtapManager
         extends AbstractListenerManager<OpenstackVtapEvent, OpenstackVtapListener>
         implements OpenstackVtapService, OpenstackVtapAdminService {
@@ -173,10 +181,8 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected ComponentConfigService componentConfigService;
 
-    private static final boolean DEFAULT_TUNNEL_NICRA = false;
-    //@Property(name = TUNNEL_NICIRA, boolValue = DEFAULT_TUNNEL_NICRA,
-    //        label = "Use nicra extension for tunneling")
-    private boolean tunnelNicira = DEFAULT_TUNNEL_NICRA;
+    /** Use nicra extension for tunneling. */
+    private boolean tunnelNicira = TUNNEL_NICRA_DEFAULT;
 
     public static final String APP_ID = "org.onosproject.openstackvtap";
     public static final String VTAP_DESC_NULL = "vtap field %s cannot be null";
@@ -208,7 +214,6 @@
                     IpPrefix.valueOf(IpAddress.valueOf("0.0.0.0"), 0);
     private static final String TABLE_EXTENSION = "table";
     private static final String TUNNEL_DST_EXTENSION = "tunnelDst";
-    private static final String TUNNEL_NICIRA = "tunnelNicira";
 
     private static final int VTAP_NETWORK_KEY = 0;