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

OFC25 test:

- Fixed tfs_profiles fixture import
parent e933092a
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ from pathlib import Path

import pytest

from .Fixtures import PROFILE_FILENAMES, PROFILE_E2E, PROFILE_IP, PROFILE_OPT, RUNTIME_ENV_DIR, tfs_clients
# pylint: disable=unused-import
from .Fixtures import (
    PROFILE_FILENAMES, PROFILE_E2E, PROFILE_IP, PROFILE_OPT,
    RUNTIME_ENV_DIR, tfs_clients, tfs_profiles
)


def pytest_addoption(parser):
+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_lo
from common.tools.grpc.Tools import grpc_message_to_json, grpc_message_to_json_string
from common.tools.object_factory.Context import json_context_id

from .conftest import selected_tfs_client_bundle, selected_tfs_profile, selected_topology_descriptor  # pylint: disable=unused-import
# pylint: disable=unused-import
from .conftest import (
    selected_tfs_client_bundle, selected_tfs_profile, selected_topology_descriptor
)

LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ from common.proto.context_pb2 import ContextId
from common.tools.descriptor.Loader import DescriptorLoader, validate_empty_scenario
from common.tools.object_factory.Context import json_context_id

from .conftest import selected_tfs_client_bundle, selected_topology_descriptor  # pylint: disable=unused-import
# pylint: disable=unused-import
from .conftest import (
    selected_tfs_client_bundle, selected_topology_descriptor
)

LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_lo
from common.tools.grpc.Tools import grpc_message_to_json_string
from common.tools.object_factory.Context import json_context_id

from .Fixtures import PROFILE_E2E, PROFILE_IP, PROFILE_OPT, tfs_clients  # pylint: disable=unused-import
# pylint: disable=unused-import
from .Fixtures import PROFILE_E2E, PROFILE_IP, PROFILE_OPT, tfs_clients

LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ import os

from common.tools.descriptor.Loader import DescriptorLoader

from .Fixtures import PROFILE_E2E, PROFILE_IP, PROFILE_OPT, tfs_clients  # pylint: disable=unused-import
from .test_functional_create_vlinks import (
# pylint: disable=unused-import
from .Fixtures import PROFILE_E2E, PROFILE_IP, PROFILE_OPT, tfs_clients
    DESCRIPTORS_DIR,
    VIRTUAL_LINK_DESCRIPTORS,
    _wait_for_state_or_raise,