Bug 4724 added containers to tenant
[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / flow / OfTableTest.java
index 405b78b1b60521da3c8ec903a4dfbdc75ad7a36f..13bf771333967c3dfadcfd9929914b056ff9b108 100755 (executable)
@@ -46,22 +46,24 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.has.classifier.refs.ClassifierRefBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.subject.feature.instance.ParameterValueBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.TenantBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.ContractBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.EndpointGroupBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.L2BridgeDomainBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.L2FloodDomainBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.L3ContextBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.SubjectFeatureInstancesBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.SubnetBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.ClauseBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.Subject;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.SubjectBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.subject.Rule;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.contract.subject.RuleBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.endpoint.group.ConsumerNamedSelectorBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.endpoint.group.ProviderNamedSelectorBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.subject.feature.instances.ActionInstanceBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.subject.feature.instances.ClassifierInstanceBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.ForwardingContextBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.PolicyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.L2BridgeDomainBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.L2FloodDomainBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.L3ContextBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.forwarding.context.SubnetBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.ContractBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.EndpointGroupBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.SubjectFeatureInstancesBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.contract.ClauseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.contract.Subject;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.contract.SubjectBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.contract.subject.Rule;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.contract.subject.RuleBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.endpoint.group.ConsumerNamedSelectorBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.endpoint.group.ProviderNamedSelectorBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ActionInstanceBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstanceBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;\r
 \r
@@ -104,91 +106,81 @@ public class OfTableTest {
     }\r
 \r
     protected TenantBuilder baseTenant() {\r
-        return new TenantBuilder()\r
-            .setId(tid)\r
-            .setEndpointGroup(ImmutableList.of(new EndpointGroupBuilder()\r
-                    .setId(eg)\r
-                    .setNetworkDomain(sub)\r
-                    .setConsumerNamedSelector(ImmutableList.of(new ConsumerNamedSelectorBuilder()\r
-                        .setName(new SelectorName("cns1"))\r
-                        .setContract(ImmutableList.of(cid))\r
-                        .build()))\r
-                    .build(),\r
-                new EndpointGroupBuilder()\r
-                    .setId(eg2)\r
-                    .setNetworkDomain(sub2)\r
-                    .setProviderNamedSelector(ImmutableList.of(new ProviderNamedSelectorBuilder()\r
-                        .setName(new SelectorName("pns1"))\r
-                        .setContract(ImmutableList.of(cid))\r
-                        .build()))\r
-                    .build()))\r
-            .setL3Context(ImmutableList.of(new L3ContextBuilder()\r
-                .setId(l3c)\r
-                .build()))\r
-            .setL2BridgeDomain(ImmutableList.of(new L2BridgeDomainBuilder()\r
-                .setId(bd)\r
-                .setParent(l3c)\r
-                .build()))\r
-            .setL2FloodDomain(ImmutableList.of(new L2FloodDomainBuilder()\r
-                .setId(fd)\r
-                .setParent(bd)\r
-                .build()))\r
-            .setSubnet(ImmutableList.of(new SubnetBuilder()\r
-                    .setId(sub2)\r
-                    .setParent(fd)\r
-                    .setIpPrefix(new IpPrefix(new Ipv4Prefix("10.0.1.0/24")))\r
-                    .setVirtualRouterIp(new IpAddress(new Ipv4Address("10.0.1.1")))\r
-                    .build(),\r
-                new SubnetBuilder()\r
-                    .setId(sub)\r
-                    .setParent(fd)\r
-                    .setIpPrefix(new IpPrefix(new Ipv4Prefix("10.0.0.0/24")))\r
-                    .setVirtualRouterIp(new IpAddress(new Ipv4Address("10.0.0.1")))\r
-                    .build(),\r
-                new SubnetBuilder()\r
-                    .setId(sub3)\r
-                    .setParent(bd)\r
-                    .setIpPrefix(new IpPrefix(new Ipv4Prefix("10.0.2.0/24")))\r
-                    .setVirtualRouterIp(new IpAddress(new Ipv4Address("10.0.2.1")))\r
-                    .build()))\r
-            .setSubjectFeatureInstances(new SubjectFeatureInstancesBuilder()\r
-                .setClassifierInstance(ImmutableList.of(new ClassifierInstanceBuilder()\r
-                     .setName(new ClassifierName("tcp_dst_80"))\r
-                     .setClassifierDefinitionId(L4ClassifierDefinition.DEFINITION.getId())\r
-                     .setParameterValue(ImmutableList.of(new ParameterValueBuilder()\r
-                              .setName(new ParameterName("destport"))\r
-                              .setIntValue(Long.valueOf(80))\r
-                              .build(),\r
-                          new ParameterValueBuilder()\r
-                             .setName(new ParameterName("proto"))\r
-                             .setIntValue(Long.valueOf(6))\r
-                             .build()))\r
-                     .build(),\r
-                     new ClassifierInstanceBuilder()\r
-                     .setName(new ClassifierName("tcp_src_80"))\r
-                     .setClassifierDefinitionId(Classifier.L4_CL.getId())\r
-                     .setParameterValue(ImmutableList.of(new ParameterValueBuilder()\r
-                              .setName(new ParameterName("sourceport"))\r
-                              .setIntValue(Long.valueOf(80))\r
-                              .build(),\r
-                          new ParameterValueBuilder()\r
-                             .setName(new ParameterName("proto"))\r
-                             .setIntValue(Long.valueOf(6))\r
-                             .build()))\r
-                     .build(),\r
-                     new ClassifierInstanceBuilder()\r
-                     .setName(new ClassifierName("ether_type"))\r
-                     .setClassifierDefinitionId(Classifier.ETHER_TYPE_CL.getId())\r
-                     .setParameterValue(ImmutableList.of(new ParameterValueBuilder()\r
-                              .setName(new ParameterName("ethertype"))\r
-                              .setIntValue(Long.valueOf(FlowUtils.IPv4))\r
-                              .build()))\r
-                     .build()))\r
-                .setActionInstance(ImmutableList.of(new ActionInstanceBuilder()\r
-                    .setName(new ActionName("allow"))\r
-                    .setActionDefinitionId(new AllowAction().getId())\r
-                    .build()))\r
-                .build());\r
+        return new TenantBuilder().setId(tid)\r
+            .setPolicy(new PolicyBuilder()\r
+                .setEndpointGroup(ImmutableList.of(\r
+                        new EndpointGroupBuilder().setId(eg)\r
+                            .setNetworkDomain(sub)\r
+                            .setConsumerNamedSelector(ImmutableList.of(new ConsumerNamedSelectorBuilder()\r
+                                .setName(new SelectorName("cns1")).setContract(ImmutableList.of(cid)).build()))\r
+                            .build(),\r
+                        new EndpointGroupBuilder().setId(eg2)\r
+                            .setNetworkDomain(sub2)\r
+                            .setProviderNamedSelector(ImmutableList.of(new ProviderNamedSelectorBuilder()\r
+                                .setName(new SelectorName("pns1")).setContract(ImmutableList.of(cid)).build()))\r
+                            .build()))\r
+                .setSubjectFeatureInstances(\r
+                        new SubjectFeatureInstancesBuilder()\r
+                            .setClassifierInstance(\r
+                                    ImmutableList\r
+                                        .of(new ClassifierInstanceBuilder().setName(new ClassifierName("tcp_dst_80"))\r
+                                            .setClassifierDefinitionId(L4ClassifierDefinition.DEFINITION.getId())\r
+                                            .setParameterValue(ImmutableList.of(\r
+                                                    new ParameterValueBuilder().setName(new ParameterName("destport"))\r
+                                                        .setIntValue(Long.valueOf(80))\r
+                                                        .build(),\r
+                                                    new ParameterValueBuilder().setName(new ParameterName("proto"))\r
+                                                        .setIntValue(Long.valueOf(6))\r
+                                                        .build()))\r
+                                            .build(), new ClassifierInstanceBuilder()\r
+                                                .setName(new ClassifierName("tcp_src_80"))\r
+                                                .setClassifierDefinitionId(Classifier.L4_CL.getId())\r
+                                                .setParameterValue(ImmutableList.of(\r
+                                                        new ParameterValueBuilder()\r
+                                                            .setName(new ParameterName("sourceport"))\r
+                                                            .setIntValue(Long.valueOf(80))\r
+                                                            .build(),\r
+                                                        new ParameterValueBuilder().setName(new ParameterName("proto"))\r
+                                                            .setIntValue(Long.valueOf(6))\r
+                                                            .build()))\r
+                                                .build(),\r
+                                                new ClassifierInstanceBuilder()\r
+                                                    .setName(new ClassifierName("ether_type"))\r
+                                                    .setClassifierDefinitionId(Classifier.ETHER_TYPE_CL.getId())\r
+                                                    .setParameterValue(ImmutableList.of(new ParameterValueBuilder()\r
+                                                        .setName(new ParameterName("ethertype"))\r
+                                                        .setIntValue(Long.valueOf(FlowUtils.IPv4))\r
+                                                        .build()))\r
+                                                    .build()))\r
+                            .setActionInstance(\r
+                                    ImmutableList.of(new ActionInstanceBuilder().setName(new ActionName("allow"))\r
+                                        .setActionDefinitionId(new AllowAction().getId())\r
+                                        .build()))\r
+                            .build())\r
+                .build())\r
+            .setForwardingContext(\r
+                    new ForwardingContextBuilder()\r
+                        .setL3Context(ImmutableList.of(new L3ContextBuilder().setId(l3c).build()))\r
+                        .setL2BridgeDomain(\r
+                                ImmutableList.of(new L2BridgeDomainBuilder().setId(bd).setParent(l3c).build()))\r
+                        .setL2FloodDomain(ImmutableList.of(new L2FloodDomainBuilder().setId(fd).setParent(bd).build()))\r
+                        .setSubnet(ImmutableList.of(\r
+                                new SubnetBuilder().setId(sub2)\r
+                                    .setParent(fd)\r
+                                    .setIpPrefix(new IpPrefix(new Ipv4Prefix("10.0.1.0/24")))\r
+                                    .setVirtualRouterIp(new IpAddress(new Ipv4Address("10.0.1.1")))\r
+                                    .build(),\r
+                                new SubnetBuilder().setId(sub)\r
+                                    .setParent(fd)\r
+                                    .setIpPrefix(new IpPrefix(new Ipv4Prefix("10.0.0.0/24")))\r
+                                    .setVirtualRouterIp(new IpAddress(new Ipv4Address("10.0.0.1")))\r
+                                    .build(),\r
+                                new SubnetBuilder().setId(sub3)\r
+                                    .setParent(bd)\r
+                                    .setIpPrefix(new IpPrefix(new Ipv4Prefix("10.0.2.0/24")))\r
+                                    .setVirtualRouterIp(new IpAddress(new Ipv4Address("10.0.2.1")))\r
+                                    .build()))\r
+                        .build());\r
     }\r
 \r
     protected ContractBuilder baseContract(List<Subject> subjects) {\r