Fix some bugs and typos; make all fields except ipv4/ipv6 mandatory; rerun products db migration

geant_service_orchestrator/products/product_blocks/trunk.py

@@ -12,7 +12,7 @@ class TrunkBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLifecycle.INI
 
 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

@@ -19,7 +19,7 @@ class TrunkConfigCommonBlockProvisioning(TrunkConfigCommonBlockInactive, lifecyc
     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
@@ -14,18 +14,18 @@ class TrunkConfigSideBlockInactive(ProductBlockModel, lifecycle=[SubscriptionLif
     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(TrunkConfigSideBlockInactive, lifecycle=[SubscriptionLifecycle.PROVISIONING]):
     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(TrunkConfigSideBlockProvisioning, lifecycle=[SubscriptionLifecycle.ACTIVE]):
@@ -36,4 +36,4 @@ class TrunkConfigSideBlock(TrunkConfigSideBlockProvisioning, lifecycle=[Subscrip
     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
@@ -17,7 +16,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

-from typing import List, Optional
+from typing import List
 from uuid import uuid4
 from random import randint
 
@@ -49,7 +49,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

-from typing import List, Optional
+from typing import List
 from uuid import uuid4
+from random import randint
 
 from orchestrator.db.models import ProductTable, SubscriptionTable
 from orchestrator.forms import FormPage
@@ -40,7 +41,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
             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
@@ -52,7 +53,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

@@ -40,11 +40,11 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
             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 CreateTrunkConfigSideForm