From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Fri, 29 Jul 2022 09:35:49 +0000 (+0000)
Subject: Merge changes I8b6da9f3,I425a1d19,Ia3dfe19f,Idd68c408,I73f0c083, ...
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain

Merge changes I8b6da9f3,I425a1d19,Ia3dfe19f,Idd68c408,I73f0c083, ...

* changes:
  Migrate OTN E2E functional tests to RFC8040 step 6
  Migrate OTN E2E functional tests to RFC8040 step 5
  Migrate OTN E2E functional tests to RFC8040 step 4
  Migrate OTN E2E functional tests to RFC8040 step 3
  Migrate OTN E2E functional tests to RFC8040 step 2
  Migrate OTN E2E functional tests to RFC8040 step 1
---

0a27df8c4c1c62cc0de952d96304ffd09d6bef51
diff --cc tests/transportpce_tests/2.2.1/test11_otn_end2end.py
index feb95046d,07a493a5e..f91440c2e
--- a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
@@@ -413,20 -402,17 +402,17 @@@ class TransportPCEtesting(unittest.Test
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-         time.sleep(3)
  
      def test_22_check_otn_topo_otu4_links(self):
-         response = test_utils.get_otn_topo_request()
-         self.assertEqual(response.status_code, requests.codes.ok)
-         res = response.json()
-         nb_links = len(res['network'][0]['ietf-network-topology:link'])
-         self.assertEqual(nb_links, 2)
+         response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+         self.assertEqual(response['status_code'], requests.codes.ok)
+         self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2)
          listLinkId = ['OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                        'OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1']
-         for link in res['network'][0]['ietf-network-topology:link']:
+         for link in response['network'][0]['ietf-network-topology:link']:
              self.assertIn(link['link-id'], listLinkId)
              self.assertEqual(
 -                link['transportpce-topology:otn-link-type'], 'OTU4')
 +                link['transportpce-networkutils:otn-link-type'], 'OTU4')
              self.assertEqual(
                  link['org-openroadm-common-network:link-type'], 'OTN-LINK')
              self.assertEqual(