fix of BUG 480

- lowered priority of flow-54 added programmatically via osgi cmd
- cleaning bound to OFLibrary upon bundle stop

Change-Id: Ibe24e730b032621a97f6dd36af8c29d4607a27ea
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
index 2206091526082fc2e9cda4e6215e5d30f371ca49..65ab9231a62703af81a857fdbcc16ecb14e3b667 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
@@ -301,6 +301,7 @@ public class MDController implements IMDController, AutoCloseable {
         messageSpyCounter = null;
         messageTranslators = null;
         popListeners = null;
+        switchConnectionProvider.setSwitchConnectionHandler(null);
         switchConnectionProvider = null;
         OFSessionUtil.releaseSessionManager();
     }

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
index fe3830b2d091e73fa8df02f79ef11cf62f96c2cd..5a4b056dad72595ee8962b8e874606fa2b42be6e 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
@@ -277,6 +277,8 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
         if (flowType == null) {
             flowType = "f1";
         }
+        
+        flow.setPriority(2);
 
         switch (flowType) {
         case "f1":
@@ -551,6 +553,7 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
             id += 54;
             flow.setMatch(new MatchBuilder().build());
             flow.setInstructions(createSentToControllerInstructions().build());
+            flow.setPriority(0);
             break;
         case "f55":
             id += 55;
@@ -723,7 +726,6 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
         // flow.setOutPort(outputPort);
 
         flow.setKey(key);
-        flow.setPriority(2);
         flow.setFlowName(originalFlowName + "X" + flowType);
         testFlow = flow;
         return flow;