From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Wed, 17 Jul 2019 07:48:07 +0000 (+0200)
Subject: Update renderer functional tests
X-Git-Tag: 0.4.0~29
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=refs%2Fchanges%2F77%2F83077%2F12

Update renderer functional tests

To take into acount the new mapping result

JIRA: TRNSPRTPCE-109

Change-Id: I9401e7424f103b1ef3242098cd65a9466d9574da
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
---

diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
index 33c9a5543..7fab622dd 100644
--- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
@@ -140,11 +140,11 @@ class TransportPCERendererTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
              {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
-              'logical-connection-point': 'DEG1-TTP-TXRX'},
+              'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
              res['nodes'][0]['mapping'])
         self.assertIn(
              {'supporting-port': 'C7', 'supporting-circuit-pack-name': '4/0',
-              'logical-connection-point': 'SRG1-PP7-TXRX'},
+              'logical-connection-point': 'SRG1-PP7-TXRX', 'port-direction': 'bidirectional'},
              res['nodes'][0]['mapping'])
 
     def test_04_xpdr_portmapping(self):
@@ -158,12 +158,14 @@ class TransportPCERendererTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
              {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'logical-connection-point': 'XPDR1-NETWORK1'},
+              'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
+              'associated-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'},
              res['nodes'][0]['mapping'])
         self.assertIn(
              {'supporting-port': 'C1',
               'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
-              'logical-connection-point': 'XPDR1-CLIENT1'},
+              'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
+              'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
              res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):
diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
index c8211fa38..373b2d877 100644
--- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
@@ -140,11 +140,11 @@ class TransportPCERendererTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
              {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0',
-              'logical-connection-point': 'DEG1-TTP-TXRX'},
+              'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
              res['nodes'][0]['mapping'])
         self.assertIn(
              {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0',
-              'logical-connection-point': 'SRG1-PP3-TXRX'},
+              'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional'},
              res['nodes'][0]['mapping'])
 
     def test_04_xpdr_portmapping(self):
@@ -158,12 +158,14 @@ class TransportPCERendererTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
              {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'logical-connection-point': 'XPDR1-NETWORK1'},
+              'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network',
+              'port-direction': 'bidirectional', 'associated-lcp': 'XPDR1-CLIENT1'},
              res['nodes'][0]['mapping'])
         self.assertIn(
              {'supporting-port': 'C1',
               'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
-              'logical-connection-point': 'XPDR1-CLIENT1'},
+              'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
+              'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
              res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):