Commit 35f5472a authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

OFC22/ECOC22 end-to-end integration test: 

- Added checks to validate services are active
parent b2b37d5a

src/tests/ecoc22/tests/test_functional_create_service.py

+6 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
import logging, os



from common.Constants import DEFAULT_CONTEXT_NAME

from common.proto.context_pb2 import ContextId, ServiceTypeEnum

from common.proto.context_pb2 import ContextId, ServiceStatusEnum, ServiceTypeEnum

from common.tools.descriptor.Loader import DescriptorLoader

from common.tools.grpc.Tools import grpc_message_to_json_string

from common.tools.object_factory.Context import json_context_id
@@ -67,3 +67,8 @@ def test_service_creation(context_client : ContextClient, osm_wim : MockOSM): # 
        else:

            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceType: {:s}'.format(str_service))



        if service.service_status.service_status != ServiceStatusEnum.SERVICESTATUS_ACTIVE:

            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceStatusEnum: {:s}'.format(str_service))

src/tests/ecoc22/tests/test_functional_delete_service.py

+5 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
import logging, os



from common.Constants import DEFAULT_CONTEXT_NAME

from common.proto.context_pb2 import ContextId, ServiceTypeEnum

from common.proto.context_pb2 import ContextId, ServiceStatusEnum, ServiceTypeEnum

from common.tools.descriptor.Loader import DescriptorLoader

from common.tools.grpc.Tools import grpc_message_to_json_string

from common.tools.object_factory.Context import json_context_id
@@ -58,6 +58,10 @@ def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # p 
            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceType: {:s}'.format(str_service))



        if service.service_status.service_status != ServiceStatusEnum.SERVICESTATUS_ACTIVE:

            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceStatusEnum: {:s}'.format(str_service))



    # Identify service to delete

    assert len(service_uuids) == 1  # assume a single L2NM service has been created

    service_uuid = set(service_uuids).pop()

src/tests/ofc22/tests/test_functional_create_service.py

+5 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
import logging, os, random



from common.Constants import DEFAULT_CONTEXT_NAME

from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum

from common.proto.context_pb2 import ContextId, Empty, ServiceStatusEnum, ServiceTypeEnum

from common.proto.kpi_sample_types_pb2 import KpiSampleType

from common.tools.descriptor.Loader import DescriptorLoader

from common.tools.grpc.Tools import grpc_message_to_json_string
@@ -72,6 +72,10 @@ def test_service_creation(context_client : ContextClient, osm_wim : MockOSM): # 
            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceType: {:s}'.format(str_service))



        if service.service_status.service_status != ServiceStatusEnum.SERVICESTATUS_ACTIVE:

            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceStatusEnum: {:s}'.format(str_service))





def test_scenario_kpi_values_created(

    monitoring_client: MonitoringClient,    # pylint: disable=redefined-outer-name

src/tests/ofc22/tests/test_functional_delete_service.py

+5 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
import logging, os



from common.Constants import DEFAULT_CONTEXT_NAME

from common.proto.context_pb2 import ContextId, ServiceTypeEnum

from common.proto.context_pb2 import ContextId, ServiceStatusEnum, ServiceTypeEnum

from common.tools.descriptor.Loader import DescriptorLoader

from common.tools.grpc.Tools import grpc_message_to_json_string

from common.tools.object_factory.Context import json_context_id
@@ -58,6 +58,10 @@ def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # p 
            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceType: {:s}'.format(str_service))



        if service.service_status.service_status != ServiceStatusEnum.SERVICESTATUS_ACTIVE:

            str_service = grpc_message_to_json_string(service)

            raise Exception('Unexpected ServiceStatusEnum: {:s}'.format(str_service))



    # Identify service to delete

    assert len(service_uuids) == 1  # assume a single L3NM service has been created

    service_uuid = set(service_uuids).pop()