Commit 9840d881 authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Including the validation of creation of KPIs and their values to the OFC'22... 

Including the validation of creation of KPIs and their values to the OFC'22 test set. Also consolidating the fixtures into a single file in the root of the 'src/tests' folder so that all tests can import from it.
parent 3b02043c

src/tests/ecoc22/tests/Fixtures.py→src/tests/Fixtures.py

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ from common.Settings import get_setting 
from compute.tests.mock_osm.MockOSM import MockOSM

from context.client.ContextClient import ContextClient

from device.client.DeviceClient import DeviceClient

from monitoring.client.MonitoringClient import MonitoringClient

#from .Objects_BigNet import WIM_MAPPING, WIM_PASSWORD, WIM_USERNAME

from .Objects_DC_CSGW_TN import WIM_MAPPING, WIM_PASSWORD, WIM_USERNAME

#from .Objects_DC_CSGW_TN_OLS import WIM_MAPPING, WIM_PASSWORD, WIM_USERNAME
@@ -19,6 +20,12 @@ def device_client(): 
    yield _client

    _client.close()



@pytest.fixture(scope='session')

def monitoring_client():

    _client = MonitoringClient()

    yield _client

    _client.close()



@pytest.fixture(scope='session')

def osm_wim():

    wim_url = 'http://{:s}:{:s}'.format(

src/tests/ecoc22/tests/test_functional_bootstrap.py

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import logging 
from common.proto.context_pb2 import Context, ContextId, Device, DeviceId, Empty, Link, LinkId, Topology, TopologyId

from context.client.ContextClient import ContextClient

from device.client.DeviceClient import DeviceClient

from .Fixtures import context_client, device_client

from tests.Fixtures import context_client, device_client

#from .Objects_BigNet import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES

#from .Objects_DC_CSGW_TN import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES, OBJECTS_PER_TOPOLOGY

#from .Objects_DC_CSGW_TN_OLS import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES, OBJECTS_PER_TOPOLOGY

src/tests/ecoc22/tests/test_functional_cleanup.py

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ from common.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, Topolog 
from common.tools.object_factory.Context import json_context_id

from context.client.ContextClient import ContextClient

from device.client.DeviceClient import DeviceClient

from .Fixtures import context_client, device_client

from tests.Fixtures import context_client, device_client

#from .Objects_BigNet import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES

#from .Objects_DC_CSGW_TN import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES

#from .Objects_DC_CSGW_TN_OLS import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES

src/tests/ecoc22/tests/test_functional_create_service.py

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum 
from common.tools.grpc.Tools import grpc_message_to_json_string

from compute.tests.mock_osm.MockOSM import MockOSM

from context.client.ContextClient import ContextClient

from .Fixtures import context_client, osm_wim

from tests.Fixtures import context_client, osm_wim

#from .Objects_BigNet import (

#    CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES, WIM_SERVICE_CONNECTION_POINTS, WIM_SERVICE_TYPE)

#from .Objects_DC_CSGW_TN import (

src/tests/ecoc22/tests/test_functional_delete_service.py

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ from common.tools.object_factory.Service import json_service_id 
from common.tools.grpc.Tools import grpc_message_to_json_string

from compute.tests.mock_osm.MockOSM import MockOSM

from context.client.ContextClient import ContextClient

from .Fixtures import context_client, osm_wim

from tests.Fixtures import context_client, osm_wim

#from .Objects_BigNet import (

#    CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES, WIM_SERVICE_CONNECTION_POINTS, WIM_SERVICE_TYPE)

#from .Objects_DC_CSGW_TN import (