From 0a2397decf8a64a49e37c848bebe3e1faedd554b Mon Sep 17 00:00:00 2001 From: Simone Spinelli <simone.spinelli@geant.org> Date: Tue, 2 May 2023 09:58:03 +0000 Subject: [PATCH] Less tox errors - not finished yet --- gso/products/product_blocks/iptrunk.py | 8 ++++---- gso/services/provisioning_proxy.py | 2 +- gso/workflows/__init__.py | 3 ++- gso/workflows/device/create_device.py | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gso/products/product_blocks/iptrunk.py b/gso/products/product_blocks/iptrunk.py index 026074ee..1da94f24 100644 --- a/gso/products/product_blocks/iptrunk.py +++ b/gso/products/product_blocks/iptrunk.py @@ -14,8 +14,8 @@ class IptrunkType(strEnum): class IptrunkBlockInactive(ProductBlockModel, - lifecycle=[SubscriptionLifecycle.INITIAL], - product_block_name="IptrunkBlock"): + lifecycle=[SubscriptionLifecycle.INITIAL], + product_block_name="IptrunkBlock"): geant_s_sid: Optional[str] = None iptrunk_description: Optional[str] = None iptrunk_type: Optional[IptrunkType] = None @@ -38,7 +38,7 @@ class IptrunkBlockInactive(ProductBlockModel, class IptrunkBlockProvisioning(IptrunkBlockInactive, - lifecycle=[SubscriptionLifecycle.PROVISIONING]): + lifecycle=[SubscriptionLifecycle.PROVISIONING]): geant_s_sid: Optional[str] = None iptrunk_description: Optional[str] = None iptrunk_type: Optional[IptrunkType] = None @@ -61,7 +61,7 @@ class IptrunkBlockProvisioning(IptrunkBlockInactive, class IptrunkBlock(IptrunkBlockProvisioning, - lifecycle=[SubscriptionLifecycle.ACTIVE]): + lifecycle=[SubscriptionLifecycle.ACTIVE]): geant_s_sid: str iptrunk_description: str iptrunk_type: IptrunkType diff --git a/gso/services/provisioning_proxy.py b/gso/services/provisioning_proxy.py index 0b68ead5..db50cf97 100644 --- a/gso/services/provisioning_proxy.py +++ b/gso/services/provisioning_proxy.py @@ -3,7 +3,7 @@ import logging from gso.products.product_types.device \ import DeviceBlock from gso import settings -import requests +# import requests logger = logging.getLogger(__name__) diff --git a/gso/workflows/__init__.py b/gso/workflows/__init__.py index 33951c4e..1ba2f18d 100644 --- a/gso/workflows/__init__.py +++ b/gso/workflows/__init__.py @@ -1,6 +1,7 @@ from orchestrator.workflows import LazyWorkflowInstance LazyWorkflowInstance("gso.workflows.device.create_device", "create_device") -LazyWorkflowInstance("gso.workflows.device.terminate_device", "terminate_device") +LazyWorkflowInstance("gso.workflows.device.terminate_device", + "terminate_device") LazyWorkflowInstance("gso.workflows.device.get_facts", "get_facts") LazyWorkflowInstance("gso.workflows.iptrunk.create_iptrunk", "create_iptrunk") diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py index 4082c46d..d3e0bfd0 100644 --- a/gso/workflows/device/create_device.py +++ b/gso/workflows/device/create_device.py @@ -172,7 +172,7 @@ def provision_device_real( # out_splitted = out.splitlines() # # return {"real_run_output": out_splitted, "return_code": r.rc} - #provisioning_proxy.provision_node( + # provisioning_proxy.provision_node( # node_subscription_params=subscription) # TODO: figure out what to return when we are suspending & waiting # for the provisioning-proxy to call back -- GitLab