Merge branch 'develop' into 'getting_things_to_work'

# Conflicts:
#   geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
#   geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
#   geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py

geant_service_orchestrator/workflows/trunk_config_side/terminate_trunk_config_side.py

@@ -3,17 +3,22 @@ from orchestrator.forms.validators import Label
 from orchestrator.targets import Target
 from orchestrator.types import InputForm, SubscriptionLifecycle, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from orchestrator.workflows.steps import resync, set_status, store_process_subscription, unsync
+from orchestrator.workflows.steps \
+    import resync, set_status, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 
-from products import TrunkConfigSide
+from geant_service_orchestrator.products import TrunkConfigSide
 
 
-def initial_input_form_generator(subscription_id: UUIDstr, organisation: UUIDstr) -> InputForm:
+def initial_input_form_generator(
+        subscription_id: UUIDstr,
+        organisation: UUIDstr) -> InputForm:
     subscription = TrunkConfigSide.from_subscription(subscription_id)
 
     class TerminateForm(FormPage):
-        are_you_sure: Label = f"Are you sure you want to remove {subscription.description}?"  # type:ignore
+        are_you_sure: Label = \
+            "Are you sure you want to remove " \
+            f"{subscription.description}?"  # type:ignore
 
     return TerminateForm
 
@@ -23,13 +28,14 @@ def _deprovision_in_gap(trunk_config_side_id: int) -> int:
 
 
 @step("Deprovision trunk config side")
-def deprovision_trunk_config_side(subscription: TrunkConfigSide) -> None:
+def deprovision_trunk_config_side(
+        subscription: TrunkConfigSide) -> None:
     _deprovision_in_gap(subscription.trunk_config_side.trunk_config_side_id)
 
 
 @workflow(
     "Terminate trunk config side",
-    initial_input_form=wrap_modify_initial_input_form(initial_input_form_generator),
+    initial_input_form=wrap_modify_initial_input_form(initial_input_form_generator),  # noqa: E501
     target=Target.TERMINATE,
 )
 def terminate_trunk_config_side():
@@ -42,4 +48,4 @@ def terminate_trunk_config_side():
         >> set_status(SubscriptionLifecycle.TERMINATED)
         >> resync
         >> done
-    )
+    )
\ No newline at end of file

requirements.txt

 orchestrator-core
+
+pytest

test/test_placeholder.py

+# just a placeholder to be able to run tests during ci
+
+def test_placeholder():
+    pass

tox.ini

+[flake8]
+exclude = venv,.tox, migrations
+
+[testenv]
+deps =
+    coverage
+    flake8
+    -r requirements.txt
+
+commands =
+    coverage erase
+    coverage run --source geant_service_orchestrator -m pytest {posargs}
+    coverage xml
+    coverage html
+    # coverage report --fail-under 80
+    coverage report
+    flake8
+