Upgrade openroadm network models to 10.1 01/99601/6
authorChristophe Betoule <christophe.betoule@orange.com>
Fri, 4 Feb 2022 16:30:36 +0000 (17:30 +0100)
committerGilles Thouenon <gilles.thouenon@orange.com>
Fri, 1 Apr 2022 14:09:34 +0000 (16:09 +0200)
commit21d35937b8a2d9f6930985485a1b54eb7bec9a91
tree5ddd9fedc68bebab1a9140cebe287a684ed4109f
parent48f7364d64b0c3095f4b5823c74374ac7d45d0ae
Upgrade openroadm network models to 10.1

- upgrade network models to 10.1
- add new required 10.1 models from common
- update java code accordingly to these new models
- update UT

JIRA: TRNSPRTPCE-516
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I14585ee1e3bd3b3aac639e7ffffb3c1a722af977
65 files changed:
api/src/main/yang/service_path/transportpce-pathDescription@2021-07-05.yang
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
common/src/test/java/org/opendaylight/transportpce/common/fixedflex/GridUtilsTest.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.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/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TpceNetwork.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetworkTest.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/TpceNetworkTest.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/test/NetworkmodelTestUtil.java
olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
ordmodels/common/src/main/yang/org-openroadm-port-types@2020-12-11.yang [new file with mode: 0644]
ordmodels/network/src/main/yang/org-openroadm-amplifier@2021-09-24.yang [moved from ordmodels/network/src/main/yang/org-openroadm-amplifier@2019-11-29.yang with 96% similarity]
ordmodels/network/src/main/yang/org-openroadm-common-network@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-common-network@2020-05-29.yang with 86% similarity]
ordmodels/network/src/main/yang/org-openroadm-degree@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-degree@2020-05-29.yang with 90% similarity]
ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2020-05-29.yang with 95% similarity]
ordmodels/network/src/main/yang/org-openroadm-link@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-link@2020-05-29.yang with 71% similarity]
ordmodels/network/src/main/yang/org-openroadm-network-topology-types@2020-12-11.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network-topology-types@2020-03-27.yang with 98% similarity]
ordmodels/network/src/main/yang/org-openroadm-network-topology@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network-topology@2020-05-29.yang with 96% similarity]
ordmodels/network/src/main/yang/org-openroadm-network-types@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network-types@2020-05-29.yang with 81% similarity]
ordmodels/network/src/main/yang/org-openroadm-network@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network@2020-05-29.yang with 91% similarity]
ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2020-05-29.yang with 95% similarity]
ordmodels/network/src/main/yang/org-openroadm-srg@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-srg@2020-05-29.yang with 90% similarity]
ordmodels/network/src/main/yang/org-openroadm-xponder@2021-12-10.yang [moved from ordmodels/network/src/main/yang/org-openroadm-xponder@2020-05-29.yang with 93% similarity]
ordmodels/network/src/main/yang/transportpce-topology@2022-01-23.yang
pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java
pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java
pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java
pce/src/main/java/org/opendaylight/transportpce/pce/graph/InAlgoPathValidator.java
pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphEdgeTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java
pce/src/test/java/org/opendaylight/transportpce/pce/utils/TransactionUtils.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDeleteDataUtils.java
tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java
tapi/src/main/java/org/opendaylight/transportpce/tapi/listeners/TapiPceListenerImpl.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/TapiNetworkModelServiceImpl.java
tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiOrLinkListener.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/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToFullTapiTopoTest.java
tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopoTest.java