Portmapping-topologies code consolidation 90/86990/14
authorGilles Thouenon <gilles.thouenon@orange.com>
Fri, 17 Jan 2020 10:41:30 +0000 (11:41 +0100)
committerguillaume.lambert <guillaume.lambert@orange.com>
Sat, 25 Jan 2020 00:32:19 +0000 (01:32 +0100)
commite5480799d2f666999f2ae5cd7a874aa78d648a60
treecec9e366da39edaa546a233710ac4ae03974c1cd
parente77d02c00813e934ddc697802e53c5be7118aab4
Portmapping-topologies code consolidation

Refactor otn-topology code to avoid any access to OpenROADM device
configuration during node creation. To that purpose:
- review code related to all topology layers to use static methods
- add new class OtnNode to help creation of different otn-nodes in
  otn-topology
- change code to create otn node in otn-topology distinguishing tpdr,
  switch, mpdr
- adapt openroadm-topology to make appear network tp of otn switch/mpdr
  nodes
- remove from openroadm-topology tail-equipment-id for xpdr nodes
- adapt pce code consequently
- add tail-equipment-id with ROADM-SRG-PP info on tp of xpdr node when
  creating XPONDER-INPUT/OUTPUT links in openroadm-topology
- adapt functional tests consequently to all these modifications
- deactivate test 33 from end2end functional tests since the deletion of
  the "tail-equipment-id" from the topology is not fully implemented yet

JIRA: TRNSPRTPCE-177
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule.com>
Change-Id: I45bb0f06b0bae87af10164addbdedc3ab79dba36
29 files changed:
common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.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/dto/OtnTopoNode.java [new file with mode: 0644]
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/OpenRoadmFactory.java [deleted file]
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java [new file with mode: 0644]
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology22.java [deleted file]
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java [moved from networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java with 59% similarity]
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/TpceNetwork.java [new file with mode: 0644]
networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java
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/1.2.1/test_topology.py
tests/transportpce_tests/2.2.1/test_end2end.py
tests/transportpce_tests/2.2.1/test_otn_topology.py
tests/transportpce_tests/2.2.1/test_portmapping.py
tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
tests/transportpce_tests/2.2.1/test_topology.py