Fixing LLDP link provider property defaults.
Change-Id: Ifa23a686989c6cce43d5a5f6a2dec6d92df6ed50
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 e2e3fbe..71d8810 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
@@ -156,19 +156,19 @@
//@Property(name = PROP_ENABLED, boolValue = true,
// label = "If false, link discovery is disabled")
- private boolean enabled = ENABLED_DEFAULT;
+ protected boolean enabled = ENABLED_DEFAULT;
//@Property(name = PROP_USE_BDDP, boolValue = true,
// label = "Use BDDP for link discovery")
- private boolean useBddp = USE_BDDP_DEFAULT;
+ protected boolean useBddp = USE_BDDP_DEFAULT;
//@Property(name = PROP_PROBE_RATE, intValue = DEFAULT_PROBE_RATE,
// label = "LLDP and BDDP probe rate specified in millis")
- private int probeRate = PROBE_RATE_DEFAULT;
+ 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")
- private int staleLinkAge = STALE_LINK_AGE_DEFAULT;
+ protected int staleLinkAge = STALE_LINK_AGE_DEFAULT;
private final LinkDiscoveryContext context = new InternalDiscoveryContext();
private final InternalRoleListener roleListener = new InternalRoleListener();
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 ab20c03..95fb99c0 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
@@ -24,7 +24,7 @@
private OsgiPropertyConstants() {}
public static final String PROP_ENABLED = "enabled";
- public static final boolean ENABLED_DEFAULT = false;
+ public static final boolean ENABLED_DEFAULT = true;
public static final String PROP_USE_BDDP = "useBDDP";
public static final boolean USE_BDDP_DEFAULT = true;
diff --git a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java
index 54bd151..77341c2 100644
--- a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java
+++ b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LldpLinkProviderTest.java
@@ -135,6 +135,7 @@
replay(coreService);
provider.cfgService = new ComponentConfigAdapter();
+ provider.enabled = false;
provider.coreService = coreService;
provider.cfgRegistry = configRegistry;