Bump version odlparent->6.0.0,mdsal->5.0.3

[genius.git] / itm / itm-impl / src / test / java / org / opendaylight / genius / itm / tests / xtend / ExpectedDefTransportZoneObjects.xtend

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/xtend/ExpectedDefTransportZoneObjects.xtend b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/xtend/ExpectedDefTransportZoneObjects.xtend
index 9e16fea53df5ba457097b55aba0eb50ff7f1129d..934538e67fff76040d7aab4a4a55b21196e198a6 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/xtend/ExpectedDefTransportZoneObjects.xtend
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/xtend/ExpectedDefTransportZoneObjects.xtend
@@ -5,17 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.genius.itm.tests.xtend;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.TransportZoneBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.SubnetsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.subnets.VtepsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.VtepsBuilder;
 import org.opendaylight.genius.itm.globals.ITMConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeVxlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeGre;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder;
 import org.opendaylight.genius.itm.tests.ItmTestConstants;
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
@@ -40,23 +37,27 @@ class ExpectedDefTransportZoneObjects {
         new TransportZoneBuilder >> [
             zoneName = ITMConstants.DEFAULT_TRANSPORT_ZONE
             tunnelType = TunnelTypeVxlan
+            vteps = #[
+                new VtepsBuilder >> [
+                    dpnId = ItmTestConstants.INT_DEF_BR_DPID
+                    ipAddress = IpAddressBuilder.getDefaultInstance(ItmTestConstants.DEF_TZ_TEP_IP)
+                    optionOfTunnel = false
+                ]
+            ]
+
+        ]
+    }
 
-            subnets = #[
-                new SubnetsBuilder >> [
-                gatewayIp = IpAddressBuilder.getDefaultInstance(ITMConstants.DUMMY_GATEWAY_IP)
-                prefix = IpPrefixBuilder.getDefaultInstance(ITMConstants.DUMMY_PREFIX)
-                vlanId = ITMConstants.DUMMY_VLANID
-
-                    vteps = #[
-                        new VtepsBuilder >> [
-                            dpnId = ItmTestConstants.INT_DEF_BR_DPID
-                            ipAddress = IpAddressBuilder.getDefaultInstance(ItmTestConstants.DEF_TZ_TEP_IP)
-                            portname = ITMConstants.DUMMY_PORT
-                            weight = 1
-                            optionOfTunnel = false
-                        ]
+    static def defTzWithUpdatedTepIp() {
+        new TransportZoneBuilder >> [
+            zoneName = ITMConstants.DEFAULT_TRANSPORT_ZONE
+            tunnelType = TunnelTypeVxlan
+            vteps = #[
+                    new VtepsBuilder >> [
+                        dpnId = ItmTestConstants.INT_DEF_BR_DPID
+                        ipAddress = IpAddressBuilder.getDefaultInstance(ItmTestConstants.NB_TZ_TEP_IP)
+                        optionOfTunnel = false
                     ]
-                ]
             ]
         ]
     }