Skip to content
Snippets Groups Projects
Verified Commit 27934bdf authored by Karel van Klink's avatar Karel van Klink :smiley_cat:
Browse files

Refactor validators into separate types module

parent f1bb7633
No related branches found
No related tags found
1 merge request!265Feature/refactor validators
...@@ -5,7 +5,7 @@ import pytest ...@@ -5,7 +5,7 @@ import pytest
from requests import HTTPError from requests import HTTPError
from gso.services.librenms_client import LibreNMSClient from gso.services.librenms_client import LibreNMSClient
from gso.utils.helpers import SNMPVersion from gso.types.snmp import SNMPVersion
@pytest.fixture() @pytest.fixture()
......
...@@ -6,10 +6,10 @@ from orchestrator.types import SubscriptionLifecycle ...@@ -6,10 +6,10 @@ from orchestrator.types import SubscriptionLifecycle
from gso.products import Router from gso.products import Router
from gso.products.product_blocks.iptrunk import IptrunkInterfaceBlock from gso.products.product_blocks.iptrunk import IptrunkInterfaceBlock
from gso.products.product_blocks.router import RouterRole from gso.products.product_blocks.router import RouterRole
from gso.types.tt_number import validate_tt_number
from gso.utils.helpers import ( from gso.utils.helpers import (
available_interfaces_choices_including_current_members, available_interfaces_choices_including_current_members,
generate_inventory_for_active_routers, generate_inventory_for_active_routers,
validate_tt_number,
) )
from gso.utils.shared_enums import Vendor from gso.utils.shared_enums import Vendor
......
...@@ -2,8 +2,9 @@ import pytest ...@@ -2,8 +2,9 @@ import pytest
from orchestrator.types import SubscriptionLifecycle from orchestrator.types import SubscriptionLifecycle
from gso.products import ProductName from gso.products import ProductName
from gso.products.product_blocks.iptrunk import IptrunkType, PhysicalPortCapacity from gso.products.product_blocks.iptrunk import IptrunkType
from gso.products.product_types.iptrunk import ImportedIptrunk from gso.products.product_types.iptrunk import ImportedIptrunk
from gso.types.interfaces import PhysicalPortCapacity
from test.workflows import ( from test.workflows import (
assert_complete, assert_complete,
extract_state, extract_state,
......
...@@ -5,8 +5,9 @@ import pytest ...@@ -5,8 +5,9 @@ import pytest
from infoblox_client.objects import HostRecord from infoblox_client.objects import HostRecord
from gso.products import Iptrunk, ProductName from gso.products import Iptrunk, ProductName
from gso.products.product_blocks.iptrunk import IptrunkType, PhysicalPortCapacity from gso.products.product_blocks.iptrunk import IptrunkType
from gso.services.subscriptions import get_product_id_by_name from gso.services.subscriptions import get_product_id_by_name
from gso.types.interfaces import PhysicalPortCapacity
from gso.utils.shared_enums import Vendor from gso.utils.shared_enums import Vendor
from test import USER_CONFIRM_EMPTY_FORM from test import USER_CONFIRM_EMPTY_FORM
from test.services.conftest import MockedNetboxClient, MockedSharePointClient from test.services.conftest import MockedNetboxClient, MockedSharePointClient
......
...@@ -3,7 +3,8 @@ from unittest.mock import patch ...@@ -3,7 +3,8 @@ from unittest.mock import patch
import pytest import pytest
from gso.products import Iptrunk from gso.products import Iptrunk
from gso.products.product_blocks.iptrunk import IptrunkType, PhysicalPortCapacity from gso.products.product_blocks.iptrunk import IptrunkType
from gso.types.interfaces import LAGMemberList, PhysicalPortCapacity
from gso.utils.shared_enums import Vendor from gso.utils.shared_enums import Vendor
from test.conftest import UseJuniperSide from test.conftest import UseJuniperSide
from test.workflows import ( from test.workflows import (
...@@ -172,7 +173,7 @@ def test_iptrunk_modify_trunk_interface_success( ...@@ -172,7 +173,7 @@ def test_iptrunk_modify_trunk_interface_success(
assert subscription.iptrunk.iptrunk_minimum_links == input_form_iptrunk_data[1]["iptrunk_number_of_members"] - 1 assert subscription.iptrunk.iptrunk_minimum_links == input_form_iptrunk_data[1]["iptrunk_number_of_members"] - 1
assert subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid == new_side_a_sid assert subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid == new_side_a_sid
def _find_interface_by_name(interfaces: list[dict[str, str]], name: str): def _find_interface_by_name(interfaces: LAGMemberList, name: str):
for interface in interfaces: for interface in interfaces:
if interface.interface_name == name: if interface.interface_name == name:
return interface return interface
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment