Skip to content
Snippets Groups Projects
Commit 7fd4a960 authored by JORGE SASIAIN's avatar JORGE SASIAIN
Browse files

Fixes to previous commit to prepare for migration

parent 93ff2a63
No related branches found
No related tags found
No related merge requests found
__pycache__/
...@@ -2,6 +2,8 @@ from orchestrator import OrchestratorCore ...@@ -2,6 +2,8 @@ from orchestrator import OrchestratorCore
from orchestrator.cli.main import app as core_cli from orchestrator.cli.main import app as core_cli
from orchestrator.settings import AppSettings from orchestrator.settings import AppSettings
import products
app = OrchestratorCore(base_settings=AppSettings()) app = OrchestratorCore(base_settings=AppSettings())
if __name__ == "__main__": if __name__ == "__main__":
......
from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
from products.product_types.trunk import Trunk
from products.product_types.trunk_config import TrunkConfig
from products.product_types.trunk_config_common import TrunkConfigCommon
from products.product_types.trunk_config_side import TrunkConfigSide
SUBSCRIPTION_MODEL_REGISTRY.update(
{
"Trunk": Trunk,
"Trunk Config": TrunkConfig,
"Trunk Config Common": TrunkConfigCommon,
"Trunk Config Side": TrunkConfigSide,
}
)
...@@ -7,16 +7,16 @@ from orchestrator.types import SubscriptionLifecycle ...@@ -7,16 +7,16 @@ from orchestrator.types import SubscriptionLifecycle
class TrunkBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkBlock"): class TrunkBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkBlock"):
trunk_id: Optional[int] = None trunk_id: Optional[int] = None
geant_s_sid: Optional[str] = None geant_s_sid: Optional[str] = None
name: Optional[str] = None trunk_name: Optional[str] = None
class TrunkBlockProvisioning(TrunkBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class TrunkBlockProvisioning(TrunkBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
trunk_id: Optional[int] = None trunk_id: Optional[int] = None
geant_s_sid: Optional[str] = None geant_s_sid: Optional[str] = None
name: str trunk_name: str
class TrunkBlock(TrunkBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class TrunkBlock(TrunkBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
trunk_id: int trunk_id: int
geant_s_sid: str geant_s_sid: str
name: str trunk_name: str
...@@ -9,7 +9,7 @@ from products.product_blocks.trunk_config import TrunkConfigBlock, TrunkConfigBl ...@@ -9,7 +9,7 @@ from products.product_blocks.trunk_config import TrunkConfigBlock, TrunkConfigBl
class TrunkConfigSideBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkConfigSideBlock"): class TrunkConfigSideBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkConfigSideBlock"):
trunk_config: TrunkConfigBlockInactive trunk_config: TrunkConfigBlockInactive
trunk_config_side_id: Optional[int] = None trunk_config_side_id: Optional[int] = None
name: Optional[str] = None fqdn: Optional[str] = None
ae_name: Optional[str] = None ae_name: Optional[str] = None
geant_a_sid: Optional[str] = None geant_a_sid: Optional[str] = None
ipv4_address: Optional[str] = None ipv4_address: Optional[str] = None
...@@ -20,7 +20,7 @@ class TrunkConfigSideBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLif ...@@ -20,7 +20,7 @@ class TrunkConfigSideBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLif
class TrunkConfigSideBlockProvisioning(TrunkConfigSideBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class TrunkConfigSideBlockProvisioning(TrunkConfigSideBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
trunk_config: TrunkConfigBlockProvisioning trunk_config: TrunkConfigBlockProvisioning
trunk_config_side_id: Optional[int] = None trunk_config_side_id: Optional[int] = None
name: str fqdn: str
ae_name: Optional[str] = None ae_name: Optional[str] = None
geant_a_sid: Optional[str] = None geant_a_sid: Optional[str] = None
ipv4_address: Optional[str] = None ipv4_address: Optional[str] = None
...@@ -31,7 +31,7 @@ class TrunkConfigSideBlockProvisioning(TrunkConfigSideBlockInactive, lifecycle=[ ...@@ -31,7 +31,7 @@ class TrunkConfigSideBlockProvisioning(TrunkConfigSideBlockInactive, lifecycle=[
class TrunkConfigSideBlock(TrunkConfigSideBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class TrunkConfigSideBlock(TrunkConfigSideBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
trunk_config: TrunkConfigBlock trunk_config: TrunkConfigBlock
trunk_config_side_id: int trunk_config_side_id: int
name: str fqdn: str
ae_name: str ae_name: str
geant_a_sid: str geant_a_sid: str
ipv4_address: str ipv4_address: str
......
...@@ -4,13 +4,13 @@ from orchestrator.types import SubscriptionLifecycle ...@@ -4,13 +4,13 @@ from orchestrator.types import SubscriptionLifecycle
from products.product_blocks.trunk_config import TrunkConfigBlock, TrunkConfigBlockInactive, TrunkConfigBlockProvisioning from products.product_blocks.trunk_config import TrunkConfigBlock, TrunkConfigBlockInactive, TrunkConfigBlockProvisioning
class TrunkInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]): class TrunkConfigInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]):
trunk_config: TrunkConfigBlockInactive trunk_config: TrunkConfigBlockInactive
class TrunkProvisioning(TrunkInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class TrunkConfigProvisioning(TrunkConfigInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
trunk_config: TrunkConfigBlockProvisioning trunk_config: TrunkConfigBlockProvisioning
class Trunk(TrunkProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class TrunkConfig(TrunkConfigProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
trunk_config: TrunkConfigBlock trunk_config: TrunkConfigBlock
...@@ -4,13 +4,13 @@ from orchestrator.types import SubscriptionLifecycle ...@@ -4,13 +4,13 @@ from orchestrator.types import SubscriptionLifecycle
from products.product_blocks.trunk_config_common import TrunkConfigCommonBlock, TrunkConfigCommonBlockInactive, TrunkConfigCommonBlockProvisioning from products.product_blocks.trunk_config_common import TrunkConfigCommonBlock, TrunkConfigCommonBlockInactive, TrunkConfigCommonBlockProvisioning
class TrunkInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]): class TrunkConfigCommonInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]):
trunk_config_common: TrunkConfigCommonBlockInactive trunk_config_common: TrunkConfigCommonBlockInactive
class TrunkProvisioning(TrunkInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class TrunkConfigCommonProvisioning(TrunkConfigCommonInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
trunk_config_common: TrunkConfigCommonBlockProvisioning trunk_config_common: TrunkConfigCommonBlockProvisioning
class Trunk(TrunkProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class TrunkConfigCommon(TrunkConfigCommonProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
trunk_config_common: TrunkConfigCommonBlock trunk_config_common: TrunkConfigCommonBlock
...@@ -4,13 +4,13 @@ from orchestrator.types import SubscriptionLifecycle ...@@ -4,13 +4,13 @@ from orchestrator.types import SubscriptionLifecycle
from products.product_blocks.trunk_config_side import TrunkConfigSideBlock, TrunkConfigSideBlockInactive, TrunkConfigSideBlockProvisioning from products.product_blocks.trunk_config_side import TrunkConfigSideBlock, TrunkConfigSideBlockInactive, TrunkConfigSideBlockProvisioning
class TrunkInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]): class TrunkConfigSideInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]):
trunk_config_side: TrunkConfigSideBlockInactive trunk_config_side: TrunkConfigSideBlockInactive
class TrunkProvisioning(TrunkInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): class TrunkConfigSideProvisioning(TrunkConfigSideInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
trunk_config_side: TrunkConfigSideBlockProvisioning trunk_config_side: TrunkConfigSideBlockProvisioning
class Trunk(TrunkProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): class TrunkConfigSide(TrunkConfigSideProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
trunk_config_side: TrunkConfigSideBlock trunk_config_side: TrunkConfigSideBlock
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment