X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FTapiNetworkModelServiceImpl.java;h=15263b06ba32c9650dc214c0de643696756965ad;hb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;hp=e94f8293f7f27081b44e55a90889f2b61b5b81cc;hpb=02120b6f30aece5acfa0fba69419c6b65f0f1659;p=transportpce.git diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java index e94f8293f..15263b06b 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java @@ -24,31 +24,31 @@ import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.tapi.R2RTapiLinkDiscovery; import org.opendaylight.transportpce.tapi.TapiStringConstants; import org.opendaylight.transportpce.tapi.utils.TapiLink; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.network.Nodes; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPoolsBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If100GEODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If10GEODU2e; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GEODU0; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.OduSwitchingPools; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.OduSwitchingPoolsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev201211.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingListKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GEODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2e; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If1GE; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If1GEODU0; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCHOTU4ODU4; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.SupportedIfCapability; import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; @@ -103,6 +103,9 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.no import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePoint; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePointBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePointKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePointBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePointKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.Rule; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.RuleBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.RuleKey; @@ -184,8 +187,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { onepMap.putAll(transformSrgToOnep(orNodeId, mapSrg)); // create tapi Node - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node roadmNode = - createRoadmTapiNode(orNodeId, onepMap); + Node roadmNode = createRoadmTapiNode(orNodeId, onepMap); mergeNodeinTopology(Map.of(roadmNode.key(), roadmNode)); mergeSipsinContext(this.sipMap); // TODO add states corresponding to device config -> based on mapping. @@ -242,11 +244,12 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { .getBytes(Charset.forName("UTF-8"))).toString()); Name nameDsr = new NameBuilder().setValueName("dsr/odu node name").setValue( String.join("+", nodeId, TapiStringConstants.DSR)).build(); + Name nameNodeType = new NameBuilder().setValueName("Node Type") + .setValue(getNodeType(xponderType)).build(); List dsrLayerProtocols = Arrays.asList(LayerProtocolName.DSR, LayerProtocolName.ODU); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology - .Node dsrNode = createTapiXpdrNode(Map.of(nameDsr.key(), nameDsr), dsrLayerProtocols, - nodeId, nodeUuidDsr, xpdrClMaps, xpdrNetMaps, xponderType, oorOduSwitchingPool); + Node dsrNode = createTapiXpdrNode(Map.of(nameDsr.key(), nameDsr, nameNodeType.key(), nameNodeType), + dsrLayerProtocols, nodeId, nodeUuidDsr, xpdrClMaps, xpdrNetMaps, xponderType, oorOduSwitchingPool); nodeMap.put(dsrNode.key(), dsrNode); @@ -257,9 +260,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { Name nameOtsi = new NameBuilder().setValueName("otsi node name").setValue( String.join("+", nodeId, TapiStringConstants.OTSI)).build(); List otsiLayerProtocols = Arrays.asList(LayerProtocolName.PHOTONICMEDIA); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology - .Node otsiNode = createTapiXpdrNode(Map.of(nameOtsi.key(), nameOtsi), otsiLayerProtocols, - nodeId, nodeUuidOtsi, xpdrClMaps, xpdrNetMaps, xponderType, null); + Node otsiNode = createTapiXpdrNode(Map.of(nameOtsi.key(), nameOtsi, nameNodeType.key(), nameNodeType), + otsiLayerProtocols, nodeId, nodeUuidOtsi, xpdrClMaps, xpdrNetMaps, xponderType, null); nodeMap.put(otsiNode.key(), otsiNode); @@ -278,7 +280,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { switch (xpdrType) { case 1: // Tpdr - return createTpdrSwitchPool(); + return createTpdrSwitchPool(xpdrNetMaps); case 2: // Mux return createMuxSwitchPool(xpdrClMaps, xpdrNetMaps, xpdrNb); @@ -502,10 +504,11 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); + ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + OwnedNodeEdgePoint onep = createNep(nepUuid1, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, - true, String.join("+", nodeId, TapiStringConstants.I_OTSI), - xpdrNetMaps.get(i).getSupportedInterfaceCapability(), + true, String.join("+", nodeId, TapiStringConstants.I_OTSI), newSupIfCapList, transformOperState(xpdrNetMaps.get(i).getPortOperState()), transformAdminState(xpdrNetMaps.get(i).getPortAdminState())); onepl.put(onep.key(), onep); @@ -521,10 +524,11 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); + ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + OwnedNodeEdgePoint onep = createNep(nepUuid2, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, - false, String.join("+", nodeId, TapiStringConstants.E_OTSI), - xpdrNetMaps.get(i).getSupportedInterfaceCapability(), + false, String.join("+", nodeId, TapiStringConstants.E_OTSI), newSupIfCapList, transformOperState(xpdrNetMaps.get(i).getPortOperState()), transformAdminState(xpdrNetMaps.get(i).getPortAdminState())); onepl.put(onep.key(), onep); @@ -540,10 +544,11 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); + ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + OwnedNodeEdgePoint onep = createNep(nepUuid3, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, - false, String.join("+", nodeId, TapiStringConstants.PHTNC_MEDIA), - xpdrNetMaps.get(i).getSupportedInterfaceCapability(), + false, String.join("+", nodeId, TapiStringConstants.PHTNC_MEDIA), newSupIfCapList, transformOperState(xpdrNetMaps.get(i).getPortOperState()), transformAdminState(xpdrNetMaps.get(i).getPortAdminState())); onepl.put(onep.key(), onep); @@ -571,10 +576,11 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { name = nameBldr.setValueName("NodeEdgePoint_C").build(); } + ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrClMaps, i); + OwnedNodeEdgePoint onep = createNep(nepUuid, xpdrClMaps.get(i).getLogicalConnectionPoint(), Map.of(name.key(), name), LayerProtocolName.DSR, LayerProtocolName.DSR, true, - String.join("+", nodeId, TapiStringConstants.DSR), - xpdrClMaps.get(i).getSupportedInterfaceCapability(), + String.join("+", nodeId, TapiStringConstants.DSR), newSupIfCapList, transformOperState(xpdrClMaps.get(i).getPortOperState()), transformAdminState(xpdrClMaps.get(i).getPortAdminState())); onepl.put(onep.key(), onep); @@ -592,35 +598,37 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); + ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + OwnedNodeEdgePoint onep = createNep(nepUuid, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), - LayerProtocolName.ODU, LayerProtocolName.DSR, false, - String.join("+", nodeId, TapiStringConstants.I_ODU), - xpdrNetMaps.get(i).getSupportedInterfaceCapability(), + LayerProtocolName.ODU, LayerProtocolName.DSR, true, + String.join("+", nodeId, TapiStringConstants.I_ODU), newSupIfCapList, transformOperState(xpdrNetMaps.get(i).getPortOperState()), transformAdminState(xpdrNetMaps.get(i).getPortAdminState())); onepl.put(onep.key(), onep); } // network nep creation on E_ODU node - for (int i = 0; i < xpdrNetMaps.size(); i++) { + for (int i = 0; i < xpdrClMaps.size(); i++) { LOG.info("eODU NEP = {}", String.join("+", nodeId, TapiStringConstants.E_ODU, - xpdrNetMaps.get(i).getLogicalConnectionPoint())); + xpdrClMaps.get(i).getLogicalConnectionPoint())); Uuid nepUuid = new Uuid(UUID.nameUUIDFromBytes( (String.join("+", nodeId, TapiStringConstants.E_ODU, - xpdrNetMaps.get(i).getLogicalConnectionPoint())).getBytes(Charset.forName("UTF-8"))).toString()); + xpdrClMaps.get(i).getLogicalConnectionPoint())).getBytes(Charset.forName("UTF-8"))).toString()); Name onedName = new NameBuilder() .setValueName("eNodeEdgePoint_N") .setValue(String.join("+", nodeId, TapiStringConstants.E_ODU, - xpdrNetMaps.get(i).getLogicalConnectionPoint())) + xpdrClMaps.get(i).getLogicalConnectionPoint())) .build(); - OwnedNodeEdgePoint onep = createNep(nepUuid, xpdrNetMaps.get(i).getLogicalConnectionPoint(), + ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrClMaps, i); + + OwnedNodeEdgePoint onep = createNep(nepUuid, xpdrClMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), - LayerProtocolName.ODU, LayerProtocolName.DSR, true, - String.join("+", nodeId, TapiStringConstants.E_ODU), - xpdrNetMaps.get(i).getSupportedInterfaceCapability(), - transformOperState(xpdrNetMaps.get(i).getPortOperState()), - transformAdminState(xpdrNetMaps.get(i).getPortAdminState())); + LayerProtocolName.ODU, LayerProtocolName.DSR, false, + String.join("+", nodeId, TapiStringConstants.E_ODU), newSupIfCapList, + transformOperState(xpdrClMaps.get(i).getPortOperState()), + transformAdminState(xpdrClMaps.get(i).getPortAdminState())); onepl.put(onep.key(), onep); } return onepl; @@ -633,7 +641,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { private AdministrativeState transformAdminState(String adminString) { AdminStates adminState = org.opendaylight.transportpce.networkmodel.util.TopologyUtils - .setNetworkAdminState(adminString); + .setNetworkAdminState(adminString); return adminState.equals(AdminStates.InService) ? AdministrativeState.UNLOCKED : AdministrativeState.LOCKED; } @@ -652,7 +660,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { } LOG.debug("Node layer {}", nodeProtocol.getName()); onepBldr.setSupportedCepLayerProtocolQualifier(createSupportedLayerProtocolQualifier( - supportedInterfaceCapability, nodeProtocol)); + supportedInterfaceCapability, nepProtocol)); onepBldr.setLinkPortDirection(PortDirection.BIDIRECTIONAL).setLinkPortRole(PortRole.SYMMETRIC) .setAdministrativeState(adminState).setOperationalState(operState) .setLifecycleState(LifecycleState.INSTALLED).setTerminationDirection(TerminationDirection.BIDIRECTIONAL) @@ -739,9 +747,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { tpid)).getBytes(Charset.forName("UTF-8"))).toString()); MappedServiceInterfacePoint msip = new MappedServiceInterfacePointBuilder() .setServiceInterfacePointUuid(sipUuid).build(); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.tapi.context.ServiceInterfacePoint sip - = createSIP(sipUuid, layerProtocol, tpid, nodeid, supportedInterfaceCapability, - operState, adminState); + ServiceInterfacePoint sip = createSIP(sipUuid, layerProtocol, tpid, nodeid, supportedInterfaceCapability, + operState, adminState); this.sipMap.put(sip.key(), sip); LOG.info("SIP created {}", sip.getUuid()); // this.tapiSips.put(sip.key(), sip); @@ -773,14 +780,15 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { .build(); } - private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node - createRoadmTapiNode(String orNodeId, Map oneplist) { + private Node createRoadmTapiNode(String orNodeId, Map oneplist) { // UUID Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes((String.join("+", orNodeId, TapiStringConstants.PHTNC_MEDIA)).getBytes(Charset.forName("UTF-8"))).toString()); // Names Name nodeNames = new NameBuilder().setValueName("roadm node name") .setValue(String.join("+", orNodeId, TapiStringConstants.PHTNC_MEDIA)).build(); + Name nameNodeType = new NameBuilder().setValueName("Node Type") + .setValue(OpenroadmNodeType.ROADM.getName()).build(); // Protocol Layer List layerProtocols = Arrays.asList(LayerProtocolName.PHOTONICMEDIA); // Empty random creation of mandatory fields for avoiding errors.... @@ -798,7 +806,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { .build(); return new NodeBuilder() .setUuid(nodeUuid) - .setName(Map.of(nodeNames.key(), nodeNames)) + .setName(Map.of(nodeNames.key(), nodeNames, nameNodeType.key(), nameNodeType)) .setLayerProtocolName(layerProtocols) .setAdministrativeState(AdministrativeState.UNLOCKED) .setOperationalState(OperationalState.ENABLED) @@ -818,17 +826,14 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { private Map createNodeRuleGroupForRdmNode(String orNodeId, Uuid nodeUuid, Collection onepl) { - Map + Map nepMap = new HashMap<>(); for (OwnedNodeEdgePoint onep : onepl) { - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint - nep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group - .NodeEdgePointBuilder() - .setTopologyUuid(this.tapiTopoUuid) - .setNodeUuid(nodeUuid) - .setNodeEdgePointUuid(onep.key().getUuid()) - .build(); + NodeEdgePoint nep = new NodeEdgePointBuilder() + .setTopologyUuid(this.tapiTopoUuid) + .setNodeUuid(nodeUuid) + .setNodeEdgePointUuid(onep.key().getUuid()) + .build(); nepMap.put(nep.key(), nep); } Map nodeRuleGroupMap = new HashMap<>(); @@ -866,8 +871,28 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { return linkMap; } - private OduSwitchingPools createTpdrSwitchPool() { - return new OduSwitchingPoolsBuilder().build(); + private OduSwitchingPools createTpdrSwitchPool(List xpdrNetMaps) { + Map nblMap = new HashMap<>(); + int count = 1; + for (int i = 1; i <= xpdrNetMaps.size(); i++) { + LOG.info("XPDr net LCP = {}", xpdrNetMaps.get(i - 1).getLogicalConnectionPoint()); + LOG.info("XPDr net associated LCP = {}", xpdrNetMaps.get(i - 1).getConnectionMapLcp()); + TpId tpid1 = new TpId(xpdrNetMaps.get(i - 1).getLogicalConnectionPoint()); + TpId tpid2 = new TpId(xpdrNetMaps.get(i - 1).getConnectionMapLcp()); + List tpList = new ArrayList<>(); + tpList.add(tpid1); + tpList.add(tpid2); + NonBlockingList nbl = new NonBlockingListBuilder() + .setNblNumber(Uint16.valueOf(count)) + .setTpList(tpList) + .build(); + nblMap.put(nbl.key(), nbl); + count++; + } + return new OduSwitchingPoolsBuilder() + .setNonBlockingList(nblMap) + .setSwitchingPoolNumber(Uint16.valueOf(1)) + .build(); } private OduSwitchingPools createSwtchSwitchPool(List xpdrClMaps, List xpdrNetMaps, @@ -884,16 +909,16 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { } Map nbMap = new HashMap<>(); NonBlockingList nbl = new NonBlockingListBuilder() - .setNblNumber(Uint16.valueOf(1)) - .setTpList(tpl) - .build(); + .setNblNumber(Uint16.valueOf(1)) + .setTpList(tpl) + .build(); nbMap.put(nbl.key(),nbl); return new OduSwitchingPoolsBuilder() - .setSwitchingPoolNumber(Uint16.valueOf(1)) - .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking) - .setNonBlockingList(nbMap) - .build(); + .setSwitchingPoolNumber(Uint16.valueOf(1)) + .setSwitchingPoolType(SwitchingPoolTypes.NonBlocking) + .setNonBlockingList(nbMap) + .build(); } private OduSwitchingPools createMuxSwitchPool(List xpdrClMaps, List xpdrNetMaps, Integer xpdrNb) { @@ -905,11 +930,11 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { tpId = new TpId("XPDR" + xpdrNb + "-NETWORK1"); tpList.add(tpId); NonBlockingList nbl = new NonBlockingListBuilder() - .setNblNumber(Uint16.valueOf(i)) - .setTpList(tpList) - .setAvailableInterconnectBandwidth(Uint32.valueOf(xpdrNetMaps.size() * 10L)) - .setInterconnectBandwidthUnit(Uint32.valueOf(1000000000)) - .build(); + .setNblNumber(Uint16.valueOf(i)) + .setTpList(tpList) + .setAvailableInterconnectBandwidth(Uint32.valueOf(xpdrNetMaps.size() * 10L)) + .setInterconnectBandwidthUnit(Uint32.valueOf(1000000000)) + .build(); nbMap.put(nbl.key(),nbl); } return new OduSwitchingPoolsBuilder() @@ -926,30 +951,23 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { // create NodeRuleGroup int count = 1; for (Mapping tpMapping : xpdrNetMaps) { - Map - nepList = new HashMap<>(); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group - .NodeEdgePoint inep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210 - .node.rule.group.NodeEdgePointBuilder() - .setTopologyUuid(this.tapiTopoUuid) - .setNodeUuid(new Uuid(UUID.nameUUIDFromBytes((String.join("+", nodeId, - TapiStringConstants.OTSI)).getBytes(Charset.forName("UTF-8"))) - .toString())) - .setNodeEdgePointUuid(new Uuid(UUID.nameUUIDFromBytes((String.join("+", nodeId, - TapiStringConstants.I_OTSI, tpMapping.getLogicalConnectionPoint())) - .getBytes(Charset.forName("UTF-8"))).toString())) - .build(); - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group - .NodeEdgePoint enep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210 - .node.rule.group.NodeEdgePointBuilder() - .setTopologyUuid(this.tapiTopoUuid) - .setNodeUuid(new Uuid(UUID.nameUUIDFromBytes((String.join("+", nodeId, + Map nepList = new HashMap<>(); + NodeEdgePoint inep = new NodeEdgePointBuilder() + .setTopologyUuid(this.tapiTopoUuid) + .setNodeUuid(new Uuid(UUID.nameUUIDFromBytes((String.join("+", nodeId, TapiStringConstants.OTSI)).getBytes(Charset.forName("UTF-8"))).toString())) - .setNodeEdgePointUuid(new Uuid(UUID.nameUUIDFromBytes( - (String.join("+", nodeId, TapiStringConstants.E_OTSI, - tpMapping.getLogicalConnectionPoint())).getBytes(Charset.forName("UTF-8"))).toString())) - .build(); + .setNodeEdgePointUuid(new Uuid(UUID.nameUUIDFromBytes((String.join("+", nodeId, + TapiStringConstants.I_OTSI, tpMapping.getLogicalConnectionPoint())) + .getBytes(Charset.forName("UTF-8"))).toString())) + .build(); + NodeEdgePoint enep = new NodeEdgePointBuilder() + .setTopologyUuid(this.tapiTopoUuid) + .setNodeUuid(new Uuid(UUID.nameUUIDFromBytes((String.join("+", nodeId, + TapiStringConstants.OTSI)).getBytes(Charset.forName("UTF-8"))).toString())) + .setNodeEdgePointUuid(new Uuid(UUID.nameUUIDFromBytes( + (String.join("+", nodeId, TapiStringConstants.E_OTSI, + tpMapping.getLogicalConnectionPoint())).getBytes(Charset.forName("UTF-8"))).toString())) + .build(); nepList.put(inep.key(), inep); nepList.put(enep.key(), enep); // Empty random creation of mandatory fields for avoiding errors.... @@ -992,7 +1010,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { OwnedNodeEdgePoint> onepl) { // create NodeRuleGroup if (oorOduSwitchingPool == null) { - LOG.info("TPDR node --> no switching pool"); + LOG.info("No switching pool created for node = {}", nodeId); return new HashMap<>(); } LOG.info("ONEPL = {}", onepl.values()); @@ -1000,9 +1018,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { int count = 1; for (NonBlockingList nbl : oorOduSwitchingPool.nonnullNonBlockingList().values()) { LOG.info("Non blocking list = {}", nbl); - Map - nepList = new HashMap<>(); + Map nepList = new HashMap<>(); for (TpId tp : nbl.getTpList()) { LOG.info("EDOU TP = {}", String.join("+", nodeId, TapiStringConstants.E_ODU, tp.getValue())); LOG.info("DSR TP = {}", String.join("+", nodeId, TapiStringConstants.DSR, tp.getValue())); @@ -1011,17 +1027,23 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { Uuid tp1Uuid = new Uuid(UUID.nameUUIDFromBytes((String.join("+", nodeId, TapiStringConstants.DSR, tp.getValue())).getBytes(Charset.forName("UTF-8"))).toString()); if (onepl.containsKey(new OwnedNodeEdgePointKey(tpUuid)) - || onepl.containsKey(new OwnedNodeEdgePointKey(tp1Uuid))) { - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint - nep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group - .NodeEdgePointBuilder() - .setTopologyUuid(this.tapiTopoUuid) - .setNodeUuid(new Uuid(UUID.nameUUIDFromBytes( - (String.join("+", nodeId,TapiStringConstants. DSR)) - .getBytes(Charset.forName("UTF-8"))).toString())) - .setNodeEdgePointUuid((tp.getValue().contains("CLIENT")) ? tp1Uuid : tpUuid) - .build(); - nepList.put(nep.key(), nep); + && onepl.containsKey(new OwnedNodeEdgePointKey(tp1Uuid))) { + NodeEdgePoint nep1 = new NodeEdgePointBuilder() + .setTopologyUuid(this.tapiTopoUuid) + .setNodeUuid(new Uuid(UUID.nameUUIDFromBytes( + (String.join("+", nodeId,TapiStringConstants. DSR)) + .getBytes(Charset.forName("UTF-8"))).toString())) + .setNodeEdgePointUuid(tp1Uuid) + .build(); + NodeEdgePoint nep2 = new NodeEdgePointBuilder() + .setTopologyUuid(this.tapiTopoUuid) + .setNodeUuid(new Uuid(UUID.nameUUIDFromBytes( + (String.join("+", nodeId,TapiStringConstants. DSR)) + .getBytes(Charset.forName("UTF-8"))).toString())) + .setNodeEdgePointUuid(tpUuid) + .build(); + nepList.put(nep1.key(), nep1); + nepList.put(nep2.key(), nep2); } } // Empty random creation of mandatory fields for avoiding errors.... @@ -1075,7 +1097,6 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { for (SupportedInterfaceCapability sic : supIfMap.values()) { switch (lpn.getName()) { case "DSR": - case "ODU": switch (sic.getIfCapType().getSimpleName()) { // TODO: it may be needed to add more cases clauses if the interface capabilities of a // port are extended in the config file @@ -1110,9 +1131,34 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { break; } break; + case "ODU": + switch (sic.getIfCapType().getSimpleName()) { + // TODO: it may be needed to add more cases clauses if the interface capabilities of a + // port are extended in the config file + case "If1GEODU0": + sclpqList.add(ODUTYPEODU0.class); + break; + case "If10GEODU2e": + sclpqList.add(ODUTYPEODU2E.class); + break; + case "If10GEODU2": + case "If10GE": + sclpqList.add(ODUTYPEODU2.class); + break; + case "If100GEODU4": + case "If100GE": + case "IfOCHOTU4ODU4": + case "IfOCH": + sclpqList.add(ODUTYPEODU4.class); + break; + default: + LOG.error("IfCapability type not managed"); + break; + } + break; case "PHOTONIC_MEDIA": if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4") - || sic.getIfCapType().getSimpleName().equals("IfOCH")) { + || sic.getIfCapType().getSimpleName().equals("IfOCH")) { sclpqList.add(PHOTONICLAYERQUALIFIEROTSi.class); sclpqList.add(PHOTONICLAYERQUALIFIEROMS.class); } @@ -1152,13 +1198,27 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { } } + private String getNodeType(XpdrNodeTypes xponderType) { + switch (xponderType.getIntValue()) { + case 1: + return OpenroadmNodeType.TPDR.getName(); + case 2: + return OpenroadmNodeType.MUXPDR.getName(); + case 3: + return OpenroadmNodeType.SWITCH.getName(); + default: + LOG.info("XpdrType {} not supported", xponderType); + break; + } + return null; + } + private void mergeNodeinTopology(Map nodeMap) { // TODO is this merge correct? Should we just merge topology by changing the nodes map?? // TODO: verify this is correct. Should we identify the context IID with the context UUID?? LOG.info("Creating tapi node in TAPI topology context"); InstanceIdentifier topoIID = InstanceIdentifier.builder(Context.class) - .augmentation(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.Context1.class) - .child(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.context.TopologyContext.class) + .augmentation(Context1.class).child(TopologyContext.class) .child(Topology.class, new TopologyKey(this.tapiTopoUuid)) .build(); @@ -1180,11 +1240,9 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { // TODO: verify this is correct. Should we identify the context IID with the context UUID?? LOG.info("Creating tapi node in TAPI topology context"); InstanceIdentifier topoIID = InstanceIdentifier.builder(Context.class) - .augmentation(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.Context1.class) - .child(org.opendaylight.yang.gen.v1.urn - .onf.otcc.yang.tapi.topology.rev181210.context.TopologyContext.class) - .child(Topology.class, new TopologyKey(this.tapiTopoUuid)) - .build(); + .augmentation(Context1.class).child(TopologyContext.class) + .child(Topology.class, new TopologyKey(this.tapiTopoUuid)) + .build(); Topology topology = new TopologyBuilder().setUuid(this.tapiTopoUuid).setLink(linkMap).build(); @@ -1260,9 +1318,9 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { private void updateConnectivityServicesState(Uuid sipUuid, String nodeId) { // TODO: check if this IID is correct InstanceIdentifier connectivitycontextIID = InstanceIdentifier.builder(Context.class) - .augmentation(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.Context1.class) - .child(ConnectivityContext.class) - .build(); + .augmentation(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.Context1.class) + .child(ConnectivityContext.class) + .build(); ConnectivityContext connContext = null; try { Optional optConnContext = @@ -1341,4 +1399,12 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { } } + private ArrayList> convertSupIfCapaList(List xpdrNetMaps, + int index) { + ArrayList> newSupIfCapList = new ArrayList>(); + xpdrNetMaps.get(index).getSupportedInterfaceCapability() + .forEach(a -> newSupIfCapList.add(xpdrNetMaps.get(index).getSupportedInterfaceCapability().get(0))); + return newSupIfCapList; + } }