X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=southbound%2Fsouthbound-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fsouthbound%2Fit%2FSouthboundIT.java;h=425ba4c9da7820166853926fd5941225a24d143c;hb=e7281ecd6f3f4c375727d41130e9902cd6daffce;hp=f46e15fcf9f969f520b81fcbf377342f0eae010a;hpb=a117b1b6c0d0f6db45efba035bf85c1ee3728dd5;p=ovsdb.git diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java index f46e15fcf..425ba4c9d 100644 --- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java +++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java @@ -12,16 +12,15 @@ import static org.junit.Assert.fail; import static org.ops4j.pax.exam.CoreOptions.composite; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.vmOption; -import static org.ops4j.pax.exam.CoreOptions.when; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import java.io.File; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; @@ -34,8 +33,10 @@ import java.util.Set; import javax.annotation.Nullable; import javax.inject.Inject; +import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -48,6 +49,8 @@ import org.opendaylight.ovsdb.southbound.SouthboundConstants; import org.opendaylight.ovsdb.southbound.SouthboundMapper; import org.opendaylight.ovsdb.southbound.SouthboundProvider; import org.opendaylight.ovsdb.southbound.SouthboundUtil; +import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils; +import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; @@ -60,7 +63,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbFailModeBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentationBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbPortInterfaceAttributes.VlanMode; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation; @@ -108,7 +110,6 @@ 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; -import org.ops4j.pax.exam.karaf.options.KarafDistributionOption; import org.ops4j.pax.exam.karaf.options.LogLevelOption; import org.ops4j.pax.exam.options.MavenUrlReference; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; @@ -136,12 +137,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { private static boolean setup = false; private static MdsalUtils mdsalUtils = null; private static Node ovsdbNode; - - // TODO Constants copied from AbstractConfigTestBase, need to be removed (see TODO below) - private static final String PAX_EXAM_UNPACK_DIRECTORY = "target/exam"; - private static final String KARAF_DEBUG_PORT = "5005"; - private static final String KARAF_DEBUG_PROP = "karaf.debug"; - private static final String KEEP_UNPACK_DIRECTORY_PROP = "karaf.keep.unpack"; + private static int testMethodsRemaining; @Inject private BundleContext bundleContext; @@ -198,16 +194,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { @Configuration public Option[] config() { - // TODO Figure out how to use the parent Karaf setup, then just use super.config() - Option[] options = new Option[] { - when(Boolean.getBoolean(KARAF_DEBUG_PROP)) - .useOptions(KarafDistributionOption.debugConfiguration(KARAF_DEBUG_PORT, true)), - karafDistributionConfiguration().frameworkUrl(getKarafDistro()) - .unpackDirectory(new File(PAX_EXAM_UNPACK_DIRECTORY)) - .useDeployFolder(false), - when(Boolean.getBoolean(KEEP_UNPACK_DIRECTORY_PROP)).useOptions(keepRuntimeFolder()), - // Works only if we don't specify the feature repo and name - getLoggingOption()}; + Option[] options = super.config(); Option[] propertyOptions = getPropertiesOptions(); Option[] otherOptions = getOtherOptions(); Option[] combinedOptions = new Option[options.length + propertyOptions.length + otherOptions.length]; @@ -257,7 +244,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { @Override public String getFeatureName() { - return "odl-ovsdb-southbound-impl-ui"; + return "odl-ovsdb-southbound-test"; } protected String usage() { @@ -334,7 +321,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { mdsalUtils = new MdsalUtils(dataBroker); final ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portNumber); - final InstanceIdentifier iid = createInstanceIdentifier(connectionInfo); + final InstanceIdentifier iid = SouthboundUtils.createInstanceIdentifier(connectionInfo); dataBroker.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, iid, CONFIGURATION_LISTENER, AsyncDataBroker.DataChangeScope.SUBTREE); dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, @@ -342,9 +329,41 @@ public class SouthboundIT extends AbstractMdsalTestBase { ovsdbNode = connectOvsdbNode(connectionInfo); + // Let's count the test methods (we need to use this instead of @AfterClass on teardown() since the latter is + // useless with pax-exam) + for (Method method : getClass().getMethods()) { + boolean testMethod = false; + boolean ignoreMethod = false; + for (Annotation annotation : method.getAnnotations()) { + if (Test.class.equals(annotation.annotationType())) { + testMethod = true; + } + if (Ignore.class.equals(annotation.annotationType())) { + ignoreMethod = true; + } + } + if (testMethod && !ignoreMethod) { + testMethodsRemaining++; + } + } + LOG.info("{} test methods to run", testMethodsRemaining); + setup = true; } + @After + public void teardown() { + testMethodsRemaining--; + LOG.info("{} test methods remaining", testMethodsRemaining); + if (testMethodsRemaining == 0) { + try { + disconnectOvsdbNode(getConnectionInfo(addressStr, portNumber)); + } catch (InterruptedException e) { + LOG.warn("Interrupted while disconnecting", e); + } + } + } + /** * Test passive connection mode. The southbound starts in a listening mode waiting for connections on port * 6640. This test will wait for incoming connections for {@link SouthboundITConstants#CONNECTION_INIT_TIMEOUT} ms. @@ -359,7 +378,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { } } - private ConnectionInfo getConnectionInfo(final String addressStr, final int portNumber) { + private static ConnectionInfo getConnectionInfo(final String addressStr, final int portNumber) { InetAddress inetAddress = null; try { inetAddress = InetAddress.getByName(addressStr); @@ -378,10 +397,6 @@ public class SouthboundIT extends AbstractMdsalTestBase { return connectionInfo; } - private static String connectionInfoToString(final ConnectionInfo connectionInfo) { - return new String(connectionInfo.getRemoteIp().getValue()) + ":" + connectionInfo.getRemotePort().getValue(); - } - @Test public void testNetworkTopology() throws InterruptedException { NetworkTopology networkTopology = mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, @@ -411,21 +426,14 @@ public class SouthboundIT extends AbstractMdsalTestBase { topology); } - private static InstanceIdentifier createInstanceIdentifier(ConnectionInfo connectionInfo) { - return InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID)) - .child(Node.class, - createNodeKey(connectionInfo.getRemoteIp(), connectionInfo.getRemotePort())); - } - private Node connectOvsdbNode(final ConnectionInfo connectionInfo) throws InterruptedException { - final InstanceIdentifier iid = createInstanceIdentifier(connectionInfo); - Assert.assertTrue(mdsalUtils.put(LogicalDatastoreType.CONFIGURATION, iid, createNode(connectionInfo))); + final InstanceIdentifier iid = SouthboundUtils.createInstanceIdentifier(connectionInfo); + Assert.assertTrue( + mdsalUtils.put(LogicalDatastoreType.CONFIGURATION, iid, SouthboundUtils.createNode(connectionInfo))); waitForOperationalCreation(iid); Node node = mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, iid); Assert.assertNotNull(node); - LOG.info("Connected to {}", connectionInfoToString(connectionInfo)); + LOG.info("Connected to {}", SouthboundUtils.connectionInfoToString(connectionInfo)); return node; } @@ -466,12 +474,12 @@ public class SouthboundIT extends AbstractMdsalTestBase { } private static void disconnectOvsdbNode(final ConnectionInfo connectionInfo) throws InterruptedException { - final InstanceIdentifier iid = createInstanceIdentifier(connectionInfo); + final InstanceIdentifier iid = SouthboundUtils.createInstanceIdentifier(connectionInfo); Assert.assertTrue(mdsalUtils.delete(LogicalDatastoreType.CONFIGURATION, iid)); waitForOperationalDeletion(iid); Node node = mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, iid); Assert.assertNull(node); - LOG.info("Disconnected from {}", connectionInfoToString(connectionInfo)); + LOG.info("Disconnected from {}", SouthboundUtils.connectionInfoToString(connectionInfo)); } @Test @@ -496,9 +504,9 @@ public class SouthboundIT extends AbstractMdsalTestBase { LOG.info("dp type is {}", dpTypeStr); if (dpTypeStr.equals(NETDEV_DP_TYPE)) { LOG.info("Found a DPDK node; adding a corresponding netdev device"); - InstanceIdentifier bridgeIid = createInstanceIdentifier(connectionInfo, + InstanceIdentifier bridgeIid = SouthboundUtils.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(SouthboundITConstants.BRIDGE_NAME)); - NodeId bridgeNodeId = createManagedNodeId(bridgeIid); + NodeId bridgeNodeId = SouthboundUtils.createManagedNodeId(bridgeIid); try (TestBridge testBridge = new TestBridge(connectionInfo, bridgeIid, SouthboundITConstants.BRIDGE_NAME, bridgeNodeId, false, null, true, dpType, null, null, null)) { @@ -614,7 +622,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { private static void setManagedBy(final OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, final ConnectionInfo connectionInfo) { - InstanceIdentifier connectionNodePath = createInstanceIdentifier(connectionInfo); + InstanceIdentifier connectionNodePath = SouthboundUtils.createInstanceIdentifier(connectionInfo); ovsdbBridgeAugmentationBuilder.setManagedBy(new OvsdbNodeRef(connectionNodePath)); } @@ -707,7 +715,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { this.bridgeName = bridgeName; NodeBuilder bridgeNodeBuilder = new NodeBuilder(); if (bridgeIid == null) { - bridgeIid = createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); + bridgeIid = SouthboundUtils.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); } if (bridgeNodeId == null) { bridgeNodeId = SouthboundMapper.createManagedNodeId(bridgeIid); @@ -745,7 +753,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { @Override public void close() { final InstanceIdentifier iid = - createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); + SouthboundUtils.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); Assert.assertTrue(mdsalUtils.delete(LogicalDatastoreType.CONFIGURATION, iid)); try { Thread.sleep(OVSDB_UPDATE_TIMEOUT); @@ -801,8 +809,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { */ private Node getBridgeNode(ConnectionInfo connectionInfo, String bridgeName, LogicalDatastoreType store) { InstanceIdentifier bridgeIid = - createInstanceIdentifier(connectionInfo, - new OvsdbBridgeName(bridgeName)); + SouthboundUtils.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); return mdsalUtils.read(store, bridgeIid); } @@ -830,8 +837,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { } private InstanceIdentifier getTpIid(ConnectionInfo connectionInfo, OvsdbBridgeAugmentation bridge) { - return createInstanceIdentifier(connectionInfo, - bridge.getBridgeName()); + return SouthboundUtils.createInstanceIdentifier(connectionInfo, bridge.getBridgeName()); } /** @@ -865,7 +871,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { OvsdbBridgeAugmentation bridge = getBridge(connectionInfo); Assert.assertNotNull(bridge); LOG.info("bridge: {}", bridge); - NodeId nodeId = SouthboundMapper.createManagedNodeId(createInstanceIdentifier( + NodeId nodeId = SouthboundMapper.createManagedNodeId(SouthboundUtils.createInstanceIdentifier( connectionInfo, bridge.getBridgeName())); OvsdbTerminationPointAugmentationBuilder ovsdbTerminationBuilder = createGenericOvsdbTerminationPointAugmentationBuilder(); @@ -910,7 +916,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { try (TestBridge testBridge = new TestBridge(connectionInfo, SouthboundITConstants.BRIDGE_NAME)) { OvsdbBridgeAugmentation bridge = getBridge(connectionInfo); Assert.assertNotNull(bridge); - NodeId nodeId = createManagedNodeId(createInstanceIdentifier( + NodeId nodeId = SouthboundUtils.createManagedNodeId(SouthboundUtils.createInstanceIdentifier( connectionInfo, bridge.getBridgeName())); OvsdbTerminationPointAugmentationBuilder ovsdbTerminationBuilder = createGenericOvsdbTerminationPointAugmentationBuilder(); @@ -942,9 +948,8 @@ public class SouthboundIT extends AbstractMdsalTestBase { } // UPDATE- Not Applicable. From the OpenVSwitch documentation: - // "A client should ideally set this column’s value in the same database transaction that it uses to create - - // the interface. " + // "A client should ideally set this column’s value in the same database transaction that it uses to + // create the interface. " // DELETE handled by TestBridge } @@ -988,8 +993,9 @@ public class SouthboundIT extends AbstractMdsalTestBase { try (TestBridge testBridge = new TestBridge(connectionInfo, null, testBridgeAndPortName, null, true, SouthboundConstants.OVSDB_FAIL_MODE_MAP.inverse().get("secure"), true, null, null, null, null)) { - NodeId testBridgeNodeId = createManagedNodeId(createInstanceIdentifier( - connectionInfo, new OvsdbBridgeName(testBridgeAndPortName))); + NodeId testBridgeNodeId = SouthboundUtils.createManagedNodeId( + SouthboundUtils.createInstanceIdentifier(connectionInfo, + new OvsdbBridgeName(testBridgeAndPortName))); OvsdbTerminationPointAugmentationBuilder tpCreateAugmentationBuilder = createGenericOvsdbTerminationPointAugmentationBuilder(); tpCreateAugmentationBuilder.setName(testBridgeAndPortName); @@ -1023,7 +1029,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { helper.writeValues(tpUpdateAugmentationBuilder, updateToTestCase.inputValues); InstanceIdentifier portIid = SouthboundMapper.createInstanceIdentifier(testBridgeNodeId); NodeBuilder portUpdateNodeBuilder = new NodeBuilder(); - NodeId portUpdateNodeId = createManagedNodeId(portIid); + NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(testBridgeAndPortName))); @@ -1129,7 +1135,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { try (TestBridge testBridge = new TestBridge(connectionInfo, SouthboundITConstants.BRIDGE_NAME)) { OvsdbBridgeAugmentation bridge = getBridge(connectionInfo, SouthboundITConstants.BRIDGE_NAME); Assert.assertNotNull(bridge); - NodeId nodeId = createManagedNodeId(createInstanceIdentifier( + NodeId nodeId = SouthboundUtils.createManagedNodeId(SouthboundUtils.createInstanceIdentifier( connectionInfo, bridge.getBridgeName())); OvsdbTerminationPointAugmentationBuilder ovsdbTerminationBuilder = createGenericOvsdbTerminationPointAugmentationBuilder(); @@ -1162,7 +1168,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { tpUpdateAugmentationBuilder.setVlanTag(new VlanId(UPDATED_VLAN_ID)); InstanceIdentifier portIid = SouthboundMapper.createInstanceIdentifier(testBridgeNodeId); NodeBuilder portUpdateNodeBuilder = new NodeBuilder(); - NodeId portUpdateNodeId = createManagedNodeId(portIid); + NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(portName))); @@ -1202,7 +1208,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { try (TestBridge testBridge = new TestBridge(connectionInfo, SouthboundITConstants.BRIDGE_NAME)) { OvsdbBridgeAugmentation bridge = getBridge(connectionInfo); Assert.assertNotNull(bridge); - NodeId nodeId = createManagedNodeId(createInstanceIdentifier( + NodeId nodeId = SouthboundUtils.createManagedNodeId(SouthboundUtils.createInstanceIdentifier( connectionInfo, bridge.getBridgeName())); OvsdbTerminationPointAugmentationBuilder ovsdbTerminationBuilder = createGenericOvsdbTerminationPointAugmentationBuilder(); @@ -1232,7 +1238,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { tpUpdateAugmentationBuilder.setVlanMode(UPDATED_VLAN_MODE); InstanceIdentifier portIid = SouthboundMapper.createInstanceIdentifier(testBridgeNodeId); NodeBuilder portUpdateNodeBuilder = new NodeBuilder(); - NodeId portUpdateNodeId = createManagedNodeId(portIid); + NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(portName))); @@ -1293,8 +1299,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { try (TestBridge testBridge = new TestBridge(connectionInfo, SouthboundITConstants.BRIDGE_NAME)) { OvsdbBridgeAugmentation bridge = getBridge(connectionInfo); Assert.assertNotNull(bridge); - NodeId nodeId = createManagedNodeId(createInstanceIdentifier( - connectionInfo, bridge.getBridgeName())); + NodeId nodeId = SouthboundUtils.createManagedNodeId(connectionInfo, bridge.getBridgeName()); OvsdbTerminationPointAugmentationBuilder ovsdbTerminationBuilder = createGenericOvsdbTerminationPointAugmentationBuilder(); String portName = "testTerminationPointVlanTrunks" + testCase; @@ -1327,7 +1332,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { tpUpdateAugmentationBuilder.setTrunks(UPDATED_TRUNKS); InstanceIdentifier portIid = SouthboundMapper.createInstanceIdentifier(testBridgeNodeId); NodeBuilder portUpdateNodeBuilder = new NodeBuilder(); - NodeId portUpdateNodeId = createManagedNodeId(portIid); + NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(portName))); @@ -1364,7 +1369,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID)); Topology topology = mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, topologyPath); - InstanceIdentifier expectedNodeIid = createInstanceIdentifier(connectionInfo); + InstanceIdentifier expectedNodeIid = SouthboundUtils.createInstanceIdentifier(connectionInfo); NodeId expectedNodeId = expectedNodeIid.firstKeyOf(Node.class, NodeKey.class).getNodeId(); Node foundNode = null; Assert.assertNotNull("Expected to find topology: " + topologyPath, topology); @@ -1406,7 +1411,8 @@ public class SouthboundIT extends AbstractMdsalTestBase { // CREATE: Create the test bridge final OvsdbBridgeName ovsdbBridgeName = new OvsdbBridgeName(testBridgeName); - final InstanceIdentifier bridgeIid = createInstanceIdentifier(connectionInfo, ovsdbBridgeName); + final InstanceIdentifier bridgeIid = + SouthboundUtils.createInstanceIdentifier(connectionInfo, ovsdbBridgeName); final NodeId bridgeNodeId = SouthboundMapper.createManagedNodeId(bridgeIid); final NodeBuilder bridgeCreateNodeBuilder = new NodeBuilder(); bridgeCreateNodeBuilder.setNodeId(bridgeNodeId); @@ -1474,48 +1480,6 @@ public class SouthboundIT extends AbstractMdsalTestBase { new BridgeExternalIdsSouthboundHelper()); } - public static InstanceIdentifier createInstanceIdentifier(ConnectionInfo key,OvsdbBridgeName bridgeName) { - return SouthboundMapper.createInstanceIdentifier(createManagedNodeId(key, bridgeName)); - } - - public static NodeId createManagedNodeId(ConnectionInfo key, OvsdbBridgeName bridgeName) { - return createManagedNodeId(key.getRemoteIp(), key.getRemotePort(), bridgeName); - } - - public static NodeId createManagedNodeId(IpAddress ip, PortNumber port, OvsdbBridgeName bridgeName) { - return new NodeId(createNodeId(ip,port).getValue() - + "/" + SouthboundConstants.BRIDGE_URI_PREFIX + "/" + bridgeName.getValue()); - } - - public static NodeId createNodeId(IpAddress ip, PortNumber port) { - String uriString = SouthboundConstants.OVSDB_URI_PREFIX + "://" - + new String(ip.getValue()) + ":" + port.getValue(); - Uri uri = new Uri(uriString); - return new NodeId(uri); - } - - public static NodeKey createNodeKey(IpAddress ip, PortNumber port) { - return new NodeKey(createNodeId(ip,port)); - } - - public static Node createNode(ConnectionInfo key) { - NodeBuilder nodeBuilder = new NodeBuilder(); - nodeBuilder.setNodeId(createNodeId(key.getRemoteIp(),key.getRemotePort())); - nodeBuilder.addAugmentation(OvsdbNodeAugmentation.class, createOvsdbAugmentation(key)); - return nodeBuilder.build(); - } - - public static OvsdbNodeAugmentation createOvsdbAugmentation(ConnectionInfo key) { - OvsdbNodeAugmentationBuilder ovsdbNodeBuilder = new OvsdbNodeAugmentationBuilder(); - ovsdbNodeBuilder.setConnectionInfo(key); - return ovsdbNodeBuilder.build(); - } - - public static NodeId createManagedNodeId(InstanceIdentifier iid) { - NodeKey nodeKey = iid.firstKeyOf(Node.class, NodeKey.class); - return nodeKey.getNodeId(); - } - /** *

* Representation of a southbound test case. Each test case has a name, a list of input values and a list of @@ -1809,6 +1773,15 @@ public class SouthboundIT extends AbstractMdsalTestBase { .expectInputAsOutput() .build()); + if ((builder instanceof SouthboundBridgeExternalIdsBuilder) || + (builder instanceof SouthboundInterfaceExternalIdsBuilder) || + (builder instanceof SouthboundPortExternalIdsBuilder)) { + LOG.info("generateKeyValueTestCases: instance skipping test case 3 TestOneGoodOneMalformedValue"); + builder.reset(); + + return testCases; + } + // Test Case 3: TestOneGoodOneMalformedValue // Test Type: Negative // Description: