[ONOS-8123] Fix an issue related to the component properties.
Properties are not inherited by the derived classes. This means that
a subclass cannot change a property defined in the super class.
We are seeing an issue with FObj managers where the FlowObjectiveManager
is not enabled and ConfigAdmin suppresses the calls "cfg set" to its
properties. Moreover, the InOrderFlowObjective is not able to change
its properties because it does not receive calls to "modified".
The last issue happens because the properties defined in the Component
annotation are not inherited.
Additionally, this patch makes configurable the objective timeout in
InOrderFlowObjectiveManager.
Change-Id: Ibd84be914b15a17f82186b5013c0c0697d2657c3
diff --git a/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java b/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java
index 8e88e77..e230550 100644
--- a/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java
@@ -63,6 +63,7 @@
import static org.junit.Assert.assertEquals;
import static org.onlab.junit.TestTools.assertAfter;
import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.net.OsgiPropertyConstants.IFOM_OBJ_TIMEOUT_MS_DEFAULT;
import java.util.Collection;
import java.util.List;
@@ -186,12 +187,12 @@
@Before
public void setUp() {
- internalSetup(InOrderFlowObjectiveManager.DEFAULT_OBJ_TIMEOUT);
+ internalSetup(IFOM_OBJ_TIMEOUT_MS_DEFAULT);
}
private void internalSetup(int objTimeoutMs) {
mgr = new InOrderFlowObjectiveManager();
- mgr.objTimeoutMs = objTimeoutMs;
+ mgr.objectiveTimeoutMs = objTimeoutMs;
mgr.pipeliners.put(DEV1, pipeliner);
mgr.installerExecutor = newFixedThreadPool(4, groupedThreads("foo", "bar"));
mgr.cfgService = createMock(ComponentConfigService.class);
@@ -263,7 +264,7 @@
replay(mgr.flowObjectiveStore);
// Force this objective to time out
- offset = mgr.objTimeoutMs * 3;
+ offset = mgr.objectiveTimeoutMs * 3;
expectFwdObjsTimeout.forEach(fwdObj -> mgr.forward(DEV1, fwdObj));