Upgrade to OpenROADM 7.1.0 network models 45/93745/10
authormanuedelf <emmanuelle.delfour@orange.com>
Wed, 4 Nov 2020 08:10:37 +0000 (09:10 +0100)
committermanuedelf <emmanuelle.delfour@orange.com>
Fri, 4 Dec 2020 09:39:53 +0000 (10:39 +0100)
commit9f04e99bf6c53ce3218835145085fb75dc5b4590
tree42db26065b76c5a271f41b094827cb84e12acc4b
parent12832542e72d836f57041ba5d21d7e7493faedbd
Upgrade to OpenROADM 7.1.0 network models

- Replace existing OpenROADM network models with version 7.1.0
- New version of transportpce-topology model to suppport 7.1.0 models
- common module: add constants to manage fixed and flex grid,
  add GridUtils class to init frequencies map
- update networkmodel module: update import version, update unit tests
- update renderer module: update import version, replace wavelength
  with frequencies map, update unit tests
- update olm module: update import version
- update pce module: update import version, replace wavelength with
  frequencies map (from 7.1 models), update unit tests and data test
  files
- update tapi module: update import version and data test file
- update lighty module: update import version
- update functional tests: update response check, add constants and
  functions to compute freq map, update data test files

Note that in pce, tapi modules and functional tests, there is
a major update in test data files: replacement of
available-wavelength
with avail-freq-maps which contains a base64 encoded 96 bytes
representing available frequency

JIRA: TRNSPRTPCE-259
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Iaf95e04232283f6adf08ef41b394c1cd0fca2354
78 files changed:
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedGridConstant.java [new file with mode: 0644]
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java [new file with mode: 0644]
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java [new file with mode: 0644]
lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.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/NetworkModelService.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/ClliNetwork.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/util/ClliNetworkTest.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/OlmPowerServiceRpcImplUtil.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
ordmodels/network/src/main/yang/org-openroadm-amplifier@2019-11-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-amplifier@2018-11-30.yang with 92% similarity]
ordmodels/network/src/main/yang/org-openroadm-clli-network@2019-11-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-clli-network@2018-11-30.yang with 95% similarity]
ordmodels/network/src/main/yang/org-openroadm-common-network@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-common-network@2018-11-30.yang with 75% similarity]
ordmodels/network/src/main/yang/org-openroadm-degree@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-degree@2018-11-30.yang with 85% similarity]
ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2018-11-30.yang with 90% similarity]
ordmodels/network/src/main/yang/org-openroadm-link@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-link@2018-11-30.yang with 87% similarity]
ordmodels/network/src/main/yang/org-openroadm-network-topology-types@2020-03-27.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network-topology-types@2018-11-30.yang with 82% similarity]
ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang [deleted file]
ordmodels/network/src/main/yang/org-openroadm-network-topology@2020-05-29.yang [new file with mode: 0644]
ordmodels/network/src/main/yang/org-openroadm-network-types@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network-types@2018-11-30.yang with 62% similarity]
ordmodels/network/src/main/yang/org-openroadm-network@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang with 79% similarity]
ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang with 57% similarity]
ordmodels/network/src/main/yang/org-openroadm-roadm@2019-11-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-roadm@2018-11-30.yang with 97% similarity]
ordmodels/network/src/main/yang/org-openroadm-srg@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-srg@2018-11-30.yang with 85% similarity]
ordmodels/network/src/main/yang/org-openroadm-xponder@2020-05-29.yang [moved from ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang with 56% similarity]
ordmodels/network/src/main/yang/transportpce-topology@2020-10-19.yang [moved from ordmodels/network/src/main/yang/transportpce-topology@2020-01-29.yang with 93% similarity]
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
pce/src/test/resources/gnpy/gnpy_topology.json
pce/src/test/resources/topologyData/basePceTopology.json
renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/WaveLengthServiceUtils.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/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java
tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
tapi/src/test/resources/openroadm-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-topo.xml
tests/transportpce_tests/1.2.1/test_end2end.py
tests/transportpce_tests/2.2.1/test_end2end.py
tests/transportpce_tests/2.2.1/test_otn_end2end.py
tests/transportpce_tests/2.2.1/test_tapi.py
tests/transportpce_tests/common/test_utils.py