From 93ff2a6316952a1ed0c5ba7ebad878df62bcbfdd Mon Sep 17 00:00:00 2001 From: Ubuntu <jorge.sasiain@ehu.eus> Date: Wed, 8 Mar 2023 18:01:06 +0000 Subject: [PATCH] Products and product blocks for trunk --- alembic.ini | 45 +++++++++ migrations/__pycache__/env.cpython-39.pyc | Bin 0 -> 2289 bytes migrations/env.py | 92 ++++++++++++++++++ migrations/helpers.py | 3 + migrations/script.py.mako | 23 +++++ products/__init__.py | 0 products/product_blocks/trunk.py | 22 +++++ products/product_blocks/trunk_config.py | 21 ++++ .../product_blocks/trunk_config_common.py | 33 +++++++ products/product_blocks/trunk_config_side.py | 39 ++++++++ products/product_types/trunk.py | 16 +++ products/product_types/trunk_config.py | 16 +++ products/product_types/trunk_config_common.py | 16 +++ products/product_types/trunk_config_side.py | 16 +++ 14 files changed, 342 insertions(+) create mode 100644 alembic.ini create mode 100644 migrations/__pycache__/env.cpython-39.pyc create mode 100644 migrations/env.py create mode 100644 migrations/helpers.py create mode 100644 migrations/script.py.mako create mode 100644 products/__init__.py create mode 100644 products/product_blocks/trunk.py create mode 100644 products/product_blocks/trunk_config.py create mode 100644 products/product_blocks/trunk_config_common.py create mode 100644 products/product_blocks/trunk_config_side.py create mode 100644 products/product_types/trunk.py create mode 100644 products/product_types/trunk_config.py create mode 100644 products/product_types/trunk_config_common.py create mode 100644 products/product_types/trunk_config_side.py diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 00000000..d7ed3559 --- /dev/null +++ b/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +file_template = %%(year)d-%%(month).2d-%%(day).2d_%%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false +script_location = migrations +version_locations = %(here)s/migrations/versions/schema +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S \ No newline at end of file diff --git a/migrations/__pycache__/env.cpython-39.pyc b/migrations/__pycache__/env.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a3f1f38bec2618de40ae47f038c6ae77f2e29148 GIT binary patch literal 2289 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 Lluw0&k%I{U@W+HR literal 0 HcmV?d00001 diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 00000000..1b039d7f --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,92 @@ +import logging +import os +from alembic import context +from sqlalchemy import engine_from_config, pool + +import orchestrator +from orchestrator.db.database import BaseModel +from orchestrator.settings import app_settings + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +logger = logging.getLogger("alembic.env") + +config.set_main_option("sqlalchemy.url", app_settings.DATABASE_URI) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = BaseModel.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True, dialect_opts={"paramstyle": "named"} + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): # type: ignore + if getattr(config.cmd_opts, "autogenerate", False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info("No changes in schema detected.") + + engine = engine_from_config( + config.get_section(config.config_ini_section), prefix="sqlalchemy.", poolclass=pool.NullPool + ) + + connection = engine.connect() + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + compare_type=True, + ) + try: + with context.begin_transaction(): + context.run_migrations() + finally: + connection.close() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/helpers.py b/migrations/helpers.py new file mode 100644 index 00000000..c5634526 --- /dev/null +++ b/migrations/helpers.py @@ -0,0 +1,3 @@ +from orchestrator.migrations.helpers import * + +# Write your own helper functions below this line. diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 00000000..e1fbdb8f --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,23 @@ +"""${message}. + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +import sqlalchemy as sa +from alembic import op +${imports if imports else ""} +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade() -> None: + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + ${downgrades if downgrades else "pass"} diff --git a/products/__init__.py b/products/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/products/product_blocks/trunk.py b/products/product_blocks/trunk.py new file mode 100644 index 00000000..dcd27f16 --- /dev/null +++ b/products/product_blocks/trunk.py @@ -0,0 +1,22 @@ +from typing import Optional + +from orchestrator.domain.base import ProductBlockModel +from orchestrator.types import SubscriptionLifecycle + + +class TrunkBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkBlock"): + trunk_id: Optional[int] = None + geant_s_sid: Optional[str] = None + name: Optional[str] = None + + +class TrunkBlockProvisioning(TrunkBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk_id: Optional[int] = None + geant_s_sid: Optional[str] = None + name: str + + +class TrunkBlock(TrunkBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk_id: int + geant_s_sid: str + name: str diff --git a/products/product_blocks/trunk_config.py b/products/product_blocks/trunk_config.py new file mode 100644 index 00000000..bf375d0c --- /dev/null +++ b/products/product_blocks/trunk_config.py @@ -0,0 +1,21 @@ +from typing import Optional + +from orchestrator.domain.base import ProductBlockModel +from orchestrator.types import SubscriptionLifecycle + +from products.product_blocks.trunk import TrunkBlock, TrunkBlockInactive, TrunkBlockProvisioning + + +class TrunkConfigBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkConfigBlock"): + trunk: TrunkBlockInactive + trunk_config_id: Optional[int] = None + + +class TrunkConfigBlockProvisioning(TrunkConfigBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk: TrunkBlockProvisioning + trunk_config_id: Optional[int] = None + + +class TrunkConfigBlock(TrunkConfigBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk: TrunkBlock + trunk_config_id: int diff --git a/products/product_blocks/trunk_config_common.py b/products/product_blocks/trunk_config_common.py new file mode 100644 index 00000000..c2c18b98 --- /dev/null +++ b/products/product_blocks/trunk_config_common.py @@ -0,0 +1,33 @@ +from typing import Optional + +from orchestrator.domain.base import ProductBlockModel +from orchestrator.types import SubscriptionLifecycle + +from products.product_blocks.trunk_config import TrunkConfigBlock, TrunkConfigBlockInactive, TrunkConfigBlockProvisioning + + +class TrunkConfigCommonBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkConfigCommonBlock"): + trunk_config: TrunkConfigBlockInactive + trunk_config_common_id: Optional[int] = None + speed: Optional[str] = None + is_leased_line: Optional[bool] = None + isis_metric: Optional[int] = None + minimum_links: Optional[int] = None + + +class TrunkConfigCommonBlockProvisioning(TrunkConfigCommonBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk_config: TrunkConfigBlockProvisioning + trunk_config_common_id: Optional[int] = None + speed: str + is_leased_line: Optional[bool] = None + isis_metric: int + minimum_links: int + + +class TrunkConfigCommonBlock(TrunkConfigCommonBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk_config: TrunkConfigBlock + trunk_config_common_id: int + speed: str + is_leased_line: bool + isis_metric: int + minimum_links: int diff --git a/products/product_blocks/trunk_config_side.py b/products/product_blocks/trunk_config_side.py new file mode 100644 index 00000000..de792d49 --- /dev/null +++ b/products/product_blocks/trunk_config_side.py @@ -0,0 +1,39 @@ +from typing import Optional + +from orchestrator.domain.base import ProductBlockModel +from orchestrator.types import SubscriptionLifecycle + +from products.product_blocks.trunk_config import TrunkConfigBlock, TrunkConfigBlockInactive, TrunkConfigBlockProvisioning + + +class TrunkConfigSideBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INITIAL], product_block_name="TrunkConfigSideBlock"): + trunk_config: TrunkConfigBlockInactive + trunk_config_side_id: Optional[int] = None + name: Optional[str] = None + ae_name: Optional[str] = None + geant_a_sid: Optional[str] = None + ipv4_address: Optional[str] = None + ipv6_address: Optional[str] = None + members: Optional[list] = None + + +class TrunkConfigSideBlockProvisioning(TrunkConfigSideBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk_config: TrunkConfigBlockProvisioning + trunk_config_side_id: Optional[int] = None + name: str + ae_name: Optional[str] = None + geant_a_sid: Optional[str] = None + ipv4_address: Optional[str] = None + ipv6_address: Optional[str] = None + members: Optional[list] = None + + +class TrunkConfigSideBlock(TrunkConfigSideBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk_config: TrunkConfigBlock + trunk_config_side_id: int + name: str + ae_name: str + geant_a_sid: str + ipv4_address: str + ipv6_address: str + members: list diff --git a/products/product_types/trunk.py b/products/product_types/trunk.py new file mode 100644 index 00000000..5b000584 --- /dev/null +++ b/products/product_types/trunk.py @@ -0,0 +1,16 @@ +from orchestrator.domain.base import SubscriptionModel +from orchestrator.types import SubscriptionLifecycle + +from products.product_blocks.trunk import TrunkBlock, TrunkBlockInactive, TrunkBlockProvisioning + + +class TrunkInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]): + trunk: TrunkBlockInactive + + +class TrunkProvisioning(TrunkInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk: TrunkBlockProvisioning + + +class Trunk(TrunkProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk: TrunkBlock diff --git a/products/product_types/trunk_config.py b/products/product_types/trunk_config.py new file mode 100644 index 00000000..bdd5ca7a --- /dev/null +++ b/products/product_types/trunk_config.py @@ -0,0 +1,16 @@ +from orchestrator.domain.base import SubscriptionModel +from orchestrator.types import SubscriptionLifecycle + +from products.product_blocks.trunk_config import TrunkConfigBlock, TrunkConfigBlockInactive, TrunkConfigBlockProvisioning + + +class TrunkInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]): + trunk_config: TrunkConfigBlockInactive + + +class TrunkProvisioning(TrunkInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk_config: TrunkConfigBlockProvisioning + + +class Trunk(TrunkProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk_config: TrunkConfigBlock diff --git a/products/product_types/trunk_config_common.py b/products/product_types/trunk_config_common.py new file mode 100644 index 00000000..b098f499 --- /dev/null +++ b/products/product_types/trunk_config_common.py @@ -0,0 +1,16 @@ +from orchestrator.domain.base import SubscriptionModel +from orchestrator.types import SubscriptionLifecycle + +from products.product_blocks.trunk_config_common import TrunkConfigCommonBlock, TrunkConfigCommonBlockInactive, TrunkConfigCommonBlockProvisioning + + +class TrunkInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]): + trunk_config_common: TrunkConfigCommonBlockInactive + + +class TrunkProvisioning(TrunkInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk_config_common: TrunkConfigCommonBlockProvisioning + + +class Trunk(TrunkProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk_config_common: TrunkConfigCommonBlock diff --git a/products/product_types/trunk_config_side.py b/products/product_types/trunk_config_side.py new file mode 100644 index 00000000..55b05717 --- /dev/null +++ b/products/product_types/trunk_config_side.py @@ -0,0 +1,16 @@ +from orchestrator.domain.base import SubscriptionModel +from orchestrator.types import SubscriptionLifecycle + +from products.product_blocks.trunk_config_side import TrunkConfigSideBlock, TrunkConfigSideBlockInactive, TrunkConfigSideBlockProvisioning + + +class TrunkInactive(SubscriptionModel, is_base=True, lifecycle=[SubscriptionLifecycle.INITIAL]): + trunk_config_side: TrunkConfigSideBlockInactive + + +class TrunkProvisioning(TrunkInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]): + trunk_config_side: TrunkConfigSideBlockProvisioning + + +class Trunk(TrunkProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]): + trunk_config_side: TrunkConfigSideBlock -- GitLab