Commit c622f31f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NBI Component: 

- Unit test cosmetic cleanup
parent 16c36229

src/nbi/tests/test_ietf_l2vpn.py

+6 −6
Original line number Diff line number Diff line
@@ -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_ietf_l2vpn_prepare_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name

def test_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_ietf_l2vpn_prepare_environment(context_client : ContextClient) -> None: 
    assert len(response.service_ids ) == 0

    assert len(response.slice_ids   ) == 0



def test_ietf_l2vpn_create_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name

def test_create_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name

    osm_wim.create_connectivity_service(SERVICE_TYPE, SERVICE_CONNECTION_POINTS_1)



def test_ietf_l2vpn_get_service_status(osm_wim : MockOSM): # pylint: disable=redefined-outer-name

def test_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_ietf_l2vpn_edit_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name

def test_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_ietf_l2vpn_delete_service(osm_wim : MockOSM): # pylint: disable=redefined-outer-name

def test_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_ietf_l2vpn_cleanup_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name

def test_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

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 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)



def test_ietf_network_prepare_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name

def test_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()
@@ -74,7 +74,7 @@ def sort_data(data : Dict) -> None: 
                key=operator.itemgetter('link-id')

            )



def test_ietf_network_rest_get_networks(nbi_service_rest : RestServer): # pylint: disable=redefined-outer-name, unused-argument

def test_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'
@@ -85,7 +85,7 @@ def test_ietf_network_rest_get_networks(nbi_service_rest : RestServer): # pylint 
    LOGGER.error('Differences:\n{:s}'.format(str(diff_data.pretty())))

    assert len(diff_data) == 0



def test_ietf_network_cleanup_environment(context_client : ContextClient) -> None: # pylint: disable=redefined-outer-name

def test_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