Upgrade Network model from 2.1 to 4.1 09/81609/4
authorGilles Thouenon <gilles.thouenon@orange.com>
Thu, 11 Apr 2019 08:41:18 +0000 (10:41 +0200)
committerguillaume.lambert <guillaume.lambert@orange.com>
Thu, 18 Apr 2019 09:37:32 +0000 (11:37 +0200)
commite9ff01802d87203416f6af280c0590c22ed75538
tree9f60de431cb7d28daeb1153351b27c18adf80722
parent5ec93e13718264540d4578a15bae220f23d7fa2e
Upgrade Network model from 2.1 to 4.1

- update models to migrate network models to 4.1
- adapt new yang model naming to be compliant with ODL
- integrate rfc8345 dependencies in network/pom
- adapt all the code to new models

Change-Id: Ia48271cb45590aa59956130f5d80891c4140a749
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Dhruv Bhardwaj <db929a@att.com>
Co-authored-by: Shweta Vachhani <sv111y@att.com>
83 files changed:
api/src/main/yang/transportpce-olm@2017-04-18.yang
common/src/main/java/org/opendaylight/transportpce/common/InstanceIdentifiers.java
common/src/test/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerTest.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.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/dto/NodeData.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/dto/TopologyShard.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/LldpListener.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/LldpListener221.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/LinkIdUtil.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmFactory.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology121.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TopologyUtils.java
olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java
olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java
ordmodels/common/src/main/yang/org-openroadm-alarm@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-common-amplifier-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-common-equipment-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-common-link-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-common-node-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-common-optical-channel-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-common-state-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-common-types@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-common-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-equipment-states-types@2017-12-15.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-equipment-states-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-maintenance@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-otn-common-types@2017-12-15.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-otn-common-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-pm-types@2017-12-15.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-pm@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-port-types@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-port-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-probable-cause@2016-10-14.yang
ordmodels/common/src/main/yang/org-openroadm-probable-cause@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-resource-types@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-resource@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-switching-pool-types@2017-12-15.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-switching-pool-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/common/src/main/yang/org-openroadm-tca@2018-10-19.yang [changed mode: 0755->0644]
ordmodels/common/src/main/yang/org-openroadm-user-mgmt@2017-12-15.yang [changed mode: 0755->0644]
ordmodels/network/pom.xml
ordmodels/network/src/main/yang/ietf-network-topology@2015-06-08.yang [deleted file]
ordmodels/network/src/main/yang/ietf-network@2015-06-08.yang [deleted file]
ordmodels/network/src/main/yang/org-openroadm-amplifier@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-amplifier@2017-09-29.yang with 80% similarity]
ordmodels/network/src/main/yang/org-openroadm-clli-network@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-clli-network@2017-06-26.yang with 90% similarity]
ordmodels/network/src/main/yang/org-openroadm-common-network@2018-11-30.yang [new file with mode: 0644]
ordmodels/network/src/main/yang/org-openroadm-degree@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-degree@2017-09-29.yang with 80% similarity]
ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-external-pluggable@2017-09-29.yang with 73% similarity]
ordmodels/network/src/main/yang/org-openroadm-link@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-link@2017-09-29.yang with 76% similarity]
ordmodels/network/src/main/yang/org-openroadm-network-topology-types@2018-11-30.yang [new file with mode: 0644]
ordmodels/network/src/main/yang/org-openroadm-network-topology@2017-09-29.yang [deleted file]
ordmodels/network/src/main/yang/org-openroadm-network-topology@2018-11-30.yang [new file with mode: 0644]
ordmodels/network/src/main/yang/org-openroadm-network-types@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network-types@2017-09-29.yang with 66% similarity]
ordmodels/network/src/main/yang/org-openroadm-network@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-network@2017-09-29.yang with 67% similarity]
ordmodels/network/src/main/yang/org-openroadm-opposite-links@2017-09-29.yang [deleted file]
ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2017-09-29.yang [deleted file]
ordmodels/network/src/main/yang/org-openroadm-otn-network-topology@2018-11-30.yang [new file with mode: 0644]
ordmodels/network/src/main/yang/org-openroadm-roadm@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-roadm@2017-09-29.yang with 92% similarity]
ordmodels/network/src/main/yang/org-openroadm-srg@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-srg@2017-09-29.yang with 77% similarity]
ordmodels/network/src/main/yang/org-openroadm-xponder@2018-11-30.yang [moved from ordmodels/network/src/main/yang/org-openroadm-xponder@2017-09-29.yang with 74% similarity]
pce/src/main/java/org/opendaylight/transportpce/pce/MapUtils.java
pce/src/main/java/org/opendaylight/transportpce/pce/PceCalculation.java
pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java
pce/src/main/java/org/opendaylight/transportpce/pce/PceLink.java
pce/src/main/java/org/opendaylight/transportpce/pce/PceNode.java
pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java
pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.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