| commit | bd508ede5c98ae0c811d765f38e79cd9abef8000 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Tue Mar 19 14:22:02 2019 -0700 |
| committer | Thomas Vachuska <tom@opennetworking.org> | Thu Mar 21 19:07:31 2019 +0000 |
| tree | 7fd751d8ac280e7f4beb03baac2882031d269aa1 | |
| parent | f42f76e9558be86d416ca60090a4270ef63aa0d4 [diff] |
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/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/NetworkConfigLinksProvider.java index 68e4895..e73163c 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
@@ -112,7 +112,7 @@ private int probeRate = PROBE_RATE_DEFAULT; /** Number of millis beyond which an LLDP packet will not be accepted. */ - private int maxDiscoveryDelayMs = DISCOVERY_DELAY_DEFAULT; + private int maxLldpAge = DISCOVERY_DELAY_DEFAULT; // Device link discovery helpers. protected final Map<DeviceId, LinkDiscovery> discoverers = new ConcurrentHashMap<>(); @@ -284,7 +284,7 @@ @Override public long maxDiscoveryDelay() { - return maxDiscoveryDelayMs; + return maxLldpAge; } }
diff --git a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/OsgiPropertyConstants.java b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/OsgiPropertyConstants.java index 5d718ed..463ae25 100644 --- a/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/OsgiPropertyConstants.java +++ b/providers/netcfglinks/src/main/java/org/onosproject/provider/netcfglinks/OsgiPropertyConstants.java
@@ -26,7 +26,7 @@ public static final String PROP_PROBE_RATE = "probeRate"; public static final int PROBE_RATE_DEFAULT = 3000; - public static final String PROP_DISCOVERY_DELAY = "maxLLDPAge"; + public static final String PROP_DISCOVERY_DELAY = "maxLldpAge"; public static final int DISCOVERY_DELAY_DEFAULT = 1000; }