From c52cde4d97a7a22314efaf9041cec51ff5391970 Mon Sep 17 00:00:00 2001
From: Ubuntu <jorge.sasiain@ehu.eus>
Date: Wed, 15 Mar 2023 11:53:42 +0000
Subject: [PATCH] Fix merge related errors
---
geant_service_orchestrator/main.py | 4 ++--
.../workflows/trunk_config/create_trunk_config.py | 5 +----
.../trunk_config_common/create_trunk_config_common.py | 9 ++-------
.../trunk_config_side/create_trunk_config_side.py | 6 +-----
4 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/geant_service_orchestrator/main.py b/geant_service_orchestrator/main.py
index 1df03d52..66357c21 100644
--- a/geant_service_orchestrator/main.py
+++ b/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())
diff --git a/geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py b/geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
index 1827796e..b1f39f95 100644
--- a/geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
+++ b/geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
@@ -1,7 +1,4 @@
-<<<<<<< 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
diff --git a/geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py b/geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
index 617e5a00..521b4aef 100644
--- a/geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
+++ b/geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
@@ -1,11 +1,6 @@
-<<<<<<< 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()
diff --git a/geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py b/geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
index 978cb655..625f7b4d 100644
--- a/geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
+++ b/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()
--
GitLab