diff --git a/geant_service_orchestrator/services/ipam.py b/geant_service_orchestrator/services/ipam.py index 3314bce4ed21d4cc1633a75a7cf10d77b54e94e1..021bcb4480859835a7fe081d294f91fa7f44f33a 100644 --- a/geant_service_orchestrator/services/ipam.py +++ b/geant_service_orchestrator/services/ipam.py @@ -2,6 +2,7 @@ import ipaddress from pydantic import BaseSettings from geant_service_orchestrator import settings + class ServiceNetworks(BaseSettings): v4: ipaddress.IPv4Network v6: ipaddress.IPv6Network diff --git a/geant_service_orchestrator/workflows/device/create_device.py b/geant_service_orchestrator/workflows/device/create_device.py index 02eedfa7626b740258aba1cedec4ae478b3a9a25..bf7e66272d5ca6ef027ce1b5f844ef0f808bbdf7 100644 --- a/geant_service_orchestrator/workflows/device/create_device.py +++ b/geant_service_orchestrator/workflows/device/create_device.py @@ -95,7 +95,10 @@ def initialize_subscription( @step("Provision device [DRY RUN]") def provision_device_dry( - subscription: device.DeviceProvisioning, fqdn: str, ts_address: str, ts_port: str + subscription: device.DeviceProvisioning, + fqdn: str, + ts_address: str, + ts_port: str ) -> State: import ansible_runner @@ -117,7 +120,7 @@ def provision_device_dry( ) out = r.stdout.read() out_splitted = out.splitlines() - #if r.rc != 0: + # if r.rc != 0: # raise ValueError("Ansible has failed") return {"dry_run_output": out_splitted, "return_code": r.rc} @@ -134,7 +137,10 @@ def confirm_step() -> FormGenerator: @step("Provision device [FOR REAL]") def provision_device_real( - subscription: device.DeviceProvisioning, fqdn: str, ts_address: str, ts_port: str + subscription: device.DeviceProvisioning, + fqdn: str, + ts_address: str, + ts_port: str ) -> State: import ansible_runner