X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FConvertORTopoToFullTapiTopoTest.java;h=57e4ba097f17b7dcdac1e6dc6ee8ea69e2f853a5;hb=652c9098f8d97e6f5a723a7c55929f9351bffb5b;hp=0c371e95de83d10b88e5c7ed3eb29bfd952a1367;hpb=01b5c73b75ef7df21f062ae4f814101ec0ed8cbe;p=transportpce.git
diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java
index 0c371e95d..57e4ba097 100644
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java
@@ -87,6 +87,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev221121.DIGITAL
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;
@@ -375,7 +376,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
@Test
void convertNodeForRoadmWhenNoOtnMuxAttached() {
ConvertORTopoToTapiFullTopo tapiFullFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- tapiFullFactory.convertRoadmNode(roadmA, openroadmNet);
+ tapiFullFactory.convertRoadmNode(roadmA, openroadmNet, "Full");
assertEquals(1, tapiFullFactory.getTapiNodes().size(), "Node list size should be 1");
assertEquals(0, tapiFullFactory.getTapiLinks().size(), "Link list size should be empty");
@@ -389,8 +390,8 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
@Test
void convertNodeForRoadmWhenRoadmNeighborAttached() {
ConvertORTopoToTapiFullTopo tapiFullFactory = new ConvertORTopoToTapiFullTopo(topologyUuid, tapiLink);
- tapiFullFactory.convertRoadmNode(roadmA, openroadmNet);
- tapiFullFactory.convertRoadmNode(roadmC, openroadmNet);
+ tapiFullFactory.convertRoadmNode(roadmA, openroadmNet, "Full");
+ tapiFullFactory.convertRoadmNode(roadmC, openroadmNet, "Full");
List rdmTordmLinkList = ortopoLinks.values().stream()
.filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.ROADMTOROADM))
@@ -448,7 +449,7 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
}
tapiFactory.convertNode(otnMuxA, networkPortListA);
tapiFullFactory.setTapiNodes(tapiFactory.getTapiNodes());
- tapiFullFactory.convertRoadmNode(roadmA, openroadmNet);
+ tapiFullFactory.convertRoadmNode(roadmA, openroadmNet, "Full");
List xponderOutLinkList = ortopoLinks.values().stream()
.filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDEROUTPUT))
.filter(lk1 -> ((lk1.getSource().getSourceNode().equals(otnMuxA.getNodeId())
@@ -804,9 +805,12 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
checkNepOtsiRdmNode(otsNep4, otsNep4Uuid, nodeId + "+PHOTONIC_MEDIA_OTS+SRG1-PP3-TXRX",
"PHOTONIC_MEDIA_OTSNodeEdgePoint", false);
List 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, 12);
+ LOG.info("NODERULEGROUP List nrgLIst4 is as follows {}", nrgList4.toString());
+ List nepNumber = new ArrayList<>(List.of(2, 4, 4));
+ checkNodeRuleGroupForRdm(nrgList4, nepNumber);
break;
default:
fail();
@@ -973,22 +977,27 @@ public class ConvertORTopoToFullTapiTopoTest extends AbstractTest {
"the rule type should be 'FORWARDING'");
}
- private void checkNodeRuleGroupForRdm(List nrgList, int nbNeps) {
- assertEquals(1, nrgList.size(), "RDM infra node - OTSi should contain a single node rule groups");
- if (nbNeps > 0) {
- List 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 nrgList, List nbNeps) {
+ assertEquals(3, nrgList.size(), "RDM infra node - OTS should contain 3 node rule groups");
+ int index = 0;
+ for (NodeRuleGroup nrg : nrgList) {
+ List nodeEdgePointList = new ArrayList<>(nrg.getNodeEdgePoint().values());
+ assertEquals(nbNeps.get(index), nodeEdgePointList.size(),
+ "RDM infra node -rule-group should contain " + nbNeps.get(index) + " NEP");
+ List 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 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().stream().findFirst().orElseThrow(),
- "the rule type should be 'FORWARDING'");
}
private void checkNodeRuleGroupForTpdrOTSi(List nrgList, Uuid enepUuid, Uuid inepUuid,