Merge branch 'getting_things_to_work' into 'develop'

Getting things to work

See merge request goat/geant-service-orchestrator!1

.gitignore

-__pycache__
+__pycache__/
 *.egg-info
 .coverage
 coverage.xml

geant_service_orchestrator/products/product_blocks/trunk.py

@@ -17,7 +17,7 @@ class TrunkBlockProvisioning(
         TrunkBlockInactive,
         lifecycle=[SubscriptionLifecycle.PROVISIONING]):
     trunk_id: Optional[int] = None
-    geant_s_sid: Optional[str] = None
+    geant_s_sid: str
     trunk_name: str
 
 

geant_service_orchestrator/products/product_blocks/trunk_config_common.py

@@ -26,7 +26,7 @@ class TrunkConfigCommonBlockProvisioning(
     trunk_config: TrunkConfigBlockProvisioning
     trunk_config_common_id: Optional[int] = None
     speed: str
-    is_leased_line: Optional[bool] = None
+    is_leased_line: bool
     isis_metric: int
     minimum_links: int
 

geant_service_orchestrator/products/product_blocks/trunk_config_side.py

-from typing import Optional
+from typing import List, Optional
 
 from orchestrator.domain.base import ProductBlockModel
 from orchestrator.types import SubscriptionLifecycle
@@ -19,7 +19,7 @@ class TrunkConfigSideBlockInactive(
     geant_a_sid: Optional[str] = None
     ipv4_address: Optional[str] = None
     ipv6_address: Optional[str] = None
-    members: Optional[list] = None
+    members: Optional[List[str]] = None
 
 
 class TrunkConfigSideBlockProvisioning(
@@ -28,11 +28,11 @@ class TrunkConfigSideBlockProvisioning(
     trunk_config: TrunkConfigBlockProvisioning
     trunk_config_side_id: Optional[int] = None
     fqdn: str
-    ae_name: Optional[str] = None
-    geant_a_sid: Optional[str] = None
-    ipv4_address: Optional[str] = None
-    ipv6_address: Optional[str] = None
-    members: Optional[list] = None
+    ae_name: str
+    geant_a_sid: str
+    ipv4_address: Optional[str] = "127.0.0.1"
+    ipv6_address: Optional[str] = "::1"
+    members: List[str]
 
 
 class TrunkConfigSideBlock(
@@ -45,4 +45,4 @@ class TrunkConfigSideBlock(
     geant_a_sid: str
     ipv4_address: str
     ipv6_address: str
-    members: list
+    members: List[str]

geant_service_orchestrator/workflows/trunk/create_trunk.py

-from typing import Optional
 from uuid import uuid4
 
 from orchestrator.forms import FormPage
@@ -20,7 +19,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
             title = product_name
 
         trunk_name: str
-        geant_s_sid: Optional[str]
+        geant_s_sid: str
 
     user_input = yield CreateTrunkForm
 

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 typing import List
 from uuid import uuid4
 
@@ -57,7 +60,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
 
 def _provision_in_gap() -> int:
 
-    return random.randint(0, 2147483648)
+    return randint(0, 2147483648)
 
 
 @step("Create subscription")

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 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
@@ -45,11 +50,11 @@ def trunk_config_selector() -> list:
 
 
 def initial_input_form_generator(product_name: str) -> FormGenerator:
-    class CreateTrunkConfigForm(FormPage):
+    class CreateTrunkConfigCommonForm(FormPage):
         class Config:
             title = product_name
         speed: str
-        is_leased_line: Optional[bool]
+        is_leased_line: bool
         isis_metric: int
         minimum_links: int
         trunk_config_ids: trunk_config_selector()  # type:ignore
@@ -60,7 +65,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
 
 def _provision_in_gap() -> int:
 
-    return random.randint(0, 2147483648)
+    return randint(0, 2147483648)
 
 
 @step("Create subscription")

geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py

@@ -44,16 +44,20 @@ 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
 
         fqdn: str
-        ae_name: Optional[str]
-        geant_a_sid: Optional[str]
+        ae_name: str
+        geant_a_sid: str
         ipv4_address: Optional[str]
         ipv6_address: Optional[str]
-        members: Optional[list]
+        members: List[str]
         trunk_config_ids: trunk_config_selector()  # type:ignore
 
     user_input = yield CreateTrunkConfigCommonForm