From 19f2f86f5361e3117b63f21498d753d66fba35eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Thu, 9 Jun 2016 11:25:44 -0400 Subject: [PATCH] Remove getModuleName()/getInstanceName() in IT MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit see: https://git.opendaylight.org/gerrit/#/c/39891/ Change-Id: I08725e0ce15697fee8ad76f7ce5d51bfdfd1f816 Signed-off-by: Alexis de Talhouët --- .../openstack/netvirt/it/NetvirtIT.java | 18 ++++-------------- .../openstack/netvirt/sfc/it/NetvirtSfcIT.java | 10 ---------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java b/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java index 798ed2a1e7..03ecf64efd 100644 --- a/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java +++ b/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java @@ -44,6 +44,10 @@ import org.opendaylight.netvirt.openstack.netvirt.api.Southbound; import org.opendaylight.netvirt.openstack.netvirt.providers.NetvirtProvidersProvider; import org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.PipelineOrchestrator; import org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.Service; +import org.opendaylight.netvirt.utils.netvirt.it.utils.NetvirtItUtils; +import org.opendaylight.netvirt.utils.netvirt.it.utils.NeutronNetItUtil; +import org.opendaylight.netvirt.utils.neutron.utils.NeutronUtils; +import org.opendaylight.ovsdb.lib.notation.Version; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronNetwork; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup; @@ -52,10 +56,6 @@ import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnet; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronPortCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityGroupCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD; -import org.opendaylight.netvirt.utils.netvirt.it.utils.NetvirtItUtils; -import org.opendaylight.netvirt.utils.netvirt.it.utils.NeutronNetItUtil; -import org.opendaylight.netvirt.utils.neutron.utils.NeutronUtils; -import org.opendaylight.ovsdb.lib.notation.Version; import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils; import org.opendaylight.ovsdb.utils.ovsdb.it.utils.DockerOvs; import org.opendaylight.ovsdb.utils.ovsdb.it.utils.ItConstants; @@ -110,16 +110,6 @@ public class NetvirtIT extends AbstractMdsalTestBase { @Inject @Filter(timeout=60000) private static DataBroker dataBroker = null; - @Override - public String getModuleName() { - return "netvirt-providers-impl"; - } - - @Override - public String getInstanceName() { - return "netvirt-providers-default"; - } - @Override public MavenUrlReference getFeatureRepo() { return maven() diff --git a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/sfc/it/NetvirtSfcIT.java b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/sfc/it/NetvirtSfcIT.java index d790d0cb9c..1bfea474d1 100644 --- a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/sfc/it/NetvirtSfcIT.java +++ b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/sfc/it/NetvirtSfcIT.java @@ -211,16 +211,6 @@ public class NetvirtSfcIT extends AbstractMdsalTestBase { @Inject @Filter(timeout=60000) private static DataBroker dataBroker = null; - @Override - public String getModuleName() { - return "netvirt-sfc-impl"; - } - - @Override - public String getInstanceName() { - return "netvirt-sfc-impl"; - } - @Override public MavenUrlReference getFeatureRepo() { return maven() -- 2.36.6