From 1caa5846db88a857c88b9fdf5a9e30c542786add Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Wed, 15 Mar 2023 13:25:32 +0100
Subject: [PATCH] fixed some merge errors
---
.../workflows/trunk_config/create_trunk_config.py | 5 +----
.../trunk_config_common/create_trunk_config_common.py | 7 +------
.../trunk_config_side/create_trunk_config_side.py | 6 +-----
3 files changed, 3 insertions(+), 15 deletions(-)
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..4dafee56 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 typing import List
from uuid import uuid4
@@ -60,7 +57,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
def _provision_in_gap() -> int:
- return randint(0, 2147483648)
+ return random.randint(0, 2147483648)
@step("Create subscription")
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..42646762 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,9 +1,4 @@
-<<<<<<< geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
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
@@ -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