cfgdef tool modifications to catch variable names that don't match properties
- catch errors in the cfgdef tool and abort compilation if a mismatch
is seen
- Fix mismatches in the code discovered by the tool
Change-Id: Icd9a15eb9312bba6c2208b0b2a684062fcdc19c3
diff --git a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index f473715..d72f64e 100644
--- a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -123,7 +123,6 @@
@Component(
service = { DhcpHandler.class, HostProvider.class },
property = {
- "version:Integer = 4",
LEARN_ROUTE_FROM_LEASE_QUERY + ":Boolean=" + LEARN_ROUTE_FROM_LEASE_QUERY_DEFAULT
}
)
diff --git a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
index 7d23293..5068eae 100644
--- a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
+++ b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
@@ -128,7 +128,6 @@
@Component(
service = { DhcpHandler.class, HostProvider.class },
property = {
- "version:Integer=6",
LEARN_ROUTE_FROM_LEASE_QUERY + ":Boolean=" + LEARN_ROUTE_FROM_LEASE_QUERY_DEFAULT
}
)
diff --git a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java
index bec99e1..5a9bbb9 100644
--- a/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java
+++ b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java
@@ -45,10 +45,7 @@
*/
@Component(
immediate = true,
- service = DhcpFpmPrefixStore.class,
- property = {
- "fpm_type=DHCP"
- }
+ service = DhcpFpmPrefixStore.class
)
public class DistributedFpmPrefixStore implements DhcpFpmPrefixStore {
diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
index 83dc3bc..6ed366e 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -219,7 +219,7 @@
private boolean matchIcmpFields = MATCH_ICMP_FIELDS_DEFAULT;
/** Ignore (do not forward) IPv4 multicast packets; default is false. */
- private boolean ignoreIpv4McastPackets = IGNORE_IPV4_MCAST_PACKETS_DEFAULT;
+ private boolean ignoreIPv4Multicast = IGNORE_IPV4_MCAST_PACKETS_DEFAULT;
/** Enable record metrics for reactive forwarding. */
private boolean recordMetrics = RECORD_METRICS_DEFAULT;
@@ -436,11 +436,11 @@
Tools.isPropertyEnabled(properties, IGNORE_IPV4_MCAST_PACKETS);
if (ignoreIpv4McastPacketsEnabled == null) {
log.info("Ignore IPv4 multi-cast packet is not configured, " +
- "using current value of {}", ignoreIpv4McastPackets);
+ "using current value of {}", ignoreIPv4Multicast);
} else {
- ignoreIpv4McastPackets = ignoreIpv4McastPacketsEnabled;
+ ignoreIPv4Multicast = ignoreIpv4McastPacketsEnabled;
log.info("Configured. Ignore IPv4 multicast packets is {}",
- ignoreIpv4McastPackets ? "enabled" : "disabled");
+ ignoreIPv4Multicast ? "enabled" : "disabled");
}
Boolean recordMetricsEnabled =
Tools.isPropertyEnabled(properties, RECORD_METRICS);
@@ -507,7 +507,7 @@
}
// Do not process IPv4 multicast packets, let mfwd handle them
- if (ignoreIpv4McastPackets && ethPkt.getEtherType() == Ethernet.TYPE_IPV4) {
+ if (ignoreIPv4Multicast && ethPkt.getEtherType() == Ethernet.TYPE_IPV4) {
if (id.mac().isMulticast()) {
return;
}
diff --git a/apps/test/transaction-perf/src/main/java/org/onosproject/transactionperf/TransactionPerfApp.java b/apps/test/transaction-perf/src/main/java/org/onosproject/transactionperf/TransactionPerfApp.java
index b79ea2e..b41cad1 100644
--- a/apps/test/transaction-perf/src/main/java/org/onosproject/transactionperf/TransactionPerfApp.java
+++ b/apps/test/transaction-perf/src/main/java/org/onosproject/transactionperf/TransactionPerfApp.java
@@ -66,7 +66,7 @@
immediate = true,
service = TransactionPerfApp.class,
property = {
- MAP_NAME_DEFAULT + "=" + MAP_NAME,
+ MAP_NAME + "=" + MAP_NAME_DEFAULT,
READ_PERCENTAGE + ":Double=" + READ_PERCENTAGE_DEFAULT,
TOTAL_OPERATIONS + ":Integer=" + TOTAL_OPERATIONS_DEFAULT,
WITH_CONTENTION + ":Boolean=" + WITH_CONTENTION_DEFAULT,
diff --git a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/store/impl/DistributedVirtualFlowRuleStore.java b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/store/impl/DistributedVirtualFlowRuleStore.java
index 8722c92..c43b0b9 100644
--- a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/store/impl/DistributedVirtualFlowRuleStore.java
+++ b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/store/impl/DistributedVirtualFlowRuleStore.java
@@ -134,7 +134,7 @@
= new MessageSubject("virtual-peer-apply-completed");
/** Number of threads in the message handler pool. */
- private int msgHandlerThreadPoolSize = MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
+ private int messageHandlerThreadPoolSize = MESSAGE_HANDLER_THREAD_POOL_SIZE_DEFAULT;
/** Delay in ms between successive backup runs. */
private int backupPeriod = BACKUP_PERIOD_MILLIS_DEFAULT;
@@ -197,7 +197,7 @@
eventHandler = Executors.newSingleThreadExecutor(
groupedThreads("onos/virtual-flow", "event-handler", log));
messageHandlingExecutor = Executors.newFixedThreadPool(
- msgHandlerThreadPoolSize, groupedThreads("onos/store/virtual-flow", "message-handlers", log));
+ messageHandlerThreadPoolSize, groupedThreads("onos/store/virtual-flow", "message-handlers", log));
registerMessageHandlers(messageHandlingExecutor);
@@ -238,7 +238,7 @@
int newBackupPeriod;
try {
String s = get(properties, MESSAGE_HANDLER_THREAD_POOL_SIZE);
- newPoolSize = isNullOrEmpty(s) ? msgHandlerThreadPoolSize : Integer.parseInt(s.trim());
+ newPoolSize = isNullOrEmpty(s) ? messageHandlerThreadPoolSize : Integer.parseInt(s.trim());
s = get(properties, BACKUP_PERIOD_MILLIS);
newBackupPeriod = isNullOrEmpty(s) ? backupPeriod : Integer.parseInt(s.trim());
@@ -256,11 +256,11 @@
if (restartBackupTask) {
log.warn("Currently, backup tasks are not supported.");
}
- if (newPoolSize != msgHandlerThreadPoolSize) {
- msgHandlerThreadPoolSize = newPoolSize;
+ if (newPoolSize != messageHandlerThreadPoolSize) {
+ messageHandlerThreadPoolSize = newPoolSize;
ExecutorService oldMsgHandler = messageHandlingExecutor;
messageHandlingExecutor = Executors.newFixedThreadPool(
- msgHandlerThreadPoolSize, groupedThreads("onos/store/virtual-flow", "message-handlers", log));
+ messageHandlerThreadPoolSize, groupedThreads("onos/store/virtual-flow", "message-handlers", log));
// replace previously registered handlers.
registerMessageHandlers(messageHandlingExecutor);
@@ -566,7 +566,7 @@
private void logConfig(String prefix) {
log.info("{} with msgHandlerPoolSize = {}; backupPeriod = {}",
- prefix, msgHandlerThreadPoolSize, backupPeriod);
+ prefix, messageHandlerThreadPoolSize, backupPeriod);
}
private void storeBatchInternal(NetworkId networkId, FlowRuleBatchOperation operation) {