diff --git a/Changelog.md b/Changelog.md index 3169eaec23dacf10c94272ce43829400e6cb2324..4cb3fbb61bd0dbc2d0988157dd3f1aec4737c0a0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. +## [2.1] - 2024-06-17 +- Fixed tiny bugs in migrate IP trunk. +§ ## [2.0] - 2024-05-23 - Upgraded `orchestrator-core` to version 2! - Added Opengear products. diff --git a/gso/api/v1/network.py b/gso/api/v1/network.py index 309d52ec79fda8b072c26ff6d1375de848b845e4..6dd5ac75e3fc62b64fd4a30f69880e13227497f5 100644 --- a/gso/api/v1/network.py +++ b/gso/api/v1/network.py @@ -3,19 +3,20 @@ import ipaddress from uuid import UUID -from fastapi import APIRouter +from fastapi import APIRouter, Depends from orchestrator.domain import SubscriptionModel from orchestrator.schemas.base import OrchestratorBaseModel from orchestrator.services.subscriptions import build_extended_domain_model from starlette import status +from gso.auth.security import opa_security_default from gso.products.product_blocks.iptrunk import IptrunkType, PhysicalPortCapacity from gso.products.product_blocks.router import RouterRole from gso.products.product_blocks.site import LatitudeCoordinate, LongitudeCoordinate from gso.services.subscriptions import get_active_iptrunk_subscriptions from gso.utils.shared_enums import Vendor -router = APIRouter(prefix="/networks", tags=["Network"]) +router = APIRouter(prefix="/networks", tags=["Network"], dependencies=[Depends(opa_security_default)]) class SiteBlock(OrchestratorBaseModel): diff --git a/gso/workflows/iptrunk/migrate_iptrunk.py b/gso/workflows/iptrunk/migrate_iptrunk.py index 6f99015c8bc3518d616dc919927b2ca673e3bd38..11294d9e2c50fb29b55eb99370162fb6d12c39aa 100644 --- a/gso/workflows/iptrunk/migrate_iptrunk.py +++ b/gso/workflows/iptrunk/migrate_iptrunk.py @@ -658,7 +658,7 @@ def update_subscription_model( subscription.iptrunk.iptrunk_sides[replace_index].iptrunk_side_ae_members.clear() # And update the list to only include the new member interfaces for member in new_lag_member_interfaces: - subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members.append( + subscription.iptrunk.iptrunk_sides[replace_index].iptrunk_side_ae_members.append( IptrunkInterfaceBlock.new(subscription_id=uuid4(), **member), ) diff --git a/setup.py b/setup.py index e856a7a87089e7b5618cf8d882bc3ac84cdbe30a..691295ab3ef0d0c17920e46e7241a9e3affee835 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import find_packages, setup setup( name="geant-service-orchestrator", - version="2.0", + version="2.1", author="GÉANT Orchestration and Automation Team", author_email="goat@geant.org", description="GÉANT Service Orchestrator",