Initial implementation for dynamic SNAT

[groupbasedpolicy.git] / neutron-mapper / src / test / java / org / opendaylight / groupbasedpolicy / neutron / mapper / test / NeutronMapperAssert.java

diff --git a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java
index d3b774ed08f318ec14fba4c98f72a935e45eeef2..5098cb3f3f50c6de45c84304409ca6d31924ba92 100644 (file)
--- a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java
+++ b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronMapperAssert.java
@@ -27,6 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.endpoints.by.ports.EndpointByPort;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes.FixedIps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.SubnetBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -55,35 +56,35 @@ public class NeutronMapperAssert {
         return portOptional;
     }
 
-    public static void assertNetworkDomainExists(DataBroker dataBroker, Port port, Subnet subnet, IpAddress ipAddress) {
+    public static void assertNetworkDomainExists(DataBroker dataBroker, Port port, Subnet subnet, Neutron neutron) {
         Optional<NetworkDomain> opt =
-                getNetworkDomainOptional(dataBroker, port.getTenantId(), ipAddress, subnet);
+                getNetworkDomainOptional(dataBroker, port.getTenantId(), neutron, subnet);
         assertTrue(opt.isPresent());
     }
 
     public static void assertNetworkDomainNotExists(DataBroker dataBroker, Port port, Subnet subnet,
-            IpAddress ipAddress) {
+            Neutron neutron) {
         Optional<NetworkDomain> opt =
-                getNetworkDomainOptional(dataBroker, port.getTenantId(), ipAddress, subnet);
+                getNetworkDomainOptional(dataBroker, port.getTenantId(), neutron, subnet);
         assertFalse(opt.isPresent());
     }
 
     public static void assertNetworkDomainExists(DataBroker dataBroker, Uuid tenantUuid, Subnet subnet,
-            IpAddress ipAddress) {
-        Optional<NetworkDomain> opt = getNetworkDomainOptional(dataBroker, tenantUuid, ipAddress, subnet);
+            Neutron neutron) {
+        Optional<NetworkDomain> opt = getNetworkDomainOptional(dataBroker, tenantUuid, neutron, subnet);
         assertTrue(opt.isPresent());
     }
 
     public static void assertNetworkDomainNotExists(DataBroker dataBroker, Uuid tenantUuid, Subnet subnet,
-            IpAddress ipAddress) {
-        Optional<NetworkDomain> opt = getNetworkDomainOptional(dataBroker, tenantUuid, ipAddress, subnet);
+            Neutron neutron) {
+        Optional<NetworkDomain> opt = getNetworkDomainOptional(dataBroker, tenantUuid, neutron, subnet);
         assertFalse(opt.isPresent());
     }
 
     private static Optional<NetworkDomain> getNetworkDomainOptional(DataBroker dataBroker, Uuid tenantUuid,
-            IpAddress ipAddress, Subnet subnet) {
+            Neutron neutron, Subnet subnet) {
         InstanceIdentifier<NetworkDomain> iid;
-        NetworkDomain subnetDomain = NeutronSubnetAware.createSubnet(subnet, ipAddress);
+        NetworkDomain subnetDomain = NeutronSubnetAware.createSubnet(subnet, neutron);
         TenantId tenantId = new TenantId(tenantUuid.getValue());
         iid = L2L3IidFactory.subnetIid(tenantId, subnetDomain.getNetworkDomainId());
         Optional<NetworkDomain> optional;