commit 88dd7e29979214bc378b554952939e2eaf156e3b
author Ray Milkey <ray@opennetworking.org> Wed Oct 24 10:04:03 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Thu Oct 25 14:10:17 2018 +0000
tree 9b99eb44880252b2b7a45e59c7b4fdeca79eb1c9
parent ac216216dce2c3533f0d5cfc1529ec2b5dc53ec4

Modify test app usages of Property annotations for new OSGi implementation

Change-Id: Ie16cc4c41541f9e199c0c9e5f1338ee617097942

apps/test/route-scale/src/main/java/org/onosproject/routescale/ScaleTestManager.java

diff --git a/apps/test/route-scale/src/main/java/org/onosproject/routescale/ScaleTestManager.java b/apps/test/route-scale/src/main/java/org/onosproject/routescale/ScaleTestManager.java
index d24a4b6..8c8b398 100644
--- a/apps/test/route-scale/src/main/java/org/onosproject/routescale/ScaleTestManager.java
+++ b/apps/test/route-scale/src/main/java/org/onosproject/routescale/ScaleTestManager.java
@@ -61,8 +61,19 @@
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static org.onlab.util.Tools.get;
+import static org.onosproject.routescale.OsgiPropertyConstants.FLOW_COUNT;
+import static org.onosproject.routescale.OsgiPropertyConstants.FLOW_COUNT_DEFAULT;
+import static org.onosproject.routescale.OsgiPropertyConstants.ROUTE_COUNT;
+import static org.onosproject.routescale.OsgiPropertyConstants.ROUTE_COUNT_DEFAULT;
 
-@Component(immediate = true, service = ScaleTestManager.class)
+@Component(
+    immediate = true,
+    service = ScaleTestManager.class,
+    property = {
+        FLOW_COUNT + ":Integer=" + FLOW_COUNT_DEFAULT,
+        ROUTE_COUNT + ":Integer=" + ROUTE_COUNT_DEFAULT,
+    }
+)
 public class ScaleTestManager {
 
     private Logger log = LoggerFactory.getLogger(getClass());
@@ -88,13 +99,11 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected ComponentConfigService componentConfigService;
 
-    //@Property(name = "flowCount", intValue = 0,
-    //        label = "Number of flows to be maintained in the system")
-    private int flowCount = 0;
+    /** Number of flows to be maintained in the system. */
+    private int flowCount = FLOW_COUNT_DEFAULT;
 
-    //@Property(name = "routeCount", intValue = 0,
-    //        label = "Number of routes to be maintained in the system")
-    private int routeCount = 0;
+    /** Number of routes to be maintained in the system. */
+    private int routeCount = ROUTE_COUNT_DEFAULT;
 
     private final Random random = new Random(System.currentTimeMillis());
 
@@ -123,10 +132,10 @@
 
         Dictionary<?, ?> properties = context.getProperties();
         try {
-            String s = get(properties, "flowCount");
+            String s = get(properties, FLOW_COUNT);
             flowCount = isNullOrEmpty(s) ? flowCount : Integer.parseInt(s.trim());
 
-            s = get(properties, "routeCount");
+            s = get(properties, ROUTE_COUNT);
             routeCount = isNullOrEmpty(s) ? routeCount : Integer.parseInt(s.trim());
 
             log.info("Reconfigured; flowCount={}; routeCount={}", flowCount, routeCount);