Revert "Device renderer functional tests intermediate rate" 43/99043/1
authorGuillaume Lambert <guillaume.lambert@orange.com>
Fri, 28 Jan 2022 22:45:10 +0000 (22:45 +0000)
committerGuillaume Lambert <guillaume.lambert@orange.com>
Fri, 28 Jan 2022 22:45:10 +0000 (22:45 +0000)
This reverts commit 2ca7fed08ba82bf718c9805ea4eca1e2b6a8b147.

Reason for revert: comments acked without any answer, not enough time let for other committers review

Change-Id: I29e9f66de98e5462ec5dc2874f39d2aa1daeea10

tests/transportpce_tests/7.1/test02_device_renderer.py [deleted file]
tests/transportpce_tests/common/test_utils.py
tests/transportpce_tests/common/test_utils_rfc8040.py

diff --git a/tests/transportpce_tests/7.1/test02_device_renderer.py b/tests/transportpce_tests/7.1/test02_device_renderer.py
deleted file mode 100644 (file)
index d941aea..0000000
+++ /dev/null
@@ -1,801 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-# Copyright (c) 2022 AT&T, 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
-# pylint: disable=too-many-public-methods
-
-import unittest
-import time
-import requests
-# pylint: disable=wrong-import-order
-import sys
-sys.path.append('transportpce_tests/common')
-# pylint: disable=wrong-import-position
-# pylint: disable=import-error
-import test_utils  # nopep8
-import test_utils_rfc8040  # nopep8
-
-
-class TransportPCE400GPortMappingTesting(unittest.TestCase):
-
-    processes = None
-    NETWORK2_CHECK_DICT = {"logical-connection-point": "XPDR2-NETWORK1",
-                           "supporting-port": "L1",
-                           "supported-interface-capability": [
-                               "org-openroadm-port-types:if-otsi-otsigroup"
-                           ],
-                           "port-direction": "bidirectional",
-                           "port-qual": "switch-network",
-                           "supporting-circuit-pack-name": "1/2/2-PLUG-NET",
-                           "xponder-type": "mpdr",
-                           'lcp-hash-val': 'LY9PxYJqUbw=',
-                           'port-admin-state': 'InService',
-                           'port-oper-state': 'InService'}
-    NODE_VERSION = '7.1'
-
-    @classmethod
-    def setUpClass(cls):
-        cls.processes = test_utils_rfc8040.start_tpce()
-        cls.processes = test_utils_rfc8040.start_sims([('xpdra2', cls.NODE_VERSION)])
-
-    @classmethod
-    def tearDownClass(cls):
-        # pylint: disable=not-an-iterable
-        for process in cls.processes:
-            test_utils_rfc8040.shutdown_process(process)
-        print("all processes killed")
-
-    def setUp(self):
-        # pylint: disable=consider-using-f-string
-        print("execution of {}".format(self.id().split(".")[-1]))
-        time.sleep(10)
-
-    def test_01_xpdr_device_connection(self):
-        response = test_utils_rfc8040.mount_device("XPDR-A2",
-                                                   ('xpdra2', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created,
-                         test_utils_rfc8040.CODE_SHOULD_BE_201)
-
-    # Check if the node appears in the ietf-network topology
-    # this test has been removed, since it already exists in port-mapping
-    # 1a) create a OTUC2 device renderer
-    def test_02_service_path_create_otuc2(self):
-        response = test_utils.service_path_request("create", "service_OTUC2", "0",
-                                                   [{"node-id": "XPDR-A2", "dest-tp": "XPDR2-NETWORK1"}],
-                                                   196.1, 75, 196.0375, 196.125, 755,
-                                                   768, "dp-qpsk")
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Interfaces created successfully for nodes: ', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-        self.assertIn(
-            {'node-id': 'XPDR-A2',
-             'otu-interface-id': ['XPDR2-NETWORK1-OTUC2'],
-             'och-interface-id': ['XPDR2-NETWORK1-OTSIGROUP-200G']}, res["output"]['node-interface'])
-
-    def test_03_get_portmapping_network1(self):
-        response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-NETWORK1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.NETWORK2_CHECK_DICT["supporting-otucn"] = "XPDR2-NETWORK1-OTUC2"
-        self.assertIn(
-            self.NETWORK2_CHECK_DICT,
-            res['mapping'])
-
-    def test_04_check_interface_otsi(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-755:768',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        'type': 'org-openroadm-interfaces:otsi',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {
-            "frequency": 196.0812,
-            "otsi-rate": "org-openroadm-common-optical-channel-types:R200G-otsi",
-            "fec": "org-openroadm-common-types:ofec",
-            "transmit-power": -5,
-            "provision-mode": "explicit",
-            "modulation-format": "dp-qpsk"}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
-        self.assertDictEqual({"foic-type": "org-openroadm-common-optical-channel-types:foic2.4", "iid": [1, 2]},
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo'])
-
-    def test_05_check_interface_otsig(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-200G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-200G',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        ['supporting-interface-list'][0]: 'XPDR2-NETWORK1-755:768',
-                        'type': 'org-openroadm-interfaces:otsi-group',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {"group-id": 1,
-                        "group-rate": "org-openroadm-common-optical-channel-types:R200G-otsi"}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']),
-                             res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group'])
-
-    def test_06_check_interface_otuc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC2',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        ['supporting-interface-list'][0]: 'XPDR2-NETWORK1-OTSIGROUP-200G',
-                        'type': 'org-openroadm-interfaces:otnOtu',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {"rate": "org-openroadm-otn-common-types:OTUCn",
-                        "degthr-percentage": 100,
-                        "tim-detect-mode": "Disabled",
-                        "otucn-n-rate": 2,
-                        "degm-intervals": 2}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
-                             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
-
-    # 1b) create a ODUC2 device renderer
-    def test_07_otn_service_path_create_oduc2(self):
-        response = test_utils.otn_service_path_request("create", "service_ODUC2", "200", "ODU",
-                                                       [{"node-id": "XPDR-A2", "network-tp": "XPDR2-NETWORK1"}])
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-        self.assertIn(
-            {'node-id': 'XPDR-A2',
-             'odu-interface-id': ['XPDR2-NETWORK1-ODUC2']}, res["output"]['node-interface'])
-
-    def test_08_get_portmapping_network1(self):
-        response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-NETWORK1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.NETWORK2_CHECK_DICT["supporting-oducn"] = "XPDR2-NETWORK1-ODUC2"
-        self.assertIn(
-            self.NETWORK2_CHECK_DICT,
-            res['mapping'])
-
-    def test_09_check_interface_oduc2(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-ODUC2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC2',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        'supporting-interface-list': 'XPDR2-NETWORK1-OTUC2',
-                        'type': 'org-openroadm-interfaces:otnOdu',
-                        'supporting-port': 'L1'}
-
-        input_dict_2 = {'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
-                        'rate': 'org-openroadm-otn-common-types:ODUCn',
-                        'tx-sapi': 'LY9PxYJqUbw=',
-                        'tx-dapi': 'LY9PxYJqUbw=',
-                        'expected-sapi': 'LY9PxYJqUbw=',
-                        'expected-dapi': 'LY9PxYJqUbw=',
-                        "degm-intervals": 2,
-                        "degthr-percentage": 100,
-                        "monitoring-mode": "terminated",
-                        "oducn-n-rate": 2
-                        }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
-        self.assertDictEqual(
-            {'payload-type': '22', 'exp-payload-type': '22'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-
-    # 1c) create Ethernet device renderer
-    def test_10_otn_service_path_create_100ge(self):
-        response = test_utils.otn_service_path_request("create", "service_Ethernet", "100", "Ethernet",
-                                                       [{"node-id": "XPDR-A2", "client-tp": "XPDR2-CLIENT1",
-                                                         "network-tp": "XPDR2-NETWORK1"}],
-                                                       {"ethernet-encoding": "eth encode",
-                                                        "opucn-trib-slots": [
-                                                            "1.1",
-                                                            "1.20"
-                                                        ]})
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-        self.assertEqual('XPDR-A2', res["output"]['node-interface'][0]['node-id'])
-        self.assertIn('XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet',
-                      res["output"]['node-interface'][0]['connection-id'])
-        self.assertIn('XPDR2-CLIENT1-ETHERNET-100G', res["output"]['node-interface'][0]['eth-interface-id'])
-        self.assertIn('XPDR2-NETWORK1-ODU4-service_Ethernet', res["output"]['node-interface'][0]['odu-interface-id'])
-        self.assertIn('XPDR2-CLIENT1-ODU4-service_Ethernet', res["output"]['node-interface'][0]['odu-interface-id'])
-
-    def test_11_check_interface_100ge_client(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
-                        'type': 'org-openroadm-interfaces:ethernetCsmacd',
-                        'supporting-port': 'C1'
-                        }
-        input_dict_2 = {'speed': 100000}
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
-                             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
-
-    def test_12_check_interface_odu4_client(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4-service_Ethernet")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service_Ethernet',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
-                        'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G',
-                        'type': 'org-openroadm-interfaces:otnOdu',
-                        'supporting-port': 'C1'}
-        input_dict_2 = {
-            'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP',
-            'rate': 'org-openroadm-otn-common-types:ODU4',
-            'monitoring-mode': 'terminated'}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
-        self.assertDictEqual(
-            {'payload-type': '07', 'exp-payload-type': '07'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-
-    def test_13_check_interface_odu4_network(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4-service_Ethernet")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4-service_Ethernet',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        'supporting-interface-list': 'XPDR2-NETWORK1-ODUC2',
-                        'type': 'org-openroadm-interfaces:otnOdu',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {
-            'odu-function': 'org-openroadm-otn-common-types:ODU-CTP',
-            'rate': 'org-openroadm-otn-common-types:ODU4',
-            'monitoring-mode': 'not-terminated'}
-        input_dict_3 = {'trib-port-number': 1}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
-        self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
-                                      'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
-        self.assertIn('1.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
-                      ['opucn-trib-slots'])
-        self.assertIn('1.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
-                      ['opucn-trib-slots'])
-
-    def test_14_check_odu_connection_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2",
-            "odu-connection/XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {
-            'connection-name':
-            'XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet',
-            'direction': 'bidirectional'
-        }
-
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
-        self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4-service_Ethernet'},
-                             res['odu-connection'][0]['destination'])
-        self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4-service_Ethernet'},
-                             res['odu-connection'][0]['source'])
-
-    # 1d) Delete Ethernet device interfaces
-    def test_15_otn_service_path_delete_100ge(self):
-        response = test_utils.otn_service_path_request("delete", "service_Ethernet", "100", "Ethernet",
-                                                       [{"node-id": "XPDR-A2", "client-tp": "XPDR2-CLIENT1",
-                                                         "network-tp": "XPDR2-NETWORK1"}],
-                                                       {"ethernet-encoding": "eth encode",
-                                                        "trib-slot": ["1"], "trib-port-number": "1"})
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Request processed', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-
-    def test_16_check_no_odu_connection(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2",
-            "odu-connection/XPDR2-CLIENT1-ODU4-service_Ethernet-x-XPDR2-NETWORK1-ODU4-service_Ethernet")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_17_check_no_interface_odu_network(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-ODU4-service_Ethernet")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_18_check_no_interface_odu_client(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-CLIENT1-ODU4-service_Ethernet")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_19_check_no_interface_100ge_client(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    # 1e) Delete ODUC2 device interfaces
-    def test_20_otn_service_path_delete_oduc2(self):
-        response = test_utils.otn_service_path_request("delete", "service_ODUC2", "200", "ODU",
-                                                       [{"node-id": "XPDR-A2", "network-tp": "XPDR2-NETWORK1"}])
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Request processed', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-
-    def test_21_check_no_interface_oduc2(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-ODUC2")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    # 1f) Delete OTUC2 device interfaces
-    def test_22_service_path_delete_otuc2(self):
-        response = test_utils.service_path_request("delete", "service_OTUC2", "0",
-                                                   [{"node-id": "XPDR-A2", "dest-tp": "XPDR2-NETWORK1"}],
-                                                   196.1, 75, 196.0375, 196.125, 755,
-                                                   768, "dp-qpsk")
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Request processed', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-
-    def test_23_check_no_interface_otuc2(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-OTUC2")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_24_check_no_interface_otsig(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-OTSIGROUP-200G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_25_check_no_interface_otsi(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    # 2a) create a OTUC3 device renderer
-    def test_26_service_path_create_otuc3(self):
-        response = test_utils.service_path_request("create", "service_OTUC3", "0",
-                                                   [{"node-id": "XPDR-A2", "dest-tp": "XPDR2-NETWORK1"}],
-                                                   196.1, 75, 196.0375, 196.125, 755,
-                                                   768, "dp-qam8")
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Interfaces created successfully for nodes: ', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-        self.assertIn(
-            {'node-id': 'XPDR-A2',
-             'otu-interface-id': ['XPDR2-NETWORK1-OTUC3'],
-             'och-interface-id': ['XPDR2-NETWORK1-OTSIGROUP-300G']}, res["output"]['node-interface'])
-
-    def test_27_get_portmapping_network1(self):
-        response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-NETWORK1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.NETWORK2_CHECK_DICT["supporting-otucn"] = "XPDR2-NETWORK1-OTUC3"
-        self.assertIn(
-            self.NETWORK2_CHECK_DICT,
-            res['mapping'])
-
-    def test_28_check_interface_otsi(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-755:768',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        'type': 'org-openroadm-interfaces:otsi',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {
-            "frequency": 196.0812,
-            "otsi-rate": "org-openroadm-common-optical-channel-types:R300G-otsi",
-            "fec": "org-openroadm-common-types:ofec",
-            "transmit-power": -5,
-            "provision-mode": "explicit",
-            "modulation-format": "dp-qam8"}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
-        self.assertDictEqual({"foic-type": "org-openroadm-common-optical-channel-types:foic3.6", "iid": [1, 2, 3]},
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo'])
-
-    def test_29_check_interface_otsig(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-300G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-300G',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        ['supporting-interface-list'][0]: 'XPDR2-NETWORK1-755:768',
-                        'type': 'org-openroadm-interfaces:otsi-group',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {"group-id": 1,
-                        "group-rate": "org-openroadm-common-optical-channel-types:R300G-otsi"}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']),
-                             res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group'])
-
-    def test_30_check_interface_otuc3(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC3")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC3',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        ['supporting-interface-list'][0]: 'XPDR2-NETWORK1-OTSIGROUP-300G',
-                        'type': 'org-openroadm-interfaces:otnOtu',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {"rate": "org-openroadm-otn-common-types:OTUCn",
-                        "degthr-percentage": 100,
-                        "tim-detect-mode": "Disabled",
-                        "otucn-n-rate": 3,
-                        "degm-intervals": 2}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
-                             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
-
-    # 2b) create a ODUC3 device renderer
-    def test_31_otn_service_path_create_oduc3(self):
-        response = test_utils.otn_service_path_request("create", "service_ODUC3", "300", "ODU",
-                                                       [{"node-id": "XPDR-A2", "network-tp": "XPDR2-NETWORK1"}])
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-        self.assertIn(
-            {'node-id': 'XPDR-A2',
-             'odu-interface-id': ['XPDR2-NETWORK1-ODUC3']}, res["output"]['node-interface'])
-
-    def test_32_get_portmapping_network1(self):
-        response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-NETWORK1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.NETWORK2_CHECK_DICT["supporting-oducn"] = "XPDR2-NETWORK1-ODUC3"
-        self.assertIn(
-            self.NETWORK2_CHECK_DICT,
-            res['mapping'])
-
-    def test_33_check_interface_oduc3(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-ODUC3")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC3',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        'supporting-interface-list': 'XPDR2-NETWORK1-OTUC3',
-                        'type': 'org-openroadm-interfaces:otnOdu',
-                        'supporting-port': 'L1'}
-
-        input_dict_2 = {'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
-                        'rate': 'org-openroadm-otn-common-types:ODUCn',
-                        'tx-sapi': 'LY9PxYJqUbw=',
-                        'tx-dapi': 'LY9PxYJqUbw=',
-                        'expected-sapi': 'LY9PxYJqUbw=',
-                        'expected-dapi': 'LY9PxYJqUbw=',
-                        "degm-intervals": 2,
-                        "degthr-percentage": 100,
-                        "monitoring-mode": "terminated",
-                        "oducn-n-rate": 3
-                        }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
-        self.assertDictEqual(
-            {'payload-type': '22', 'exp-payload-type': '22'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-
-    # 2c) create Ethernet device renderer
-    # No change in the ethernet device renderer so skipping those tests
-    # 2d) Delete Ethernet device interfaces
-    # No change in the ethernet device renderer so skipping those tests
-
-    # 2e) Delete ODUC3 device interfaces
-    def test_34_otn_service_path_delete_oduc3(self):
-        response = test_utils.otn_service_path_request("delete", "service_ODUC3", "300", "ODU",
-                                                       [{"node-id": "XPDR-A2", "network-tp": "XPDR2-NETWORK1"}])
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Request processed', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-
-    def test_35_check_no_interface_oduc3(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-ODUC3")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    # 2f) Delete OTUC3 device interfaces
-    def test_36_service_path_delete_otuc3(self):
-        response = test_utils.service_path_request("delete", "service_OTUC3", "0",
-                                                   [{"node-id": "XPDR-A2", "dest-tp": "XPDR2-NETWORK1"}],
-                                                   196.1, 75, 196.0375, 196.125, 755,
-                                                   768, "dp-qam8")
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Request processed', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-
-    def test_37_check_no_interface_otuc3(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-OTUC3")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_38_check_no_interface_otsig(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-OTSIGROUP-300G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_39_check_no_interface_otsi(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    # 3a) create a OTUC4 device renderer
-    def test_40_service_path_create_otuc3(self):
-        response = test_utils.service_path_request("create", "service_OTUC4", "0",
-                                                   [{"node-id": "XPDR-A2", "dest-tp": "XPDR2-NETWORK1"}],
-                                                   196.1, 75, 196.0375, 196.125, 755,
-                                                   768, "dp-qam16")
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Interfaces created successfully for nodes: ', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-        self.assertIn(
-            {'node-id': 'XPDR-A2',
-             'otu-interface-id': ['XPDR2-NETWORK1-OTUC4'],
-             'och-interface-id': ['XPDR2-NETWORK1-OTSIGROUP-400G']}, res["output"]['node-interface'])
-
-    def test_41_get_portmapping_network1(self):
-        response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-NETWORK1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.NETWORK2_CHECK_DICT["supporting-otucn"] = "XPDR2-NETWORK1-OTUC4"
-        self.assertIn(
-            self.NETWORK2_CHECK_DICT,
-            res['mapping'])
-
-    def test_42_check_interface_otsi(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-755:768',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        'type': 'org-openroadm-interfaces:otsi',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {
-            "frequency": 196.0812,
-            "otsi-rate": "org-openroadm-common-optical-channel-types:R400G-otsi",
-            "fec": "org-openroadm-common-types:ofec",
-            "transmit-power": -5,
-            "provision-mode": "explicit",
-            "modulation-format": "dp-qam16"}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
-        self.assertDictEqual({"foic-type": "org-openroadm-common-optical-channel-types:foic4.8", "iid": [1, 2, 3, 4]},
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo'])
-
-    def test_43_check_interface_otsig(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        ['supporting-interface-list'][0]: 'XPDR2-NETWORK1-755:768',
-                        'type': 'org-openroadm-interfaces:otsi-group',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {"group-id": 1,
-                        "group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']),
-                             res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group'])
-
-    def test_44_check_interface_otuc4(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC4',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        ['supporting-interface-list'][0]: 'XPDR2-NETWORK1-OTSIGROUP-400G',
-                        'type': 'org-openroadm-interfaces:otnOtu',
-                        'supporting-port': 'L1'}
-        input_dict_2 = {"rate": "org-openroadm-otn-common-types:OTUCn",
-                        "degthr-percentage": 100,
-                        "tim-detect-mode": "Disabled",
-                        "otucn-n-rate": 4,
-                        "degm-intervals": 2}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
-                             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
-
-    # 3b) create a ODUC4 device renderer
-    def test_45_otn_service_path_create_oduc3(self):
-        response = test_utils.otn_service_path_request("create", "service_ODUC4", "400", "ODU",
-                                                       [{"node-id": "XPDR-A2", "network-tp": "XPDR2-NETWORK1"}])
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-        self.assertIn(
-            {'node-id': 'XPDR-A2',
-             'odu-interface-id': ['XPDR2-NETWORK1-ODUC4']}, res["output"]['node-interface'])
-
-    def test_46_get_portmapping_network1(self):
-        response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-NETWORK1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.NETWORK2_CHECK_DICT["supporting-oducn"] = "XPDR2-NETWORK1-ODUC4"
-        self.assertIn(
-            self.NETWORK2_CHECK_DICT,
-            res['mapping'])
-
-    def test_47_check_interface_oduc4(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC4',
-                        'administrative-state': 'inService',
-                        'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
-                        'supporting-interface-list': 'XPDR2-NETWORK1-OTUC4',
-                        'type': 'org-openroadm-interfaces:otnOdu',
-                        'supporting-port': 'L1'}
-
-        input_dict_2 = {'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
-                        'rate': 'org-openroadm-otn-common-types:ODUCn',
-                        'tx-sapi': 'LY9PxYJqUbw=',
-                        'tx-dapi': 'LY9PxYJqUbw=',
-                        'expected-sapi': 'LY9PxYJqUbw=',
-                        'expected-dapi': 'LY9PxYJqUbw=',
-                        "degm-intervals": 2,
-                        "degthr-percentage": 100,
-                        "monitoring-mode": "terminated",
-                        "oducn-n-rate": 4
-                        }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
-        self.assertDictEqual(
-            {'payload-type': '22', 'exp-payload-type': '22'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-
-    # 3c) create Ethernet device renderer
-    # No change in the ethernet device renderer so skipping those tests
-    # 3d) Delete Ethernet device interfaces
-    # No change in the ethernet device renderer so skipping those tests
-
-    # 3e) Delete ODUC4 device interfaces
-    def test_48_otn_service_path_delete_oduc4(self):
-        response = test_utils.otn_service_path_request("delete", "service_ODUC4", "400", "ODU",
-                                                       [{"node-id": "XPDR-A2", "network-tp": "XPDR2-NETWORK1"}])
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Request processed', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-
-    def test_49_check_no_interface_oduc4(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    # 3f) Delete OTUC4 device interfaces
-    def test_50_service_path_delete_otuc4(self):
-        response = test_utils.service_path_request("delete", "service_OTUC4", "0",
-                                                   [{"node-id": "XPDR-A2", "dest-tp": "XPDR2-NETWORK1"}],
-                                                   196.1, 75, 196.0375, 196.125, 755,
-                                                   768, "dp-qam16")
-        time.sleep(3)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Request processed', res["output"]["result"])
-        self.assertTrue(res["output"]["success"])
-
-    def test_51_check_no_interface_otuc4(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_52_check_no_interface_otsig(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    def test_53_check_no_interface_otsi(self):
-        response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-
-    # Disconnect the XPDR
-    def test_54_xpdr_device_disconnection(self):
-        response = test_utils_rfc8040.unmount_device("XPDR-A2")
-        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
-
-    def test_55_xpdr_device_disconnected(self):
-        response = test_utils_rfc8040.check_device_connection("XPDR-A2")
-        self.assertEqual(response['status_code'], requests.codes.conflict)
-        self.assertIn(response['connection-status']['error-type'], ('protocol', 'application'))
-        self.assertEqual(response['connection-status']['error-tag'], 'data-missing')
-        self.assertEqual(response['connection-status']['error-message'],
-                         'Request could not be completed because the relevant data model content does not exist')
-
-    def test_56_xpdr_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-A2")
-        self.assertEqual(response['status_code'], requests.codes.conflict)
-        self.assertIn(response['node-info']['error-type'], ('protocol', 'application'))
-        self.assertEqual(response['node-info']['error-tag'], 'data-missing')
-        self.assertEqual(response['node-info']['error-message'],
-                         'Request could not be completed because the relevant data model content does not exist')
-
-
-if __name__ == '__main__':
-    unittest.main(verbosity=2)
index d9ecfc2116349a8f2b79711eb5d7ff2a434c065b..b6eb71cae984a48e667c214325739246cd8ee19e 100644 (file)
@@ -433,11 +433,11 @@ def service_delete_request(servicename: str,
 
 def service_path_request(operation: str, servicename: str, wavenumber: str, nodes, centerfreq: str,
                          slotwidth: int, minfreq: float, maxfreq: float, lowerslotnumber: int,
-                         higherslotnumber: int, modulation_format="dp-qpsk"):
+                         higherslotnumber: int):
     attr = {"renderer:input": {
         "renderer:service-name": servicename,
         "renderer:wave-number": wavenumber,
-        "renderer:modulation-format": modulation_format,
+        "renderer:modulation-format": "dp-qpsk",
         "renderer:operation": operation,
         "renderer:nodes": nodes,
         "renderer:center-freq": centerfreq,
index f50897bd77d32f35b881aecff2bf6ba225436d50..b2cfc4c4c75599fb626f9699dd289ca9a4ce7feb 100644 (file)
@@ -51,7 +51,7 @@ process_list = []
 if 'USE_ODL_ALT_RESTCONF_PORT' in os.environ:
     RESTCONF_PORT = os.environ['USE_ODL_ALT_RESTCONF_PORT']
 else:
-    RESTCONF_PORT = str(8181)
+    RESTCONF_PORT = 8181
 
 RESTCONF_PATH_PREFIX = {'rfc8040': '/rests',
                         'draft-bierman02': '/restconf'}