From: adetalhouet Date: Tue, 1 Dec 2015 16:03:53 +0000 (-0500) Subject: Fix IT tests as per as API change in SFC X-Git-Tag: release/beryllium-sr2~241^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7bcd370e400b0e7befbe5c79c87d9b2af36fca05;p=netvirt.git Fix IT tests as per as API change in SFC Those changes were made in SFC: https://git.opendaylight.org/gerrit/#/c/29303/16/sfc-model/src/main/yang/service-function-forwarder.yang This patch reflects those changes Change-Id: I4c07b8b0f9b9e5957b24824fd8da8edd2155cbc6 Signed-off-by: adetalhouet --- diff --git a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java index 08a1f00695..bb3a3b146a 100644 --- a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java +++ b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java @@ -25,7 +25,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configure import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import com.google.common.collect.Maps; import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; @@ -33,6 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; + import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -48,10 +48,10 @@ import org.opendaylight.ovsdb.openstack.netvirt.sfc.standalone.openflow13.SfcCla import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.AclUtils; import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.ClassifierUtils; import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.ServiceFunctionChainUtils; -import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.ServiceFunctionPathUtils; -import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.SfcUtils; import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.ServiceFunctionForwarderUtils; +import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.ServiceFunctionPathUtils; import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.ServiceFunctionUtils; +import org.opendaylight.ovsdb.openstack.netvirt.sfc.utils.SfcUtils; import org.opendaylight.ovsdb.southbound.SouthboundConstants; import org.opendaylight.ovsdb.southbound.SouthboundUtil; import org.opendaylight.ovsdb.utils.mdsal.openflow.FlowUtils; @@ -59,6 +59,7 @@ import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils; import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils; import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper; import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SftType; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.ServiceFunctions; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.ServiceFunctionsBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunction; @@ -77,7 +78,6 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfp.rev1407 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfp.rev140701.ServiceFunctionPathsBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfp.rev140701.service.function.paths.ServiceFunctionPath; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfp.rev140701.service.function.paths.ServiceFunctionPathBuilder; -import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sft.rev140701.Firewall; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev150317.AccessLists; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev150317.AccessListsBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev150317.access.lists.AclBuilder; @@ -113,7 +113,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; @@ -125,6 +124,8 @@ import org.ops4j.pax.exam.spi.reactors.PerClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.Maps; + @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public class NetvirtSfcIT extends AbstractMdsalTestBase { @@ -488,7 +489,7 @@ public class NetvirtSfcIT extends AbstractMdsalTestBase { ServiceFunctionForwarderBuilder serviceFunctionForwarderBuilder = serviceFunctionForwarderUtils.serviceFunctionForwarderBuilder( - sff1Name, sff1Ip, port, sffDpl1Name, sf1Name, sf1Ip, sn1Name, bridge1Name, Firewall.class); + sff1Name, sff1Ip, port, sffDpl1Name, sf1Ip, sn1Name, bridge1Name); List serviceFunctionForwarderList = serviceFunctionForwarderUtils.list( new ArrayList(), serviceFunctionForwarderBuilder); @@ -507,11 +508,11 @@ public class NetvirtSfcIT extends AbstractMdsalTestBase { private ServiceFunctionChainsBuilder serviceFunctionChainsBuilder() { String sf1Name = "firewall-abstract1"; - String sf2Name = "dpi-abstract1"; + SftType sfType = new SftType("firewall"); String sfcName = SFCNAME; SfcServiceFunctionBuilder sfcServiceFunctionBuilder = serviceFunctionChainUtils.sfcServiceFunctionBuilder( - new SfcServiceFunctionBuilder(), sf1Name, Firewall.class); + new SfcServiceFunctionBuilder(), sf1Name, sfType); List sfcServiceFunctionList = serviceFunctionChainUtils.list(new ArrayList(), sfcServiceFunctionBuilder); diff --git a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionChainUtils.java b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionChainUtils.java index 3ad69c4a14..560d340abc 100644 --- a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionChainUtils.java +++ b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionChainUtils.java @@ -9,19 +9,19 @@ package org.opendaylight.ovsdb.openstack.netvirt.sfc.utils; import java.util.List; -import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfcName; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfcName; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SftType; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfc.rev140701.ServiceFunctionChainsBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfc.rev140701.service.function.chain.grouping.ServiceFunctionChain; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfc.rev140701.service.function.chain.grouping.ServiceFunctionChainBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfc.rev140701.service.function.chain.grouping.service.function.chain.SfcServiceFunction; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfc.rev140701.service.function.chain.grouping.service.function.chain.SfcServiceFunctionBuilder; -import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sft.rev140701.ServiceFunctionTypeIdentity; public class ServiceFunctionChainUtils extends AbstractUtils { public SfcServiceFunctionBuilder sfcServiceFunctionBuilder(SfcServiceFunctionBuilder sfcServiceFunctionBuilder, String name, - Class type) { + SftType type) { return sfcServiceFunctionBuilder .setName(name) .setType(type); diff --git a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java index 79f3a69d7d..c9d4b4450e 100644 --- a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java +++ b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java @@ -10,6 +10,8 @@ package org.opendaylight.ovsdb.openstack.netvirt.sfc.utils; import java.util.ArrayList; import java.util.List; + +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfDataPlaneLocatorName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffDataPlaneLocatorName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName; @@ -29,10 +31,6 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev1407 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarders.service.function.forwarder.SffDataPlaneLocatorBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarders.service.function.forwarder.service.function.dictionary.SffSfDataPlaneLocatorBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarders.service.function.forwarder.sff.data.plane.locator.DataPlaneLocatorBuilder; -import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sft.rev140701.ServiceFunctionTypeIdentity; -import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sl.rev140701.VxlanGpe; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentationBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeName; public class ServiceFunctionForwarderUtils extends AbstractUtils { public OvsOptionsBuilder ovsOptionsBuilder(OvsOptionsBuilder ovsOptionsBuilder, int port) { @@ -67,18 +65,16 @@ public class ServiceFunctionForwarderUtils extends AbstractUtils { public SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder( SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder, String ip, int port) { return sffSfDataPlaneLocatorBuilder - .setLocatorType(ipBuilder(ip, port).build()) - .setTransport(VxlanGpe.class); + .setSfDplName(new SfDataPlaneLocatorName("toSff1")) + .setSffDplName(new SffDataPlaneLocatorName("ulSff1Ingress")); } public ServiceFunctionDictionaryBuilder serviceFunctionDictionaryBuilder( ServiceFunctionDictionaryBuilder serviceFunctionDictionaryBuilder, - String sfName, Class type, SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder) { return serviceFunctionDictionaryBuilder - .setName(new SfName(sfName)) - .setType(type) + .setName(new SfName("toSff1")) .setSffSfDataPlaneLocator(sffSfDataPlaneLocatorBuilder.build()); } @@ -111,8 +107,7 @@ public class ServiceFunctionForwarderUtils extends AbstractUtils { public ServiceFunctionForwarderBuilder serviceFunctionForwarderBuilder( String sffName, String sffIp, int port, String sffDplName, - String sfName, String sfIp, String snName, String bridgeName, - Class type) { + String sfIp, String snName, String bridgeName) { DataPlaneLocatorBuilder dataPlaneLocatorBuilder = dataPlaneLocatorBuilder(new DataPlaneLocatorBuilder(), sffIp, port); @@ -124,7 +119,7 @@ public class ServiceFunctionForwarderUtils extends AbstractUtils { SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder = sffSfDataPlaneLocatorBuilder(new SffSfDataPlaneLocatorBuilder(), sffIp, port); ServiceFunctionDictionaryBuilder serviceFunctionDictionaryBuilder = - serviceFunctionDictionaryBuilder(new ServiceFunctionDictionaryBuilder(), sfName, type, + serviceFunctionDictionaryBuilder(new ServiceFunctionDictionaryBuilder(), sffSfDataPlaneLocatorBuilder); List serviceFunctionDictionaryList = list(new ArrayList(), serviceFunctionDictionaryBuilder); diff --git a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionUtils.java b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionUtils.java index 39f38387b8..391c6f66c8 100644 --- a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionUtils.java +++ b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionUtils.java @@ -10,16 +10,16 @@ package org.opendaylight.ovsdb.openstack.netvirt.sfc.utils; import java.util.ArrayList; import java.util.List; + import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfDataPlaneLocatorName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SftType; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.ServiceFunctionsBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.entry.SfDataPlaneLocator; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.entry.SfDataPlaneLocatorBuilder; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunction; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunctionBuilder; -import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sft.rev140701.Firewall; -import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sft.rev140701.ServiceFunctionTypeIdentity; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sl.rev140701.VxlanGpe; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; @@ -36,7 +36,7 @@ public class ServiceFunctionUtils extends AbstractUtils { public ServiceFunctionBuilder serviceFunctionBuilder(ServiceFunctionBuilder serviceFunctionBuilder, String ip, String sfName, List sfDataPlaneLocatorList, - Class type) { + SftType type) { return serviceFunctionBuilder .setSfDataPlaneLocator(sfDataPlaneLocatorList) .setName(new SfName(sfName)) @@ -57,7 +57,7 @@ public class ServiceFunctionUtils extends AbstractUtils { List sfDataPlaneLocatorList = list(new ArrayList(), sfDataPlaneLocator); return serviceFunctionBuilder( - new ServiceFunctionBuilder(), sfIp, sfName, sfDataPlaneLocatorList, Firewall.class); + new ServiceFunctionBuilder(), sfIp, sfName, sfDataPlaneLocatorList, new SftType("firewall")); }