Add node-info in portmapping structure 96/82996/12
authorGilles Thouenon <gilles.thouenon@orange.com>
Wed, 3 Jul 2019 12:52:55 +0000 (14:52 +0200)
committerguillaume.lambert <guillaume.lambert@orange.com>
Thu, 1 Aug 2019 12:58:20 +0000 (14:58 +0200)
commit9c1c56c8dc12c164601d12f507cf3125eb43780a
tree838318fa3f727410754b8854b036456ba798cf8d
parent3ab12a8fb928c149e4779143ba3d98206a3c6d19
Add node-info in portmapping structure

- change structure of portmapping.yang to put general node info in a
new node-info container that serves to create node in different
network layers (openroadm-cli, openroadm-network, openroadm-topology)
without multiple readings inside device
- adapt code to the new portmapping structure (especially, to get the
node-version)
- remove MappingUtils from PortMappingImpl, olm and renderer unitary
tests
- remove opeenRoadmTopology121 implementation since there is no longer
any device transaction needed to built node/link in openroadm-topology
(only from portMapping)
- disable some renderer UT

JIRA: TRNSPRTPCE-109

Change-Id: Ifa475029c73cb0690ea18d9903b9dead5f0d57f1
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
34 files changed:
api/pom.xml
api/src/main/yang/transportpce-portmapping@2019-07-02.yang [new file with mode: 0644]
common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java
common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java
common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.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/InfoSubtree.java [deleted file]
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 [deleted file]
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java
networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java
olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java
olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/OlmProviderTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtTest.java
olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplDeleteTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplRollbackTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplSetupTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java