NBI Component:

- Fixing GitLab CI/CD pipeline

src/nbi/tests/test_ietf_l2vpn.py

@@ -33,7 +33,7 @@ DESCRIPTOR_FILE = 'nbi/tests/data/topology-7router-emu-dummy.json'
 JSON_ADMIN_CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
 ADMIN_CONTEXT_ID = ContextId(**JSON_ADMIN_CONTEXT_ID)
 
-def test_prepare_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
+def test_ietf_l2vpn_prepare_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
     validate_empty_scenario(context_client)
     descriptor_loader = DescriptorLoader(descriptors_file=DESCRIPTOR_FILE, context_client=context_client)
     results = descriptor_loader.process()
@@ -46,22 +46,22 @@ def test_prepare_environment(context_client : ContextClient) -> None: # pylint:
     assert len(response.service_ids ) == 0
     assert len(response.slice_ids   ) == 0
 
-def test_create_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
+def test_ietf_l2vpn_create_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
     osm_wim.create_connectivity_service(SERVICE_TYPE, SERVICE_CONNECTION_POINTS_1)
 
-def test_get_service_status(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
+def test_ietf_l2vpn_get_service_status(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
     service_uuid = list(osm_wim.conn_info.keys())[0] # this test adds a single service
     osm_wim.get_connectivity_service_status(service_uuid)
 
-def test_edit_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
+def test_ietf_l2vpn_edit_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
     service_uuid = list(osm_wim.conn_info.keys())[0] # this test adds a single service
     osm_wim.edit_connectivity_service(service_uuid, SERVICE_CONNECTION_POINTS_2)
 
-def test_delete_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
+def test_ietf_l2vpn_delete_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name
     service_uuid = list(osm_wim.conn_info.keys())[0] # this test adds a single service
     osm_wim.delete_connectivity_service(service_uuid)
 
-def test_cleanup_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
+def test_ietf_l2vpn_cleanup_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
     # Verify the scenario has no services/slices
     response = context_client.GetContext(ADMIN_CONTEXT_ID)
     assert len(response.topology_ids) == 1

src/nbi/tests/test_ietf_network.py

@@ -14,16 +14,15 @@
 
 from typing import Dict
 import deepdiff, json, logging, operator
-from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
-from common.proto.context_pb2 import ContextId, TopologyId
+from common.Constants import DEFAULT_CONTEXT_NAME
 from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_load_results, validate_empty_scenario
 from common.tools.object_factory.Context import json_context_id
-from common.tools.object_factory.Topology import json_topology_id
 from context.client.ContextClient import ContextClient
 from nbi.service.rest_server import RestServer
 from .PrepareTestScenario import ( # pylint: disable=unused-import
     # be careful, order of symbols is important here!
-    do_rest_get_request, mock_service, nbi_service_rest, osm_wim, context_client)
+    do_rest_get_request, mock_service, nbi_service_rest, osm_wim, context_client
+)
 
 LOGGER = logging.getLogger(__name__)
 LOGGER.setLevel(logging.DEBUG)
@@ -33,9 +32,8 @@ TARGET_DATA_FILE = 'nbi/tests/data/test-ietf-network.json'
 
 JSON_ADMIN_CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
 ADMIN_CONTEXT_ID = ContextId(**JSON_ADMIN_CONTEXT_ID)
-ADMIN_TOPOLOGY_ID = TopologyId(**json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=JSON_ADMIN_CONTEXT_ID))
 
-def test_prepare_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
+def test_ietf_network_prepare_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
     validate_empty_scenario(context_client)
     descriptor_loader = DescriptorLoader(descriptors_file=DESCRIPTOR_FILE, context_client=context_client)
     results = descriptor_loader.process()
@@ -75,7 +73,7 @@ def sort_data(data : Dict) -> None:
                 key=operator.itemgetter('link-id')
             )
 
-def test_rest_get_networks(nbi_service_rest : RestServer): # pylint: disable=redefined-outer-name, unused-argument
+def test_ietf_network_rest_get_networks(nbi_service_rest : RestServer): # pylint: disable=redefined-outer-name, unused-argument
     with open(TARGET_DATA_FILE, 'r', encoding='UTF-8') as f:
         target_data = json.load(f)
     URL = '/restconf/data/ietf-network:networks'
@@ -86,7 +84,7 @@ def test_rest_get_networks(nbi_service_rest : RestServer): # pylint: disable=red
     LOGGER.error('Differences:\n{:s}'.format(str(diff_data.pretty())))
     assert len(diff_data) == 0
 
-def test_cleanup_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
+def test_ietf_network_cleanup_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name
     # Verify the scenario has no services/slices
     response = context_client.GetContext(ADMIN_CONTEXT_ID)
     assert len(response.topology_ids) == 1