diff options
Diffstat (limited to 'tutorials/vFWDT/workflow/templates')
4 files changed, 14 insertions, 16 deletions
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json index b249032b..473f44f2 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json @@ -1,13 +1,13 @@ { "InventoryNames": "VM", - "PlaybookName": "${()=(book_name)}", + "PlaybookName": "${book_name}", "AutoNodeList": true, "EnvParameters": { "ConfigFileName": "../traffic_distribution_config.json", "vnf_instance": "vfwdt" }, "FileParameters": { - "traffic_distribution_config.json": "${()=(file_parameter_content)}" + "traffic_distribution_config.json": "${file_parameter_content}" }, "Timeout": 3600 } diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json index c875f285..453db34e 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json @@ -1,15 +1,15 @@ { "InventoryNames": "VM", - "PlaybookName": "${()=(book_name)}", + "PlaybookName": "${book_name}", "AutoNodeList": true, "EnvParameters": { "ConfigFileName": "../config.json", "vnf_instance": "vfwdt", - "new_software_version": "${()=(new-software-version)}", - "existing_software_version": "${()=(existing-software-version)}" + "new_software_version": "${new-software-version}", + "existing_software_version": "${existing-software-version}" }, "FileParameters": { - "config.json": "${()=(file_parameter_content)}" + "config.json": "${file_parameter_content}" }, "Timeout": 3600 } diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json index b249032b..473f44f2 100755 --- a/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json +++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json @@ -1,13 +1,13 @@ { "InventoryNames": "VM", - "PlaybookName": "${()=(book_name)}", + "PlaybookName": "${book_name}", "AutoNodeList": true, "EnvParameters": { "ConfigFileName": "../traffic_distribution_config.json", "vnf_instance": "vfwdt" }, "FileParameters": { - "traffic_distribution_config.json": "${()=(file_parameter_content)}" + "traffic_distribution_config.json": "${file_parameter_content}" }, "Timeout": 3600 } diff --git a/tutorials/vFWDT/workflow/templates/hasRequest.json b/tutorials/vFWDT/workflow/templates/hasRequest.json index a0c678b6..fd3dcf4e 100644 --- a/tutorials/vFWDT/workflow/templates/hasRequest.json +++ b/tutorials/vFWDT/workflow/templates/hasRequest.json @@ -37,7 +37,7 @@ "demands": { "vFW-SINK": [ { - "attributes": { + "filtering_attributes": { "global-customer-id": { "get_param": "chosen_customer_id" }, @@ -46,13 +46,12 @@ }, "model-version-id": "202d2fd8-a045-4c9a-b767-2a1639c10291", "orchestration-status": [ - "active" + "Active" ], "model-invariant-id": "6f3fd439-fd5f-4a2d-95bc-b6bf8787001a", "service_instance_id": { "get_param": "service_id" - }, - "prov-status": "ACTIVE" + } }, "inventory_provider": "aai", "service_resource_id": "vFW-SINK-XX", @@ -78,7 +77,7 @@ ], "vPGN": [ { - "attributes": { + "filtering_attributes": { "global-customer-id": { "get_param": "chosen_customer_id" }, @@ -87,13 +86,12 @@ }, "model-version-id": "6bfe954e-bb00-4111-be3c-33eed9d20a8c", "orchestration-status": [ - "active" + "Active" ], "model-invariant-id": "3f356335-7b36-41ee-8f74-72d0a2ec3ebf", "service_instance_id": { "get_param": "service_id" - }, - "prov-status": "ACTIVE" + } }, "inventory_provider": "aai", "service_resource_id": "vPGN-XX", |