change imports of geant_service_orchestrator to gso

README.md

@@ -12,7 +12,7 @@ This is a dummy implementation of a trunk service in workflow orchestrator. The
 - ``pip install -e .``
 - Create ``oss-params.json``
 - Export the oss-params file: ``export OSS_PARAMS_FILENAME="/path/to/file.json"``
-- The core of workflow orchestrator can be started with ``uvicorn --host 0.0.0.0 --port 8080 main:app`` from inside the ``geant_service_orchestrator`` directory of this repo.
+- The core of workflow orchestrator can be started with ``uvicorn --host 0.0.0.0 --port 8080 main:app`` from inside the ``gso`` directory of this repo.
 - The GUI can be started with ``yarn start``.
 
 ## Structure description

gso/main.py

 from orchestrator import OrchestratorCore
 from orchestrator.cli.main import app as core_cli
 from orchestrator.settings import AppSettings
-import geant_service_orchestrator.products  # noqa: F401
-import geant_service_orchestrator.workflows  # noqa: F401
+import gso.products  # noqa: F401
+import gso.workflows  # noqa: F401
 
 
 app = OrchestratorCore(base_settings=AppSettings())

gso/products/__init__.py

 from orchestrator.domain import SUBSCRIPTION_MODEL_REGISTRY
 
-from geant_service_orchestrator.products.product_types.device import Device
+from gso.products.product_types.device import Device
 
 SUBSCRIPTION_MODEL_REGISTRY.update(
     {

gso/products/product_types/device.py

 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.types import SubscriptionLifecycle, strEnum
 
-from geant_service_orchestrator.products.product_blocks.device \
+from gso.products.product_blocks.device \
     import DeviceBlock, DeviceBlockInactive, DeviceBlockProvisioning
 
 

gso/services/ipam.py

 import ipaddress
 from pydantic import BaseSettings
-from geant_service_orchestrator import settings
+from gso import settings
 
 
 class ServiceNetworks(BaseSettings):

gso/services/provisioning_proxy.py

-from geant_service_orchestrator.products.product_types.device \
+from gso.products.product_types.device \
     import DeviceBlock
-from geant_service_orchestrator import settings
+from gso import settings
 import requests
 
 

gso/services/resource_manager.py

-from geant_service_orchestrator import settings
+from gso import settings
 import requests
 
 

gso/workflows/device/create_device.py

@@ -11,8 +11,8 @@ from orchestrator.workflow import done, init, step, workflow
 from orchestrator.workflows.steps import resync, set_status
 from orchestrator.workflows.steps import store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
-from geant_service_orchestrator.products.product_types import device
-from geant_service_orchestrator.services import ipam, provisioning_proxy
+from gso.products.product_types import device
+from gso.services import ipam, provisioning_proxy
 
 
 def initial_input_form_generator(product_name: str) -> FormGenerator:

gso/workflows/device/terminate_device.py

@@ -11,7 +11,7 @@ from orchestrator.workflows.steps import (
 )
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 
-from geant_service_orchestrator.products.product_types.device import Device
+from gso.products.product_types.device import Device
 
 
 def initial_input_form_generator(subscription_id: UUIDstr) -> InputForm:

tox.ini

@@ -9,7 +9,7 @@ deps =
 
 commands =
     coverage erase
-    coverage run --source geant_service_orchestrator -m pytest {posargs}
+    coverage run --source gso -m pytest {posargs}
     coverage xml
     coverage html
     # coverage report --fail-under 80