Replace tpce-topology yang by existing ordmodels 46/101646/12
authorThierry Jiao <thierry.jiao@orange.com>
Thu, 30 Jun 2022 09:08:50 +0000 (11:08 +0200)
committerThierry Jiao <thierry.jiao@orange.com>
Wed, 13 Jul 2022 12:02:49 +0000 (14:02 +0200)
commit56d1795b647693ec1d620d6aca2c4003e3b302ca
tree76e75e6f25962731934988f4a2ad217b29c13b8c
parent6ac7415cdf2789c306f8b3d4fe082839f03dd661
Replace tpce-topology yang by existing ordmodels

- Replace all use of transportpce-topology elements with identical ones
present in OpenROADM models
- If there is no replica of an element in OpenROADM models, displace the
element to 'api/src/main/yang/transportpce-networkutils.yang'
- Delete the 'transportpce-topology' yang file

JIRA: TRNSPRTPCE-679
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: I74da30412e2d9bcfedbddef5af0055bdd742446f
45 files changed:
api/pom.xml
api/src/main/yang/transportpce-networkutils@2022-06-30.yang [moved from api/src/main/yang/transportpce-networkutils@2017-08-18.yang with 57% similarity]
lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelService.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java
networkmodel/src/test/resources/openroadm-topology.xml
ordmodels/network/src/main/yang/transportpce-topology@2022-01-23.yang [deleted file]
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
pce/src/test/resources/gnpy/gnpy_topology.json
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java
servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/RendererListenerImpl.java
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TopologyUtils.java
tapi/src/test/resources/openroadm-topology.xml
tapi/src/test/resources/otn-topology.xml
tests/sample_configs/NW-for-test-5-4.xml
tests/sample_configs/NW-simple-topology.xml
tests/sample_configs/gnpy/openroadmTopology.json
tests/sample_configs/honeynode-otntopo400G.json
tests/sample_configs/honeynode-otntopo400GwithODUC4.json
tests/sample_configs/honeynode-otntopo400GwithOTUC4.json
tests/sample_configs/honeynode-topo.xml
tests/sample_configs/honeynode-topo400G.json
tests/transportpce_tests/1.2.1/test03_topology.py
tests/transportpce_tests/2.2.1/test03_topology.py
tests/transportpce_tests/2.2.1/test11_otn_end2end.py
tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py
tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py
tests/transportpce_tests/hybrid/test02_B100G_end2end.py