Removing commented out @Property annotations from the drivers, protocols, pipelines and providers.
Change-Id: I4cabc5a53c93b778824c72cebbce0ec49700eade
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
index e3d16da..2d5213d 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
@@ -125,33 +125,26 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY)
protected NetworkConfigRegistry netCfgService;
- //@Property(name = "openflowPorts", value = DEFAULT_OFPORT,
- // label = "Port numbers (comma separated) used by OpenFlow protocol; default is 6633,6653")
- //private String openflowPortsValue = OFPORTS_DEFAULT;
+ /** Port numbers (comma separated) used by OpenFlow protocol; default is 6633,6653. */
+ private String openflowPortsValue = OFPORTS_DEFAULT;
- //@Property(name = "workerThreads", intValue = DEFAULT_WORKER_THREADS,
- // label = "Number of controller worker threads")
- //private int workerThreads = DEFAULT_WORKER_THREADS;
+ /** Number of controller worker threads. */
+ private int workerThreads = WORKER_THREADS_DEFAULT;
- //@Property(name = "tlsMode", value = "",
- // label = "TLS mode for OpenFlow channel; options are: disabled [default], enabled, strict")
- //private String tlsModeString;
+ /** TLS mode for OpenFlow channel; options are: disabled [default], enabled, strict. */
+ private String tlsModeString;
- //@Property(name = "keyStore", value = "",
- // label = "File path to key store for TLS connections")
- //private String keyStore;
+ /** File path to key store for TLS connections. */
+ private String keyStore;
- //@Property(name = "keyStorePassword", value = "",
- // label = "Key store password")
- //private String keyStorePassword;
+ /** Key store password. */
+ private String keyStorePassword;
- //@Property(name = "trustStore", value = "",
- // label = "File path to trust store for TLS connections")
- //private String trustStore;
+ /** File path to trust store for TLS connections. */
+ private String trustStore;
- //@Property(name = "trustStorePassword", value = "",
- // label = "Trust store password")
- //private String trustStorePassword;
+ /** Trust store password. */
+ private String trustStorePassword;
protected ExecutorService executorMsgs =
Executors.newFixedThreadPool(32, groupedThreads("onos/of", "event-stats-%d", log));
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OsgiPropertyConstants.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OsgiPropertyConstants.java
index 186b85e..a152239 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OsgiPropertyConstants.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OsgiPropertyConstants.java
@@ -25,38 +25,24 @@
private OsgiPropertyConstants() {
}
- //@Property(name = "openflowPorts", value = DEFAULT_OFPORT,
- // label = "Port numbers (comma separated) used by OpenFlow protocol; default is 6633,6653")
public static final String OFPORTS = "openflowPorts";
public static final String OFPORTS_DEFAULT = "6633,6653";
- //@Property(name = "workerThreads", intValue = DEFAULT_WORKER_THREADS,
- // label = "Number of controller worker threads")
public static final String WORKER_THREADS = "workerThreads";
public static final int WORKER_THREADS_DEFAULT = 0;
- //@Property(name = "tlsMode", value = "",
- // label = "TLS mode for OpenFlow channel; options are: disabled [default], enabled, strict")
public static final String TLS_MODE = "tlsMode";
public static final String TLS_MODE_DEFAULT = "";
- //@Property(name = "keyStore", value = "",
- // label = "File path to key store for TLS connections")
public static final String KEY_STORE = "keyStore";
public static final String KEY_STORE_DEFAULT = "";
- //@Property(name = "keyStorePassword", value = "",
- // label = "Key store password")
public static final String KEY_STORE_PASSWORD = "keyStorePassword";
public static final String KEY_STORE_PASSWORD_DEFAULT = "";
- //@Property(name = "trustStore", value = "",
- // label = "File path to trust store for TLS connections")
public static final String TRUST_STORE = "trustStore";
public static final String TRUST_STORE_DEFAULT = "";
- //@Property(name = "trustStorePassword", value = "",
- // label = "Trust store password")
public static final String TRUST_STORE_PASSWORD = "trustStorePassword";
public static final String TRUST_STORE_PASSWORD_DEFAULT = "";