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

Merge branch 'fix/test-kpis' into 'develop' 

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

See merge request !15
parents 3b02043c a2d1ac3c

src/tests/Fixtures.py

0 → 100644
+38 −0
Original line number Diff line number Diff line 
# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



import pytest

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



@pytest.fixture(scope='session')

def context_client():

    _client = ContextClient()

    yield _client

    _client.close()



@pytest.fixture(scope='session')

def device_client():

    _client = DeviceClient()

    yield _client

    _client.close()



@pytest.fixture(scope='session')

def monitoring_client():

    _client = MonitoringClient()

    yield _client

    _client.close()

src/tests/ecoc22/tests/Fixtures.py

+14 −14
Original line number Diff line number Diff line 
# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



import pytest

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 .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



@pytest.fixture(scope='session')

def context_client():

    _client = ContextClient()

    yield _client

    _client.close()



@pytest.fixture(scope='session')

def device_client():

    _client = DeviceClient()

    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

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 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

from .Fixtures import 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 (