commit d04e227b6836d5fee446bab6bf51101ee09c3c72
author Ray Milkey <ray@opennetworking.org> Tue Oct 16 18:20:18 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed Oct 17 13:19:13 2018 -0700
tree 0411f50e3f2e054a91bdc4e03340164621e12395
parent 7013724a31a92b047b946b5d6a87aa0751a4e88a

Constants for core/net OSGI properties

Change-Id: I43c27f7d513167da29eaf8a851989263e5d4db66

core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java

diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
index 2a9096a..c36f2b2 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
@@ -75,14 +75,25 @@
 import static org.onosproject.security.AppPermission.Type.CLUSTER_READ;
 import static org.onosproject.security.AppPermission.Type.CLUSTER_WRITE;
 import static org.slf4j.LoggerFactory.getLogger;
+import static org.onosproject.net.OsgiPropertyConstants.*;
 
 
 /**
  * Component providing the node-device mastership service.
  */
-@Component(immediate = true,
-           service = {MastershipService.class, MastershipAdminService.class, MastershipTermService.class,
-                      MetricsHelper.class})
+@Component(
+        immediate = true,
+        service = {
+                MastershipService.class,
+                MastershipAdminService.class,
+                MastershipTermService.class,
+                MetricsHelper.class
+        },
+        property = {
+                USE_REGION_FOR_BALANCE_ROLES + "=" + USE_REGION_FOR_BALANCE_ROLES_DEFAULT,
+                REBALANCE_ROLES_ON_UPGRADE + "=" + REBALANCE_ROLES_ON_UPGRADE_DEFAULT
+        }
+)
 public class MastershipManager
         extends AbstractListenerManager<MastershipEvent, MastershipListener>
         implements MastershipService, MastershipAdminService, MastershipTermService,
@@ -118,16 +129,14 @@
     private NodeId localNodeId;
     private Timer requestRoleTimer;
 
-    static final boolean DEFAULT_USE_REGION_FOR_BALANCE_ROLES = false;
     //@Property(name = "useRegionForBalanceRoles", boolValue = DEFAULT_USE_REGION_FOR_BALANCE_ROLES,
     //        label = "Use Regions for balancing roles")
-    protected boolean useRegionForBalanceRoles;
+    protected boolean useRegionForBalanceRoles = USE_REGION_FOR_BALANCE_ROLES_DEFAULT;
 
-    private static final boolean DEFAULT_REBALANCE_ROLES_ON_UPGRADE = true;
     //@Property(name = "rebalanceRolesOnUpgrade",
     //        boolValue = DEFAULT_REBALANCE_ROLES_ON_UPGRADE,
     //        label = "Automatically rebalance roles following an upgrade")
-    protected boolean rebalanceRolesOnUpgrade = DEFAULT_REBALANCE_ROLES_ON_UPGRADE;
+    protected boolean rebalanceRolesOnUpgrade = REBALANCE_ROLES_ON_UPGRADE_DEFAULT;
 
     @Activate
     public void activate() {