*/
package org.opendaylight.transportpce.tapi.topology;
-import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.either;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import com.google.common.util.concurrent.FluentFuture;
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.AdministrativeState;
-import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.CAPACITYUNITGBPS;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.Direction;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.ForwardingDirection;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev221121.LAYERPROTOCOLQUALIFIER;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev221121.DIGITALSIGNALTYPE100GigE;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev221121.DIGITALSIGNALTYPE10GigELAN;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev221121.PHOTONICLAYERQUALIFIEROMS;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev221121.PHOTONICLAYERQUALIFIEROTS;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev221121.PHOTONICLAYERQUALIFIEROTSi;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.FORWARDINGRULECANNOTFORWARDACROSSGROUP;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.FORWARDINGRULEMAYFORWARDACROSSGROUP;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.RuleType;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.NodeRuleGroup;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.OwnedNodeEdgePoint;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.OwnedNodeEdgePointKey;
-import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.edge.point.SupportedCepLayerProtocolQualifierInstances;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.rule.group.NodeEdgePoint;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.node.rule.group.Rule;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.Uint64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
TopologyDataUtils.writePortmappingFromFileToDatastore(getDataStoreContextUtil(),
TapiTopologyDataUtils.PORTMAPPING_FILE);
- KeyedInstanceIdentifier<Node, NodeKey> muxAIID = InstanceIdentifier.create(Networks.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
- .class, new NetworkKey(new NetworkId("otn-topology")))
- .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR1")));
- FluentFuture<Optional<Node>> muxAFuture = dataBroker.newReadOnlyTransaction()
- .read(LogicalDatastoreType.CONFIGURATION, muxAIID);
- otnMuxA = muxAFuture.get().orElseThrow();
- KeyedInstanceIdentifier<Node, NodeKey> muxCIID = InstanceIdentifier.create(Networks.class)
+ otnMuxA = dataBroker.newReadOnlyTransaction()
+ .read(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(Networks.class)
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+ .networks.Network.class,
+ new NetworkKey(new NetworkId("otn-topology")))
+ .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR1"))))
+ .get().orElseThrow();
+
+ /*KeyedInstanceIdentifier<Node, NodeKey> muxCIID = InstanceIdentifier.create(Networks.class)
.child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
.class, new NetworkKey(new NetworkId("otn-topology")))
.child(Node.class, new NodeKey(new NodeId("SPDR-SC1-XPDR1")));
FluentFuture<Optional<Node>> muxCFuture = dataBroker.newReadOnlyTransaction()
.read(LogicalDatastoreType.CONFIGURATION, muxCIID);
- muxCFuture.get().orElseThrow();
- KeyedInstanceIdentifier<Node, NodeKey> switchIID = InstanceIdentifier.create(Networks.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
- .class, new NetworkKey(new NetworkId("otn-topology")))
- .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR2")));
- FluentFuture<Optional<Node>> switchFuture = dataBroker.newReadOnlyTransaction()
- .read(LogicalDatastoreType.CONFIGURATION, switchIID);
- otnSwitch = switchFuture.get().orElseThrow();
- KeyedInstanceIdentifier<Node, NodeKey> roadmaIID = InstanceIdentifier.create(Networks.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
- .class, new NetworkKey(new NetworkId("openroadm-network")))
- .child(Node.class, new NodeKey(new NodeId("ROADM-A1")));
- FluentFuture<Optional<Node>> roadmaFuture = dataBroker.newReadOnlyTransaction()
- .read(LogicalDatastoreType.CONFIGURATION, roadmaIID);
- roadmA = roadmaFuture.get().orElseThrow();
- KeyedInstanceIdentifier<Node, NodeKey> roadmcIID = InstanceIdentifier.create(Networks.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
- .class, new NetworkKey(new NetworkId("openroadm-network")))
- .child(Node.class, new NodeKey(new NodeId("ROADM-C1")));
- FluentFuture<Optional<Node>> roadmcFuture = dataBroker.newReadOnlyTransaction()
- .read(LogicalDatastoreType.CONFIGURATION, roadmcIID);
- roadmC = roadmcFuture.get().orElseThrow();
-
- KeyedInstanceIdentifier<Node, NodeKey> tpdrIID = InstanceIdentifier.create(Networks.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
- .class, new NetworkKey(new NetworkId("otn-topology")))
- .child(Node.class, new NodeKey(new NodeId("XPDR-A1-XPDR1")));
- FluentFuture<Optional<Node>> tpdrFuture = dataBroker.newReadOnlyTransaction()
- .read(LogicalDatastoreType.CONFIGURATION, tpdrIID);
- tpdr100G = tpdrFuture.get().orElseThrow();
-
- InstanceIdentifier<Network1> linksIID = InstanceIdentifier.create(Networks.class)
+ muxCFuture.get().orElseThrow();*/
+
+ otnSwitch = dataBroker.newReadOnlyTransaction()
+ .read(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(Networks.class)
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+ .networks.Network.class,
+ new NetworkKey(new NetworkId("otn-topology")))
+ .child(Node.class, new NodeKey(new NodeId("SPDR-SA1-XPDR2"))))
+ .get().orElseThrow();
+ roadmA = dataBroker.newReadOnlyTransaction()
+ .read(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(Networks.class)
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+ .networks.Network.class,
+ new NetworkKey(new NetworkId("openroadm-network")))
+ .child(Node.class, new NodeKey(new NodeId("ROADM-A1"))))
+ .get().orElseThrow();
+ roadmC = dataBroker.newReadOnlyTransaction()
+ .read(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(Networks.class)
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+ .networks.Network.class,
+ new NetworkKey(new NetworkId("openroadm-network")))
+ .child(Node.class, new NodeKey(new NodeId("ROADM-C1"))))
+ .get().orElseThrow();
+
+ tpdr100G = dataBroker.newReadOnlyTransaction()
+ .read(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(Networks.class)
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+ .networks.Network.class,
+ new NetworkKey(new NetworkId("otn-topology")))
+ .child(Node.class, new NodeKey(new NodeId("XPDR-A1-XPDR1"))))
+ .get().orElseThrow();
+
+ /*InstanceIdentifier<Network1> linksIID = InstanceIdentifier.create(Networks.class)
.child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
.class, new NetworkKey(new NetworkId("otn-topology")))
.augmentation(Network1.class);
FluentFuture<Optional<Network1>> linksFuture = dataBroker.newReadOnlyTransaction()
.read(LogicalDatastoreType.CONFIGURATION, linksIID);
- linksFuture.get().orElseThrow().getLink();
-
- InstanceIdentifier<Network1> links1IID = InstanceIdentifier.create(Networks.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
- .class, new NetworkKey(new NetworkId("openroadm-topology")))
- .augmentation(Network1.class);
- FluentFuture<Optional<Network1>> links1Future = dataBroker.newReadOnlyTransaction()
- .read(LogicalDatastoreType.CONFIGURATION, links1IID);
- ortopoLinks = links1Future.get().orElseThrow().getLink();
-
- InstanceIdentifier<Network> ortopo1IID = InstanceIdentifier.create(Networks.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network
- .class, new NetworkKey(new NetworkId("openroadm-topology")));
- FluentFuture<Optional<Network>> ortopoFuture = dataBroker.newReadOnlyTransaction()
- .read(LogicalDatastoreType.CONFIGURATION, ortopo1IID);
- openroadmNet = ortopoFuture.get().orElseThrow();
-
- topologyUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER.getBytes(
- Charset.forName("UTF-8"))).toString());
+ linksFuture.get().orElseThrow().getLink();*/
+
+ ortopoLinks = dataBroker.newReadOnlyTransaction()
+ .read(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(Networks.class)
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+ .networks.Network.class,
+ new NetworkKey(new NetworkId("openroadm-topology")))
+ .augmentation(Network1.class))
+ .get().orElseThrow().getLink();
+ openroadmNet = dataBroker.newReadOnlyTransaction()
+ .read(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(Networks.class)
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226
+ .networks.Network.class,
+ new NetworkKey(new NetworkId("openroadm-topology"))))
+ .get().orElseThrow();
+
+ topologyUuid = new Uuid(UUID.nameUUIDFromBytes(
+ TapiStringConstants.T0_FULL_MULTILAYER.getBytes(Charset.forName("UTF-8")))
+ .toString());
networkTransactionService = new NetworkTransactionImpl(getDataBroker());
tapiLink = new TapiLinkImpl(networkTransactionService);
LOG.info("TEST SETUP READY");
@Test
void convertNodeWhenNoStates() {
- Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", "XPDR1-CLIENT1", null, null);
- List<String> networkPortList = new ArrayList<>();
- for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) {
- if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) {
- networkPortList.add(tp.getTpId().getValue());
- }
- }
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- tapiFactory.convertNode(tpdr, networkPortList);
-
- Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8")))
- .toString());
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node dsrNode = tapiFactory
- .getTapiNodes().get(new
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(dsrNodeUuid));
- Uuid enetworkNepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eODU+XPDR1-CLIENT1").getBytes(Charset.forName("UTF-8")))
- .toString());
- Uuid inetworkNepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint enepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enetworkNepUuid));
- assertNull(enepN.getAdministrativeState(), "Administrative State should not be present");
- assertNull(enepN.getOperationalState(), "Operational State should not be present");
-
- OwnedNodeEdgePoint inepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inetworkNepUuid));
- assertNull(inepN.getAdministrativeState(), "Administrative State should not be present");
- assertNull(inepN.getOperationalState(), "Operational State should not be present");
-
- Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8")))
- .toString());
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node otsiNode = tapiFactory
- .getTapiNodes().get(new
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(otsiNodeUuid));
- Uuid enepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid));
- assertNull(enep.getAdministrativeState(), "Administrative State should not be present");
- assertNull(enep.getOperationalState(), "Operational State should not be present");
-
- Uuid inepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid));
- assertNull(inep.getAdministrativeState(), "Administrative State should not be present");
- assertNull(inep.getOperationalState(), "Operational State should not be present");
-
- Uuid photnepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint photnep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(photnepUuid));
- assertNull(photnep.getAdministrativeState(), "Administrative State should not be present");
- assertNull(photnep.getOperationalState(), "Operational State should not be present");
+ rawConvertNodeWhenBadStates(
+ "XPDR-A1-XPDR1", "XPDR1-NETWORK1", "XPDR1-CLIENT1", null, null);
}
@Test
void convertNodeWhenBadStates1() {
- Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", "XPDR1-CLIENT1",
- AdminStates.OutOfService, State.OutOfService);
- List<String> networkPortList = new ArrayList<>();
- for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) {
- if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) {
- networkPortList.add(tp.getTpId().getValue());
- }
- }
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- tapiFactory.convertNode(tpdr, networkPortList);
-
- Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8")))
- .toString());
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node dsrNode = tapiFactory
- .getTapiNodes().get(new
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(dsrNodeUuid));
- Uuid enetworkNepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eODU+XPDR1-CLIENT1").getBytes(Charset.forName("UTF-8")))
- .toString());
- Uuid inetworkNepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint enepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enetworkNepUuid));
- assertEquals(AdministrativeState.LOCKED, enepN.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, enepN.getOperationalState(), "Operational State should be Disabled");
-
- OwnedNodeEdgePoint inepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inetworkNepUuid));
- assertEquals(AdministrativeState.LOCKED, inepN.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, inepN.getOperationalState(), "Operational State should be Disabled");
-
- Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8")))
- .toString());
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node otsiNode = tapiFactory
- .getTapiNodes().get(new
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(otsiNodeUuid));
- Uuid enepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid));
- assertEquals(AdministrativeState.LOCKED, enep.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, enep.getOperationalState(), "Operational State should be Disabled");
-
- Uuid inepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid));
- assertEquals(AdministrativeState.LOCKED, inep.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, inep.getOperationalState(), "Operational State should be Disabled");
-
- Uuid photnepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint photnep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(photnepUuid));
- assertEquals(AdministrativeState.LOCKED, photnep.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, photnep.getOperationalState(), "Operational State should be Disabled");
+ rawConvertNodeWhenBadStates(
+ "XPDR-A1-XPDR1", "XPDR1-NETWORK1", "XPDR1-CLIENT1", AdminStates.OutOfService, State.OutOfService);
}
@Test
void convertNodeWhenBadStates2() {
- Node tpdr = changeTerminationPointState(tpdr100G, "XPDR1-NETWORK1", "XPDR1-CLIENT1",
- AdminStates.Maintenance, State.Degraded);
- List<String> networkPortList = new ArrayList<>();
- for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) {
- if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) {
- networkPortList.add(tp.getTpId().getValue());
- }
- }
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- tapiFactory.convertNode(tpdr, networkPortList);
-
- Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8")))
- .toString());
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node dsrNode = tapiFactory
- .getTapiNodes().get(new
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(dsrNodeUuid));
- Uuid enetworkNepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eODU+XPDR1-CLIENT1").getBytes(Charset.forName("UTF-8")))
- .toString());
- Uuid inetworkNepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint enepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enetworkNepUuid));
- assertEquals(AdministrativeState.LOCKED, enepN.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, enepN.getOperationalState(), "Operational State should be Disabled");
-
- OwnedNodeEdgePoint inepN = dsrNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inetworkNepUuid));
- assertEquals(AdministrativeState.LOCKED, inepN.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, inepN.getOperationalState(), "Operational State should be Disabled");
-
- Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8")))
- .toString());
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node otsiNode = tapiFactory
- .getTapiNodes().get(new
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(otsiNodeUuid));
- Uuid enepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint enep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(enepUuid));
- assertEquals(AdministrativeState.LOCKED, enep.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, enep.getOperationalState(), "Operational State should be Disabled");
-
- Uuid inepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint inep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(inepUuid));
- assertEquals(AdministrativeState.LOCKED, inep.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, inep.getOperationalState(), "Operational State should be Disabled");
+ rawConvertNodeWhenBadStates(
+ "XPDR-A1-XPDR1", "XPDR1-NETWORK1", "XPDR1-CLIENT1", AdminStates.Maintenance, State.Degraded);
+ }
- Uuid photnepUuid = new Uuid(
- UUID.nameUUIDFromBytes(("XPDR-A1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
- .toString());
- OwnedNodeEdgePoint photnep = otsiNode.nonnullOwnedNodeEdgePoint().get(new OwnedNodeEdgePointKey(photnepUuid));
- assertEquals(AdministrativeState.LOCKED, photnep.getAdministrativeState(),
- "Administrative State should be Locked");
- assertEquals(OperationalState.DISABLED, photnep.getOperationalState(), "Operational State should be Disabled");
+ private void rawConvertNodeWhenBadStates(
+ String nodeId, String networkId, String clientId, AdminStates admState, State rawState) {
+ ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid);
+ tapiFactory.convertNode(
+ changeTerminationPointState(tpdr100G, networkId, clientId , admState, rawState),
+ tpdr100G.augmentation(Node1.class).getTerminationPoint().values().stream()
+ .filter(tp -> tp.augmentation(TerminationPoint1.class).getTpType()
+ .equals(OpenroadmTpType.XPONDERNETWORK))
+ .map(tp -> tp.getTpId().getValue())
+ .collect(Collectors.toList()));
+ var dsrNodeNnOnep = tapiFactory
+ .getTapiNodes()
+ .get(new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey(new Uuid(
+ UUID.nameUUIDFromBytes((nodeId + "+XPONDER").getBytes(Charset.forName("UTF-8"))).toString())))
+ .nonnullOwnedNodeEdgePoint();
+ OwnedNodeEdgePoint enepN = dsrNodeNnOnep.get(new OwnedNodeEdgePointKey(new Uuid(
+ UUID.nameUUIDFromBytes(String.join("+", nodeId, "eODU", clientId).getBytes(Charset.forName("UTF-8")))
+ .toString())));
+ OwnedNodeEdgePoint inepN = dsrNodeNnOnep.get(new OwnedNodeEdgePointKey(new Uuid(
+ UUID.nameUUIDFromBytes(String.join("+", nodeId, "iODU", networkId).getBytes(Charset.forName("UTF-8")))
+ .toString())));
+ if (admState == null) {
+ assertNull(enepN.getAdministrativeState(), "Administrative State should not be present");
+ assertNull(inepN.getAdministrativeState(), "Administrative State should not be present");
+ } else {
+ assertEquals(AdministrativeState.LOCKED, enepN.getAdministrativeState(),
+ "Administrative State should be Locked");
+ assertEquals(AdministrativeState.LOCKED, inepN.getAdministrativeState(),
+ "Administrative State should be Locked");
+ }
+ if (rawState == null) {
+ assertNull(enepN.getOperationalState(), "Operational State should not be present");
+ assertNull(inepN.getOperationalState(), "Operational State should not be present");
+ } else {
+ assertEquals(OperationalState.DISABLED, enepN.getOperationalState(),
+ "Operational State should be Disabled");
+ assertEquals(OperationalState.DISABLED, inepN.getOperationalState(),
+ "Operational State should be Disabled");
+ }
}
@Test
void convertNodeForTransponder100G() {
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- List<String> networkPortList = new ArrayList<>();
- for (TerminationPoint tp : tpdr100G.augmentation(Node1.class).getTerminationPoint().values()) {
- if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) {
- networkPortList.add(tp.getTpId().getValue());
- }
- }
- tapiFactory.convertNode(tpdr100G, networkPortList);
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> tapiNodes
- = tapiFactory.getTapiNodes().values().stream()
- .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue()))
- .collect(Collectors.toList());
-
- assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2");
- assertEquals(2, tapiFactory.getTapiLinks().size(), "Link list size should be 2");
-
- Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+DSR".getBytes(Charset.forName("UTF-8")))
- .toString());
- checkDsrNode(tapiNodes.get(1), dsrNodeUuid, "tpdr", "XPDR-A1-XPDR1");
- Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("XPDR-A1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8")))
- .toString());
- checkOtsiNode(tapiNodes.get(0), otsiNodeUuid, "tpdr", "XPDR-A1-XPDR1");
-
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link> tapiLinks
- = tapiFactory.getTapiLinks().values().stream()
- .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue()))
- .collect(Collectors.toList());
- checkTransitionalLink(tapiLinks.get(1), dsrNodeUuid, otsiNodeUuid,
- "XPDR-A1-XPDR1+iODU+XPDR1-NETWORK1", "XPDR-A1-XPDR1+iOTSi+XPDR1-NETWORK1", "XPDR-A1-XPDR1");
+ rawConvertNode(tpdr100G, "tpdr", "XPDR-A1-XPDR1");
}
@Test
void convertNodeForOtnMuxponder() {
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- List<String> networkPortList = new ArrayList<>();
- for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) {
- if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) {
- networkPortList.add(tp.getTpId().getValue());
- }
- }
- tapiFactory.convertNode(otnMuxA, networkPortList);
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> tapiNodes
- = tapiFactory.getTapiNodes().values().stream()
- .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue()))
- .collect(Collectors.toList());
-
- assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2");
- assertEquals(1, tapiFactory.getTapiLinks().size(), "Link list size should be 1");
- Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+DSR".getBytes(Charset.forName("UTF-8")))
- .toString());
- checkDsrNode(tapiNodes.get(0), dsrNodeUuid, "mux", "SPDR-SA1-XPDR1");
- Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8")))
- .toString());
- checkOtsiNode(tapiNodes.get(1), otsiNodeUuid, "mux", "SPDR-SA1-XPDR1");
-
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link> tapiLinks
- = tapiFactory.getTapiLinks().values().stream()
- .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue()))
- .collect(Collectors.toList());
- checkTransitionalLink(tapiLinks.get(0), dsrNodeUuid, otsiNodeUuid,
- "SPDR-SA1-XPDR1+iODU+XPDR1-NETWORK1", "SPDR-SA1-XPDR1+iOTSi+XPDR1-NETWORK1", "SPDR-SA1-XPDR1");
+ rawConvertNode(otnMuxA, "mux", "SPDR-SA1-XPDR1");
}
@Test
void convertNodeForOtnSwitch() {
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- List<String> networkPortList = new ArrayList<>();
- for (TerminationPoint tp : otnSwitch.augmentation(Node1.class).getTerminationPoint().values()) {
- if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) {
- networkPortList.add(tp.getTpId().getValue());
- }
- }
- tapiFactory.convertNode(otnSwitch, networkPortList);
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> tapiNodes
- = tapiFactory.getTapiNodes().values().stream()
- .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue()))
- .collect(Collectors.toList());
-
- assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2");
- assertEquals(4, tapiFactory.getTapiLinks().size(), "Link list size should be 4");
-
- Uuid dsrNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+DSR".getBytes(Charset.forName("UTF-8")))
- .toString());
- checkDsrNode(tapiNodes.get(0), dsrNodeUuid, "switch", "SPDR-SA1-XPDR2");
- Uuid otsiNodeUuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR2+OTSi".getBytes(Charset.forName("UTF-8")))
- .toString());
- checkOtsiNode(tapiNodes.get(1), otsiNodeUuid, "switch", "SPDR-SA1-XPDR2");
-
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link> tapiLinks
- = tapiFactory.getTapiLinks().values().stream()
- .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue()))
- .collect(Collectors.toList());
- checkTransitionalLink(tapiLinks.get(2), dsrNodeUuid, otsiNodeUuid,
- "SPDR-SA1-XPDR2+iODU+XPDR2-NETWORK4", "SPDR-SA1-XPDR2+iOTSi+XPDR2-NETWORK4", "SPDR-SA1-XPDR2");
+ rawConvertNode(otnSwitch, "switch", "SPDR-SA1-XPDR2");
}
+
@Test
void convertNodeForRoadmWhenNoOtnMuxAttached() {
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- tapiFactory.convertRoadmNode(roadmA, openroadmNet);
+ ConvertORTopoToTapiFullTopo tapiFullFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
+ tapiFullFactory.convertRoadmNode(roadmA, openroadmNet, "Full");
- assertEquals(1, tapiFactory.getTapiNodes().size(), "Node list size should be 1");
- assertEquals(0, tapiFactory.getTapiLinks().size(), "Link list size should be empty");
+ assertEquals(1, tapiFullFactory.getTapiNodes().size(), "Node list size should be 1");
+ assertEquals(0, tapiFullFactory.getTapiLinks().size(), "Link list size should be empty");
List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> tapiNodes
- = tapiFactory.getTapiNodes().values().stream().collect(Collectors.toList());
+ = tapiFullFactory.getTapiNodes().values().stream().collect(Collectors.toList());
Uuid roadmNodeUuid = new Uuid(UUID.nameUUIDFromBytes((roadmA.getNodeId().getValue() + "+PHOTONIC_MEDIA")
.getBytes(Charset.forName("UTF-8"))).toString());
- checkOtsiNode(tapiNodes.get(0), roadmNodeUuid, "roadm", "ROADM-A1");
+ checkOtsiNode(tapiNodes.get(getNodeRank("ROADM-A1", tapiNodes)), roadmNodeUuid, "roadm", "ROADM-A1");
}
@Test
void convertNodeForRoadmWhenRoadmNeighborAttached() {
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- tapiFactory.convertRoadmNode(roadmA, openroadmNet);
- tapiFactory.convertRoadmNode(roadmC, openroadmNet);
+ ConvertORTopoToTapiFullTopo tapiFullFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
+ tapiFullFactory.convertRoadmNode(roadmA, openroadmNet, "Full");
+ tapiFullFactory.convertRoadmNode(roadmC, openroadmNet, "Full");
List<Link> rdmTordmLinkList = ortopoLinks.values().stream()
.filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.ROADMTOROADM))
.collect(Collectors.toList());
- tapiFactory.convertRdmToRdmLinks(rdmTordmLinkList);
+ tapiFullFactory.convertRdmToRdmLinks(rdmTordmLinkList);
- assertEquals(2, tapiFactory.getTapiNodes().size(), "Node list size should be 2");
- assertEquals(1, tapiFactory.getTapiLinks().size(), "Link list size should be 1");
+ assertEquals(2, tapiFullFactory.getTapiNodes().size(), "Node list size should be 2");
+ assertEquals(1, tapiFullFactory.getTapiLinks().size(), "Link list size should be 1");
List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> tapiNodes
- = tapiFactory.getTapiNodes().values().stream().collect(Collectors.toList());
+ = tapiFullFactory.getTapiNodes().values().stream().collect(Collectors.toList());
+ int myInt = 0;
+ for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node : tapiNodes) {
+ if (node.getLayerProtocolName().contains(LayerProtocolName.PHOTONICMEDIA)
+ && !node.getLayerProtocolName().contains(LayerProtocolName.DSR)) {
+ LOG.info("LOOP ROADM node found at rank {}, with Name {} and Uuid {}",
+ myInt, node.getName().toString(), node.getUuid());
+ }
+ myInt++;
+ }
Uuid roadmaNodeUuid = new Uuid(UUID.nameUUIDFromBytes((roadmA.getNodeId().getValue() + "+PHOTONIC_MEDIA")
.getBytes(Charset.forName("UTF-8"))).toString());
- checkOtsiNode(tapiNodes.get(1), roadmaNodeUuid, "roadm", "ROADM-A1");
+ LOG.info("ROADM node found at rank {} from getrank", getNodeRank("ROADM-A1", tapiNodes));
+ checkOtsiNode(tapiNodes.get(getNodeRank("ROADM-A1", tapiNodes)), roadmaNodeUuid, "roadm", "ROADM-A1");
List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link> links
- = tapiFactory.getTapiLinks().values().stream()
+ = tapiFullFactory.getTapiLinks().values().stream()
.sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue()))
.collect(Collectors.toList());
Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-A1+PHOTONIC_MEDIA".getBytes(Charset.forName("UTF-8")))
.toString());
Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-C1+PHOTONIC_MEDIA".getBytes(Charset.forName("UTF-8")))
.toString());
- Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-A1+PHOTONIC_MEDIA+DEG2-TTP-TXRX"
+ Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-A1+PHOTONIC_MEDIA_OTS+DEG2-TTP-TXRX"
.getBytes(Charset.forName("UTF-8"))).toString());
- Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes(("ROADM-C1+PHOTONIC_MEDIA+DEG1-TTP-TXRX")
+ Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes(("ROADM-C1+PHOTONIC_MEDIA_OTS+DEG1-TTP-TXRX")
.getBytes(Charset.forName("UTF-8"))).toString());
Uuid linkUuid =
new Uuid(UUID.nameUUIDFromBytes(
- "ROADM-C1+PHOTONIC_MEDIA+DEG1-TTP-TXRXtoROADM-A1+PHOTONIC_MEDIA+DEG2-TTP-TXRX"
+ "ROADM-C1+PHOTONIC_MEDIA_OTS+DEG1-TTP-TXRXtoROADM-A1+PHOTONIC_MEDIA_OTS+DEG2-TTP-TXRX"
.getBytes(Charset.forName("UTF-8"))).toString());
checkOmsLink(links.get(0), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid,
- "ROADM-C1+PHOTONIC_MEDIA+DEG1-TTP-TXRXtoROADM-A1+PHOTONIC_MEDIA+DEG2-TTP-TXRX");
+ "ROADM-C1+PHOTONIC_MEDIA_OTS+DEG1-TTP-TXRXtoROADM-A1+PHOTONIC_MEDIA_OTS+DEG2-TTP-TXRX");
}
@Test
void convertNodeForRoadmWhenOtnMuxAttached() {
- ConvertORTopoToTapiFullTopo tapiFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
+ ConvertORTopoToTapiFullTopo tapiFullFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
+ ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid);
List<String> networkPortListA = new ArrayList<>();
for (TerminationPoint tp : otnMuxA.augmentation(Node1.class).getTerminationPoint().values()) {
if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK)) {
}
}
tapiFactory.convertNode(otnMuxA, networkPortListA);
- tapiFactory.convertRoadmNode(roadmA, openroadmNet);
+ tapiFullFactory.setTapiNodes(tapiFactory.getTapiNodes());
+ tapiFullFactory.convertRoadmNode(roadmA, openroadmNet, "Full");
List<Link> xponderOutLinkList = ortopoLinks.values().stream()
.filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDEROUTPUT))
.filter(lk1 -> ((lk1.getSource().getSourceNode().equals(otnMuxA.getNodeId())
|| lk1.getDestination().getDestNode().getValue().contains(roadmA.getNodeId().getValue()))))
.collect(Collectors.toList());
xponderInLinkList.addAll(xponderOutLinkList);
- tapiFactory.convertXpdrToRdmLinks(xponderInLinkList);
- assertEquals(3, tapiFactory.getTapiNodes().size(), "Node list size should be 3");
- assertEquals(2, tapiFactory.getTapiLinks().size(), "Link list size should be 2");
+ tapiFullFactory.convertXpdrToRdmLinks(xponderInLinkList);
+ assertEquals(2, tapiFullFactory.getTapiNodes().size(),
+ "Node list size should be 2 (XPDR, DSR-ODU merged; ROADM)");
+ assertEquals(1, tapiFullFactory.getTapiLinks().size(),
+ "Link list size should be 1 : no more transitional link");
+ Map<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.NodeKey,
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> nodeMap =
+ tapiFactory.getTapiNodes();
+ nodeMap.putAll(tapiFullFactory.getTapiNodes());
List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> tapiNodes
- = tapiFactory.getTapiNodes().values().stream()
+ = nodeMap.values().stream()
.sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue()))
.collect(Collectors.toList());
Uuid roadmNodeUuid = new Uuid(UUID.nameUUIDFromBytes((roadmA.getNodeId().getValue() + "+PHOTONIC_MEDIA")
.getBytes(Charset.forName("UTF-8"))).toString());
- checkOtsiNode(tapiNodes.get(1), roadmNodeUuid, "roadm", "ROADM-A1");
+ checkOtsiNode(tapiNodes.get(getNodeRank("ROADM-A1", tapiNodes)), roadmNodeUuid, "roadm", "ROADM-A1");
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link> links
- = tapiFactory.getTapiLinks().values().stream()
- .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue()))
- .collect(Collectors.toList());
- Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+OTSi".getBytes(Charset.forName("UTF-8")))
+ Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+XPONDER".getBytes(Charset.forName("UTF-8")))
.toString());
Uuid node2Uuid = new Uuid(UUID.nameUUIDFromBytes("ROADM-A1+PHOTONIC_MEDIA".getBytes(Charset.forName("UTF-8")))
.toString());
- Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1"
+ LOG.info("ROADM-A1+PHOTONIC_MEDIA UUID is {}", node2Uuid);
+ Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes("SPDR-SA1-XPDR1+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1"
.getBytes(Charset.forName("UTF-8"))).toString());
- Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes(("ROADM-A1+PHOTONIC_MEDIA+SRG1-PP2-TXRX")
+ Uuid tp2Uuid = new Uuid(UUID.nameUUIDFromBytes(("ROADM-A1+PHOTONIC_MEDIA_OTS+SRG1-PP2-TXRX")
.getBytes(Charset.forName("UTF-8"))).toString());
Uuid linkUuid =
new Uuid(UUID.nameUUIDFromBytes(
- "ROADM-A1+PHOTONIC_MEDIA+SRG1-PP2-TXRXtoSPDR-SA1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1"
+ "ROADM-A1+PHOTONIC_MEDIA_OTS+SRG1-PP2-TXRXtoSPDR-SA1-XPDR1+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1"
.getBytes(Charset.forName("UTF-8"))).toString());
- checkXpdrRdmLink(links.get(1), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid,
- "ROADM-A1+PHOTONIC_MEDIA+SRG1-PP2-TXRXtoSPDR-SA1-XPDR1+PHOTONIC_MEDIA+XPDR1-NETWORK1");
+ List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link> links
+ = tapiFullFactory.getTapiLinks().values().stream()
+ .sorted((l1, l2) -> l1.getUuid().getValue().compareTo(l2.getUuid().getValue()))
+ .collect(Collectors.toList());
+ checkXpdrRdmLink(links.get(0), node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid,
+ "ROADM-A1+PHOTONIC_MEDIA_OTS+SRG1-PP2-TXRXtoSPDR-SA1-XPDR1+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1");
}
- private void checkDsrNode(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node,
- Uuid nodeUuid, String dsrNodeType, String nodeId) {
- assertEquals(nodeUuid, node.getUuid(), "incorrect node uuid");
- assertEquals(nodeId + "+DSR", node.getName().get(new NameKey("dsr/odu node name")).getValue(),
+ private void rawConvertNode(Node node0, String dsrNodeType, String nodeId) {
+ ConvertORToTapiTopology tapiFactory = new ConvertORToTapiTopology(topologyUuid);
+ tapiFactory.convertNode(
+ node0,
+ node0.augmentation(Node1.class).getTerminationPoint().values().stream()
+ .filter(tp -> tp.augmentation(TerminationPoint1.class).getTpType()
+ .equals(OpenroadmTpType.XPONDERNETWORK))
+ .map(tp -> tp.getTpId().getValue())
+ .collect(Collectors.toList()));
+ assertEquals(1, tapiFactory.getTapiNodes().size(), "Node list size should be 1 (DSR-ODU merged)");
+ assertEquals(0, tapiFactory.getTapiLinks().size(), "Link list size should be 0 : no more transitional link");
+ //checkDsrNode(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node,
+ // Uuid node9Uuid, String dsrNodeType, String nodeId) {
+ Uuid node9Uuid =
+ new Uuid(UUID.nameUUIDFromBytes((nodeId + "+XPONDER").getBytes(Charset.forName("UTF-8"))).toString());
+ var node =
+ tapiFactory.getTapiNodes().values().stream()
+ .sorted((n1, n2) -> n1.getUuid().getValue().compareTo(n2.getUuid().getValue()))
+ .findFirst().orElseThrow();
+ assertEquals(node9Uuid, node.getUuid(), "incorrect node uuid");
+ assertEquals(nodeId + "+XPONDER", node.getName().get(new NameKey("dsr/odu node name")).getValue(),
"incorrect node name");
assertEquals(AdministrativeState.UNLOCKED, node.getAdministrativeState(),
"administrative state should be UNLOCKED");
assertEquals(OperationalState.ENABLED, node.getOperationalState(), "operational state should be ENABLED");
assertThat("one value-name should be 'dsr/odu node name'",
new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("dsr/odu node name")));
- assertEquals(2, node.getLayerProtocolName().size(), "dsr node should manage 2 protocol layers : dsr and odu");
+ assertEquals(4, node.getLayerProtocolName().size(), "dsr node should manage 4 protocol layers : dsr and odu"
+ + " DIGITALOTN, PHOTONICMEDIA");
assertThat("dsr node should manage 2 protocol layers : dsr and odu",
node.getLayerProtocolName(), hasItems(LayerProtocolName.DSR, LayerProtocolName.ODU));
List<OwnedNodeEdgePoint> inepsN = node.nonnullOwnedNodeEdgePoint().values().stream()
List<NodeRuleGroup> nrgList = node.nonnullNodeRuleGroup().values().stream()
.sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue()))
.collect(Collectors.toList());
- checkNodeRuleGroupForSwitchDSR(nrgList, client4NepUuid, enetworkNepUuid, nodeUuid);
+// keep trace of the previous test performed before the structure of the NRG was modified
+// checkNodeRuleGroupForSwitchDSR(nrgList, client4NepUuid, enetworkNepUuid, node9Uuid);
+ checkNodeRuleGroupForSwitchDSR(nrgList, client4NepUuid, inetworkNepUuid, node9Uuid);
break;
case "mux":
nepsC = node.nonnullOwnedNodeEdgePoint().values().stream()
checkNepClient10G(nep3, client3NepUuid, nodeId + "+DSR+XPDR1-CLIENT3", "NodeEdgePoint_C");
OwnedNodeEdgePoint enep4 = enepsN.get(3);
OwnedNodeEdgePoint inep4 = inepsN.get(0);
- Uuid enetworkNepUuid2 = new Uuid(
+ Uuid eclientNepUuid2 = new Uuid(
UUID.nameUUIDFromBytes((nodeId + "+eODU+XPDR1-CLIENT3").getBytes(Charset.forName("UTF-8")))
.toString());
Uuid inetworkNepUuid2 = new Uuid(
UUID.nameUUIDFromBytes((nodeId + "+iODU+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
.toString());
- checkNepeODU4(enep4, enetworkNepUuid2, nodeId + "+eODU+XPDR1-CLIENT3", "eNodeEdgePoint_N", false);
+ checkNepeODU4(enep4, eclientNepUuid2, nodeId + "+eODU+XPDR1-CLIENT3", "eNodeEdgePoint_N", false);
checkNepNetworkODU4(inep4, inetworkNepUuid2, nodeId + "+iODU+XPDR1-NETWORK1", "iNodeEdgePoint_N",
true);
List<NodeRuleGroup> nrgList2 = node.nonnullNodeRuleGroup().values().stream()
.sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue()))
.collect(Collectors.toList());
- checkNodeRuleGroupForMuxDSR(nrgList2, client3NepUuid, enetworkNepUuid2, nodeUuid);
+// keep trace of the previous test performed before the structure of the NRG was modified
+// checkNodeRuleGroupForMuxDSR(nrgList2, client3NepUuid, eclientNepUuid2, node9Uuid);
+ checkNodeRuleGroupForMuxDSR(nrgList2, client3NepUuid, inetworkNepUuid2, node9Uuid);
break;
case "tpdr":
nepsC = node.nonnullOwnedNodeEdgePoint().values().stream()
List<NodeRuleGroup> nrgList3 = node.nonnullNodeRuleGroup().values().stream()
.sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue()))
.collect(Collectors.toList());
- checkNodeRuleGroupForTpdrDSR(nrgList3, client1NepUuid, enetworkNepUuid3, nodeUuid);
+// keep trace of the previous test performed before the structure of the NRG was modified
+// checkNodeRuleGroupForTpdrDSR(nrgList3, client1NepUuid, enetworkNepUuid3, node9Uuid);
+ checkNodeRuleGroupForTpdrDSR(nrgList3, client1NepUuid, inetworkNepUuid3, node9Uuid);
break;
default:
fail();
private void checkOtsiNode(
org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node node,
Uuid nodeUuid, String otsiNodeType, String nodeId) {
+ if (!node.getUuid().equals(nodeUuid)) {
+ LOG.info("ERRORUUID on Node.getNodeId {}, NodeId {}", node.getName().toString(), nodeId);
+ LOG.info("ERRORUUID TapiUuid {}, transmitted Node Uuid {}", node.getUuid(), nodeUuid);
+ }
assertEquals(nodeUuid, node.getUuid(), "incorrect node uuid");
List<OwnedNodeEdgePoint> nepsI = null;
List<OwnedNodeEdgePoint> nepsE = null;
List<OwnedNodeEdgePoint> nepsP = null;
- List<OwnedNodeEdgePoint> nepsMc = null;
- List<OwnedNodeEdgePoint> nepsOtsimc = null;
+ List<OwnedNodeEdgePoint> nepsOMS = null;
+ List<OwnedNodeEdgePoint> nepsOTS = null;
List<OwnedNodeEdgePoint> nepsPhot = null;
if (!otsiNodeType.equals("roadm")) {
- assertEquals(nodeId + "+OTSi", node.getName().get(new NameKey("otsi node name")).getValue(),
+ assertEquals(nodeId + "+XPONDER", node.getName().get(new NameKey("dsr/odu node name")).getValue(),
"incorrect node name");
assertThat("one value-name should be 'dsr/odu node name'",
- new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("otsi node name")));
+ new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("dsr/odu node name")));
nepsI = node.nonnullOwnedNodeEdgePoint().values().stream()
.filter(n -> n.getName().containsKey(new NameKey("iNodeEdgePoint")))
.sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue()))
"incorrect node name");
assertThat("one value-name should be 'dsr/odu node name'",
new ArrayList<>(node.nonnullName().keySet()), hasItem(new NameKey("roadm node name")));
- nepsMc = node.nonnullOwnedNodeEdgePoint().values().stream()
- .filter(n -> n.getName().containsKey(new NameKey("MEDIA_CHANNELNodeEdgePoint")))
+ nepsOMS = node.nonnullOwnedNodeEdgePoint().values().stream()
+ .filter(n -> n.getName().containsKey(new NameKey("PHOTONIC_MEDIA_OMSNodeEdgePoint")))
.sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue()))
.collect(Collectors.toList());
- nepsOtsimc = node.nonnullOwnedNodeEdgePoint().values().stream()
- .filter(n -> n.getName().containsKey(new NameKey("OTSi_MEDIA_CHANNELNodeEdgePoint")))
+ nepsOTS = node.nonnullOwnedNodeEdgePoint().values().stream()
+ .filter(n -> n.getName().containsKey(new NameKey("PHOTONIC_MEDIA_OTSNodeEdgePoint")))
.sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue()))
.collect(Collectors.toList());
nepsPhot = node.nonnullOwnedNodeEdgePoint().values().stream()
- .filter(n -> n.getName().containsKey(new NameKey("PHOTONIC_MEDIANodeEdgePoint")))
+ .filter(n -> n.getName().containsKey(new NameKey("PHOTONIC_MEDIA_OMSNodeEdgePoint")))
.sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue()))
.collect(Collectors.toList());
+ nepsPhot.addAll(node.nonnullOwnedNodeEdgePoint().values().stream()
+ .filter(n -> n.getName().containsKey(new NameKey("PHOTONIC_MEDIA_OTSNodeEdgePoint")))
+ .sorted((nep1, nep2) -> nep1.getUuid().getValue().compareTo(nep2.getUuid().getValue()))
+ .collect(Collectors.toList()));
}
assertEquals(AdministrativeState.UNLOCKED, node.getAdministrativeState(),
"administrative state should be UNLOCKED");
checkNepOtsiNode(nep1, inepUuid, nodeId + "+iOTSi+XPDR2-NETWORK2", "iNodeEdgePoint", true);
OwnedNodeEdgePoint nep2 = nepsE.get(0);
Uuid enepUuid = new Uuid(
- UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR2-NETWORK2").getBytes(Charset.forName("UTF-8")))
+ UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OTS+XPDR2-NETWORK2")
+ .getBytes(Charset.forName("UTF-8")))
.toString());
- checkNepOtsiNode(nep2, enepUuid, nodeId + "+eOTSi+XPDR2-NETWORK2", "eNodeEdgePoint", false);
+ checkNepOtsiNode(nep2, enepUuid, nodeId + "+PHOTONIC_MEDIA_OTS+XPDR2-NETWORK2",
+ "eNodeEdgePoint", false);
OwnedNodeEdgePoint photNep = nepsP.get(1);
Uuid pnepUuid = new Uuid(
UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA+XPDR2-NETWORK2")
assertEquals(1, nepsP.size(), "Mux-OTSi node should have 1 photNEPs");
OwnedNodeEdgePoint nep3 = nepsE.get(0);
Uuid enepUuid2 = new Uuid(
- UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
+ UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1")
+ .getBytes(Charset.forName("UTF-8")))
.toString());
- checkNepOtsiNode(nep3, enepUuid2, nodeId + "+eOTSi+XPDR1-NETWORK1", "eNodeEdgePoint", false);
+ checkNepOtsiNode(nep3, enepUuid2, nodeId + "+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1",
+ "eNodeEdgePoint", false);
OwnedNodeEdgePoint nep4 = nepsI.get(0);
Uuid inepUuid2 = new Uuid(
UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
assertEquals(2, nepsP.size(), "Tpdr-OTSi node should have 2 photNEPs");
OwnedNodeEdgePoint nep5 = nepsE.get(0);
Uuid enepUuid3 = new Uuid(
- UUID.nameUUIDFromBytes((nodeId + "+eOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
+ UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1")
+ .getBytes(Charset.forName("UTF-8")))
.toString());
- checkNepOtsiNode(nep5, enepUuid3, nodeId + "+eOTSi+XPDR1-NETWORK1", "eNodeEdgePoint", false);
+ checkNepOtsiNode(nep5, enepUuid3, nodeId + "+PHOTONIC_MEDIA_OTS+XPDR1-NETWORK1",
+ "eNodeEdgePoint", false);
OwnedNodeEdgePoint nep6 = nepsI.get(0);
Uuid inepUuid3 = new Uuid(
UUID.nameUUIDFromBytes((nodeId + "+iOTSi+XPDR1-NETWORK1").getBytes(Charset.forName("UTF-8")))
checkNodeRuleGroupForTpdrOTSi(nrgList3, enepUuid3, inepUuid3, nodeUuid);
break;
case "roadm":
- assertEquals(10, nepsMc.size(), "Roadm node should have 10 MC NEPs");
- assertEquals(10, nepsOtsimc.size(), "Roadm node should have 10 OTSiMC NEPs");
- assertEquals(10, nepsPhot.size(), "Roadm node should have 10 PHOT_MEDIA NEPs");
+// Keep trace of MC NEP test to be restored after the new policy for creating NEP is applied
+// assertEquals(0, nepsMc.size(), "MC NEP no more configured, Roadm node should have 0 MC NEPs");
+// assertEquals(0, nepsOtsimc.size(), "Roadm node should have 10 OTSiMC NEPs");
+ assertEquals(12, nepsPhot.size(), "Roadm node should have 12 PHOT_MEDIA NEPs (2x4 OTS +2x(OTS+OMS)");
// For Degree node
- OwnedNodeEdgePoint nep7 = nepsMc.get(6);
+ OwnedNodeEdgePoint nep7 = nepsOMS.get(getRank("DEG1-TTP", nepsOMS));
Uuid mcnepUuid3 = new Uuid(
- UUID.nameUUIDFromBytes((nodeId + "+MEDIA_CHANNEL+DEG1-TTP-TXRX").getBytes(Charset.forName("UTF-8")))
- .toString());
- checkNepOtsiRdmNode(nep7, mcnepUuid3, nodeId + "+MEDIA_CHANNEL+DEG1-TTP-TXRX",
- "MEDIA_CHANNELNodeEdgePoint", false);
- OwnedNodeEdgePoint nep8 = nepsOtsimc.get(0);
- Uuid otmcnepUuid3 = new Uuid(UUID.nameUUIDFromBytes((nodeId + "+OTSi_MEDIA_CHANNEL+DEG1-TTP-TXRX")
+ UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OMS+DEG1-TTP-TXRX").getBytes(Charset
+ .forName("UTF-8"))).toString());
+ checkNepOtsiRdmNode(nep7, mcnepUuid3, nodeId + "+PHOTONIC_MEDIA_OMS+DEG1-TTP-TXRX",
+ "PHOTONIC_MEDIA_OMSNodeEdgePoint", false);
+ OwnedNodeEdgePoint nep8 = nepsOTS.get(getRank("DEG1-TTP", nepsOTS));
+ Uuid otmcnepUuid3 = new Uuid(UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OTS+DEG1-TTP-TXRX")
.getBytes(Charset.forName("UTF-8"))).toString());
- checkNepOtsiRdmNode(nep8, otmcnepUuid3, nodeId + "+OTSi_MEDIA_CHANNEL+DEG1-TTP-TXRX",
- "OTSi_MEDIA_CHANNELNodeEdgePoint", false);
- OwnedNodeEdgePoint photNep3 = nepsPhot.get(3);
- Uuid pnep3Uuid = new Uuid(
- UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA+DEG1-TTP-TXRX")
+ checkNepOtsiRdmNode(nep8, otmcnepUuid3, nodeId + "+PHOTONIC_MEDIA_OTS+DEG1-TTP-TXRX",
+ "PHOTONIC_MEDIA_OTSNodeEdgePoint", false);
+ OwnedNodeEdgePoint omsNep3 = nepsOMS.get(getRank("DEG1-TTP", nepsOMS));
+ Uuid omsNep3Uuid = new Uuid(
+ UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OMS+DEG1-TTP-TXRX")
.getBytes(Charset.forName("UTF-8"))).toString());
- checkNepOtsiRdmNode(photNep3, pnep3Uuid, nodeId + "+PHOTONIC_MEDIA+DEG1-TTP-TXRX",
- "PHOTONIC_MEDIANodeEdgePoint", false);
+ checkNepOtsiRdmNode(omsNep3, omsNep3Uuid, nodeId + "+PHOTONIC_MEDIA_OMS+DEG1-TTP-TXRX",
+ "PHOTONIC_MEDIA_OMSNodeEdgePoint", false);
// For srg node
- OwnedNodeEdgePoint nep9 = nepsMc.get(0);
- Uuid mcnepUuid4 = new Uuid(UUID.nameUUIDFromBytes((nodeId + "+MEDIA_CHANNEL+SRG1-PP1-TXRX")
- .getBytes(Charset.forName("UTF-8"))).toString());
- checkNepOtsiRdmNode(nep9, mcnepUuid4, nodeId + "+MEDIA_CHANNEL+SRG1-PP1-TXRX",
- "MEDIA_CHANNELNodeEdgePoint", true);
- OwnedNodeEdgePoint nep10 = nepsOtsimc.get(9);
- Uuid otmcnepUuid4 = new Uuid(UUID.nameUUIDFromBytes((nodeId + "+OTSi_MEDIA_CHANNEL+SRG1-PP1-TXRX")
+ OwnedNodeEdgePoint nep10 = nepsOTS.get(getRank("SRG1-PP1", nepsOTS));
+ Uuid otsnepUuid4 = new Uuid(UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OTS+SRG1-PP1-TXRX")
.getBytes(Charset.forName("UTF-8"))).toString());
- checkNepOtsiRdmNode(nep10, otmcnepUuid4, nodeId + "+OTSi_MEDIA_CHANNEL+SRG1-PP1-TXRX",
- "OTSi_MEDIA_CHANNELNodeEdgePoint", false);
- OwnedNodeEdgePoint photNep4 = nepsPhot.get(4);
- Uuid pnep4Uuid = new Uuid(UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA+SRG1-PP1-TXRX")
+ checkNepOtsiRdmNode(nep10, otsnepUuid4, nodeId + "+PHOTONIC_MEDIA_OTS+SRG1-PP1-TXRX",
+ "PHOTONIC_MEDIA_OTSNodeEdgePoint", false);
+ OwnedNodeEdgePoint otsNep4 = nepsOTS.get(getRank("SRG1-PP3", nepsOTS));
+ Uuid otsNep4Uuid = new Uuid(UUID.nameUUIDFromBytes((nodeId + "+PHOTONIC_MEDIA_OTS+SRG1-PP3-TXRX")
.getBytes(Charset.forName("UTF-8"))).toString());
- checkNepOtsiRdmNode(photNep4, pnep4Uuid, nodeId + "+PHOTONIC_MEDIA+SRG1-PP1-TXRX",
- "PHOTONIC_MEDIANodeEdgePoint", false);
+ checkNepOtsiRdmNode(otsNep4, otsNep4Uuid, nodeId + "+PHOTONIC_MEDIA_OTS+SRG1-PP3-TXRX",
+ "PHOTONIC_MEDIA_OTSNodeEdgePoint", false);
List<NodeRuleGroup> nrgList4 = node.nonnullNodeRuleGroup().values().stream()
- .sorted((nrg1, nrg2) -> nrg1.getUuid().getValue().compareTo(nrg2.getUuid().getValue()))
+ .sorted((nrg1, nrg2) -> nrg1.getName().entrySet().iterator().next().getValue().toString()
+ .compareTo(nrg2.getName().entrySet().iterator().next().getValue().toString()))
.collect(Collectors.toList());
- checkNodeRuleGroupForRdm(nrgList4, 30);
+ LOG.info("NODERULEGROUP List nrgLIst4 is as follows {}", nrgList4.toString());
+ List<Integer> nepNumber = new ArrayList<>(List.of(2, 4, 4));
+ checkNodeRuleGroupForRdm(nrgList4, nepNumber);
break;
default:
fail();
}
private void checkNepClient10G(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) {
- assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
- List<Name> nameList = new ArrayList<>(nep.nonnullName().values());
- Name name = nameList.get(0);
- assertEquals(portName, name.getValue(), "value of client nep should be '" + portName + "'");
- assertEquals(nepName, name.getValueName(),
- "value-name of client nep for '" + portName + "' should be '" + nepName + "'");
- assertEquals(3, nep.getSupportedCepLayerProtocolQualifierInstances()
- .size(), "Client nep should support 3 kind of cep");
- List<LAYERPROTOCOLQUALIFIER> lpql = new ArrayList<>();
- List<SupportedCepLayerProtocolQualifierInstances> lsclpqi = nep
- .getSupportedCepLayerProtocolQualifierInstances();
- for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) {
- lpql.add(entry.getLayerProtocolQualifier());
- }
- assertEquals(3, lpql.size(), "Client nep should support 3 kind of cep");
- assertThat("client nep should support 3 kind of cep",
- lpql, hasItems(ODUTYPEODU2.VALUE, ODUTYPEODU2E.VALUE, DIGITALSIGNALTYPE10GigELAN.VALUE));
-
- assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR protocol type");
- checkCommonPartOfNep(nep, false);
+ rawCheckNep(
+ List.of(ODUTYPEODU2.VALUE, ODUTYPEODU2E.VALUE, DIGITALSIGNALTYPE10GigELAN.VALUE), LayerProtocolName.DSR,
+ false, nep, nepUuid, portName, nepName, false);
}
- private void checkNepeODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName,
- boolean withSip) {
- assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
- List<Name> nameList = new ArrayList<>(nep.nonnullName().values());
- Name name = nameList.get(0);
- assertEquals(portName, name.getValue(), "value of eODU nep should be '" + portName + "'");
- assertEquals(nepName, name.getValueName(),
- "value-name of eODU nep for '" + portName + "' should be '" + nepName + "'");
- // TODO: depending on the type of node there is one type or another
- List<LAYERPROTOCOLQUALIFIER> lpql = new ArrayList<>();
- List<SupportedCepLayerProtocolQualifierInstances> lsclpqi = nep
- .getSupportedCepLayerProtocolQualifierInstances();
- for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) {
- lpql.add(entry.getLayerProtocolQualifier());
- }
- assertThat("eODU nep should support 1, 2 or 3 kind of cep, depending on client port",
- lpql.size(), anyOf(is(1), is(2), is(3)));
- assertTrue(
- lpql.stream().anyMatch(splc -> splc.equals(ODUTYPEODU0.VALUE)
- || splc.equals(ODUTYPEODU2.VALUE) || splc.equals(ODUTYPEODU2E.VALUE)
- || splc.equals(ODUTYPEODU4.VALUE)),
- "eODU nep should support 1 kind of cep");
- assertEquals(LayerProtocolName.ODU, nep.getLayerProtocolName(), "eODU nep should be of ODU protocol type");
- checkCommonPartOfNep(nep, withSip);
+ private void checkNepeODU4(
+ OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, boolean withSip) {
+ rawCheckNep(
+ List.of(ODUTYPEODU0.VALUE, ODUTYPEODU2.VALUE, ODUTYPEODU2E.VALUE, ODUTYPEODU4.VALUE), LayerProtocolName.ODU,
+ true, nep, nepUuid, portName, nepName, withSip);
}
- private void checkNepNetworkODU4(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName,
- boolean withSip) {
- assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
- List<Name> nameList = new ArrayList<>(nep.nonnullName().values());
- Name name = nameList.get(0);
- assertEquals(portName, name.getValue(), "value of network nep should be '" + portName + "'");
- assertEquals(nepName, name.getValueName(),
- "value-name of network nep for '" + portName + "' should be '" + nepName + "'");
- List<LAYERPROTOCOLQUALIFIER> lpql = new ArrayList<>();
- List<SupportedCepLayerProtocolQualifierInstances> lsclpqi = nep
- .getSupportedCepLayerProtocolQualifierInstances();
- for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) {
- lpql.add(entry.getLayerProtocolQualifier());
- }
- assertEquals(1, lpql.size(), "Network nep should support 1 kind of cep");
- assertThat("network nep should support 1 kind of cep", lpql, hasItem(ODUTYPEODU4.VALUE));
- assertEquals(LayerProtocolName.ODU, nep.getLayerProtocolName(), "network nep should be of ODU protocol type");
- checkCommonPartOfNep(nep, withSip);
+ private void checkNepNetworkODU4(
+ OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, boolean withSip) {
+ rawCheckNep(
+ List.of(ODUTYPEODU4.VALUE), LayerProtocolName.ODU, false,
+ nep, nepUuid, portName, nepName, withSip);
}
- private void checkNodeRuleGroupForTpdrDSR(List<NodeRuleGroup> nrgList, Uuid clientNepUuid, Uuid networkNepUuid,
- Uuid nodeUuid) {
- assertEquals(2, nrgList.size(), "transponder DSR should contain 2 node rule group");
+ private void checkNodeRuleGroupForTpdrDSR(
+ List<NodeRuleGroup> nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) {
+ assertEquals(4, nrgList.size(), "transponder DSR should contain 4 node rule group (DSR-I_ODU/I-ODU-E_ODU)");
for (NodeRuleGroup nodeRuleGroup : nrgList) {
assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(),
"each node-rule-group should contain 2 NEP for transponder DSR");
}
- List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrgList.get(0).nonnullNodeEdgePoint().values());
+ Integer indNrg = nrgContainsClientAndNetwork(nrgList, clientNepUuid, networkNepUuid);
+ assertNotNull("One node-rule-group shall contains client and network Neps", indNrg);
+ List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrgList.get(indNrg).nonnullNodeEdgePoint().values());
assertThat("node-rule-group nb 1 should be between nep-client1 and nep-network1",
nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(),
either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue())));
assertEquals("forward", rule.get(0).getLocalId(), "local-id of the rule should be 'forward'");
assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, rule.get(0).getForwardingRule(),
"the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
- assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType(), "the rule type should be 'FORWARDING'");
+ assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType().stream().findFirst().orElseThrow(),
+ "the rule type should be 'FORWARDING'");
}
- private void checkNodeRuleGroupForMuxDSR(List<NodeRuleGroup> nrgList, Uuid clientNepUuid, Uuid networkNepUuid,
- Uuid nodeUuid) {
- assertEquals(4, nrgList.size(), "muxponder DSR should contain 4 node rule group");
- for (NodeRuleGroup nodeRuleGroup : nrgList) {
- assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(),
- "each node-rule-group should contain 2 NEP for muxponder DSR");
- }
- List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrgList.get(1).nonnullNodeEdgePoint().values());
+ private void checkNodeRuleGroupForMuxDSR(
+ List<NodeRuleGroup> nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) {
+ assertEquals(8, nrgList.size(), "muxponder DSR should contain 8 node rule group (DSR-I_ODU/I-ODU-E_ODU)");
+ Integer indNrg = nrgContainsClientAndNetwork(nrgList, clientNepUuid, networkNepUuid);
+ assertNotNull("One node-rule-group shall contains client and network Neps", indNrg);
+ List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrgList.get(indNrg).nonnullNodeEdgePoint().values());
assertThat("node-rule-group nb 2 should be between nep-client4 and nep-network1",
nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(),
either(containsString(networkNepUuid.getValue())).or(containsString(clientNepUuid.getValue())));
assertEquals("forward", rule.get(0).getLocalId(), "local-id of the rule should be 'forward'");
assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, rule.get(0).getForwardingRule(),
"the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
- assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType(), "the rule type should be 'FORWARDING'");
+ assertEquals(RuleType.FORWARDING, rule.get(0).getRuleType().stream().findFirst().orElseThrow(),
+ "the rule type should be 'FORWARDING'");
}
- private void checkNodeRuleGroupForSwitchDSR(List<NodeRuleGroup> nrgList, Uuid clientNepUuid, Uuid networkNepUuid,
- Uuid nodeUuid) {
- assertEquals(1, nrgList.size(), "Switch-DSR should contain a single node rule group");
- assertEquals(8, nrgList.get(0).getNodeEdgePoint().size(), "Switch-DSR node-rule-group should contain 8 NEP");
+ private void checkNodeRuleGroupForSwitchDSR(
+ List<NodeRuleGroup> nrgList, Uuid clientNepUuid, Uuid networkNepUuid, Uuid nodeUuid) {
+ assertEquals(2, nrgList.size(), "Switch-DSR should contain 2 node rule group (DSR-I_ODU/I-ODU-E_ODU)");
+ Integer indNrg = nrgContainsClientAndNetwork(nrgList, clientNepUuid, networkNepUuid);
+ assertNotNull("One node-rule-group shall contains client and network Neps", indNrg);
+ assertEquals(8, nrgList.get(indNrg).getNodeEdgePoint().size(), "Switch-DSR nrg should contain 8 NEP");
List<NodeEdgePoint> nrg = nrgList.get(0).nonnullNodeEdgePoint().values().stream()
.sorted((nrg1, nrg2) -> nrg1.getNodeEdgePointUuid().getValue()
.compareTo(nrg2.getNodeEdgePointUuid().getValue()))
.collect(Collectors.toList());
+ Integer xxxxx = 0;
+ for (NodeEdgePoint nep : nrg) {
+ LOG.info("nep number {} UUID is {} ", xxxxx, nep.getNodeEdgePointUuid());
+ xxxxx++;
+ }
+ LOG.info("nep SPDR-SA1-XPDR2+iODU+XPDR2-NETWORK1 UUID is {} ",
+ UUID.nameUUIDFromBytes(("SPDR-SA1-XPDR2" + "+iODU+XPDR2-NETWORK1").getBytes(Charset.forName("UTF-8"))));
+ LOG.info("nep SPDR-SA1-XPDR2+DSR+XPDR2-CLIENT4 UUID is {} ",
+ UUID.nameUUIDFromBytes(("SPDR-SA1-XPDR2" + "+DSR+XPDR2-CLIENT4").getBytes(Charset.forName("UTF-8"))));
assertEquals(networkNepUuid, nrg.get(6).getNodeEdgePointUuid(),
"in the sorted node-rule-group, nep number 7 should be XPDR2-NETWORK1");
- assertEquals(clientNepUuid, nrg.get(3).getNodeEdgePointUuid(),
+ assertEquals(clientNepUuid, nrg.get(5).getNodeEdgePointUuid(),
"in the sorted node-rule-group, nep number 4 should be XPDR2-CLIENT4");
assertEquals(nodeUuid, nrg.get(4).getNodeUuid(),
"any item of the node-rule-group should have the same nodeUuid");
assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'");
assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(),
"the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
- assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'");
+ assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().stream().findFirst().orElseThrow(),
+ "the rule type should be 'FORWARDING'");
}
- private void checkNodeRuleGroupForRdm(List<NodeRuleGroup> nrgList, int nbNeps) {
- assertEquals(1, nrgList.size(), "RDM infra node - OTSi should contain a single node rule groups");
- if (nbNeps > 0) {
- List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values());
- assertEquals(nbNeps, nodeEdgePointList.size(),
- "RDM infra node -rule-group should contain " + nbNeps + " NEP");
- } else {
- assertNull(nrgList.get(0).getNodeEdgePoint(), "RDM infra node -rule-group should contain no NEP");
+ private void checkNodeRuleGroupForRdm(List<NodeRuleGroup> nrgList, List<Integer> nbNeps) {
+ assertEquals(3, nrgList.size(), "RDM infra node - OTS should contain 3 node rule groups");
+ int index = 0;
+ for (NodeRuleGroup nrg : nrgList) {
+ List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrg.getNodeEdgePoint().values());
+ assertEquals(nbNeps.get(index), nodeEdgePointList.size(),
+ "RDM infra node -rule-group should contain " + nbNeps.get(index) + " NEP");
+ List<Rule> ruleList = new ArrayList<>(nrg.nonnullRule().values());
+ assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule");
+ assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'");
+ assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().stream().findFirst().orElseThrow(),
+ "the rule type should be 'FORWARDING'");
+ if (nrg.getName().entrySet().iterator().next().getValue().toString().contains("DEG")) {
+ assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(),
+ "the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
+ } else {
+ assertEquals(FORWARDINGRULECANNOTFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(),
+ "the forwarding rule should be 'CANNOTFORWARDACROSSGROUP'");
+ }
+ index++;
}
- List<Rule> ruleList = new ArrayList<>(nrgList.get(0).nonnullRule().values());
- assertEquals(1, ruleList.size(), "node-rule-group should contain a single rule");
- assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'");
- assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(),
- "the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
- assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'");
}
- private void checkNodeRuleGroupForTpdrOTSi(List<NodeRuleGroup> nrgList, Uuid enepUuid, Uuid inepUuid,
- Uuid nodeUuid) {
+ private void checkNodeRuleGroupForTpdrOTSi(
+ List<NodeRuleGroup> nrgList, Uuid enepUuid, Uuid inepUuid, Uuid nodeUuid) {
assertEquals(2, nrgList.size(), "Tpdr-OTSi should contain two node rule groups");
List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values());
assertEquals(2, nodeEdgePointList.size(), "Tpdr-OTSi node-rule-group should contain 2 NEP");
assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'");
assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(),
"the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
- assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'");
+ assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().stream().findFirst().orElseThrow(),
+ "the rule type should be 'FORWARDING'");
}
- private void checkNodeRuleGroupForMuxOTSi(List<NodeRuleGroup> nrgList, Uuid enepUuid, Uuid inepUuid,
- Uuid nodeUuid) {
+ private void checkNodeRuleGroupForMuxOTSi(
+ List<NodeRuleGroup> nrgList, Uuid enepUuid, Uuid inepUuid, Uuid nodeUuid) {
assertEquals(1, nrgList.size(), "Mux-OTSi should contain a single node rule group");
List<NodeEdgePoint> nodeEdgePointList = new ArrayList<>(nrgList.get(0).getNodeEdgePoint().values());
assertEquals(2, nodeEdgePointList.size(), "Mux-OTSi node-rule-group should contain 2 NEP");
assertEquals("forward", ruleList.get(0).getLocalId(), "local-id of the rule should be 'forward'");
assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList.get(0).getForwardingRule(),
"the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
- assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType(), "the rule type should be 'FORWARDING'");
+ assertEquals(RuleType.FORWARDING, ruleList.get(0).getRuleType().stream().findFirst().orElseThrow(),
+ "the rule type should be 'FORWARDING'");
}
- private void checkNodeRuleGroupForSwitchOTSi(List<NodeRuleGroup> nrgList, Uuid enepUuid, Uuid inepUuid,
- Uuid nodeUuid) {
+ private void checkNodeRuleGroupForSwitchOTSi(
+ List<NodeRuleGroup> nrgList, Uuid enepUuid, Uuid inepUuid, Uuid nodeUuid) {
assertEquals(4, nrgList.size(), "Switch-OTSi should contain 4 node rule group");
for (NodeRuleGroup nodeRuleGroup : nrgList) {
assertEquals(2, nodeRuleGroup.getNodeEdgePoint().size(),
assertEquals("forward", ruleList0.get(0).getLocalId(), "local-id of the rule should be 'forward'");
assertEquals(FORWARDINGRULEMAYFORWARDACROSSGROUP.VALUE, ruleList0.get(0).getForwardingRule(),
"the forwarding rule should be 'MAYFORWARDACROSSGROUP'");
- assertEquals(RuleType.FORWARDING, ruleList0.get(0).getRuleType(), "the rule type should be 'FORWARDING'");
+ assertEquals(RuleType.FORWARDING, ruleList0.get(0).getRuleType().stream().findFirst().orElseThrow(),
+ "the rule type should be 'FORWARDING'");
}
private void checkNepClient100GSwitch(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) {
- assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
- List<Name> nameList = new ArrayList<>(nep.nonnullName().values());
- assertEquals(portName, nameList.get(0).getValue(),
- "value of client nep should be '" + portName + "'");
- assertEquals(nepName, nameList.get(0).getValueName(),
- "value-name of client nep for '" + portName + "' should be '" + nepName + "'");
- List<LAYERPROTOCOLQUALIFIER> lpql = new ArrayList<>();
- List<SupportedCepLayerProtocolQualifierInstances> lsclpqi = nep
- .getSupportedCepLayerProtocolQualifierInstances();
- for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) {
- lpql.add(entry.getLayerProtocolQualifier());
- }
- assertEquals(2, lpql.size(), "Client nep should support 2 kind of cep");
- assertThat("client nep should support 2 kind of cep", lpql,
- hasItems(ODUTYPEODU4.VALUE, DIGITALSIGNALTYPE100GigE.VALUE));
- assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR protocol type");
- checkCommonPartOfNep(nep, false);
+ rawCheckNep(
+ List.of(ODUTYPEODU4.VALUE, DIGITALSIGNALTYPE100GigE.VALUE), LayerProtocolName.DSR, false,
+ nep, nepUuid, portName, nepName, false);
}
private void checkNepClient100GTpdr(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName) {
- assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
- List<Name> nameList = new ArrayList<>(nep.nonnullName().values());
- assertEquals(portName, nameList.get(0).getValue(), "value of client nep should be '" + portName + "'");
- assertEquals(nepName, nameList.get(0).getValueName(),
- "value-name of client nep for '" + portName + "' should be 100G-tpdr'");
- List<LAYERPROTOCOLQUALIFIER> lpql = new ArrayList<>();
- List<SupportedCepLayerProtocolQualifierInstances> lsclpqi = nep
- .getSupportedCepLayerProtocolQualifierInstances();
- for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) {
- lpql.add(entry.getLayerProtocolQualifier());
- }
- assertEquals(1, lpql.size(), "Client nep should support 1 kind of cep");
- assertThat("client nep should support 2 kind of cep", lpql, hasItems(DIGITALSIGNALTYPE100GigE.VALUE));
- assertEquals(LayerProtocolName.DSR, nep.getLayerProtocolName(), "client nep should be of DSR protocol type");
- checkCommonPartOfNep(nep, false);
+ rawCheckNep(
+ List.of(DIGITALSIGNALTYPE100GigE.VALUE), LayerProtocolName.DSR, false,
+ nep, nepUuid, portName, nepName, false);
}
- private void checkNepOtsiNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName,
- boolean withSip) {
- assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
- List<Name> nameList = new ArrayList<>(nep.nonnullName().values());
- assertEquals(portName, nameList.get(0).getValue(), "value of OTSi nep should be '" + portName + "'");
- assertEquals(nepName, nameList.get(0).getValueName(), "value-name of OTSi nep should be '" + nepName + "'");
- List<LAYERPROTOCOLQUALIFIER> lpql = new ArrayList<>();
- List<SupportedCepLayerProtocolQualifierInstances> lsclpqi = nep
- .getSupportedCepLayerProtocolQualifierInstances();
- for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) {
- lpql.add(entry.getLayerProtocolQualifier());
- }
- assertEquals(2, lpql.size(), "OTSi nep should support 2 kind of cep");
- assertThat("OTSi nep should support 2 kind of cep",
- lpql, hasItems(PHOTONICLAYERQUALIFIEROMS.VALUE, PHOTONICLAYERQUALIFIEROTSi.VALUE));
- assertEquals(LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName(),
- "OTSi nep should be of PHOTONIC_MEDIA protocol type");
- checkCommonPartOfNep(nep, withSip);
+ private void checkNepOtsiNode(
+ OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, boolean withSip) {
+ rawCheckNep(
+ List.of(PHOTONICLAYERQUALIFIEROMS.VALUE, PHOTONICLAYERQUALIFIEROTSi.VALUE), LayerProtocolName.PHOTONICMEDIA,
+ false, nep, nepUuid, portName, nepName, withSip);
}
- private void checkNepOtsiRdmNode(OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName,
- boolean withSip) {
- assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
- List<Name> nameList = new ArrayList<>(nep.nonnullName().values());
- assertEquals(portName, nameList.get(0).getValue(),
- "value of OTSi nep should be '" + portName + "'");
- assertEquals(nepName, nameList.get(0).getValueName(),
- "value-name of OTSi nep should be '" + nepName + "'");
- List<LAYERPROTOCOLQUALIFIER> lpql = new ArrayList<>();
- List<SupportedCepLayerProtocolQualifierInstances> lsclpqi = nep
- .getSupportedCepLayerProtocolQualifierInstances();
- for (SupportedCepLayerProtocolQualifierInstances entry : lsclpqi) {
- lpql.add(entry.getLayerProtocolQualifier());
+ private void checkNepOtsiRdmNode(
+ OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, boolean withSip) {
+ if (!nep.getUuid().equals(nepUuid)) {
+ LOG.info("ERRORUUIDNEP on Nep {}, expected {}", nep.getName(), portName);
}
- assertEquals(1, lpql.size(), "OTSi nep of RDM infra node should support only 1 kind of cep");
- assertThat("OTSi nep should support 2 kind of cep", lpql, hasItems(PHOTONICLAYERQUALIFIEROMS.VALUE));
- assertEquals(LayerProtocolName.PHOTONICMEDIA, nep.getLayerProtocolName(),
- "OTSi nep should be of PHOTONIC_MEDIA protocol type");
- checkCommonPartOfNep(nep, withSip);
+ rawCheckNep(nepName.contains("OMS")
+ ? List.of(PHOTONICLAYERQUALIFIEROMS.VALUE)
+ : nepName.contains("OTS") ? List.of(PHOTONICLAYERQUALIFIEROTS.VALUE) : null,
+ LayerProtocolName.PHOTONICMEDIA, false, nep, nepUuid, portName, nepName, withSip);
}
- private void checkCommonPartOfNep(OwnedNodeEdgePoint nep, boolean withSip) {
+ private void rawCheckNep(List<LAYERPROTOCOLQUALIFIER> lpqList, LayerProtocolName lpn, boolean anyInList,
+ OwnedNodeEdgePoint nep, Uuid nepUuid, String portName, String nepName, boolean withSip) {
+ assertEquals(nepUuid, nep.getUuid(), "bad uuid for " + portName);
+ Name name0 = nep.nonnullName().values().stream().findFirst().orElseThrow();
+ assertEquals(portName, name0.getValue(), "Value of nep port should be '" + portName + "'");
+ assertEquals(nepName, name0.getValueName(), "value-name of nep should be '" + nepName + "'");
+ if (lpqList != null) {
+ List<LAYERPROTOCOLQUALIFIER> lpql = nep.getSupportedCepLayerProtocolQualifierInstances().stream()
+ .map(entry -> entry.getLayerProtocolQualifier())
+ .collect(Collectors.toList());
+ if (anyInList) {
+ assertTrue(
+ lpql.size() < lpqList.size(),
+ //TODO lpqList.size() = 4 here -> check if this is the correct formula from an optical standpoint
+ "eODU nep should support less than " + lpqList.size() + " kind of cep, it depends on client port");
+ assertTrue(
+ lpqList.stream().anyMatch(splc -> lpql.contains(splc)),
+ "eODU nep should support 1 kind of cep");
+ } else {
+ assertEquals(lpqList.size(), lpql.size(), "nep should support " + lpqList.size() + " kind of cep(s)");
+ for (LAYERPROTOCOLQUALIFIER lpq: lpqList) {
+ assertThat("nep should support " + lpq + " cep", lpql, hasItem(lpq));
+ }
+ assertEquals(lpn, nep.getLayerProtocolName(), "nep should be of " + lpn.toString() + " protocol type");
+ }
+ }
+ // CommonPartOfNep(OwnedNodeEdgePoint nep, boolean withSip)
assertEquals(Direction.BIDIRECTIONAL, nep.getDirection(), "link port direction should be DIRECTIONAL");
assertEquals(AdministrativeState.UNLOCKED, nep.getAdministrativeState(),
"administrative state should be UNLOCKED");
"link-port-role of client nep should be SYMMETRIC");
}
- private void checkTransitionalLink(
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link link, Uuid node1Uuid,
- Uuid node2Uuid, String tp1, String tp2, String ietfNodeId) {
- Uuid linkUuid = new Uuid(UUID.nameUUIDFromBytes((tp1 + "to" + tp2).getBytes(Charset.forName("UTF-8")))
- .toString());
- assertEquals(linkUuid, link.getUuid(), "bad uuid for link between DSR node " + tp1 + " and iOTSI port " + tp2);
- assertEquals(CAPACITYUNITGBPS.VALUE, link.getAvailableCapacity().getTotalSize().getUnit(),
- "Available capacity unit should be GBPS");
- assertEquals(Uint64.valueOf(100), link.getAvailableCapacity().getTotalSize().getValue(),
- "Available capacity -total size value should be 100");
- assertEquals(2, link.getTransitionedLayerProtocolName().size(),
- "transitional link should be between 2 nodes of protocol layers ODU and PHOTONIC_MEDIA");
- assertThat("transitional link should be between 2 nodes of protocol layers ODU and PHOTONIC_MEDIA",
- link.getTransitionedLayerProtocolName(),
- hasItems(LayerProtocolName.ODU.getName(), LayerProtocolName.PHOTONICMEDIA.getName()));
- assertEquals(ForwardingDirection.BIDIRECTIONAL, link.getDirection(),
- "transitional link should be BIDIRECTIONAL");
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121
- .link.NodeEdgePoint> nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values());
- assertEquals(topologyUuid, nodeEdgePointList.get(0).getTopologyUuid(),
- "topology uuid should be the same for the two termination point of the link");
- assertEquals(topologyUuid, nodeEdgePointList.get(1).getTopologyUuid(),
- "topology uuid should be the same for the two termination point of the link");
- assertThat("transitional links should terminate on DSR node and Photonic node",
- nodeEdgePointList.get(0).getNodeUuid().getValue(),
- either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue())));
- assertThat("transitional links should terminate on DSR node and Photonic node",
- 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",
- nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(),
- either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue())));
- assertThat("transitional links should terminate on DSR node and Photonic node",
- nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(),
- either(containsString(nep1Uuid.getValue())).or(containsString(nep2Uuid.getValue())));
- }
-
- private void checkOmsLink(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link link,
+ private void checkOmsLink(
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link link,
Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, String linkName) {
assertEquals(linkName, link.getName().get(new NameKey("OMS link name")).getValue(), "bad name for the link");
- assertEquals(linkUuid, link.getUuid(), "bad uuid for link");
- assertEquals(
- LayerProtocolName.PHOTONICMEDIA.getName(),
- link.getLayerProtocolName().stream().findFirst().orElseThrow().getName(),
- "oms link should be between 2 nodes of protocol layers PHOTONIC_MEDIA");
- assertEquals(ForwardingDirection.BIDIRECTIONAL, link.getDirection(),"otn tapi link should be BIDIRECTIONAL");
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121
- .link.NodeEdgePoint> nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values());
- assertEquals(2 , nodeEdgePointList.size(), "oms link should be between 2 neps");
- assertEquals(topologyUuid, nodeEdgePointList.get(0).getTopologyUuid(),
- "topology uuid should be the same for the two termination point of the link");
- assertEquals(topologyUuid, nodeEdgePointList.get(1).getTopologyUuid(),
- "topology uuid should be the same for the two termination point of the link");
- assertThat("oms links should terminate on two distinct nodes",
- nodeEdgePointList.get(0).getNodeUuid().getValue(),
- either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue())));
- assertThat("oms links should terminate on two distinct nodes",
- nodeEdgePointList.get(1).getNodeUuid().getValue(),
- either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue())));
- assertThat("oms links should terminate on two distinct tps",
- nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(),
- either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue())));
- assertThat("oms links should terminate on two distinct tps",
- nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(),
- either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue())));
+ linkNepsCheck(link, node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid);
}
private void checkXpdrRdmLink(
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link link, Uuid node1Uuid,
- Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, String linkName) {
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link link,
+ Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid, String linkName) {
assertEquals(linkName, link.getName().get(new NameKey("XPDR-RDM link name")).getValue(),
"bad name for the link");
+ linkNepsCheck(link, node1Uuid, node2Uuid, tp1Uuid, tp2Uuid, linkUuid);
+ }
+
+ private void linkNepsCheck(
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Link link,
+ Uuid node1Uuid, Uuid node2Uuid, Uuid tp1Uuid, Uuid tp2Uuid, Uuid linkUuid) {
assertEquals(linkUuid, link.getUuid(), "bad uuid for link");
assertEquals(
LayerProtocolName.PHOTONICMEDIA.getName(),
"oms link should be between 2 nodes of protocol layers PHOTONIC_MEDIA");
assertEquals(ForwardingDirection.BIDIRECTIONAL, link.getDirection(),
"otn tapi link should be BIDIRECTIONAL");
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121
- .link.NodeEdgePoint> nodeEdgePointList = new ArrayList<>(link.nonnullNodeEdgePoint().values());
+ var nodeEdgePointList = link.nonnullNodeEdgePoint().values().stream().collect(Collectors.toList());
assertEquals(2 , nodeEdgePointList.size(), "oms link should be between 2 neps");
- assertEquals(topologyUuid, nodeEdgePointList.get(0).getTopologyUuid(),
+ var nep0 = nodeEdgePointList.get(0);
+ var nep1 = nodeEdgePointList.get(1);
+ assertEquals(topologyUuid, nep0.getTopologyUuid(),
"topology uuid should be the same for the two termination point of the link");
- assertEquals(topologyUuid, nodeEdgePointList.get(1).getTopologyUuid(),
+ assertEquals(topologyUuid, nep1.getTopologyUuid(),
"topology uuid should be the same for the two termination point of the link");
+ String node1UuidVal = node1Uuid.getValue();
+ String node2UuidVal = node2Uuid.getValue();
assertThat("oms links should terminate on two distinct nodes",
- nodeEdgePointList.get(0).getNodeUuid().getValue(),
- either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue())));
+ nep0.getNodeUuid().getValue(), either(containsString(node1UuidVal)).or(containsString(node2UuidVal)));
assertThat("oms links should terminate on two distinct nodes",
- nodeEdgePointList.get(1).getNodeUuid().getValue(),
- either(containsString(node1Uuid.getValue())).or(containsString(node2Uuid.getValue())));
+ nep1.getNodeUuid().getValue(), either(containsString(node1UuidVal)).or(containsString(node2UuidVal)));
+ String tp1UuidVal = tp1Uuid.getValue();
+ String tp2UuidVal = tp2Uuid.getValue();
assertThat("oms links should terminate on two distinct tps",
- nodeEdgePointList.get(0).getNodeEdgePointUuid().getValue(),
- either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue())));
+ nep0.getNodeEdgePointUuid().getValue(), either(containsString(tp1UuidVal)).or(containsString(tp2UuidVal)));
assertThat("oms links should terminate on two distinct tps",
- nodeEdgePointList.get(1).getNodeEdgePointUuid().getValue(),
- either(containsString(tp1Uuid.getValue())).or(containsString(tp2Uuid.getValue())));
+ nep1.getNodeEdgePointUuid().getValue(), either(containsString(tp1UuidVal)).or(containsString(tp2UuidVal)));
}
- private Node changeTerminationPointState(Node initialNode, String tpid, String tpid1, AdminStates admin,
- State oper) {
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder tpdr1Bldr
- = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1Builder(
- initialNode.augmentation(Node1.class));
+ private Node changeTerminationPointState(
+ Node initialNode, String tpid, String tpid1, AdminStates admin, State oper) {
+ var tpdr1Bldr = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
+ .Node1Builder(initialNode.augmentation(Node1.class));
Map<TerminationPointKey, TerminationPoint> tps = new HashMap<>(tpdr1Bldr.getTerminationPoint());
- TerminationPointBuilder tpBldr = new TerminationPointBuilder(
- tps.get(new TerminationPointKey(new TpId(tpid))));
- tpBldr.addAugmentation(new TerminationPoint1Builder(tpBldr.augmentation(TerminationPoint1.class))
- .setAdministrativeState(admin)
- .setOperationalState(oper)
- .build());
+ TerminationPointBuilder tpBldr = new TerminationPointBuilder(tps.get(new TerminationPointKey(new TpId(tpid))));
+ tpBldr.addAugmentation(
+ new TerminationPoint1Builder(tpBldr.augmentation(TerminationPoint1.class))
+ .setAdministrativeState(admin)
+ .setOperationalState(oper)
+ .build());
tps.replace(tpBldr.key(), tpBldr.build());
- TerminationPointBuilder tpBldr1 = new TerminationPointBuilder(
- tps.get(new TerminationPointKey(new TpId(tpid1))));
- tpBldr1.addAugmentation(new TerminationPoint1Builder(tpBldr1.augmentation(TerminationPoint1.class))
- .setAdministrativeState(admin)
- .setOperationalState(oper)
- .build());
+ TerminationPointBuilder tpBldr1 =
+ new TerminationPointBuilder(tps.get(new TerminationPointKey(new TpId(tpid1))));
+ tpBldr1.addAugmentation(
+ new TerminationPoint1Builder(tpBldr1.augmentation(TerminationPoint1.class))
+ .setAdministrativeState(admin)
+ .setOperationalState(oper)
+ .build());
tps.replace(tpBldr1.key(), tpBldr1.build());
- tpdr1Bldr.setTerminationPoint(tps);
- return new NodeBuilder(initialNode).addAugmentation(tpdr1Bldr.build()).build();
+ return new NodeBuilder(initialNode).addAugmentation(tpdr1Bldr.setTerminationPoint(tps).build()).build();
+ }
+
+ private int getRank(String searchedChar, List<OwnedNodeEdgePoint> onepList) {
+ return rawRank(
+ searchedChar, onepList.stream().map(entry -> entry.getName().values()).collect(Collectors.toList()));
+ }
+
+ private int getNodeRank(String searchedChar,
+ List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.Node> nodeList) {
+ return rawRank(
+ searchedChar, nodeList.stream().map(entry -> entry.getName().values()).collect(Collectors.toList()));
}
-}
\ No newline at end of file
+
+ private int rawRank(String searchedChar, List<Collection<Name>> nameCL) {
+ int foundAtRank = 0;
+ int rank = 0;
+ for (var nameC: nameCL) {
+ for (Name name: nameC) {
+ if (name.getValue().contains(searchedChar)) {
+ foundAtRank = rank;
+ //TODO should we really pursue once it is found ?
+ }
+ }
+ rank++;
+ }
+ LOG.info("searched Char {} found at rank {}", searchedChar, foundAtRank);
+ return foundAtRank;
+ }
+
+ private Integer nrgContainsClientAndNetwork(List<NodeRuleGroup> nrgList, Uuid clientNepUuid, Uuid networkNepUuid) {
+ // 1 NRG should at least contain the NEP of interest in the NEP List
+ Integer indexNrg = 0;
+ for (NodeRuleGroup nrg : nrgList) {
+ Boolean foundClient = false;
+ Boolean foundNetwork = false;
+ for (NodeEdgePoint nep : nrg.nonnullNodeEdgePoint().values()) {
+ foundClient = foundClient || nep.getNodeEdgePointUuid().equals(clientNepUuid);
+ foundNetwork = foundNetwork || nep.getNodeEdgePointUuid().equals(networkNepUuid);
+ }
+ if (foundClient && foundNetwork) {
+ return indexNrg;
+ }
+ indexNrg++;
+ }
+ return null;
+ }
+
+}