OSGi property annotations for remaining apps
Change-Id: I5f87ebeb65eb85ee7161e35a838d9275fde22787
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();
diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/OsgiPropertyConstants.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/OsgiPropertyConstants.java
new file mode 100644
index 0000000..d7909a9
--- /dev/null
+++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/impl/OsgiPropertyConstants.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.dhcp.impl;
+
+public final class OsgiPropertyConstants {
+ private OsgiPropertyConstants() {
+ }
+
+ static final String ALLOW_HOST_DISCOVERY = "allowHostDiscovery";
+ static final boolean ALLOW_HOST_DISCOVERY_DEFAULT = false;
+}