X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Fservice%2FNetworkModelService.java;h=349b45ec9635b40f7db706ac2375ad6e10f4ad5f;hb=b5ee86a522ce3cf5c6216f10647edb08b31c72e9;hp=3a02d7b715c11feaeaad2cce27d5a2820e395c61;hpb=29eb853983d2998b5303c5df6bfd212032220e41;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java index 3a02d7b71..349b45ec9 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java @@ -8,8 +8,11 @@ package org.opendaylight.transportpce.networkmodel.service; import java.util.List; -import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.OtnLinkType; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp.Link; +import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.OtnLinkType; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Service for data manipulation on OpenROADM topology models. @@ -20,79 +23,105 @@ public interface NetworkModelService { * Create new OpenROADM node in all OpenROADM topologies. * * @param nodeId - * unique node ID of new OpenROADM node + * unique node ID of new OpenROADM node * @param nodeVersion - * OpenROADM node version + * OpenROADM node version */ void createOpenRoadmNode(String nodeId, String nodeVersion); /** - * Delete OpenROADM node mapping and topologies. + * Delete OpenROADM node from portmapping and topologies. * * @param nodeId - * unique node ID of OpenROADM node. + * unique node ID of OpenROADM node. * + * @return result of node deletion from portmapping and topologies */ - void deleteOpenRoadmnode(String nodeId); + boolean deleteOpenRoadmnode(String nodeId); + + /** + * Update termination point, and if need, be associated links, of + * openroadm-topology and otn-topology after a change on a given mapping. + * + * @param nodeId + * unique node ID of OpenROADM node at the origin of the NETCONF + * notification change. + * @param mapping + * updated mapping following the device notification change. + */ + void updateOpenRoadmTopologies(String nodeId, Mapping mapping); /** * Set/update connection status of OpenROADM node. * * @param nodeId - * unique node ID of new OpenROADM node + * unique node ID of new OpenROADM node * @param connectionStatus - * connection status of the node + * connection status of the node */ void setOpenRoadmNodeStatus(String nodeId, NetconfNodeConnectionStatus.ConnectionStatus connectionStatus); /** * create new otn link in otn-topology. * - * @param nodeA - * OpenROADM node ID for link termination point A - * @param tpA - * OpenROADM tp id on nodeA for link termination point A - * @param nodeZ - * OpenROADM node ID for link termination point Z - * @param tpZ - * OpenROADM tp id on nodeZ for link termination point Z + * @param notifLink + * Expressed by the means of a link, specifies the + * termination points of the otn link to create. + * @param suppLinks + * list of link-id supported the service (used when more than one supported link) * @param linkType - * OtnLinkType, as OTU4, ODTU, etc + * OtnLinkType, as OTU4, ODTU, etc */ - void createOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ, OtnLinkType linkType); + void createOtnLinks( + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp.Link + notifLink, List suppLinks, OtnLinkType linkType); /** * delete otn links from otn-topology. * - * @param nodeA - * OpenROADM node ID for link termination point A - * @param tpA - * OpenROADM tp id on nodeA for link termination point A - * @param nodeZ - * OpenROADM node ID for link termination point Z - * @param tpZ - * OpenROADM tp id on nodeZ for link termination point Z + * @param notifLink + * Expressed by the means of a link, specifies the + * termination points of the otn link to create. + * @param suppLinks + * list of link-id supported the service (used when more than one supported link) * @param linkType - * OtnLinkType, as OTU4, ODTU, etc + * OtnLinkType, as OTU4, ODTU, etc */ - void deleteOtnLinks(String nodeA, String tpA, String nodeZ, String tpZ, OtnLinkType linkType); + void deleteOtnLinks( + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp.Link + notifLink, List suppLinks, OtnLinkType linkType); /** - * update otn links from otn-topology. + * Update otn links from otn-topology. + * For services using low-order odu, updates bandwidth parameters + * for both the direct parent high-order odu link, and also its server + * otu link. * - * @param nodeTps - * List containing a string composed of the netconf nodeId , and the - * termination point supporting the service + * @param link + * link containing termination points to be updated * @param serviceRate - * Service rate may be 1G, 10G or 100G + * Service rate may be 1G, 10G, 100G or 400G * @param tribPortNb - * Trib port number allocated by the service - * @param tribSoltNb - * First trib slot number allocated by the service + * Trib port number allocated by the service + * @param minTribSoltNb + * First contiguous trib slot number allocated by the service + * @param maxTribSoltNb + * Last contiguous trib slot number allocated by the service * @param isDeletion - * True indicates if the low-order otn service must be deleted + * True indicates if the low-order otn service must be deleted */ - void updateOtnLinks(List nodeTps, String serviceRate, Short tribPortNb, Short tribSoltNb, - boolean isDeletion); + void updateOtnLinks(Link link, Uint32 serviceRate, Short tribPortNb, Short minTribSoltNb, Short maxTribSoltNb, + boolean isDeletion); + /** + * Update otn links from otn-topology. + * For services using directly a high-order odu, updates bandwidth parameters + * of the direct parent otu link. + * + * @param supportedLinks + * list of link-id supported the service (used when more than one supported link) + * @param isDeletion + * True indicates if the low-order otn service must be deleted + */ + void updateOtnLinks(List supportedLinks, boolean isDeletion); }