From e77d02c00813e934ddc697802e53c5be7118aab4 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 24 Jan 2020 11:28:46 +0100 Subject: [PATCH] upgrate network topology YANG to introduce OTN - add openroadm-common-network/otn-topology augmentation - update revision - modify code accordingly to support this new revision JIRA: TRNSPRTPCE-177 Signedff-by: guillaume.lambert Co-authored-by: Christophe Betoule Change-Id: Ifbeac6dd6a5ccaf348e82e2fa7afbc2f4dd65e6c --- .../networkmodel/util/OpenRoadmTopology22.java | 12 ++++++------ ...=> transportpce-network-topology@2020-01-23.yang} | 10 +++++++--- .../transportpce/tapi/topology/TapiTopologyImpl.java | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) rename ordmodels/network/src/main/yang/{transportpce-network-topology@2019-06-25.yang => transportpce-network-topology@2020-01-23.yang} (82%) diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java index bd3c8665a..f0ca0bd1b 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java @@ -218,13 +218,13 @@ public class OpenRoadmTopology22 { .setTailEquipmentId(m.getConnectionMapLcp()); ontTp1Bldr.setXpdrNetworkAttributes(xpdrNwAttrBldr.build()); ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK); - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr = - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder() + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200123.TerminationPoint1Builder tpceTp1Bldr = + new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200123.TerminationPoint1Builder() .setAssociatedConnectionMapPort(m.getConnectionMapLcp()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()) .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 .TerminationPoint1.class, ocnTp1Bldr.build()) - .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625 + .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200123 .TerminationPoint1.class, tpceTp1Bldr.build()); tpList.add(ietfTpBldr.build()); } else if (m.getPortQual().equals("xpdr-client")) { @@ -232,13 +232,13 @@ public class OpenRoadmTopology22 { .setTailEquipmentId(m.getConnectionMapLcp()); ontTp1Bldr.setXpdrClientAttributes(xpdrNwAttrBldr.build()); ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERCLIENT); - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr = - new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder() + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200123.TerminationPoint1Builder tpceTp1Bldr = + new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200123.TerminationPoint1Builder() .setAssociatedConnectionMapPort(m.getConnectionMapLcp()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()) .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 .TerminationPoint1.class, ocnTp1Bldr.build()) - .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625 + .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200123 .TerminationPoint1.class, tpceTp1Bldr.build()); tpList.add(ietfTpBldr.build()); } diff --git a/ordmodels/network/src/main/yang/transportpce-network-topology@2019-06-25.yang b/ordmodels/network/src/main/yang/transportpce-network-topology@2020-01-23.yang similarity index 82% rename from ordmodels/network/src/main/yang/transportpce-network-topology@2019-06-25.yang rename to ordmodels/network/src/main/yang/transportpce-network-topology@2020-01-23.yang index bf817cc61..a28ec0e9a 100644 --- a/ordmodels/network/src/main/yang/transportpce-network-topology@2019-06-25.yang +++ b/ordmodels/network/src/main/yang/transportpce-network-topology@2020-01-23.yang @@ -17,15 +17,19 @@ module transportpce-topology { organization "TransportPCE team"; - contact + contact "TransportPCE team"; + revision 2020-01-23 { + description "Add transportpce augmentation for otn-topology"; + } + revision 2019-06-25 { description "Initial revision"; } augment "/nd:networks/nd:network/nd:node/nwt:termination-point" { - when "../../nd:network-types/cnet:openroadm-common-network/openroadm-topology"; + when "../../nd:network-types/cnet:openroadm-common-network/openroadm-topology or ../../nd:network-types/cnet:openroadm-common-network/otn-topology"; description "Defines associated logical-connection-point for XPDR port."; leaf associated-connection-map-port { @@ -35,5 +39,5 @@ module transportpce-topology { description "The xpdr port connectable regarding the device connection-map"; } - } + } } \ No newline at end of file diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 9f4b06c8d..e42ae9f73 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -282,7 +282,7 @@ public class TapiTopologyImpl implements TapiTopologyService { Link> xpdIn) { @Nullable String networkLcp = tp.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1.class) + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200123.TerminationPoint1.class) .getAssociatedConnectionMapPort(); @NonNull KeyedInstanceIdentifier pmIID = InstanceIdentifier.create( -- 2.36.6