Fixed missing tunnel type

[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / flow / PolicyEnforcerTest.java

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PolicyEnforcerTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PolicyEnforcerTest.java
index 70e373677f02eb3e3018318e85014ba551f14dca..377f4a8819731945e5d551099a54ab1c17ef76bd 100755 (executable)
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PolicyEnforcerTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PolicyEnforcerTest.java
@@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.SubjectName;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.Endpoint;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayNodeConfigBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.nodes.node.TunnelBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.HasDirection.Direction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.Matcher.MatchType;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.has.action.refs.ActionRefBuilder;\r
@@ -56,6 +57,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev14
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg3;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg7;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlow;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeVxlan;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
@@ -66,20 +68,25 @@ import static org.junit.Assert.*;
 import static org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow.FlowUtils.*;\r
 \r
 public class PolicyEnforcerTest extends FlowTableTest {\r
-    protected static final Logger LOG = \r
+    protected static final Logger LOG =\r
             LoggerFactory.getLogger(PolicyEnforcerTest.class);\r
 \r
+    @Override\r
     @Before\r
     public void setup() throws Exception {\r
         initCtx();\r
         table = new PolicyEnforcer(ctx);\r
         super.setup();\r
-        \r
-        switchManager.addSwitch(nodeId, tunnelId, \r
-                                Collections.<NodeConnectorId>emptySet(),\r
-                                new OfOverlayNodeConfigBuilder()\r
-                                    .setTunnelIp(new IpAddress(new Ipv4Address("1.2.3.4")))\r
-                                    .build());\r
+\r
+        switchManager.addSwitch(\r
+                nodeId,\r
+                tunnelId,\r
+                Collections.<NodeConnectorId>emptySet(),\r
+                new OfOverlayNodeConfigBuilder().setTunnel(\r
+                        ImmutableList.of(new TunnelBuilder().setIp(new IpAddress(new Ipv4Address("1.2.3.4")))\r
+                            .setTunnelType(TunnelTypeVxlan.class)\r
+                            .setNodeConnectorId(tunnelId)\r
+                            .build())).build());\r
     }\r
 \r
     @Test\r
@@ -212,7 +219,7 @@ public class PolicyEnforcerTest extends FlowTableTest {
                                 .getTcpDestinationPort())\r
                         )) {\r
                 count += 1;\r
-            } \r
+            }\r
         }\r
         return count;\r
     }\r
@@ -235,7 +242,7 @@ public class PolicyEnforcerTest extends FlowTableTest {
             .setCondition(ImmutableList.of(cond1.getName(), cond2.getName()))\r
             .setEndpointGroup(eg2)\r
             .build();\r
-        endpointManager.addEndpoint(ep2);        \r
+        endpointManager.addEndpoint(ep2);\r
 \r
         TenantBuilder tb = baseTenant()\r
             .setContract(ImmutableList.of(new ContractBuilder()\r
@@ -264,13 +271,13 @@ public class PolicyEnforcerTest extends FlowTableTest {
 \r
         PolicyInfo policy = policyResolver.getCurrentPolicy();\r
         List<ConditionName> ep1c = endpointManager.getCondsForEndpoint(ep1);\r
-        ConditionGroup cg1 = \r
-                policy.getEgCondGroup(new EgKey(tb.getId(), \r
+        ConditionGroup cg1 =\r
+                policy.getEgCondGroup(new EgKey(tb.getId(),\r
                                                 ep1.getEndpointGroup()),\r
                                       ep1c);\r
         List<ConditionName> ep2c = endpointManager.getCondsForEndpoint(ep2);\r
-        ConditionGroup cg2 = \r
-                policy.getEgCondGroup(new EgKey(tb.getId(), \r
+        ConditionGroup cg2 =\r
+                policy.getEgCondGroup(new EgKey(tb.getId(),\r
                                                 ep2.getEndpointGroup()),\r
                                       ep2c);\r
         int cg1Id = OrdinalFactory.getCondGroupOrdinal(cg1);\r
@@ -283,14 +290,14 @@ public class PolicyEnforcerTest extends FlowTableTest {
         assertNotEquals(cg1Id, cg2Id);\r
 \r
         MatchBuilder mb = new MatchBuilder();\r
-        FlowUtils.addNxRegMatch(mb, \r
+        FlowUtils.addNxRegMatch(mb,\r
                                 RegMatch.of(NxmNxReg0.class, Long.valueOf(eg1Id)),\r
                                 RegMatch.of(NxmNxReg1.class, Long.valueOf(cg1Id)),\r
                                 RegMatch.of(NxmNxReg2.class, Long.valueOf(eg2Id)),\r
                                 RegMatch.of(NxmNxReg3.class, Long.valueOf(cg2Id)));\r
         GeneralAugMatchNodesNodeTableFlow m1 =\r
                 mb.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class);\r
-        FlowUtils.addNxRegMatch(mb, \r
+        FlowUtils.addNxRegMatch(mb,\r
                                 RegMatch.of(NxmNxReg0.class, Long.valueOf(eg2Id)),\r
                                 RegMatch.of(NxmNxReg1.class, Long.valueOf(cg2Id)),\r
                                 RegMatch.of(NxmNxReg2.class, Long.valueOf(eg1Id)),\r
@@ -299,7 +306,7 @@ public class PolicyEnforcerTest extends FlowTableTest {
                 mb.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class);\r
         int count = 0;\r
         FlowMap fm = dosync(null);\r
-        assertEquals(6, fm.getTableForNode(nodeId, (short) 3).getFlow().size());\r
+        assertEquals(7, fm.getTableForNode(nodeId, (short) 3).getFlow().size());\r
         HashMap<String, Flow> flowMap = new HashMap<>();\r
         for (Flow f : fm.getTableForNode(nodeId, (short) 3).getFlow()) {\r
             flowMap.put(f.getId().getValue(), f);\r
@@ -308,7 +315,7 @@ public class PolicyEnforcerTest extends FlowTableTest {
                 count++;\r
             }\r
         }\r
-        assertEquals(2, count);\r
+        assertEquals(3, count);\r
         fm = dosync(flowMap);\r
         int numberOfFlows = fm.getTableForNode(nodeId, (short) 3).getFlow().size();\r
         fm = dosync(flowMap);\r