commit 93fa727942c42fff5691f7b175660baad8ef8df4
author Charles Chan <rascov@gmail.com> Tue Jan 26 22:27:02 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Jan 29 19:29:24 2016 +0000
tree bc7a0b6027715c938eba83f0e60c31c8f5ba8531
parent 95678966d48e87f8fd7128c5685cf4a7f2932aba

ONOS-3763 Change flow state to PENDING_ADD when retrying

Will emit a RULE_UPDATE event if the state is changed.
Update unit test accordingly.

Change-Id: Ie84778c62f52f15b7636d41db246814145e73f77

core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
index 553745b..24ade7e 100644
--- a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
@@ -206,7 +206,7 @@
         assertEquals("should still be 2 rules", 2, flowCount());
 
         providerService.pushFlowMetrics(DID, ImmutableList.of(fe1));
-        validateEvents(RULE_UPDATED);
+        validateEvents(RULE_UPDATED, RULE_UPDATED);
     }
 
     private boolean validateState(Map<FlowRule, FlowEntryState> expected) {
@@ -293,7 +293,7 @@
         service.applyFlowRules(f3);
 
         providerService.pushFlowMetrics(DID, Collections.singletonList(fe3));
-        validateEvents(RULE_ADD_REQUESTED, RULE_ADDED);
+        validateEvents(RULE_ADD_REQUESTED, RULE_ADDED, RULE_UPDATED);
 
         providerService.flowRemoved(fe3);
         validateEvents();