Fix merge related errors

geant_service_orchestrator/main.py

@@ -2,8 +2,8 @@ from orchestrator import OrchestratorCore
 from orchestrator.cli.main import app as core_cli
 from orchestrator.settings import AppSettings
 
-# from geant_service_orchestrator import products
-# from geant_service_orchestrator import workflows
+import products
+import workflows
 
 app = OrchestratorCore(base_settings=AppSettings())
 

geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py

-<<<<<<< geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
-=======
-import random
->>>>>>> geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
+from random import randint
 from typing import List
 from uuid import uuid4
 

geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py

-<<<<<<< geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
+from random import randint
 from typing import List
-=======
-import random
-from typing import List, Optional
->>>>>>> geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
 from uuid import uuid4
-from random import randint
 
 from orchestrator.db.models import ProductTable, SubscriptionTable
 from orchestrator.forms import FormPage
@@ -59,7 +54,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
         minimum_links: int
         trunk_config_ids: trunk_config_selector()  # type:ignore
 
-    user_input = yield CreateTrunkConfigForm
+    user_input = yield CreateTrunkConfigCommonForm
     return user_input.dict()
 
 

geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py

@@ -44,11 +44,7 @@ def trunk_config_selector() -> list:
 
 
 def initial_input_form_generator(product_name: str) -> FormGenerator:
-<<<<<<< geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
     class CreateTrunkConfigSideForm(FormPage):
-=======
-    class CreateTrunkConfigCommonForm(FormPage):
->>>>>>> geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
         class Config:
             title = product_name
 
@@ -60,7 +56,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
         members: List[str]
         trunk_config_ids: trunk_config_selector()  # type:ignore
 
-    user_input = yield CreateTrunkConfigCommonForm
+    user_input = yield CreateTrunkConfigSideForm
 
     return user_input.dict()