fix for BUG 365

 - by adding and removing all context of datastore were touched
 - now we use only the config context and by remove we do not clean flow itself

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

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
index 00c9e345c5be22538a91d7f95a3652d4e885840c..b470c2df3f6d67a69494011bbb705e57aeb4fd0d 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestCommandProvider.java
@@ -668,11 +668,6 @@ public class OpenflowpluginGroupTestCommandProvider implements CommandProvider {
         DataModification<InstanceIdentifier<?>, DataObject> modification = dataBrokerService.beginTransaction();
         InstanceIdentifier<Group> path1 = InstanceIdentifier.builder(Nodes.class).child(Node.class, testNode.getKey())
                 .augmentation(FlowCapableNode.class).child(Group.class, new GroupKey(gbuilder.getGroupId())).build();
-        // DataObject cls = (DataObject)
-        // modification.readConfigurationData(path1);
-        // modification.removeOperationalData(nodeToInstanceId(testNode));
-        modification.removeOperationalData(path1);
-        // modification.removeConfigurationData(nodeToInstanceId(testNode));
         modification.removeConfigurationData(path1);
         Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();
         try {
@@ -710,8 +705,6 @@ public class OpenflowpluginGroupTestCommandProvider implements CommandProvider {
                 .child(Node.class, testNode.getKey()).augmentation(FlowCapableNode.class)
                 .child(Group.class, new GroupKey(group.getGroupId()))
                 .build();
-        modification.putOperationalData(nodeToInstanceId(testNode), testNode);
-        modification.putOperationalData(path1, group);
         modification.putConfigurationData(nodeToInstanceId(testNode), testNode);
         modification.putConfigurationData(path1, group);
         Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
index 283de18ecaa46dbf8ac7308542996014432ee5f4..94869beec6f72db3c2733a89b69823ff01629889 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
@@ -178,9 +178,6 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
                 .child(Node.class, testNode.getKey()).augmentation(FlowCapableNode.class)
                 .child(Meter.class, new MeterKey(testMeter.getMeterId()))
                 .build();
-        modification.removeOperationalData(nodeToInstanceId(testNode));
-        modification.removeOperationalData(path1);
-        modification.removeConfigurationData(nodeToInstanceId(testNode));
         modification.removeConfigurationData(path1);
         Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();
         try {
@@ -218,8 +215,6 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
                 .child(Meter.class, new MeterKey(meter.getMeterId()))
                 .build();
         DataObject cls = (DataObject) modification.readConfigurationData(path1);
-        modification.putOperationalData(nodeToInstanceId(testNode), testNode);
-        modification.putOperationalData(path1, meter);
         modification.putConfigurationData(nodeToInstanceId(testNode), testNode);
         modification.putConfigurationData(path1, meter);
         Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();

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 7e4726454e28d495479828d3ee5c4983b5528051..fe3830b2d091e73fa8df02f79ef11cf62f96c2cd 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
@@ -3116,9 +3116,6 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
         InstanceIdentifier<Flow> path1 = InstanceIdentifier.builder(Nodes.class).child(Node.class, tn.getKey())
                 .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tf.getTableId()))
                 .child(Flow.class, tf.getKey()).build();
-        modification.removeOperationalData(nodeBuilderToInstanceId(tn));
-        modification.removeOperationalData(path1);
-        modification.removeConfigurationData(nodeBuilderToInstanceId(tn));
         modification.removeConfigurationData(path1);
         Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();
         try {
@@ -3133,6 +3130,13 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
         }
     }
 
+    /**
+     * @param ci arguments: switchId flowType tableNum
+     * 
+     * <pre>
+     * e.g.: addMDFlow openflow:1 f1 42
+     * </pre>
+     */
     public void _addMDFlow(CommandInterpreter ci) {
         NodeBuilder tn = createTestNode(ci.nextArgument());
         String flowtype = ci.nextArgument();
@@ -3150,8 +3154,6 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
         InstanceIdentifier<Flow> path1 = InstanceIdentifier.builder(Nodes.class)
                 .child(Node.class, nodeBuilder.getKey()).augmentation(FlowCapableNode.class)
                 .child(Table.class, new TableKey(flow.getTableId())).child(Flow.class, flow.getKey()).build();
-        modification.putOperationalData(nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build());
-        modification.putOperationalData(path1, flow.build());
         modification.putConfigurationData(nodeBuilderToInstanceId(nodeBuilder), nodeBuilder.build());
         modification.putConfigurationData(path1, flow.build());
         Future<RpcResult<TransactionStatus>> commitFuture = modification.commit();