commit b5646e6f7a62849d87dceb660dd6f351386d48f1
author Ray Milkey <ray@opennetworking.org> Tue Oct 16 11:42:18 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Oct 16 18:52:22 2018 +0000
tree ead639417d573bb4190f84cbc78da6d221f5b211
parent 309f9a09445eec77046efc6a5f891e2ad757e1d8

Use property constants for OSGi components for stores

Change-Id: I5d21075abb453d5bc54e02653d5a96746e6a074e

core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
index 04c9961..fee5d8d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
@@ -72,6 +72,8 @@
 import static org.onlab.util.Tools.get;
 import static org.onlab.util.Tools.isNullOrEmpty;
 import static org.onosproject.net.topology.TopologyEvent.Type.TOPOLOGY_CHANGED;
+import static org.onosproject.store.OsgiPropertyConstants.LINK_WEIGHT_FUNCTION;
+import static org.onosproject.store.OsgiPropertyConstants.LINK_WEIGHT_FUNCTION_DEFAULT;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -81,7 +83,15 @@
  * Note: This component is not distributed per-se. It runs on every
  * instance and feeds off of other distributed stores.
  */
-@Component(immediate = true, service = { TopologyStore.class, PathAdminService.class })
+@Component(
+        immediate = true,
+        service = {
+                TopologyStore.class, PathAdminService.class
+        },
+        property = {
+                LINK_WEIGHT_FUNCTION + "=" + LINK_WEIGHT_FUNCTION_DEFAULT
+        }
+)
 public class DistributedTopologyStore
         extends AbstractStore<TopologyEvent, TopologyStoreDelegate>
         implements TopologyStore, PathAdminService {
@@ -115,10 +125,9 @@
     private static final String LINK_METRIC = "linkMetric";
     private static final String GEO_DISTANCE = "geoDistance";
 
-    private static final String DEFAULT_LINK_WEIGHT_FUNCTION = "hopCount";
     //@Property(name = "linkWeightFunction", value = DEFAULT_LINK_WEIGHT_FUNCTION,
     //        label = "Default link-weight function: hopCount, linkMetric, geoDistance")
-    private String linkWeightFunction = DEFAULT_LINK_WEIGHT_FUNCTION;
+    private String linkWeightFunction = LINK_WEIGHT_FUNCTION_DEFAULT;
 
     // Cluster root to broadcast points bindings to allow convergence to
     // a shared broadcast tree; node that is the master of the cluster root