diff --git a/gso/services/provisioning_proxy.py b/gso/services/provisioning_proxy.py
index 55c272c2ccfea1d4e6ebceb517076cec38d9680c..988d392d77358fb86f0598b95eed4f3fa9cadf43 100644
--- a/gso/services/provisioning_proxy.py
+++ b/gso/services/provisioning_proxy.py
@@ -169,15 +169,13 @@ def deprovision_ip_trunk(subscription: Iptrunk,
@inputstep('Await provisioning proxy results', assignee=Assignee('SYSTEM'))
-def await_pp_results(subscription: SubscriptionModel) -> State:
+def await_pp_results(subscription: SubscriptionModel,
+ label_text: str) -> State:
class ProvisioningResultPage(FormPage):
class Config:
title = f'Deploying {subscription.product.name}...'
- warning_label: Label = f'{subscription.product.description} is being' \
- f' deployed right now. Feel free to refresh ' \
- f'this page every now and again. Just be ' \
- f'sure that you do NOT click submit!'
+ warning_label: Label = label_text
pp_run_results: dict = None
confirm: Accept = Accept('INCOMPLETE')
diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py
index d7646e5da5b0ff2f484372266abf905d5302206e..fbab2f106ae2067c6ca8a0f6858b4f60976cc5ee 100644
--- a/gso/workflows/device/create_device.py
+++ b/gso/workflows/device/create_device.py
@@ -136,7 +136,13 @@ def provision_device_dry(subscription: DeviceProvisioning,
process_id: UUIDstr) -> State:
provisioning_proxy.provision_device(subscription, process_id)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': f'This is a dry run for the deployment of a new '
+ f'{subscription.device_type}. Deployment is being '
+ f'taken care of by the provisioning proxy, please '
+ f'wait for the results to come back before '
+ f'continuing.'
+ }
@step('Provision device [FOR REAL]')
@@ -144,7 +150,13 @@ def provision_device_real(subscription: DeviceProvisioning,
process_id: UUIDstr) -> State:
provisioning_proxy.provision_device(subscription, process_id, False)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': f'This is a live deployment of a new '
+ f'{subscription.device_type}. Deployment is being '
+ f'taken care of by the provisioning proxy, please '
+ f'wait for the results to come back before '
+ f'continuing.'
+ }
@workflow(
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 1c096575bb674c9e879c22c147fbc664fac8f352..5d8baf98139965d444495492a009537b30807d39 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -158,7 +158,12 @@ def provision_ip_trunk_iface_dry(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'trunk_interface')
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a dry run for the deployment of a new IP '
+ 'trunk. Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Provision IP trunk interface [FOR REAL]')
@@ -167,7 +172,12 @@ def provision_ip_trunk_iface_real(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'trunk_interface', False)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a live deployment of a new IP trunk. '
+ 'Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Provision IP trunk ISIS interface [DRY RUN]')
@@ -176,7 +186,13 @@ def provision_ip_trunk_isis_iface_dry(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'isis_interface')
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a dry run for the deployment of a new IP '
+ 'trunk ISIS interface. '
+ 'Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Provision IP trunk ISIS interface [FOR REAL]')
@@ -185,7 +201,13 @@ def provision_ip_trunk_isis_iface_real(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'isis_interface', False)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a live deployment of a new IP trunk '
+ 'ISIS interface. '
+ 'Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Provision IP trunk LDP interface [DRY RUN]')
@@ -194,7 +216,13 @@ def provision_ip_trunk_ldp_iface_dry(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'ldp_interface')
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a dry run for the deployment of a new IP '
+ 'trunk LDP interface. '
+ 'Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Provision IP trunk LDP interface [FOR REAL]')
@@ -203,7 +231,13 @@ def provision_ip_trunk_ldp_iface_real(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'ldp_interface', False)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a live deployment of a new IP trunk '
+ 'LDP interface. '
+ 'Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Provision IP trunk LLDP interface [DRY RUN]')
@@ -212,7 +246,13 @@ def provision_ip_trunk_lldp_iface_dry(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'lldp_interface')
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a dry run for the deployment of a new IP '
+ 'trunk LLDP interface. '
+ 'Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Provision IP trunk LLDP interface [FOR REAL]')
@@ -221,7 +261,13 @@ def provision_ip_trunk_lldp_iface_real(subscription: IptrunkProvisioning,
provisioning_proxy.provision_ip_trunk(subscription, process_id,
'lldp_interface', False)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a live deployment of a new IP trunk '
+ 'LLDP interface. '
+ 'Deployment is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@workflow(
diff --git a/gso/workflows/iptrunk/terminate_iptrunk.py b/gso/workflows/iptrunk/terminate_iptrunk.py
index c77cb2f9ca339ae33d4e0c8ee5fe55165d0261e3..45976f235e65f092a87d9db9053e83896c3d57a6 100644
--- a/gso/workflows/iptrunk/terminate_iptrunk.py
+++ b/gso/workflows/iptrunk/terminate_iptrunk.py
@@ -35,7 +35,13 @@ def deprovision_ip_trunk_dry(subscription: Iptrunk,
process_id: UUIDstr) -> State:
provisioning_proxy.deprovision_ip_trunk(subscription, process_id)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a dry run for the termination of an IP '
+ 'trunk. '
+ 'Termination is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@step('Deprovision IP trunk [FOR REAL]')
@@ -43,7 +49,12 @@ def deprovision_ip_trunk_real(subscription: Iptrunk,
process_id: UUIDstr) -> State:
provisioning_proxy.deprovision_ip_trunk(subscription, process_id, False)
- return {'subscription': subscription}
+ return {'subscription': subscription,
+ 'label_text': 'This is a termination of an IP trunk. '
+ 'Termination is being taken care of by the '
+ 'provisioning proxy, please wait for the results to '
+ 'come back before continuing.'
+ }
@workflow(