Adding FlowRef,MeterRef and GroupRef for the Error message

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / ModelDrivenSwitchImplTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java
index d20798b7835ae5cf41ca72101b1562c38a004627..92cfe5ec40c04d2c95e8182cdb53c86252322065 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java
@@ -11,6 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,6 +27,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductor;
 import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher;
 import org.opendaylight.openflowplugin.openflow.md.core.session.IMessageDispatchService;
 import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
+import org.opendaylight.openflowplugin.openflow.md.core.session.TransactionKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlowInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowInputBuilder;
@@ -39,6 +41,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+
 /**
  * simple NPE smoke test
  */
@@ -47,7 +52,7 @@ public class ModelDrivenSwitchImplTest {
 
     private ModelDrivenSwitchImpl mdSwitchOF10;
     private ModelDrivenSwitchImpl mdSwitchOF13;
-    
+
     @Mock
     private SessionContext context;
     @Mock
@@ -57,6 +62,9 @@ public class ModelDrivenSwitchImplTest {
     @Mock
     private GetFeaturesOutput features;
 
+    public static Cache<TransactionKey, Object> bulkTransactionCache = CacheBuilder.newBuilder()
+            .expireAfterWrite(10000, TimeUnit.MILLISECONDS).concurrencyLevel(1).build();
+
     /**
      * @throws java.lang.Exception
      */
@@ -64,77 +72,81 @@ public class ModelDrivenSwitchImplTest {
     public void setUp() throws Exception {
         Mockito.when(context.getPrimaryConductor()).thenReturn(conductor);
         Mockito.when(context.getMessageDispatchService()).thenReturn(messageDispatchService);
-        Mockito.when(conductor.getVersion())
-            .thenReturn(OFConstants.OFP_VERSION_1_0)
-            .thenReturn(OFConstants.OFP_VERSION_1_3);
+        Mockito.when(conductor.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_0)
+                .thenReturn(OFConstants.OFP_VERSION_1_3);
         Mockito.when(context.getFeatures()).thenReturn(features);
+        Mockito.when(context.getbulkTransactionCache()).thenReturn(bulkTransactionCache);
         Mockito.when(features.getDatapathId()).thenReturn(BigInteger.valueOf(1));
 
         mdSwitchOF10 = new ModelDrivenSwitchImpl(null, null, context);
         mdSwitchOF13 = new ModelDrivenSwitchImpl(null, null, context);
     }
 
-
     /**
-     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.ModelDrivenSwitchImpl#addFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput)}.
+     * Test method for
+     * {@link org.opendaylight.openflowplugin.openflow.md.core.sal.ModelDrivenSwitchImpl#addFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput)}
+     * .
      */
     @Test
     public void testAddFlow() {
         UpdateFlowOutputBuilder updateFlowOutput = new UpdateFlowOutputBuilder();
         updateFlowOutput.setTransactionId(new TransactionId(new BigInteger("42")));
         Set<RpcError> errorSet = Collections.emptySet();
-        RpcResult<UpdateFlowOutput> result = Rpcs.getRpcResult(true, 
-                updateFlowOutput.build(), errorSet);
-        Mockito.when(messageDispatchService.flowMod(Matchers.any(FlowModInput.class), 
-                Matchers.any(SwitchConnectionDistinguisher.class))).thenReturn(Futures.immediateFuture(result));
-        
+        RpcResult<UpdateFlowOutput> result = Rpcs.getRpcResult(true, updateFlowOutput.build(), errorSet);
+        Mockito.when(
+                messageDispatchService.flowMod(Matchers.any(FlowModInput.class),
+                        Matchers.any(SwitchConnectionDistinguisher.class))).thenReturn(Futures.immediateFuture(result));
+
         AddFlowInputBuilder input = new AddFlowInputBuilder();
         input.setMatch(new MatchBuilder().build());
-        
+
         mdSwitchOF10.addFlow(input.build());
         mdSwitchOF13.addFlow(input.build());
     }
 
     /**
-     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.ModelDrivenSwitchImpl#removeFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlowInput)}.
+     * Test method for
+     * {@link org.opendaylight.openflowplugin.openflow.md.core.sal.ModelDrivenSwitchImpl#removeFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.RemoveFlowInput)}
+     * .
      */
     @Test
     public void testRemoveFlow() {
         UpdateFlowOutputBuilder updateFlowOutput = new UpdateFlowOutputBuilder();
         updateFlowOutput.setTransactionId(new TransactionId(new BigInteger("42")));
         Set<RpcError> errorSet = Collections.emptySet();
-        RpcResult<UpdateFlowOutput> result = Rpcs.getRpcResult(true, 
-                updateFlowOutput.build(), errorSet);
-        Mockito.when(messageDispatchService.flowMod(Matchers.any(FlowModInput.class), 
-                Matchers.any(SwitchConnectionDistinguisher.class))).thenReturn(Futures.immediateFuture(result));
-        
+        RpcResult<UpdateFlowOutput> result = Rpcs.getRpcResult(true, updateFlowOutput.build(), errorSet);
+        Mockito.when(
+                messageDispatchService.flowMod(Matchers.any(FlowModInput.class),
+                        Matchers.any(SwitchConnectionDistinguisher.class))).thenReturn(Futures.immediateFuture(result));
+
         RemoveFlowInputBuilder input = new RemoveFlowInputBuilder();
         input.setMatch(new MatchBuilder().build());
-        
+
         mdSwitchOF10.removeFlow(input.build());
         mdSwitchOF13.removeFlow(input.build());
     }
 
     /**
-     * Test method for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.ModelDrivenSwitchImpl#updateFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowInput)}.
+     * Test method for
+     * {@link org.opendaylight.openflowplugin.openflow.md.core.sal.ModelDrivenSwitchImpl#updateFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowInput)}
+     * .
      */
     @Test
     public void testUpdateFlow() {
         UpdateFlowOutputBuilder updateFlowOutput = new UpdateFlowOutputBuilder();
         updateFlowOutput.setTransactionId(new TransactionId(new BigInteger("42")));
         Set<RpcError> errorSet = Collections.emptySet();
-        RpcResult<UpdateFlowOutput> result = Rpcs.getRpcResult(true, 
-                updateFlowOutput.build(), errorSet);
-        Mockito.when(messageDispatchService.flowMod(Matchers.any(FlowModInput.class), 
-                Matchers.any(SwitchConnectionDistinguisher.class))).thenReturn(Futures.immediateFuture(result));
-        
+        RpcResult<UpdateFlowOutput> result = Rpcs.getRpcResult(true, updateFlowOutput.build(), errorSet);
+        Mockito.when(
+                messageDispatchService.flowMod(Matchers.any(FlowModInput.class),
+                        Matchers.any(SwitchConnectionDistinguisher.class))).thenReturn(Futures.immediateFuture(result));
+
         UpdateFlowInputBuilder input = new UpdateFlowInputBuilder();
         UpdatedFlowBuilder updatedFlow = new UpdatedFlowBuilder();
         updatedFlow.setMatch(new MatchBuilder().build());
         input.setUpdatedFlow(updatedFlow.build());
-        
+
         mdSwitchOF10.updateFlow(input.build());
         mdSwitchOF13.updateFlow(input.build());
     }
-
 }