Skip to content
Snippets Groups Projects
Commit d5ede6a3 authored by Neda Moeini's avatar Neda Moeini
Browse files

Improved the switch, LAN switch interconnect and POP VLAN data model.

parent 3d47ff6c
Branches
Tags
No related merge requests found
This commit is part of merge request !186. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
gso/products/product_blocks/lan_switch_interconnect.py
+ 3
− 3
View file @ d5ede6a3
...@@ -117,7 +117,7 @@ class LanSwitchInterconnectBlockInactive( ...@@ -117,7 +117,7 @@ class LanSwitchInterconnectBlockInactive(
lan_switch_interconnect_description: str | None = None lan_switch_interconnect_description: str | None = None
address_space: LanSwitchInterconnectAddressSpace | None = None address_space: LanSwitchInterconnectAddressSpace | None = None
number_of_members: int | None = None minimum_links: int | None = None
router_side: LanSwitchInterconnectRouterSideBlockInactive router_side: LanSwitchInterconnectRouterSideBlockInactive
switch_side: LanSwitchInterconnectSwitchSideBlockInactive switch_side: LanSwitchInterconnectSwitchSideBlockInactive
...@@ -129,7 +129,7 @@ class LanSwitchInterconnectBlockProvisioning( ...@@ -129,7 +129,7 @@ class LanSwitchInterconnectBlockProvisioning(
lan_switch_interconnect_description: str | None = None lan_switch_interconnect_description: str | None = None
address_space: LanSwitchInterconnectAddressSpace | None = None address_space: LanSwitchInterconnectAddressSpace | None = None
number_of_members: int | None = None minimum_links: int | None = None
router_side: LanSwitchInterconnectRouterSideBlockProvisioning router_side: LanSwitchInterconnectRouterSideBlockProvisioning
switch_side: LanSwitchInterconnectSwitchSideBlockProvisioning switch_side: LanSwitchInterconnectSwitchSideBlockProvisioning
...@@ -142,7 +142,7 @@ class LanSwitchInterconnectBlock(LanSwitchInterconnectBlockProvisioning, lifecyc ...@@ -142,7 +142,7 @@ class LanSwitchInterconnectBlock(LanSwitchInterconnectBlockProvisioning, lifecyc
#: The address space of the VLAN Switch Interconnect. It can be private or public. #: The address space of the VLAN Switch Interconnect. It can be private or public.
address_space: LanSwitchInterconnectAddressSpace address_space: LanSwitchInterconnectAddressSpace
#: The minimum amount of links the LAN Switch Interconnect should consist of. #: The minimum amount of links the LAN Switch Interconnect should consist of.
number_of_members: int minimum_links: int
#: The router side of the LAN Switch Interconnect. #: The router side of the LAN Switch Interconnect.
router_side: LanSwitchInterconnectRouterSideBlock router_side: LanSwitchInterconnectRouterSideBlock
#: The switch side of the LAN Switch Interconnect. #: The switch side of the LAN Switch Interconnect.
......
gso/products/product_blocks/pop_vlan.py
+ 43
− 110
View file @ d5ede6a3
"""Pop VLAN product block that has all parameters of a subscription throughout its lifecycle.""" """Pop VLAN product block that has all parameters of a subscription throughout its lifecycle."""
from ipaddress import IPv4Network, IPv6Network
from typing import TypeVar from typing import TypeVar
from orchestrator.domain.base import ProductBlockModel from orchestrator.domain.base import ProductBlockModel
from orchestrator.forms.validators import UniqueConstrainedList from orchestrator.forms.validators import UniqueConstrainedList
from orchestrator.types import SubscriptionLifecycle from orchestrator.types import SubscriptionLifecycle
from pydantic_forms.types import strEnum
from gso.products.product_blocks.iptrunk import LAGMemberList from gso.products.product_blocks.lan_switch_interconnect import LanSwitchInterconnectBlock
from gso.products.product_blocks.router import RouterBlock, RouterBlockInactive, RouterBlockProvisioning from gso.products.product_types.lan_switch_interconnect import (
from gso.products.product_blocks.switch import SwitchBlock, SwitchBlockInactive, SwitchBlockProvisioning LanSwitchInterconnectInactive,
LanSwitchInterconnectProvisioning,
)
T_co = TypeVar("T_co", covariant=True) T_co = TypeVar("T_co", covariant=True)
class LayerPreference(strEnum):
"""Enumerator for the different types of layer preferences."""
L2 = "L2"
L3 = "L3"
class PortList(UniqueConstrainedList[T_co]): # type: ignore[type-var] class PortList(UniqueConstrainedList[T_co]): # type: ignore[type-var]
"""A list of ports.""" """A list of ports."""
...@@ -22,7 +32,7 @@ class PopVlanPortBlockInactive( ...@@ -22,7 +32,7 @@ class PopVlanPortBlockInactive(
): ):
"""An inactive Pop VLAN port.""" """An inactive Pop VLAN port."""
port: str | None = None port_name: str | None = None
port_description: str | None = None port_description: str | None = None
tagged: bool | None = None tagged: bool | None = None
...@@ -30,7 +40,7 @@ class PopVlanPortBlockInactive( ...@@ -30,7 +40,7 @@ class PopVlanPortBlockInactive(
class PopVlanPortBlockProvisioning(PopVlanPortBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class PopVlanPortBlockProvisioning(PopVlanPortBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
"""A Pop VLAN port that is being provisioned.""" """A Pop VLAN port that is being provisioned."""
port: str | None = None port_name: str | None = None
port_description: str | None = None port_description: str | None = None
tagged: bool | None = None tagged: bool | None = None
...@@ -38,96 +48,11 @@ class PopVlanPortBlockProvisioning(PopVlanPortBlockInactive, lifecycle=[Subscrip ...@@ -38,96 +48,11 @@ class PopVlanPortBlockProvisioning(PopVlanPortBlockInactive, lifecycle=[Subscrip
class PopVlanPortBlock(PopVlanPortBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class PopVlanPortBlock(PopVlanPortBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
"""An active Pop VLAN port.""" """An active Pop VLAN port."""
port: str port_name: str
port_description: str port_description: str
tagged: bool tagged: bool
class PopVlanInterfaceBlockInactive(
ProductBlockModel,
lifecycle=[SubscriptionLifecycle.INITIAL],
product_block_name="PopVlanInterfaceBlock",
):
"""An inactive Pop VLAN interface."""
interface_name: str | None = None
interface_description: str | None = None
class PopVlanInterfaceBlockProvisioning(PopVlanInterfaceBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
"""A Pop VLAN interface that is being provisioned."""
interface_name: str
interface_description: str
class PopVlanInterfaceBlock(PopVlanInterfaceBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
"""An active Pop VLAN interface."""
interface_name: str
interface_description: str
class PopVlanRouterSideBlockInactive(
ProductBlockModel,
lifecycle=[SubscriptionLifecycle.INITIAL],
product_block_name="PopVlanRouterSideBlock",
):
"""An inactive Pop VLAN router side."""
node: RouterBlockInactive
ae_iface: str | None = None
ae_members: LAGMemberList[PopVlanInterfaceBlockInactive]
class PopVlanRouterSideBlockProvisioning(
PopVlanRouterSideBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]
):
"""An Pop VLAN router side that is being provisioned."""
node: RouterBlockProvisioning
ae_iface: str | None = None
ae_members: LAGMemberList[PopVlanInterfaceBlockProvisioning]
class PopVlanRouterSideBlock(PopVlanRouterSideBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
"""An active Pop VLAN router side."""
node: RouterBlock
ae_iface: str
ae_members: LAGMemberList[PopVlanInterfaceBlock]
class PopVlanSwitchSideBlockInactive(
ProductBlockModel,
lifecycle=[SubscriptionLifecycle.INITIAL],
product_block_name="PopVlanSwitchSideBlock",
):
"""An inactive Pop VLAN switch side."""
node: SwitchBlockInactive
ae_iface: str | None = None
ae_members: LAGMemberList[PopVlanInterfaceBlockInactive]
class PopVlanSwitchSideBlockProvisioning(
PopVlanSwitchSideBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]
):
"""An Pop VLAN switch side that is being provisioned."""
node: SwitchBlockProvisioning
ae_iface: str | None = None
ae_members: LAGMemberList[PopVlanInterfaceBlockProvisioning]
class PopVlanSwitchSideBlock(PopVlanSwitchSideBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
"""An active Pop VLAN switch side."""
node: SwitchBlock
ae_iface: str
ae_members: LAGMemberList[PopVlanInterfaceBlock]
class PopVlanBlockInactive( class PopVlanBlockInactive(
ProductBlockModel, ProductBlockModel,
lifecycle=[SubscriptionLifecycle.INITIAL], lifecycle=[SubscriptionLifecycle.INITIAL],
...@@ -135,33 +60,41 @@ class PopVlanBlockInactive( ...@@ -135,33 +60,41 @@ class PopVlanBlockInactive(
): ):
"""A Pop VLAN that's currently inactive, see :class:`PopVlanBlock`.""" """A Pop VLAN that's currently inactive, see :class:`PopVlanBlock`."""
number_of_ports: int | None = None vlan_id: int
number_of_members: int | None = None description: str | None
router_side: PopVlanRouterSideBlockInactive lan_switch_interconnect: LanSwitchInterconnectInactive
switch_side: PopVlanSwitchSideBlockInactive ports: PortList[PopVlanPortBlockProvisioning]
ports: PortList[PopVlanPortBlockInactive] layer_preference: LayerPreference
ipv4_network: IPv4Network | None = None
ipv6_network: IPv6Network | None = None
class PopVlanBlockProvisioning(PopVlanBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class PopVlanBlockProvisioning(PopVlanBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
"""A Pop VLAN that's currently being provisioned, see :class:`PopVlanBlock`.""" """A Pop VLAN that's currently being provisioned, see :class:`PopVlanBlock`."""
number_of_ports: int | None = None vlan_id: int
number_of_members: int | None = None description: str | None
router_side: PopVlanRouterSideBlockProvisioning lan_switch_interconnect: LanSwitchInterconnectProvisioning
switch_side: PopVlanSwitchSideBlockProvisioning
ports: PortList[PopVlanPortBlockProvisioning] ports: PortList[PopVlanPortBlockProvisioning]
layer_preference: LayerPreference
ipv4_network: IPv4Network | None = None
ipv6_network: IPv6Network | None = None
class PopVlanBlock(PopVlanBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class PopVlanBlock(PopVlanBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
"""A Pop VLAN that's currently deployed in the network.""" """A Pop VLAN that's currently deployed in the network."""
#: The number of ports in the Pop VLAN. #: The VLAN ID of the Pop VLAN.
number_of_ports: int vlan_id: int
#: The number of members in the Pop VLAN. #: The description of the Pop VLAN.
number_of_members: int description: str
#: The router side of the Pop VLAN. #: The Lan Switch Interconnect that this Pop VLAN is connected to.
router_side: PopVlanRouterSideBlock lan_switch_interconnect: LanSwitchInterconnectBlock
#: The switch side of the Pop VLAN. #: The ports of the Pop VLAN.
switch_side: PopVlanSwitchSideBlock
#: The ports of the Pop VLAN.
ports: PortList[PopVlanPortBlock] ports: PortList[PopVlanPortBlock]
#: The level of the layer preference for the Pop VLAN (L2 or L3).
layer_preference: LayerPreference
#: IPv4 network for the Pop VLAN if layer_preference is L3.
ipv4_network: IPv4Network | None = None
#: IPv6 network for the Pop VLAN if layer_preference is L3.
ipv6_network: IPv6Network | None = None
gso/products/product_blocks/switch.py
+ 18
− 1
View file @ d5ede6a3
...@@ -2,13 +2,22 @@ ...@@ -2,13 +2,22 @@
from orchestrator.domain.base import ProductBlockModel from orchestrator.domain.base import ProductBlockModel
from orchestrator.types import SubscriptionLifecycle from orchestrator.types import SubscriptionLifecycle
from pydantic_forms.types import strEnum
from gso.products.product_blocks.site import ( from gso.products.product_blocks.site import (
SiteBlock, SiteBlock,
SiteBlockInactive, SiteBlockInactive,
SiteBlockProvisioning, SiteBlockProvisioning,
) )
from gso.utils.shared_enums import PortNumber from gso.utils.shared_enums import PortNumber, Vendor
class SwitchModel(strEnum):
"""Enumerator for the different types of switches."""
EX3400_24 = "EX3400 24"
EX3400_32 = "EX3400 32"
EX3400_48 = "EX3400 48"
class SwitchBlockInactive( class SwitchBlockInactive(
...@@ -21,6 +30,8 @@ class SwitchBlockInactive( ...@@ -21,6 +30,8 @@ class SwitchBlockInactive(
switch_hostname: str | None = None switch_hostname: str | None = None
switch_ts_port: PortNumber | None = None switch_ts_port: PortNumber | None = None
switch_site: SiteBlockInactive | None switch_site: SiteBlockInactive | None
switch_vendor: Vendor | None
switch_model: SwitchModel | None = None
class SwitchBlockProvisioning(SwitchBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class SwitchBlockProvisioning(SwitchBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
...@@ -29,6 +40,8 @@ class SwitchBlockProvisioning(SwitchBlockInactive, lifecycle=[SubscriptionLifecy ...@@ -29,6 +40,8 @@ class SwitchBlockProvisioning(SwitchBlockInactive, lifecycle=[SubscriptionLifecy
switch_hostname: str switch_hostname: str
switch_ts_port: PortNumber switch_ts_port: PortNumber
switch_site: SiteBlockProvisioning switch_site: SiteBlockProvisioning
switch_vendor: Vendor
switch_model: SwitchModel | None = None
class SwitchBlock(SwitchBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class SwitchBlock(SwitchBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
...@@ -40,3 +53,7 @@ class SwitchBlock(SwitchBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTI ...@@ -40,3 +53,7 @@ class SwitchBlock(SwitchBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTI
switch_ts_port: PortNumber switch_ts_port: PortNumber
#: The :class:`Site` that this switch resides in. Both physically and computationally. #: The :class:`Site` that this switch resides in. Both physically and computationally.
switch_site: SiteBlock switch_site: SiteBlock
#: The vendor of the switch.
switch_vendor: Vendor
#: The model of the switch.
switch_model: SwitchModel | None = None
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment