commit 4694e0618f484c26e792cff36869aa065ac87055
author Ray Milkey <ray@opennetworking.org> Wed Oct 31 13:17:18 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed Oct 31 13:17:48 2018 -0700
tree b00358fc7738542debfa13efecb6cc99d6a562ad
parent 2069565d120279f4f29ea71c4cd61af7a94b7cdb

OSGi property annotations for remaining apps

Change-Id: I5f87ebeb65eb85ee7161e35a838d9275fde22787

apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java

diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
index a0f9548..6480e2b 100644
--- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
+++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/DhcpManager.java
@@ -88,17 +88,23 @@
 import static org.onlab.packet.MacAddress.valueOf;
 import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNotEnforced;
 import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_Requested;
+import static org.onosproject.dhcp.impl.OsgiPropertyConstants.ALLOW_HOST_DISCOVERY;
+import static org.onosproject.dhcp.impl.OsgiPropertyConstants.ALLOW_HOST_DISCOVERY_DEFAULT;
 import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FACTORY;
 
 /**
  * Skeletal ONOS DHCP Server application.
  */
-@Component(immediate = true, service = DhcpService.class)
+@Component(
+    immediate = true,
+    service = DhcpService.class,
+    property = {
+        ALLOW_HOST_DISCOVERY + "=" + ALLOW_HOST_DISCOVERY_DEFAULT
+    }
+)
 public class DhcpManager implements DhcpService {
 
     private static final ProviderId PID = new ProviderId("of", "org.onosproject.dhcp", true);
-    private static final String ALLOW_HOST_DISCOVERY = "allowHostDiscovery";
-    private static final boolean DEFAULT_ALLOW_HOST_DISCOVERY = false;
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -134,9 +140,8 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected ComponentConfigService componentConfigService;
 
-    //@Property(name = ALLOW_HOST_DISCOVERY, boolValue = DEFAULT_ALLOW_HOST_DISCOVERY,
-    //        label = "Allow host discovery from DHCP request")
-    private boolean allowHostDiscovery = DEFAULT_ALLOW_HOST_DISCOVERY;
+    /** Allow host discovery from DHCP request. */
+    private boolean allowHostDiscovery = ALLOW_HOST_DISCOVERY_DEFAULT;
 
     protected HostProviderService hostProviderService;
     private final HostProvider hostProvider = new InternalHostProvider();