outsource flexgrid constants import in functests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibaac844844e7c2113b9f2ddde1e5879cedf862f1

diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py
index 92032039e051c32a54ab30a40d789a0ce9f09cfb..759fdbaa0f2161ac30dbf795281586adcb787904 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test_end2end.py
@@ -17,7 +17,7 @@ import unittest
 
 import requests
 from common import test_utils
-from common.test_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP
+from common.flexgrid_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP, check_freq_map
 
 
 class TransportPCEFulltesting(unittest.TestCase):
@@ -594,7 +594,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         freq_map = base64.b64decode(
             res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
-        self.assertTrue(test_utils.check_freq_map(freq_map), "Index 1 and 2 should be available")
+        self.assertTrue(check_freq_map(freq_map), "Index 1 and 2 should be available")
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
@@ -606,7 +606,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         freq_map = base64.b64decode(
             res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
-        self.assertTrue(test_utils.check_freq_map(freq_map), "Index 1 and 2 should be available")
+        self.assertTrue(check_freq_map(freq_map), "Index 1 and 2 should be available")
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'DEG1-CTP-TXRX':

diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py
index c20b0eba59af0482e52b16f27def9759453aece3..56f1e36324fc437c27ea7cdf4f7bc4c4d2ad2124 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_end2end.py
@@ -15,7 +15,7 @@ import unittest
 import time
 import requests
 from common import test_utils
-from common.test_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP
+from common.flexgrid_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP, check_freq_map
 
 
 class TransportPCEFulltesting(unittest.TestCase):
@@ -555,7 +555,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         freq_map = base64.b64decode(
             res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
-        self.assertTrue(test_utils.check_freq_map(freq_map), "Index 1 and 2 should be available")
+        self.assertTrue(check_freq_map(freq_map), "Index 1 and 2 should be available")
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'DEG2-CTP-TXRX':

diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
index 35e2e379bb91e6aa6b3feb4244ba80ed4d2237a0..71091d284962864f47c74506d1016766f8cf2ac1 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
@@ -17,7 +17,7 @@ import unittest
 import time
 import requests
 from common import test_utils
-from common.test_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP
+from common.flexgrid_utils import INDEX_1_USED_FREQ_MAP, INDEX_1_2_USED_FREQ_MAP, AVAILABLE_FREQ_MAP
 
 
 class TransportPCEtesting(unittest.TestCase):

diff --git a/tests/transportpce_tests/common/flexgrid_utils.py b/tests/transportpce_tests/common/flexgrid_utils.py
new file mode 100644 (file)
index 0000000..f7cff97
--- /dev/null
+++ b/tests/transportpce_tests/common/flexgrid_utils.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+##############################################################################
+# Copyright (c) 2020 Orange, Inc. and others.  All rights reserved.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# pylint: disable=no-member
+
+import base64
+
+def check_freq_map(freq_map):
+    freq_map_array = [int(x) for x in freq_map]
+    return freq_map_array[0] == 255 and freq_map_array[1] == 255
+
+
+def set_used_index_for_freq_map(freq_map, index):
+    freq_map[index] = 0
+    return freq_map
+
+
+INDEX_1_USED_FREQ_MAP = base64.b64encode(set_used_index_for_freq_map(bytearray(b'\xFF' * 96), 0)).decode('UTF-8')
+
+INDEX_1_2_USED_FREQ_MAP = base64.b64encode(set_used_index_for_freq_map(
+    set_used_index_for_freq_map(bytearray(b'\xFF' * 96), 0), 1)).decode('utf-8')
+
+AVAILABLE_FREQ_MAP = base64.b64encode(bytearray(b'\xFF' * 96)).decode('UTF-8')

diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py
index 9d3bfec3eb62c86a8518b42363a68fb906905df0..34238bcc52a3edcc3927d80061d1841fd487a6c7 100644 (file)
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -11,7 +11,6 @@
 
 # pylint: disable=no-member
 
-import base64
 import json
 import os
 import sys
@@ -465,20 +464,3 @@ class TimeOut:
         # pylint: disable=W0622
         signal.alarm(0)
 
-
-def check_freq_map(freq_map):
-    freq_map_array = [int(x) for x in freq_map]
-    return freq_map_array[0] == 255 and freq_map_array[1] == 255
-
-
-def set_used_index_for_freq_map(freq_map, index):
-    freq_map[index] = 0
-    return freq_map
-
-
-INDEX_1_USED_FREQ_MAP = base64.b64encode(set_used_index_for_freq_map(bytearray(b'\xFF' * 96), 0)).decode('UTF-8')
-
-INDEX_1_2_USED_FREQ_MAP = base64.b64encode(set_used_index_for_freq_map(
-    set_used_index_for_freq_map(bytearray(b'\xFF' * 96), 0), 1)).decode('utf-8')
-
-AVAILABLE_FREQ_MAP = base64.b64encode(bytearray(b'\xFF' * 96)).decode('UTF-8')