Move type specifiers from property name constants to the corresponding component annotations
Change-Id: Id5e3b669721ecf076a010cc4783b9e6b33e6fca0
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 c36f2b2..3e2f42a 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
@@ -90,8 +90,8 @@
MetricsHelper.class
},
property = {
- USE_REGION_FOR_BALANCE_ROLES + "=" + USE_REGION_FOR_BALANCE_ROLES_DEFAULT,
- REBALANCE_ROLES_ON_UPGRADE + "=" + REBALANCE_ROLES_ON_UPGRADE_DEFAULT
+ USE_REGION_FOR_BALANCE_ROLES + ":Boolean=" + USE_REGION_FOR_BALANCE_ROLES_DEFAULT,
+ REBALANCE_ROLES_ON_UPGRADE + ":Boolean=" + REBALANCE_ROLES_ON_UPGRADE_DEFAULT
}
)
public class MastershipManager
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index 4f72ef3..f53c9e8 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -60,9 +60,9 @@
immediate = true,
service = CoreService.class,
property = {
- SHARED_THREAD_POOL_SIZE + "=" + SHARED_THREAD_POOL_SIZE_DEFAULT,
- MAX_EVENT_TIME_LIMIT + "=" + MAX_EVENT_TIME_LIMIT_DEFAULT,
- CALCULATE_PERFORMANCE_CHECK + "=" + CALCULATE_PERFORMANCE_CHECK_DEFAULT
+ SHARED_THREAD_POOL_SIZE + ":Integer=" + SHARED_THREAD_POOL_SIZE_DEFAULT,
+ MAX_EVENT_TIME_LIMIT + ":Integer=" + MAX_EVENT_TIME_LIMIT_DEFAULT,
+ CALCULATE_PERFORMANCE_CHECK + ":Boolean=" + CALCULATE_PERFORMANCE_CHECK_DEFAULT
}
)
public class CoreManager implements CoreService {
diff --git a/core/net/src/main/java/org/onosproject/net/OsgiPropertyConstants.java b/core/net/src/main/java/org/onosproject/net/OsgiPropertyConstants.java
index 110beed..e40bcbe 100644
--- a/core/net/src/main/java/org/onosproject/net/OsgiPropertyConstants.java
+++ b/core/net/src/main/java/org/onosproject/net/OsgiPropertyConstants.java
@@ -22,85 +22,85 @@
//@Property(name = "useRegionForBalanceRoles", boolValue = DEFAULT_USE_REGION_FOR_BALANCE_ROLES,
// label = "Use Regions for balancing roles")
- public static final String USE_REGION_FOR_BALANCE_ROLES = "useRegionForBalanceRoles:Boolean";
+ public static final String USE_REGION_FOR_BALANCE_ROLES = "useRegionForBalanceRoles";
public static final boolean USE_REGION_FOR_BALANCE_ROLES_DEFAULT = false;
//@Property(name = "rebalanceRolesOnUpgrade",
// boolValue = DEFAULT_REBALANCE_ROLES_ON_UPGRADE,
// label = "Automatically rebalance roles following an upgrade")
- public static final String REBALANCE_ROLES_ON_UPGRADE = "rebalanceRolesOnUpgrade:Boolean";
+ public static final String REBALANCE_ROLES_ON_UPGRADE = "rebalanceRolesOnUpgrade";
public static final boolean REBALANCE_ROLES_ON_UPGRADE_DEFAULT = true;
//@Property(name = "sharedThreadPoolSize", intValue = DEFAULT_POOL_SIZE,
// label = "Configure shared pool maximum size ")
- public static final String SHARED_THREAD_POOL_SIZE = "sharedThreadPoolSize:Integer";
+ public static final String SHARED_THREAD_POOL_SIZE = "sharedThreadPoolSize";
public static final int SHARED_THREAD_POOL_SIZE_DEFAULT = 30;
//@Property(name = "maxEventTimeLimit", intValue = DEFAULT_EVENT_TIME,
// label = "Maximum number of millis an event sink has to process an event")
- public static final String MAX_EVENT_TIME_LIMIT = "maxEventTimeLimit:Integer";
+ public static final String MAX_EVENT_TIME_LIMIT = "maxEventTimeLimit";
public static final int MAX_EVENT_TIME_LIMIT_DEFAULT = 2000;
//@Property(name = "sharedThreadPerformanceCheck", boolValue = DEFAULT_PERFORMANCE_CHECK,
// label = "Enable queue performance check on shared pool")
- public static final String CALCULATE_PERFORMANCE_CHECK = "calculatePoolPerformance:Boolean";
+ public static final String CALCULATE_PERFORMANCE_CHECK = "calculatePoolPerformance";
public static final boolean CALCULATE_PERFORMANCE_CHECK_DEFAULT = false;
//@Property(name = "allowExtraneousRules", boolValue = ALLOW_EXTRANEOUS_RULES,
// label = "Allow flow rules in switch not installed by ONOS")
- public static final String ALLOW_EXTRANEOUS_RULES = "allowExtraneousRules:Boolean";
+ public static final String ALLOW_EXTRANEOUS_RULES = "allowExtraneousRules";
public static final boolean ALLOW_EXTRANEOUS_RULES_DEFAULT = false;
//@Property(name = "purgeOnDisconnection", boolValue = false,
// label = "Purge entries associated with a device when the device goes offline")
- public static final String PURGE_ON_DISCONNECTION = "purgeOnDisconnection:Boolean";
+ public static final String PURGE_ON_DISCONNECTION = "purgeOnDisconnection";
public static final boolean PURGE_ON_DISCONNECTION_DEFAULT = false;
//@Property(name = "fallbackFlowPollFrequency", intValue = DEFAULT_POLL_FREQUENCY,
// label = "Frequency (in seconds) for polling flow statistics via fallback provider")
- public static final String POLL_FREQUENCY = "fallbackFlowPollFrequency:Integer";
+ public static final String POLL_FREQUENCY = "fallbackFlowPollFrequency";
public static final int POLL_FREQUENCY_DEFAULT = 30;
//@Property(name = NUM_THREAD,
// intValue = DEFAULT_NUM_THREADS,
// label = "Number of worker threads")
- public static final String FOM_NUM_THREADS = "FOMNumThreads:Integer";
+ public static final String FOM_NUM_THREADS = "FOMNumThreads";
public static final int FOM_NUM_THREADS_DEFAULT = 4;
//@Property(name = "fallbackGroupPollFrequency", intValue = DEFAULT_POLL_FREQUENCY,
// label = "Frequency (in seconds) for polling groups via fallback provider")
- public static final String GM_POLL_FREQUENCY = "fallbackGroupPollFrequency:Integer";
+ public static final String GM_POLL_FREQUENCY = "fallbackGroupPollFrequency";
public static final int GM_POLL_FREQUENCY_DEFAULT = 30;
//@Property(name = "purgeOnDisconnection", boolValue = false,
// label = "Purge entries associated with a device when the device goes offline")
- public static final String GM_PURGE_ON_DISCONNECTION = "purgeOnDisconnection:Boolean";
+ public static final String GM_PURGE_ON_DISCONNECTION = "purgeOnDisconnection";
public static final boolean GM_PURGE_ON_DISCONNECTION_DEFAULT = false;
//@Property(name = "allowDuplicateIps", boolValue = true,
// label = "Enable removal of duplicate ip address")
- public static final String HM_ALLOW_DUPLICATE_IPS = "allowDuplicateIps:Boolean";
+ public static final String HM_ALLOW_DUPLICATE_IPS = "allowDuplicateIps";
public static final boolean HM_ALLOW_DUPLICATE_IPS_DEFAULT = true;
//@Property(name = "monitorHosts", boolValue = false,
// label = "Enable/Disable monitoring of hosts")
- public static final String HM_MONITOR_HOSTS = "monitorHosts:Boolean";
+ public static final String HM_MONITOR_HOSTS = "monitorHosts";
public static final boolean HM_MONITOR_HOSTS_DEFAULT = false;
//@Property(name = "probeRate", longValue = 30000,
// label = "Set the probe Rate in milli seconds")
- public static final String HM_PROBE_RATE = "probeRate:Integer";
+ public static final String HM_PROBE_RATE = "probeRate";
public static final long HM_PROBE_RATE_DEFAULT = 30000;
//@Property(name = "greedyLearningIpv6", boolValue = false,
// label = "Enable/Disable greedy learning of IPv6 link local address")
- public static final String HM_GREEDY_LEARNING_IPV6 = "greedyLearningIpv6:Boolean";
+ public static final String HM_GREEDY_LEARNING_IPV6 = "greedyLearningIpv6";
public static final boolean HM_GREEDY_LEARNING_IPV6_DEFAULT = false;
//@Property(name = "useFlowObjectives",
// boolValue = DEFAULT_FLOW_OBJECTIVES,
// label = "Indicates whether or not to use flow objective-based compilers")
- public static final String ICR_USE_FLOW_OBJECTIVES = "useFlowObjectives:Boolean";
+ public static final String ICR_USE_FLOW_OBJECTIVES = "useFlowObjectives";
public static final boolean ICR_USE_FLOW_OBJECTIVES_DEFAULT = false;
//@Property(name = "labelSelection",
@@ -118,92 +118,92 @@
//@Property(name = "optimizeInstructions",
// boolValue = DEFAULT_FLOW_OPTIMIZATION,
// label = "Indicates whether or not to optimize the flows in the link collection compiler")
- public static final String ICR_FLOW_OPTIMIZATION = "optimizeInstructions:Boolean";
+ public static final String ICR_FLOW_OPTIMIZATION = "optimizeInstructions";
public static final boolean ICR_FLOW_OPTIMIZATION_DEFAULT = false;
//@Property(name = "useCopyTtl",
// boolValue = DEFAULT_COPY_TTL,
// label = "Indicates whether or not to use copy ttl in the link collection compiler")
- public static final String ICR_COPY_TTL = "useCopyTtl:Boolean";
+ public static final String ICR_COPY_TTL = "useCopyTtl";
public static final boolean ICR_COPY_TTL_DEFAULT = false;
//@Property(name = "enabled", boolValue = true,
// label = "Enables/disables the intent cleanup component")
- public static final String ICU_ENABLED = "enabled:Boolean";
+ public static final String ICU_ENABLED = "enabled";
public static final boolean ICU_ENABLED_DEFAULT = true;
//@Property(name = "period", intValue = DEFAULT_PERIOD,
// label = "Frequency in ms between cleanup runs")
- public static final String ICU_PERIOD = "period:Integer";
+ public static final String ICU_PERIOD = "period";
public static final int ICU_PERIOD_DEFAULT = 5; //seconds
//@Property(name = "retryThreshold", intValue = DEFAULT_THRESHOLD,
// label = "Number of times to retry CORRUPT intent without delay")
- public static final String ICU_RETRY_THRESHOLD = "retryThreshold:Integer";
+ public static final String ICU_RETRY_THRESHOLD = "retryThreshold";
public static final int ICU_RETRY_THRESHOLD_DEFAULT = 5; //tries
//@Property(name = "nonDisruptiveInstallationWaitingTime",
// intValue = DEFAULT_NON_DISRUPTIVE_INSTALLATION_WAITING_TIME,
// label = "Number of seconds to wait during the non-disruptive installation phases")
public static final String NON_DISRUPTIVE_INSTALLATION_WAITING_TIME =
- "nonDisruptiveInstallationWaitingTime:Integer";
+ "nonDisruptiveInstallationWaitingTime";
public static final int NON_DISRUPTIVE_INSTALLATION_WAITING_TIME_DEFAULT = 1;
//@Property(name = "skipReleaseResourcesOnWithdrawal",
// boolValue = DEFAULT_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL,
// label = "Indicates whether skipping resource releases on withdrawal is enabled or not")
- public static final String IM_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL = "skipReleaseResourcesOnWithdrawal:Boolean";
+ public static final String IM_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL = "skipReleaseResourcesOnWithdrawal";
public static final boolean IM_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL_DEFAULT = false;
//@Property(name = "numThreads",
// intValue = DEFAULT_NUM_THREADS,
// label = "Number of worker threads")
- public static final String IM_NUM_THREADS = "IMNumThreads:Integer";
+ public static final String IM_NUM_THREADS = "IMNumThreads";
public static final int IM_NUM_THREADS_DEFAULT = 12;
//@Property(name = NUM_THREAD,
// intValue = DEFAULT_NUM_THREADS,
// label = "Number of worker threads")
- public static final String MM_NUM_THREADS = "NMNumThreads:Integer";
+ public static final String MM_NUM_THREADS = "NMNumThreads";
public static final int MM_NUM_THREADS_DEFAULT = 12;
//@Property(name = "fallbackMeterPollFrequency", intValue = DEFAULT_POLL_FREQUENCY,
// label = "Frequency (in seconds) for polling meters via fallback provider")
- public static final String MM_FALLBACK_METER_POLL_FREQUENCY = "fallbackMeterPollFrequency:Integer";
+ public static final String MM_FALLBACK_METER_POLL_FREQUENCY = "fallbackMeterPollFrequency";
public static final int MM_FALLBACK_METER_POLL_FREQUENCY_DEFAULT = 30;
//@Property(name = "arpEnabled", boolValue = true,
// label = "Enable Address resolution protocol")
- public static final String NRM_ARP_ENABLED = "arpEnabled:Boolean";
+ public static final String NRM_ARP_ENABLED = "arpEnabled";
public static final boolean NRM_ARP_ENABLED_DEFAULT = true;
//@Property(name = "ndpEnabled", boolValue = false,
// label = "Enable IPv6 neighbour discovery")
- public static final String NRM_NDP_ENABLED = "ndpEnabled:Boolean";
+ public static final String NRM_NDP_ENABLED = "ndpEnabled";
public static final boolean NRM_NDP_ENABLED_DEFAULT = false;
//@Property(name = "requestInterceptsEnabled", boolValue = true,
// label = "Enable requesting packet intercepts")
- public static final String NRM_REQUEST_INTERCEPTS_ENABLED = "requestInterceptsEnabled:Boolean";
+ public static final String NRM_REQUEST_INTERCEPTS_ENABLED = "requestInterceptsEnabled";
public static final boolean NRM_REQUEST_INTERCEPTS_ENABLED_DEFAULT = true;
//@Property(name = PROBE_INTERVAL, intValue = DEFAULT_PROBE_INTERVAL,
// label = "Configure interval in seconds for device pipeconf probing")
- public static final String PWM_PROBE_INTERVAL = "probeInterval:Integer";
+ public static final String PWM_PROBE_INTERVAL = "probeInterval";
public static final int PWM_PROBE_INTERVAL_DEFAULT = 15;
//@Property(name = "maxEvents", intValue = DEFAULT_MAX_EVENTS,
// label = "Maximum number of events to accumulate")
- public static final String DTP_MAX_EVENTS = "maxEvents:Integer";
+ public static final String DTP_MAX_EVENTS = "maxEvents";
public static final int DTP_MAX_EVENTS_DEFAULT = 1000;
//@Property(name = "maxIdleMs", intValue = DEFAULT_MAX_IDLE_MS,
// label = "Maximum number of millis between events")
- public static final String DTP_MAX_IDLE_MS = "maxIdleMs:Integer";
+ public static final String DTP_MAX_IDLE_MS = "maxIdleMs";
public static final int DTP_MAX_IDLE_MS_DEFAULT = 10;
//@Property(name = "maxBatchMs", intValue = DEFAULT_MAX_BATCH_MS,
// label = "Maximum number of millis for whole batch")
- public static final String DTP_MAX_BATCH_MS = "maxBatchMs:Integer";
+ public static final String DTP_MAX_BATCH_MS = "maxBatchMs";
public static final int DTP_MAX_BATCH_MS_DEFAULT = 50;
}
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 9285ebc..515291f 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -103,9 +103,9 @@
FlowRuleProviderRegistry.class
},
property = {
- ALLOW_EXTRANEOUS_RULES + "=" + ALLOW_EXTRANEOUS_RULES_DEFAULT,
- PURGE_ON_DISCONNECTION + "=" + PURGE_ON_DISCONNECTION_DEFAULT,
- POLL_FREQUENCY + "=" + POLL_FREQUENCY_DEFAULT
+ ALLOW_EXTRANEOUS_RULES + ":Boolean=" + ALLOW_EXTRANEOUS_RULES_DEFAULT,
+ PURGE_ON_DISCONNECTION + ":Boolean=" + PURGE_ON_DISCONNECTION_DEFAULT,
+ POLL_FREQUENCY + ":Integer=" + POLL_FREQUENCY_DEFAULT
}
)
public class FlowRuleManager
diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
index e973da1..39fe1d4 100644
--- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManager.java
@@ -84,7 +84,7 @@
enabled = false,
service = FlowObjectiveService.class,
property = {
- FOM_NUM_THREADS + "=" + FOM_NUM_THREADS_DEFAULT
+ FOM_NUM_THREADS + ":Integer=" + FOM_NUM_THREADS_DEFAULT
}
)
public class FlowObjectiveManager implements FlowObjectiveService {
diff --git a/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java b/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java
index a160ae0..0f6a5ac 100644
--- a/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java
+++ b/core/net/src/main/java/org/onosproject/net/group/impl/GroupManager.java
@@ -78,8 +78,8 @@
GroupProviderRegistry.class
},
property = {
- GM_POLL_FREQUENCY + "=" + GM_POLL_FREQUENCY_DEFAULT,
- GM_PURGE_ON_DISCONNECTION + "=" + GM_PURGE_ON_DISCONNECTION_DEFAULT
+ GM_POLL_FREQUENCY + ":Integer=" + GM_POLL_FREQUENCY_DEFAULT,
+ GM_PURGE_ON_DISCONNECTION + ":Boolean=" + GM_PURGE_ON_DISCONNECTION_DEFAULT
}
)
public class GroupManager
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
index 37a37b0..13a13d7 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
@@ -86,10 +86,10 @@
HostProviderRegistry.class
},
property = {
- HM_ALLOW_DUPLICATE_IPS + "=" + HM_ALLOW_DUPLICATE_IPS_DEFAULT,
- HM_MONITOR_HOSTS + "=" + HM_MONITOR_HOSTS_DEFAULT,
- HM_PROBE_RATE + "=" + HM_PROBE_RATE_DEFAULT,
- HM_GREEDY_LEARNING_IPV6 + "=" + HM_GREEDY_LEARNING_IPV6_DEFAULT
+ HM_ALLOW_DUPLICATE_IPS + ":Boolean=" + HM_ALLOW_DUPLICATE_IPS_DEFAULT,
+ HM_MONITOR_HOSTS + ":Boolean=" + HM_MONITOR_HOSTS_DEFAULT,
+ HM_PROBE_RATE + ":Integer=" + HM_PROBE_RATE_DEFAULT,
+ HM_GREEDY_LEARNING_IPV6 + ":Boolean=" + HM_GREEDY_LEARNING_IPV6_DEFAULT
}
)
public class HostManager
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
index e33ab82..37e6be8 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCleanup.java
@@ -62,9 +62,9 @@
@Component(
immediate = true,
property = {
- ICU_ENABLED + "=" + ICU_ENABLED_DEFAULT,
- ICU_PERIOD + "=" + ICU_PERIOD_DEFAULT,
- ICU_RETRY_THRESHOLD + "=" + ICU_RETRY_THRESHOLD_DEFAULT
+ ICU_ENABLED + ":Boolean=" + ICU_ENABLED_DEFAULT,
+ ICU_PERIOD + ":Integer=" + ICU_PERIOD_DEFAULT,
+ ICU_RETRY_THRESHOLD + ":Integer=" + ICU_RETRY_THRESHOLD_DEFAULT
}
)
public class IntentCleanup implements Runnable, IntentListener {
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 80c9897..38d7a5b 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -102,8 +102,8 @@
IntentInstallCoordinator.class
},
property = {
- IM_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL + "=" + IM_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL_DEFAULT,
- IM_NUM_THREADS + "=" + IM_NUM_THREADS_DEFAULT
+ IM_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL + ":Boolean=" + IM_SKIP_RELEASE_RESOURCES_ON_WITHDRAWAL_DEFAULT,
+ IM_NUM_THREADS + ":Integer=" + IM_NUM_THREADS_DEFAULT
}
)
public class IntentManager
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java
index 0712d46..14c2d83 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/IntentConfigurableRegistrator.java
@@ -54,11 +54,11 @@
@Component(
service = IntentConfigurableRegistrator.class,
property = {
- ICR_USE_FLOW_OBJECTIVES + "=" + ICR_USE_FLOW_OBJECTIVES_DEFAULT,
+ ICR_USE_FLOW_OBJECTIVES + ":Boolean=" + ICR_USE_FLOW_OBJECTIVES_DEFAULT,
ICR_LABEL_SELECTION + "=" + ICR_LABEL_SELECTION_DEFAULT,
ICR_OPT_LABEL_SELECTION + "=" + ICR_LABEL_SELECTION_DEFAULT,
- ICR_FLOW_OPTIMIZATION + "=" + ICR_FLOW_OPTIMIZATION_DEFAULT,
- ICR_COPY_TTL + "=" + ICR_COPY_TTL_DEFAULT
+ ICR_FLOW_OPTIMIZATION + ":Boolean=" + ICR_FLOW_OPTIMIZATION_DEFAULT,
+ ICR_COPY_TTL + ":Boolean=" + ICR_COPY_TTL_DEFAULT
}
)
public class IntentConfigurableRegistrator {
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/installer/FlowRuleIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/FlowRuleIntentInstaller.java
index 12d1891..8f31d9a 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/installer/FlowRuleIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/installer/FlowRuleIntentInstaller.java
@@ -76,7 +76,7 @@
@Component(
immediate = true,
property = {
- NON_DISRUPTIVE_INSTALLATION_WAITING_TIME + "=" + NON_DISRUPTIVE_INSTALLATION_WAITING_TIME_DEFAULT
+ NON_DISRUPTIVE_INSTALLATION_WAITING_TIME + ":Integer=" + NON_DISRUPTIVE_INSTALLATION_WAITING_TIME_DEFAULT
}
)
public class FlowRuleIntentInstaller implements IntentInstaller<FlowRuleIntent> {
diff --git a/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java b/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java
index 721cf15..ffe5a56 100644
--- a/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java
+++ b/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java
@@ -78,8 +78,8 @@
MeterProviderRegistry.class
},
property = {
- MM_NUM_THREADS + "=" + MM_NUM_THREADS_DEFAULT,
- MM_FALLBACK_METER_POLL_FREQUENCY + "=" + MM_FALLBACK_METER_POLL_FREQUENCY_DEFAULT
+ MM_NUM_THREADS + ":Integer=" + MM_NUM_THREADS_DEFAULT,
+ MM_FALLBACK_METER_POLL_FREQUENCY + ":Integer=" + MM_FALLBACK_METER_POLL_FREQUENCY_DEFAULT
}
)
public class MeterManager
diff --git a/core/net/src/main/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManager.java b/core/net/src/main/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManager.java
index c0ee1a7..dd9da4b 100644
--- a/core/net/src/main/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManager.java
+++ b/core/net/src/main/java/org/onosproject/net/neighbour/impl/NeighbourResolutionManager.java
@@ -83,9 +83,9 @@
immediate = true,
service = NeighbourResolutionService.class,
property = {
- NRM_ARP_ENABLED + "=" + NRM_ARP_ENABLED_DEFAULT,
- NRM_NDP_ENABLED + "=" + NRM_NDP_ENABLED,
- NRM_REQUEST_INTERCEPTS_ENABLED + "=" + NRM_REQUEST_INTERCEPTS_ENABLED_DEFAULT
+ NRM_ARP_ENABLED + ":Boolean=" + NRM_ARP_ENABLED_DEFAULT,
+ NRM_NDP_ENABLED + ":Boolean=" + NRM_NDP_ENABLED,
+ NRM_REQUEST_INTERCEPTS_ENABLED + ":Boolean=" + NRM_REQUEST_INTERCEPTS_ENABLED_DEFAULT
}
)
public class NeighbourResolutionManager implements NeighbourResolutionService {
diff --git a/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfWatchdogManager.java b/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfWatchdogManager.java
index 998ca61..04acc01 100644
--- a/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfWatchdogManager.java
+++ b/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfWatchdogManager.java
@@ -80,7 +80,7 @@
immediate = true,
service = PiPipeconfWatchdogService.class,
property = {
- PWM_PROBE_INTERVAL + "=" + PWM_PROBE_INTERVAL_DEFAULT
+ PWM_PROBE_INTERVAL + ":Integer=" + PWM_PROBE_INTERVAL_DEFAULT
}
)
public class PiPipeconfWatchdogManager
diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java b/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
index 0c33512..1e1aa5a 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
@@ -72,9 +72,9 @@
immediate = true,
service = TopologyProvider.class,
property = {
- DTP_MAX_EVENTS + "=" + DTP_MAX_EVENTS_DEFAULT,
- DTP_MAX_IDLE_MS + "=" + DTP_MAX_IDLE_MS_DEFAULT,
- DTP_MAX_BATCH_MS + "=" + DTP_MAX_BATCH_MS_DEFAULT
+ DTP_MAX_EVENTS + ":Integer=" + DTP_MAX_EVENTS_DEFAULT,
+ DTP_MAX_IDLE_MS + ":Integer=" + DTP_MAX_IDLE_MS_DEFAULT,
+ DTP_MAX_BATCH_MS + ":Integer=" + DTP_MAX_BATCH_MS_DEFAULT
}
)
public class DefaultTopologyProvider extends AbstractProvider