X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FTapiTopologyImplTest.java;h=026c5744b01b404d3244c620c4e163afdaf0a90a;hb=1badcea7eeb5bd7066749900658c06b027c75745;hp=3fdad4da75b1fc47f53232f387216a0a7610c50f;hpb=b6ad4ae8cec0ad9e3fa35b1e6e3153f045a97bf1;p=transportpce.git diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java index 3fdad4da7..026c5744b 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java @@ -19,6 +19,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.CountDownLatch; @@ -26,15 +27,12 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.Nullable; -import org.junit.BeforeClass; -import org.junit.Ignore; +import org.junit.Before; import org.junit.Test; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.tapi.utils.TopologyDataUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.transportpce.test.DataStoreContext; -import org.opendaylight.transportpce.test.DataStoreContextImpl; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.AdministrativeState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.CapacityUnit; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.ForwardingDirection; @@ -46,6 +44,8 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Port import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationDirection; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E; @@ -60,6 +60,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.ge import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.NodeRuleGroup; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePoint; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.Rule; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Link; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -67,32 +68,29 @@ import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Ignore public class TapiTopologyImplTest extends AbstractTest { private static final Logger LOG = LoggerFactory.getLogger(TapiTopologyImplTest.class); private static ListeningExecutorService executorService; private static CountDownLatch endSignal; private static final int NUM_THREADS = 3; - private static DataStoreContext dataStoreContextUtil; - @BeforeClass - public static void setUp() throws InterruptedException { + @Before + public void setUp() throws InterruptedException, ExecutionException { executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS)); endSignal = new CountDownLatch(1); - dataStoreContextUtil = new DataStoreContextImpl(); - TopologyDataUtils.writeTopologyFromFileToDatastore(dataStoreContextUtil, + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), TopologyDataUtils.OPENROADM_TOPOLOGY_FILE, InstanceIdentifiers.OVERLAY_NETWORK_II); - TopologyDataUtils.writeTopologyFromFileToDatastore(dataStoreContextUtil, + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), TopologyDataUtils.OTN_TOPOLOGY_FILE, InstanceIdentifiers.OTN_NETWORK_II); - TopologyDataUtils.writePortmappingFromFileToDatastore(dataStoreContextUtil); + TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil()); LOG.info("setup done"); } @Test public void getTopologyDetailsForOpenroadmTopologyWhenSuccessful() throws ExecutionException, InterruptedException { GetTopologyDetailsInput input = TopologyDataUtils.buildGetTopologyDetailsInput(NetworkUtils.OVERLAY_NETWORK_ID); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(dataStoreContextUtil.getDataBroker()); + TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker()); ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); result.addListener(new Runnable() { @Override @@ -106,24 +104,29 @@ public class TapiTopologyImplTest extends AbstractTest { Topology topology = rpcResult.getResult().getTopology(); assertNotNull("Topology should not be null", topology); assertEquals("Nodes list size should be 1", 1, topology.getNode().size()); + List topologyNodeList = new ArrayList<>(topology.nonnullNode().values()); + List nodeList = new ArrayList<>(topologyNodeList); + List nameList = new ArrayList<>(nodeList.get(0).nonnullName().values()); assertEquals("Node name should be TAPI Ethernet Node", - "TAPI Ethernet Node", topology.getNode().get(0).getName().get(0).getValue()); + "TAPI Ethernet Node", nameList.get(0).getValue()); Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes("Ethernet Topology".getBytes()).toString()); Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes("TAPI Ethernet Node".getBytes()).toString()); assertEquals("incorrect topology uuid", topoUuid, topology.getUuid()); - assertEquals("incorrect node uuid", nodeUuid, topology.getNode().get(0).getUuid()); + assertEquals("incorrect node uuid", nodeUuid, topologyNodeList.get(0).getUuid()); Uuid onep1Uuid = new Uuid(UUID.nameUUIDFromBytes("OwnedNodeEdgePoint 0".getBytes()).toString()); Uuid onep2Uuid = new Uuid(UUID.nameUUIDFromBytes("OwnedNodeEdgePoint 1".getBytes()).toString()); + List edgePointList = new ArrayList<>(topologyNodeList.get(0) + .nonnullOwnedNodeEdgePoint().values()); assertEquals("incorrect uuid for nep1", - onep1Uuid, topology.getNode().get(0).getOwnedNodeEdgePoint().get(1).getUuid()); + onep1Uuid, edgePointList.get(1).getUuid()); assertEquals("incorrect uuid for nep1", - onep2Uuid, topology.getNode().get(0).getOwnedNodeEdgePoint().get(0).getUuid()); + onep2Uuid, edgePointList.get(0).getUuid()); } @Test public void getTopologyDetailsForOtnTopologyWhenSuccessful() throws ExecutionException, InterruptedException { GetTopologyDetailsInput input = TopologyDataUtils.buildGetTopologyDetailsInput(NetworkUtils.OTN_NETWORK_ID); - TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(dataStoreContextUtil.getDataBroker()); + TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker()); ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); result.addListener(new Runnable() { @Override @@ -142,59 +145,119 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("incorrect topology uuid", topoUuid, topology.getUuid()); assertEquals("topology name should be T0 - Multi-layer topology", "T0 - Multi-layer topology", - topology.getName().get(0).getValue()); + topology.nonnullName().values().stream().findFirst().get().getValue()); - List nodes = topology.getNode().values().stream() + List nodes = topology.nonnullNode().values().stream() .sorted((n1,n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue())) .collect(Collectors.toList()); Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) .toString()); - checkDsrNode(nodes.get(0), node1Uuid, false); + checkDsrNode(nodes.get(0), node1Uuid, false, "SPDR-SA1-XPDR1"); Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+DSR".getBytes(Charset.forName("UTF-8"))) .toString()); - checkDsrNode(nodes.get(1), node2Uuid, true); + checkDsrNode(nodes.get(1), node2Uuid, true, "SPDR-SA1-XPDR2"); Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) .toString()); - checkOtsiNode(nodes.get(2), node3Uuid, false); + checkOtsiNode(nodes.get(2), node3Uuid, false, "SPDR-SA1-XPDR1"); Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+OTSi".getBytes(Charset.forName("UTF-8"))) .toString()); - checkOtsiNode(nodes.get(3), node4Uuid, true); + checkOtsiNode(nodes.get(3), node4Uuid, true, "SPDR-SA1-XPDR2"); - List links = topology.getLink().values().stream() + List links = topology.nonnullLink().values().stream() .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) .collect(Collectors.toList()); - checkTransitionalLink(links.get(0), topoUuid, node1Uuid, node3Uuid, "DSR+XPDR1-NETWORK1", - "iOTSi+XPDR1-NETWORK1"); - checkTransitionalLink(links.get(1), topoUuid, node2Uuid, node4Uuid, "DSR+XPDR2-NETWORK1", - "iOTSi+XPDR2-NETWORK1"); + checkTransitionalLink(links.get(4), topoUuid, node1Uuid, node3Uuid, "SPDR-SA1-XPDR1+DSR+XPDR1-NETWORK1", + "SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1", "SPDR-SA1-XPDR1"); + checkTransitionalLink(links.get(2), topoUuid, node2Uuid, node4Uuid, "SPDR-SA1-XPDR2+DSR+XPDR2-NETWORK1", + "SPDR-SA1-XPDR2+iOTSi+XPDR2-NETWORK1", "SPDR-SA1-XPDR2"); } - private void checkDsrNode(Node node, Uuid nodeUuid, boolean isSwitch) { + @Test + public void getTopologyDetailsForOtnTopologyWithOtnLinksWhenSuccessful() + throws ExecutionException, InterruptedException { + executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(NUM_THREADS)); + endSignal = new CountDownLatch(1); + TopologyDataUtils.writeTopologyFromFileToDatastore(getDataStoreContextUtil(), + TopologyDataUtils.OTN_TOPOLOGY_WITH_OTN_LINKS_FILE, InstanceIdentifiers.OTN_NETWORK_II); + + GetTopologyDetailsInput input = TopologyDataUtils.buildGetTopologyDetailsInput(NetworkUtils.OTN_NETWORK_ID); + TapiTopologyImpl tapiTopoImpl = new TapiTopologyImpl(getDataBroker()); + ListenableFuture> result = tapiTopoImpl.getTopologyDetails(input); + result.addListener(new Runnable() { + @Override + public void run() { + endSignal.countDown(); + } + }, executorService); + endSignal.await(); + RpcResult rpcResult = result.get(); + @Nullable + Topology topology = rpcResult.getResult().getTopology(); + assertNotNull("Topology should not be null", topology); + assertEquals("Node list size should be 8", 8, topology.getNode().size()); + assertEquals("Link list size should be 12", 12, topology.getLink().size()); + + Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes("T0 - Multi-layer topology".getBytes()).toString()); + Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + .toString()); + Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+DSR".getBytes(Charset.forName("UTF-8"))) + .toString()); + Uuid node3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) + .toString()); + Uuid node4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8"))) + .toString()); + Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR+XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))).toString()); + Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+DSR+XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))).toString()); + Uuid tp3Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))).toString()); + Uuid tp4Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SC1-XPDR1+iOTSi+XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))).toString()); + Uuid link1Uuid = + new Uuid(UUID.nameUUIDFromBytes("ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))).toString()); + Uuid link2Uuid = + new Uuid(UUID.nameUUIDFromBytes("OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1" + .getBytes(Charset.forName("UTF-8"))).toString()); + + List links = topology.nonnullLink().values().stream() + .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue())) + .collect(Collectors.toList()); + checkOtnLink(links.get(3), topoUuid, node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, link1Uuid, + "ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"); + checkOtnLink(links.get(9), topoUuid, node3Uuid, node4Uuid, tp3Uuid, tp4Uuid, link2Uuid, + "OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1"); + } + + private void checkDsrNode(Node node, Uuid nodeUuid, boolean isSwitch, String nodeId) { assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); assertEquals("administrative state should be UNLOCKED", AdministrativeState.UNLOCKED, node.getAdministrativeState()); assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); assertEquals("value-name should be 'dsr/odu node name'", - "dsr/odu node name", node.getName().get(0).getValueName()); + "dsr/odu node name", node.nonnullName().values().stream().findFirst().get().getValueName()); assertEquals("dsr node should manage 2 protocol layers : dsr and odu", 2, node.getLayerProtocolName().size()); assertThat("dsr node should manage 2 protocol layers : dsr and odu", node.getLayerProtocolName(), hasItems(LayerProtocolName.DSR, LayerProtocolName.ODU)); - List neps = node.getOwnedNodeEdgePoint().values().stream() + List neps = node.nonnullOwnedNodeEdgePoint().values().stream() .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); if (isSwitch) { assertEquals("Switch-DSR node should have 8 NEPs", 8, neps.size()); - OwnedNodeEdgePoint nep1 = neps.get(5); + OwnedNodeEdgePoint nep1 = neps.get(3); Uuid client4NepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR2-CLIENT4".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR2-CLIENT4").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepClient100G(nep1, client4NepUuid, "XPDR2-CLIENT4", "NodeEdgePoint_C4"); - OwnedNodeEdgePoint nep2 = neps.get(1); + OwnedNodeEdgePoint nep2 = neps.get(4); Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR2-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR2-NETWORK1").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepNetworkODU4(nep2, networkNepUuid, "XPDR2-NETWORK1", "NodeEdgePoint_N1"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForSwitchDSR(nrgList, client4NepUuid, networkNepUuid, nodeUuid); @@ -202,46 +265,50 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("Mux-DSR node should have 5 NEPs", 5, neps.size()); OwnedNodeEdgePoint nep1 = neps.get(0); Uuid client4NepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR1-CLIENT4".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-CLIENT4").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepClient10G(nep1, client4NepUuid, "XPDR1-CLIENT4", "NodeEdgePoint_C4"); OwnedNodeEdgePoint nep2 = neps.get(1); Uuid networkNepUuid = new Uuid( - UUID.nameUUIDFromBytes("DSR+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+DSR+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepNetworkODU4(nep2, networkNepUuid, "XPDR1-NETWORK1", "NodeEdgePoint_N1"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForMuxDSR(nrgList, client4NepUuid, networkNepUuid, nodeUuid); } } - private void checkOtsiNode(Node node, Uuid nodeUuid, boolean isSwitch) { + private void checkOtsiNode(Node node, Uuid nodeUuid, boolean isSwitch, String nodeId) { assertEquals("incorrect node uuid", nodeUuid, node.getUuid()); assertEquals("administrative state should be UNLOCKED", AdministrativeState.UNLOCKED, node.getAdministrativeState()); assertEquals("life-cycle state should be INSTALLED", LifecycleState.INSTALLED, node.getLifecycleState()); assertEquals("operational state should be ENABLED", OperationalState.ENABLED, node.getOperationalState()); assertEquals("value-name should be 'dsr/odu node name'", - "otsi node name", node.getName().get(0).getValueName()); + "otsi node name", node.nonnullName().values().stream().findFirst().get().getValueName()); assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", 1, node.getLayerProtocolName().size()); assertEquals("otsi node should manage a single protocol layer : PHOTONIC_MEDIA", LayerProtocolName.PHOTONICMEDIA, node.getLayerProtocolName().get(0)); - List neps = node.getOwnedNodeEdgePoint().values().stream() + List neps = node.nonnullOwnedNodeEdgePoint().values().stream() .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue())) .collect(Collectors.toList()); if (isSwitch) { assertEquals("Switch-OTSi node should have 8 NEPs", 8, neps.size()); - OwnedNodeEdgePoint nep1 = neps.get(0); + OwnedNodeEdgePoint nep1 = neps.get(2); Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes("iOTSi+XPDR2-NETWORK2".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR2-NETWORK2").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepOtsiNode(nep1, inepUuid, "XPDR2-NETWORK2", "iNodeEdgePoint_2"); - OwnedNodeEdgePoint nep2 = neps.get(5); + OwnedNodeEdgePoint nep2 = neps.get(0); Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes("eOTSi+XPDR2-NETWORK2".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR2-NETWORK2").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepOtsiNode(nep2, enepUuid, "XPDR2-NETWORK2", "eNodeEdgePoint_2"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForSwitchOTSi(nrgList, enepUuid, inepUuid, nodeUuid); @@ -249,13 +316,15 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("Mux-OTSi node should have 2 NEPs", 2, neps.size()); OwnedNodeEdgePoint nep1 = neps.get(0); Uuid enepUuid = new Uuid( - UUID.nameUUIDFromBytes("eOTSi+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepOtsiNode(nep1, enepUuid, "XPDR1-NETWORK1", "eNodeEdgePoint_1"); OwnedNodeEdgePoint nep2 = neps.get(1); Uuid inepUuid = new Uuid( - UUID.nameUUIDFromBytes("iOTSi+XPDR1-NETWORK1".getBytes(Charset.forName("UTF-8"))).toString()); + UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8"))) + .toString()); checkNepOtsiNode(nep2, inepUuid, "XPDR1-NETWORK1", "iNodeEdgePoint_1"); - List nrgList = node.getNodeRuleGroup().values().stream() + List nrgList = node.nonnullNodeRuleGroup().values().stream() .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue())) .collect(Collectors.toList()); checkNodeRuleGroupForMuxOTSi(nrgList, enepUuid, inepUuid, nodeUuid); @@ -264,10 +333,12 @@ public class TapiTopologyImplTest extends AbstractTest { private void checkNepClient10G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); + Name name = nameList.get(0); assertEquals("value of client nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, name.getValue()); assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, name.getValueName()); assertEquals("Client nep should support 2 kind of cep", 2, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("client nep should support 2 kind of cep", @@ -279,10 +350,12 @@ public class TapiTopologyImplTest extends AbstractTest { private void checkNepNetworkODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); + Name name = nameList.get(0); assertEquals("value of network nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, name.getValue()); assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, name.getValueName()); assertEquals("Network nep should support 1 kind of cep", 1, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("network nep should support 1 kind of cep", @@ -299,71 +372,77 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("each node-rule-group should contain 2 NEP for muxponder DSR", 2, nodeRuleGroup.getNodeEdgePoint().size()); } + List nodeEdgePointList = new ArrayList<>(nrgList.get(0).nonnullNodeEdgePoint().values()); assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue()))); assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeUuid(), nodeUuid); + nodeEdgePointList.get(0).getNodeUuid(), nodeUuid); assertEquals("node-rule-group nb 2 should be between nep-client4 and nep-network1 of the same node", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeUuid(), nodeUuid); - assertEquals("node-rule-group nb 2 should contain a single rule", 1, nrgList.get(1).getRule().size()); + nodeEdgePointList.get(1).getNodeUuid(), nodeUuid); + List rule = new ArrayList<>(nrgList.get(1).nonnullRule().values()); + assertEquals("node-rule-group nb 2 should contain a single rule", 1, rule.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(1).getRule().get(0).getLocalId()); + "forward", rule.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(1).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, rule.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(1).getRule().get(0).getRuleType()); + RuleType.FORWARDING, rule.get(0).getRuleType()); } private void checkNodeRuleGroupForSwitchDSR(List nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) { assertEquals("Switch-DSR should contain a single node rule group", 1, nrgList.size()); assertEquals("Switch-DSR node-rule-group should contain 8 NEP", 8, nrgList.get(0).getNodeEdgePoint().size()); - List nrg = nrgList.get(0).getNodeEdgePoint().values().stream() + List nrg = nrgList.get(0).nonnullNodeEdgePoint().values().stream() .sorted((nrg1, nrg2) -> nrg1.getNodeEdgePointUuid().getValue() .compareTo(nrg2.getNodeEdgePointUuid().getValue())) .collect(Collectors.toList()); assertEquals("in the sorted node-rule-group, nep number 2 should be XPDR2-NETWORK1", - networkNepUuid, nrg.get(1).getNodeEdgePointUuid()); + networkNepUuid, nrg.get(4).getNodeEdgePointUuid()); assertEquals("in the sorted node-rule-group, nep number 6 should be XPDR2-CLIENT4", - clientNepUuid, nrg.get(5).getNodeEdgePointUuid()); + clientNepUuid, nrg.get(3).getNodeEdgePointUuid()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(1).getNodeUuid()); + nodeUuid, nrg.get(4).getNodeUuid()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrg.get(5).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); + nodeUuid, nrg.get(3).getNodeUuid()); + @Nullable + List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); + assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); + "forward", ruleList.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); + RuleType.FORWARDING, ruleList.get(0).getRuleType()); } private void checkNodeRuleGroupForMuxOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, Uuid nodeUuid) { assertEquals("Mux-OTSi should contain a single node rule group", 1, nrgList.size()); - assertEquals("Mux-OTSi node-rule-group should contain 2 NEP", 2, nrgList.get(0).getNodeEdgePoint().size()); + List nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); + assertEquals("Mux-OTSi node-rule-group should contain 2 NEP", 2, nodeEdgePointList.size()); assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", - nrgList.get(0).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertThat("Mux-OTSi node-rule-group should be between eNEP and iNEP of XPDR1-NETWORK1", - nrgList.get(0).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(0).getNodeUuid()); + nodeUuid, nodeEdgePointList.get(0).getNodeUuid()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(1).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); + nodeUuid, nodeEdgePointList.get(1).getNodeUuid()); + List ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values()); + assertEquals("node-rule-group should contain a single rule", 1, ruleList.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); + "forward", ruleList.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, ruleList.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); + RuleType.FORWARDING, ruleList.get(0).getRuleType()); } private void checkNodeRuleGroupForSwitchOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid, @@ -373,31 +452,35 @@ public class TapiTopologyImplTest extends AbstractTest { assertEquals("each node-rule-group should contain 2 NEP for Switch-OTSi", 2, nodeRuleGroup.getNodeEdgePoint().size()); } + List nodeEdgePointList1 = new ArrayList<>(nrgList.get(3).nonnullNodeEdgePoint().values()); assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", - nrgList.get(1).getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList1.get(0).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); assertThat("Switch-OTSi node-rule-group nb 4 should be between eNEP and iNEP of XPDR2-NETWORK2", - nrgList.get(1).getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList1.get(1).getNodeEdgePointUuid().getValue(), either(containsString(enepUuid.getValue())).or(containsString(inepUuid.getValue()))); + List nodeEdgePointList0 = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(0).getNodeUuid()); + nodeUuid, nodeEdgePointList0.get(0).getNodeUuid()); assertEquals("any item of the node-rule-group should have the same nodeUuid", - nodeUuid, nrgList.get(0).getNodeEdgePoint().get(1).getNodeUuid()); - assertEquals("node-rule-group should contain a single rule", 1, nrgList.get(0).getRule().size()); + nodeUuid, nodeEdgePointList0.get(1).getNodeUuid()); + List ruleList0 = new ArrayList<>(nrgList.get(0).nonnullRule().values()); + assertEquals("node-rule-group should contain a single rule", 1, ruleList0.size()); assertEquals("local-id of the rule should be 'forward'", - "forward", nrgList.get(0).getRule().get(0).getLocalId()); + "forward", ruleList0.get(0).getLocalId()); assertEquals("the forwarding rule should be 'MAYFORWARDACROSSGROUP'", - ForwardingRule.MAYFORWARDACROSSGROUP, nrgList.get(0).getRule().get(0).getForwardingRule()); + ForwardingRule.MAYFORWARDACROSSGROUP, ruleList0.get(0).getForwardingRule()); assertEquals("the rule type should be 'FORWARDING'", - RuleType.FORWARDING, nrgList.get(0).getRule().get(0).getRuleType()); + RuleType.FORWARDING, ruleList0.get(0).getRuleType()); } private void checkNepClient100G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); assertEquals("value of client nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, nameList.get(0).getValue()); assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, nameList.get(0).getValueName()); assertEquals("Client nep should support 2 kind of cep", 2, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("client nep should support 2 kind of cep", @@ -409,10 +492,11 @@ public class TapiTopologyImplTest extends AbstractTest { private void checkNepOtsiNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) { assertEquals("bad uuid for " + portName, nepUuid, nep.getUuid()); + List nameList = new ArrayList<>(nep.nonnullName().values()); assertEquals("value of OTSi nep should be '" + portName + "'", - portName, nep.getName().get(0).getValue()); + portName, nameList.get(0).getValue()); assertEquals("value-name of OTSi nep should be '" + nepName + "'", - nepName, nep.getName().get(0).getValueName()); + nepName, nameList.get(0).getValueName()); assertEquals("OTSi nep should support 2 kind of cep", 2, nep.getSupportedCepLayerProtocolQualifier().size()); assertThat("OTSi nep should support 2 kind of cep", @@ -442,9 +526,9 @@ public class TapiTopologyImplTest extends AbstractTest { } private void checkTransitionalLink(Link link, Uuid topoUuid, Uuid node1Uuid, Uuid node2Uuid, String tp1, - String tp2) { - Uuid linkUuid = new Uuid(UUID.nameUUIDFromBytes((tp1 + "--" + tp2).getBytes(Charset.forName("UTF-8"))) - .toString()); + String tp2, String ietfNodeId) { + Uuid linkUuid = new Uuid(UUID.nameUUIDFromBytes((ietfNodeId + "--" + tp1 + "--" + tp2) + .getBytes(Charset.forName("UTF-8"))).toString()); assertEquals("bad uuid for link between DSR node " + tp1 + " and iOTSI port " + tp2, linkUuid, link.getUuid()); assertEquals("Available capacity unit should be GBPS", CapacityUnit.GBPS, link.getAvailableCapacity().getTotalSize().getUnit()); @@ -457,23 +541,77 @@ public class TapiTopologyImplTest extends AbstractTest { hasItems(LayerProtocolName.ODU.getName(), LayerProtocolName.PHOTONICMEDIA.getName())); assertEquals("transitional link should be BIDIRECTIONAL", ForwardingDirection.BIDIRECTIONAL, link.getDirection()); + List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); assertEquals("topology uuid should be the same for the two termination point of the link", - topoUuid, link.getNodeEdgePoint().get(0).getTopologyUuid()); + topoUuid, nodeEdgePointList.get(0).getTopologyUuid()); assertEquals("topology uuid should be the same for the two termination point of the link", - topoUuid, link.getNodeEdgePoint().get(1).getTopologyUuid()); + topoUuid, nodeEdgePointList.get(1).getTopologyUuid()); assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(0).getNodeUuid().getValue(), + nodeEdgePointList.get(0).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(1).getNodeUuid().getValue(), + nodeEdgePointList.get(1).getNodeUuid().getValue(), either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); Uuid nep1Uuid = new Uuid(UUID.nameUUIDFromBytes(tp1.getBytes(Charset.forName("UTF-8"))).toString()); Uuid nep2Uuid = new Uuid(UUID.nameUUIDFromBytes(tp2.getBytes(Charset.forName("UTF-8"))).toString()); assertThat("transitional links should terminate on " + tp1 + " and " + tp2 + " neps", - link.getNodeEdgePoint().get(0).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); assertThat("transitional links should terminate on DSR node and Photonic node", - link.getNodeEdgePoint().get(1).getNodeEdgePointUuid().getValue(), + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue()))); } + + private void checkOtnLink(Link link, Uuid topoUuid, Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, + Uuid linkUuid, String linkName) { + assertEquals("bad name for the link", linkName, link.getName().get(new NameKey("otn link name")).getValue()); + assertEquals("bad uuid for link", linkUuid, link.getUuid()); + assertEquals("Available capacity unit should be MBPS", + CapacityUnit.MBPS, link.getAvailableCapacity().getTotalSize().getUnit()); + String prefix = linkName.split("-")[0]; + if ("OTU4".equals(prefix)) { + assertEquals("Available capacity -total size value should be 0", + Uint64.valueOf(0), link.getAvailableCapacity().getTotalSize().getValue()); + } else if ("ODU4".equals(prefix)) { + assertEquals("Available capacity -total size value should be 100 000", + Uint64.valueOf(100000), link.getAvailableCapacity().getTotalSize().getValue()); + } + assertEquals("Total capacity unit should be GBPS", + CapacityUnit.GBPS, link.getTotalPotentialCapacity().getTotalSize().getUnit()); + assertEquals("Total capacity -total size value should be 100", + Uint64.valueOf(100), link.getTotalPotentialCapacity().getTotalSize().getValue()); + if ("OTU4".equals(prefix)) { + assertEquals("otn link should be between 2 nodes of protocol layers PHOTONIC_MEDIA", + LayerProtocolName.PHOTONICMEDIA.getName(), link.getLayerProtocolName().get(0).getName()); + } else if ("ODU4".equals(prefix)) { + assertEquals("otn link should be between 2 nodes of protocol layers ODU", + LayerProtocolName.ODU.getName(), link.getLayerProtocolName().get(0).getName()); + } + assertEquals("transitional link should be BIDIRECTIONAL", + ForwardingDirection.BIDIRECTIONAL, link.getDirection()); + List nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values()); + assertEquals("topology uuid should be the same for the two termination point of the link", + topoUuid, nodeEdgePointList.get(0).getTopologyUuid()); + assertEquals("topology uuid should be the same for the two termination point of the link", + topoUuid, nodeEdgePointList.get(1).getTopologyUuid()); + assertThat("otn links should terminate on two distinct nodes", + nodeEdgePointList.get(0).getNodeUuid().getValue(), + either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); + assertThat("otn links should terminate on two distinct nodes", + nodeEdgePointList.get(1).getNodeUuid().getValue(), + either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue()))); + assertThat("otn links should terminate on two distinct tps", + nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(), + either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); + assertThat("otn links should terminate on two distinct tps", + nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(), + either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue()))); + assertEquals("operational state should be ENABLED", + OperationalState.ENABLED, link.getOperationalState()); + assertEquals("administrative state should be UNLOCKED", + AdministrativeState.UNLOCKED, link.getAdministrativeState()); + } + }