Removing commented out @Property annotations from the drivers, protocols, pipelines and providers.
Change-Id: I4cabc5a53c93b778824c72cebbce0ec49700eade
diff --git a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
index 6e8fe1d..4374089 100644
--- a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
+++ b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
@@ -106,9 +106,7 @@
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.net.device.DeviceEvent.Type;
-import static org.onosproject.provider.general.device.impl.OsgiPropertyDefaults.OP_TIMEOUT_SHORT_DEFAULT;
-import static org.onosproject.provider.general.device.impl.OsgiPropertyDefaults.PROBE_FREQUENCY_DEFAULT;
-import static org.onosproject.provider.general.device.impl.OsgiPropertyDefaults.STATS_POLL_FREQUENCY_DEFAULT;
+import static org.onosproject.provider.general.device.impl.OsgiPropertyConstants.*;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -119,9 +117,9 @@
@Beta
@Component(immediate = true,
property = {
- "deviceStatsPollFrequency:Integer=" + STATS_POLL_FREQUENCY_DEFAULT,
- "deviceProbeFrequency:Integer=" + PROBE_FREQUENCY_DEFAULT,
- "deviceOperationTimeoutShort:Integer=" + OP_TIMEOUT_SHORT_DEFAULT,
+ STATS_POLL_FREQUENCY + ":Integer=" + STATS_POLL_FREQUENCY_DEFAULT,
+ PROBE_FREQUENCY + ":Integer=" + PROBE_FREQUENCY_DEFAULT,
+ OP_TIMEOUT_SHORT + ":Integer=" + OP_TIMEOUT_SHORT_DEFAULT,
})
public class GeneralDeviceProvider extends AbstractProvider
implements DeviceProvider {
@@ -166,23 +164,20 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
private PiPipeconfWatchdogService pipeconfWatchdogService;
- private static final String STATS_POLL_FREQUENCY = "deviceStatsPollFrequency";
- //@Property(name = STATS_POLL_FREQUENCY, intValue = DEFAULT_STATS_POLL_FREQUENCY,
- // label = "Configure poll frequency for port status and statistics; " +
- // "default is 10 sec")
+ /**
+ * Configure poll frequency for port status and statistics; default is 10 sec.
+ */
private int statsPollFrequency = STATS_POLL_FREQUENCY_DEFAULT;
- private static final String PROBE_FREQUENCY = "deviceProbeFrequency";
- //@Property(name = PROBE_FREQUENCY, intValue = DEFAULT_PROBE_FREQUENCY,
- // label = "Configure probe frequency for checking device availability; " +
- // "default is 10 sec")
+ /**
+ * Configure probe frequency for checking device availability; default is 10 sec.
+ */
private int probeFrequency = PROBE_FREQUENCY_DEFAULT;
- private static final String OP_TIMEOUT_SHORT = "deviceOperationTimeoutShort";
- //@Property(name = OP_TIMEOUT_SHORT, intValue = DEFAULT_OP_TIMEOUT_SHORT,
- // label = "Configure timeout in seconds for device operations " +
- // "that are supposed to take a short time " +
- // "(e.g. checking device reachability); default is 10 seconds")
+ /**
+ * Configure timeout in seconds for device operations that are supposed to take a short time
+ * (e.g. checking device reachability); default is 10 seconds.
+ */
private int opTimeoutShort = OP_TIMEOUT_SHORT_DEFAULT;
//FIXME to be removed when netcfg will issue device events in a bundle or
diff --git a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/OsgiPropertyDefaults.java b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/OsgiPropertyConstants.java
similarity index 74%
rename from providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/OsgiPropertyDefaults.java
rename to providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/OsgiPropertyConstants.java
index 90cf437..84419f4 100644
--- a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/OsgiPropertyDefaults.java
+++ b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/OsgiPropertyConstants.java
@@ -19,12 +19,17 @@
/**
* Constants for default values of configurable properties.
*/
-public final class OsgiPropertyDefaults {
+public final class OsgiPropertyConstants {
- private OsgiPropertyDefaults() {}
+ private OsgiPropertyConstants() {}
+ public static final String STATS_POLL_FREQUENCY = "deviceStatsPollFrequency";
public static final int STATS_POLL_FREQUENCY_DEFAULT = 10;
+
+ public static final String PROBE_FREQUENCY = "deviceProbeFrequency";
public static final int PROBE_FREQUENCY_DEFAULT = 10;
+
+ public static final String OP_TIMEOUT_SHORT = "deviceOperationTimeoutShort";
public static final int OP_TIMEOUT_SHORT_DEFAULT = 10;
}
diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
index b804c6d..2e4b412 100644
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -103,6 +103,7 @@
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.provider.host.impl.OsgiPropertyConstants.*;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -111,13 +112,13 @@
*/
@Component(immediate = true, service = HostProvider.class,
property = {
- "hostRemovalEnabled:Boolean=true",
- "requestArp:Boolean=true",
- "requestIpv6ND:Boolean=false",
- "useDhcp:Boolean=false",
- "useDhcp6:Boolean=false",
- "requestInterceptsEnabled:Boolean=true",
- "multihomingEnabled:Boolean=false",
+ HOST_REMOVAL_ENABLED + ":Boolean=" + HOST_REMOVAL_ENABLED_DEFAULT,
+ REQUEST_ARP + ":Boolean=" + REQUEST_ARP_DEFAULT,
+ REQUEST_NDP + ":Boolean=" + REQUEST_NDP_DEFAULT,
+ USE_DHCP + ":Boolean=" + USE_DHCP_DEFAULT,
+ USE_DHCP6 + ":Boolean=" + USE_DHCP6_DEFAULT,
+ REQUEST_INTERCEPTS_ENABLED + ":Boolean=" + REQUEST_INTERCEPTS_ENABLED_DEFAULT,
+ MULTIHOMING_ENABLED + ":Boolean=" + MULTIHOMING_ENABLED_DEFAULT,
})
public class HostLocationProvider extends AbstractProvider implements HostProvider {
private final Logger log = getLogger(getClass());
@@ -155,34 +156,25 @@
private ApplicationId appId;
- //@Property(name = "hostRemovalEnabled", boolValue = true,
- // label = "Enable host removal on port/device down events")
+ /** Enable host removal on port/device down events. */
private boolean hostRemovalEnabled = true;
- //@Property(name = "requestArp", boolValue = true,
- // label = "Request ARP packets for neighbor discovery by the " +
- // "Host Location Provider; default is true")
+ /** Request ARP packets for neighbor discovery by the Host Location Provider; default is true. */
private boolean requestArp = true;
- //@Property(name = "requestIpv6ND", boolValue = false,
- // label = "Requests IPv6 Neighbor Discovery by the " +
- // "Host Location Provider; default is false")
+ /** Requests IPv6 Neighbor Discovery by the Host Location Provider; default is false. */
private boolean requestIpv6ND = false;
- //@Property(name = "useDhcp", boolValue = false,
- // label = "Use DHCP to update IP address of the host; default is false")
+ /** Use DHCP to update IP address of the host; default is false. */
private boolean useDhcp = false;
- //@Property(name = "useDhcp6", boolValue = false,
- // label = "Use DHCPv6 to update IP address of the host; default is false")
+ /** Use DHCPv6 to update IP address of the host; default is false. */
private boolean useDhcp6 = false;
- //@Property(name = "requestInterceptsEnabled", boolValue = true,
- // label = "Enable requesting packet intercepts")
+ /** Enable requesting packet intercepts. */
private boolean requestInterceptsEnabled = true;
- //@Property(name = "multihomingEnabled", boolValue = false,
- // label = "Allow hosts to be multihomed")
+ /** Allow hosts to be multihomed. */
private boolean multihomingEnabled = false;
private HostProviderService providerService;
@@ -322,7 +314,7 @@
Dictionary<?, ?> properties = context.getProperties();
Boolean flag;
- flag = Tools.isPropertyEnabled(properties, "hostRemovalEnabled");
+ flag = Tools.isPropertyEnabled(properties, HOST_REMOVAL_ENABLED);
if (flag == null) {
log.info("Host removal on port/device down events is not configured, " +
"using current value of {}", hostRemovalEnabled);
@@ -332,7 +324,7 @@
hostRemovalEnabled ? "enabled" : "disabled");
}
- flag = Tools.isPropertyEnabled(properties, "requestArp");
+ flag = Tools.isPropertyEnabled(properties, REQUEST_ARP);
if (flag == null) {
log.info("Using ARP is not configured, " +
"using current value of {}", requestArp);
@@ -342,7 +334,7 @@
requestArp ? "enabled" : "disabled");
}
- flag = Tools.isPropertyEnabled(properties, "requestIpv6ND");
+ flag = Tools.isPropertyEnabled(properties, REQUEST_NDP);
if (flag == null) {
log.info("Using IPv6 Neighbor Discovery is not configured, " +
"using current value of {}", requestIpv6ND);
@@ -352,7 +344,7 @@
requestIpv6ND ? "enabled" : "disabled");
}
- flag = Tools.isPropertyEnabled(properties, "useDhcp");
+ flag = Tools.isPropertyEnabled(properties, USE_DHCP);
if (flag == null) {
log.info("Using DHCP is not configured, " +
"using current value of {}", useDhcp);
@@ -362,7 +354,17 @@
useDhcp ? "enabled" : "disabled");
}
- flag = Tools.isPropertyEnabled(properties, "requestInterceptsEnabled");
+ flag = Tools.isPropertyEnabled(properties, USE_DHCP6);
+ if (flag == null) {
+ log.info("Using DHCP6 is not configured, " +
+ "using current value of {}", useDhcp6);
+ } else {
+ useDhcp6 = flag;
+ log.info("Configured. Using DHCP6 is {}",
+ useDhcp6 ? "enabled" : "disabled");
+ }
+
+ flag = Tools.isPropertyEnabled(properties, REQUEST_INTERCEPTS_ENABLED);
if (flag == null) {
log.info("Request intercepts is not configured, " +
"using current value of {}", requestInterceptsEnabled);
@@ -372,7 +374,7 @@
requestInterceptsEnabled ? "enabled" : "disabled");
}
- flag = Tools.isPropertyEnabled(properties, "multihomingEnabled");
+ flag = Tools.isPropertyEnabled(properties, MULTIHOMING_ENABLED);
if (flag == null) {
log.info("Multihoming is not configured, " +
"using current value of {}", multihomingEnabled);
diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/OsgiPropertyConstants.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/OsgiPropertyConstants.java
new file mode 100644
index 0000000..eb8dafe
--- /dev/null
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/OsgiPropertyConstants.java
@@ -0,0 +1,48 @@
+/*
+ * 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.provider.host.impl;
+
+/**
+ * Name/Value constants for properties.
+ */
+
+public final class OsgiPropertyConstants {
+
+ private OsgiPropertyConstants() {
+ }
+
+ public static final String HOST_REMOVAL_ENABLED = "hostRemovalEnabled:Boolean=true";
+ public static final boolean HOST_REMOVAL_ENABLED_DEFAULT = true;
+
+ public static final String REQUEST_ARP = "requestArp";
+ public static final boolean REQUEST_ARP_DEFAULT = true;
+
+ public static final String REQUEST_NDP = "requestIpv6ND";
+ public static final boolean REQUEST_NDP_DEFAULT = false;
+
+ public static final String USE_DHCP = "useDhcp";
+ public static final boolean USE_DHCP_DEFAULT = false;
+
+ public static final String USE_DHCP6 = "useDhcp6";
+ public static final boolean USE_DHCP6_DEFAULT = false;
+
+ public static final String REQUEST_INTERCEPTS_ENABLED = "requestInterceptsEnabled";
+ public static final boolean REQUEST_INTERCEPTS_ENABLED_DEFAULT = true;
+
+ public static final String MULTIHOMING_ENABLED = "multihomingEnabled";
+ public static final boolean MULTIHOMING_ENABLED_DEFAULT = false;
+}
diff --git a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java
index 44dd60d..dba7add 100644
--- a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java
+++ b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java
@@ -58,8 +58,7 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.onlab.util.Tools.get;
import static org.onlab.util.Tools.groupedThreads;
-import static org.onosproject.provider.linkdiscovery.impl.OsgiPropertyDefaults.POLL_DELAY_SECONDS_DEFAULT;
-import static org.onosproject.provider.linkdiscovery.impl.OsgiPropertyDefaults.POLL_FREQUENCY_SECONDS_DEFAULT;
+import static org.onosproject.provider.linkdiscovery.impl.OsgiPropertyConstants.*;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -68,8 +67,8 @@
*/
@Component(immediate = true,
property = {
- "linkPollDelaySeconds:Integer=" + POLL_DELAY_SECONDS_DEFAULT,
- "linkPollFrequencySeconds:Integer=" + POLL_FREQUENCY_SECONDS_DEFAULT,
+ POLL_DELAY_SECONDS + ":Integer=" + POLL_DELAY_SECONDS_DEFAULT,
+ POLL_FREQUENCY_SECONDS + ":Integer=" + POLL_FREQUENCY_SECONDS_DEFAULT,
})
public class LinkDiscoveryProvider extends AbstractProvider
implements LinkProvider {
@@ -78,12 +77,11 @@
protected static final String SCHEME_NAME = "linkdiscovery";
private static final String LINK_PROVIDER_PACKAGE = "org.onosproject.provider.linkdiscovery";
private final Logger log = getLogger(getClass());
- //@Property(name = "linkPollDelaySeconds", intValue = DEFAULT_POLL_DELAY_SECONDS,
- // label = "Initial delay (in seconds) for polling link discovery")
+
+ /** Initial delay (in seconds) for polling link discovery. */
protected static int linkPollDelaySeconds = POLL_DELAY_SECONDS_DEFAULT;
- //@Property(name = "linkPollFrequencySeconds", intValue = DEFAULT_POLL_FREQUENCY_SECONDS,
- // label = "Frequency (in seconds) for polling link discovery")
+ /** Frequency (in seconds) for polling link discovery. */
protected static int linkPollFrequencySeconds = POLL_FREQUENCY_SECONDS_DEFAULT;
@@ -171,7 +169,7 @@
private int getNewPollFrequency(Dictionary<?, ?> properties, int pollFrequency) {
int newPollFrequency;
try {
- String s = get(properties, "linkPollFrequencySeconds");
+ String s = get(properties, POLL_FREQUENCY_SECONDS);
newPollFrequency = isNullOrEmpty(s) ? pollFrequency : Integer.parseInt(s.trim());
} catch (NumberFormatException | ClassCastException e) {
newPollFrequency = POLL_FREQUENCY_SECONDS_DEFAULT;
@@ -182,7 +180,7 @@
private int getNewPollDealy(Dictionary<?, ?> properties, int pollDelay) {
int newPollFrequency;
try {
- String s = get(properties, "linkPollDelaySeconds");
+ String s = get(properties, POLL_DELAY_SECONDS);
newPollFrequency = isNullOrEmpty(s) ? pollDelay : Integer.parseInt(s.trim());
} catch (NumberFormatException | ClassCastException e) {
newPollFrequency = POLL_DELAY_SECONDS_DEFAULT;
diff --git a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/OsgiPropertyDefaults.java b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/OsgiPropertyConstants.java
similarity index 78%
rename from providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/OsgiPropertyDefaults.java
rename to providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/OsgiPropertyConstants.java
index ba85b86..4335fac 100644
--- a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/OsgiPropertyDefaults.java
+++ b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/OsgiPropertyConstants.java
@@ -19,11 +19,14 @@
/**
* Constants for default values of configurable properties.
*/
-public final class OsgiPropertyDefaults {
+public final class OsgiPropertyConstants {
- private OsgiPropertyDefaults() {}
+ private OsgiPropertyConstants() {}
+ public static final String POLL_DELAY_SECONDS = "linkPollDelaySeconds";
public static final int POLL_DELAY_SECONDS_DEFAULT = 20;
+
+ public static final String POLL_FREQUENCY_SECONDS = "linkPollFrequencySeconds";
public static final int POLL_FREQUENCY_SECONDS_DEFAULT = 10;
}
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
index 2914965..6849119 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LldpLinkProvider.java
@@ -155,28 +155,19 @@
private static final long DEVICE_SYNC_DELAY = 5;
private static final long LINK_PRUNER_DELAY = 3;
- //@Property(name = PROP_ENABLED, boolValue = true,
- // label = "If false, link discovery is disabled")
/** If false, link discovery is disabled. */
protected boolean enabled = false;
- //@Property(name = PROP_USE_BDDP, boolValue = true,
- // label = "Use BDDP for link discovery")
/** Use BDDP for link discovery. */
protected boolean useBddp = USE_BDDP_DEFAULT;
- //@Property(name = PROP_PROBE_RATE, intValue = DEFAULT_PROBE_RATE,
- // label = "LLDP and BDDP probe rate specified in millis")
/** LLDP and BDDP probe rate specified in millis. */
protected int probeRate = PROBE_RATE_DEFAULT;
- //@Property(name = PROP_STALE_LINK_AGE, intValue = DEFAULT_STALE_LINK_AGE,
- // label = "Number of millis beyond which links will be considered stale")
/** Number of millis beyond which links will be considered stale. */
protected int staleLinkAge = STALE_LINK_AGE_DEFAULT;
- //@Property(name = PROP_DISCOVERY_DELAY, intValue = DEFAULT_DISCOVERY_DELAY,
- // label = "Number of millis beyond which an LLDP packet will not be accepted")
+ /** Number of millis beyond which an LLDP packet will not be accepted. */
private int maxDiscoveryDelayMs = DISCOVERY_DELAY_DEFAULT;
private final LinkDiscoveryContext context = new InternalDiscoveryContext();
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/OsgiPropertyConstants.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/OsgiPropertyConstants.java
index e67f3d8..77e7167 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/OsgiPropertyConstants.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/OsgiPropertyConstants.java
@@ -35,7 +35,7 @@
public static final String PROP_STALE_LINK_AGE = "staleLinkAge";
public static final int STALE_LINK_AGE_DEFAULT = 10000;
- public static final String PROP_DISCOVERY_DELAY = "maxLLDPAge";
+ public static final String PROP_DISCOVERY_DELAY = "maxDiscoveryDelayMs";
public static final int DISCOVERY_DELAY_DEFAULT = 1000;
}
diff --git a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
index 06de0f9..ac00cf8 100644
--- a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
+++ b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java
@@ -108,12 +108,10 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected ClusterMetadataService metadataService;
- //@Property(name = PROP_PROBE_RATE, intValue = DEFAULT_PROBE_RATE,
- // label = "LLDP and BDDP probe rate specified in millis")
+ /** LLDP and BDDP probe rate specified in millis. */
private int probeRate = PROBE_RATE_DEFAULT;
- //@Property(name = PROP_DISCOVERY_DELAY, intValue = DEFAULT_DISCOVERY_DELAY,
- // label = "Number of millis beyond which an LLDP packet will not be accepted")
+ /** Number of millis beyond which an LLDP packet will not be accepted. */
private int maxDiscoveryDelayMs = DISCOVERY_DELAY_DEFAULT;
// Device link discovery helpers.
diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
index 9987c6e..d9afbe3 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -145,14 +145,10 @@
private static final String PORT = "port";
private static final int CORE_POOL_SIZE = 10;
- //@Property(name = "pollFrequency", intValue = DEFAULT_POLL_FREQUENCY_SECONDS,
- // label = "Configure poll frequency for port status and statistics; " +
- // "default is 30 sec")
+ /** Configure poll frequency for port status and statistics; default is 30 sec. */
private int pollFrequency = POLL_FREQUENCY_SECONDS_DEFAULT;
- //@Property(name = "maxRetries", intValue = DEFAULT_MAX_RETRIES,
- // label = "Configure maximum allowed number of retries for obtaining list of ports; " +
- // "default is 5 times")
+ /** Configure maximum allowed number of retries for obtaining list of ports; default is 5 times. */
private int maxRetries = MAX_RETRIES_DEFAULT;
protected ExecutorService executor =
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/NullProviders.java b/providers/null/src/main/java/org/onosproject/provider/nil/NullProviders.java
index 1f21244..d95943b 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/NullProviders.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/NullProviders.java
@@ -64,7 +64,7 @@
import static org.onosproject.net.DeviceId.deviceId;
import static org.onosproject.net.MastershipRole.MASTER;
import static org.onosproject.net.MastershipRole.NONE;
-import static org.onosproject.provider.nil.OsgiPropertyDefaults.*;
+import static org.onosproject.provider.nil.OsgiPropertyConstants.*;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -73,13 +73,13 @@
*/
@Component(immediate = true, service = NullProviders.class,
property = {
- "enabled:Boolean=" + false,
- "topoShape=" + TOPO_SHAPE_DEFAULT,
- "deviceCount:Integer=" + DEVICE_COUNT_DEFAULT,
- "hostCount:Integer=" + HOST_COUNT_DEFAULT,
- "packetRate:Integer=" + PACKET_RATE_DEFAULT,
- "mutationRate:Double=" + MUTATION_RATE_DEFAULT,
- "mastership=" + MASTERSHIP_DEFAULT,
+ ENABLED + ":Boolean=" + ENABLED_DEFAULT,
+ TOPO_SHAPE + "=" + TOPO_SHAPE_DEFAULT,
+ DEVICE_COUNT + ":Integer=" + DEVICE_COUNT_DEFAULT,
+ HOST_COUNT + ":Integer=" + HOST_COUNT_DEFAULT,
+ PACKET_RATE + ":Integer=" + PACKET_RATE_DEFAULT,
+ MUTATION_RATE + ":Double=" + MUTATION_RATE_DEFAULT,
+ MASTERSHIP + "=" + MASTERSHIP_DEFAULT,
})
public class NullProviders {
@@ -110,7 +110,6 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected LinkService linkService;
-
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DeviceProviderRegistry deviceProviderRegistry;
@@ -146,32 +145,25 @@
private TopologySimulator simulator;
- //@Property(name = "enabled", boolValue = false,
- // label = "Enables or disables the provider")
+ /** Enables or disables the provider. */
private boolean enabled = false;
- //@Property(name = "topoShape", value = DEFAULT_TOPO_SHAPE,
- // label = "Topology shape: configured, linear, reroute, tree, spineleaf, mesh, grid")
+ /** Topology shape: configured, linear, reroute, tree, spineleaf, mesh, grid. */
private String topoShape = TOPO_SHAPE_DEFAULT;
- //@Property(name = "deviceCount", intValue = DEFAULT_DEVICE_COUNT,
- // label = "Number of devices to generate")
+ /** Number of devices to generate. */
private int deviceCount = DEVICE_COUNT_DEFAULT;
- //@Property(name = "hostCount", intValue = DEFAULT_HOST_COUNT,
- // label = "Number of host to generate per device")
+ /** Number of host to generate per device. */
private int hostCount = HOST_COUNT_DEFAULT;
- //@Property(name = "packetRate", intValue = DEFAULT_PACKET_RATE,
- // label = "Packet-in/s rate; 0 for no packets")
+ /** Packet-in/s rate; 0 for no packets. */
private int packetRate = PACKET_RATE_DEFAULT;
- //@Property(name = "mutationRate", doubleValue = DEFAULT_MUTATION_RATE,
- // label = "Link event/s topology mutation rate; 0 for no mutations")
+ /** Link event/s topology mutation rate; 0 for no mutations. */
private double mutationRate = MUTATION_RATE_DEFAULT;
- //@Property(name = "mastership", value = DEFAULT_MASTERSHIP,
- // label = "Mastership given as 'random' or 'node1=dpid,dpid/node2=dpid,...'")
+ /** Mastership given as 'random' or 'node1=dpid,dpid/node2=dpid,...'. */
private String mastership = MASTERSHIP_DEFAULT;
@@ -219,22 +211,22 @@
double newMutationRate;
String newTopoShape, newMastership;
try {
- String s = get(properties, "enabled");
+ String s = get(properties, ENABLED);
newEnabled = isNullOrEmpty(s) ? enabled : Boolean.parseBoolean(s.trim());
- newTopoShape = get(properties, "topoShape");
- newMastership = get(properties, "mastership");
+ newTopoShape = get(properties, TOPO_SHAPE);
+ newMastership = get(properties, MASTERSHIP);
- s = get(properties, "deviceCount");
+ s = get(properties, DEVICE_COUNT);
newDeviceCount = isNullOrEmpty(s) ? deviceCount : Integer.parseInt(s.trim());
- s = get(properties, "hostCount");
+ s = get(properties, HOST_COUNT);
newHostCount = isNullOrEmpty(s) ? hostCount : Integer.parseInt(s.trim());
- s = get(properties, "packetRate");
+ s = get(properties, PACKET_RATE);
newPacketRate = isNullOrEmpty(s) ? packetRate : Integer.parseInt(s.trim());
- s = get(properties, "mutationRate");
+ s = get(properties, MUTATION_RATE);
newMutationRate = isNullOrEmpty(s) ? mutationRate : Double.parseDouble(s.trim());
} catch (NumberFormatException e) {
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/OsgiPropertyDefaults.java b/providers/null/src/main/java/org/onosproject/provider/nil/OsgiPropertyConstants.java
similarity index 66%
rename from providers/null/src/main/java/org/onosproject/provider/nil/OsgiPropertyDefaults.java
rename to providers/null/src/main/java/org/onosproject/provider/nil/OsgiPropertyConstants.java
index 2dd35e5..8cd6d8e 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/OsgiPropertyDefaults.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/OsgiPropertyConstants.java
@@ -19,15 +19,29 @@
/**
* Constants for default values of configurable properties.
*/
-public final class OsgiPropertyDefaults {
+public final class OsgiPropertyConstants {
- private OsgiPropertyDefaults() {}
+ private OsgiPropertyConstants() {}
+ public static final String ENABLED = "enabled";
+ public static final boolean ENABLED_DEFAULT = false;
+
+ public static final String TOPO_SHAPE = "topoShape";
public static final String TOPO_SHAPE_DEFAULT = "configured";
+
+ public static final String DEVICE_COUNT = "deviceCount";
public static final int DEVICE_COUNT_DEFAULT = 10;
+
+ public static final String HOST_COUNT = "hostCount";
public static final int HOST_COUNT_DEFAULT = 5;
+
+ public static final String PACKET_RATE = "packetRate";
public static final int PACKET_RATE_DEFAULT = 0;
+
+ public static final String MUTATION_RATE = "mutationRate";
public static final double MUTATION_RATE_DEFAULT = 0;
+
+ public static final String MASTERSHIP = "mastership";
public static final String MASTERSHIP_DEFAULT = "random";
}
diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index 6117339..f849467 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -453,12 +453,10 @@
private final InternalDeviceProvider listener = new InternalDeviceProvider();
- //@Property(name = POLL_PROP_NAME, intValue = POLL_INTERVAL,
- //label = "Frequency (in seconds) for polling switch Port statistics")
+ /** Frequency (in seconds) for polling switch Port statistics. */
private int portStatsPollFrequency = POLL_FREQ_DEFAULT;
- //@Property(name = PROP_FREQ, boolValue = DEFAULT_PROP_FREQ,
- //label = "It indicates frequency must be used instead of wavelength for port tuning.")
+ /** It indicates frequency must be used instead of wavelength for port tuning. */
private static boolean propFreq = PROP_FREQ_DEFAULT;
private final Timer timer = new Timer("onos-openflow-portstats-collector");
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
index 22b5246..d1867e2 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
@@ -135,12 +135,10 @@
private static final int MIN_EXPECTED_BYTE_LEN = 56;
private static final int SKIP_BYTES = 4;
- //@Property(name = "flowPollFrequency", intValue = DEFAULT_POLL_FREQUENCY,
- // label = "Frequency (in seconds) for polling flow statistics")
+ /** Frequency (in seconds) for polling flow statistics. */
private int flowPollFrequency = POLL_FREQUENCY_DEFAULT;
- //@Property(name = "adaptiveFlowSampling", boolValue = DEFAULT_ADAPTIVE_FLOW_SAMPLING,
- // label = "Adaptive Flow Sampling is on or off")
+ /** Adaptive Flow Sampling is on or off. */
private boolean adaptiveFlowSampling = ADAPTIVE_FLOW_SAMPLING_DEFAULT;
private FlowRuleProviderService providerService;
diff --git a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
index a74e2c7..433cfb6 100644
--- a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
+++ b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
@@ -121,8 +121,7 @@
private static final String COMPONENT = "org.onosproject.provider.of.group.impl.OpenFlowGroupProvider";
- //@Property(name = "groupPollInterval", intValue = DEFAULT_POLL_INTERVAL,
- // label = "Frequency (in seconds) for polling group statistics")
+ /** Frequency (in seconds) for polling group statistics. */
private int groupPollInterval = POLL_FREQUENCY_DEFAULT;
private final InternalGroupProvider listener = new InternalGroupProvider();
diff --git a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java
index 04612c45..d25c95f 100644
--- a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java
+++ b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java
@@ -183,8 +183,7 @@
private static final int WAIT_TIME = 5;
public static final String LSRID = "lsrId";
- //@Property(name = "tunnelStatsPollFrequency", intValue = POLL_INTERVAL,
- // label = "Frequency (in seconds) for polling tunnel statistics")
+ /** Frequency (in seconds) for polling tunnel statistics. */
private int tunnelStatsPollFrequency = POLL_FREQUENCY_DEFAULT;
private static final String TUNNLE_NOT_NULL = "Create failed,The given port may be wrong or has been occupied.";
diff --git a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
index 56afd93..a302203 100644
--- a/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
+++ b/providers/rest/device/src/main/java/org/onosproject/provider/rest/device/impl/RestDeviceProvider.java
@@ -137,9 +137,7 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected DriverService driverService;
- //@Property(name = POLL_FREQUENCY, intValue = DEFAULT_POLL_FREQUENCY_SECONDS,
- // label = "Configure poll frequency for port status and statistics; " +
- // "default is 30 seconds")
+ /** Configure poll frequency for port status and statistics; default is 30 seconds. */
private int pollFrequency = POLL_FREQUENCY_DEFAULT;
private DeviceProviderService providerService;