Skip to content
Snippets Groups Projects
Commit 1caa5846 authored by Erik Reid's avatar Erik Reid
Browse files

fixed some merge errors

parent 203d6b86
Branches
Tags
No related merge requests found
<<<<<<< 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")
......
<<<<<<< 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()
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment