diff options
Diffstat (limited to 'robot/assets')
| -rw-r--r-- | robot/assets/templates/sdnc/template.network.jinja (renamed from robot/assets/templates/vcpeutils/template.network.json) | 14 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/template.vcpe_gwgra_vfmodule.jinja (renamed from robot/assets/templates/vcpeutils/template.vcpe_gwgra_vfmodule.json) | 22 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/template.vcpe_infra_vfmodule.jinja (renamed from robot/assets/templates/vcpeutils/template.vcpe_infra_vfmodule.json) | 42 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/template.vcpe_vgw_vfmodule.jinja (renamed from robot/assets/templates/vcpeutils/template.vcpe_vgw_vfmodule.json) | 20 | ||||
| -rw-r--r-- | robot/assets/templates/vcpeutils/README.TXT | 15 | ||||
| -rw-r--r-- | robot/assets/templates/vcpeutils/template_sniro_data.jinja (renamed from robot/assets/templates/vcpeutils/template_sniro_data.sniro) | 0 |
6 files changed, 49 insertions, 64 deletions
diff --git a/robot/assets/templates/vcpeutils/template.network.json b/robot/assets/templates/sdnc/template.network.jinja index 2acb9e36..02ea14fc 100644 --- a/robot/assets/templates/vcpeutils/template.network.json +++ b/robot/assets/templates/sdnc/template.network.jinja @@ -11,25 +11,25 @@ }, "VNF-API:network-topology-information": { "VNF-API:network-topology-identifier": { - "VNF-API:network-role": "${network_role}", + "VNF-API:network-role": "{{network_role}}", "VNF-API:network-technology": "neutron", - "VNF-API:service-type": "${service_type}", - "VNF-API:network-name": "${network_name}", - "VNF-API:network-type": "${network_type}" + "VNF-API:service-type": "{{service_type}}", + "VNF-API:network-name": "{{network_name}}", + "VNF-API:network-type": "{{network_type}}" }, "VNF-API:provider-network-information": { "VNF-API:is-external-network": "true", - "VNF-API:physical-network-name": "${network_name}", + "VNF-API:physical-network-name": "{{network_name}}", "VNF-API:is-provider-network": "true", "VNF-API:is-shared-network": "true" }, "VNF-API:subnets": [ { - "VNF-API:start-address": "${subnet_start_ip}", + "VNF-API:start-address": "{{subnet_start_ip}}", "VNF-API:cidr-mask": "24", "VNF-API:ip-version": "4", "VNF-API:dhcp-enabled": "N", - "VNF-API:gateway-address": "${subnet_gateway}" + "VNF-API:gateway-address": "{{subnet_gateway}}" } ] }, diff --git a/robot/assets/templates/vcpeutils/template.vcpe_gwgra_vfmodule.json b/robot/assets/templates/sdnc/template.vcpe_gwgra_vfmodule.jinja index 48883b99..f1fec648 100644 --- a/robot/assets/templates/vcpeutils/template.vcpe_gwgra_vfmodule.json +++ b/robot/assets/templates/sdnc/template.vcpe_gwgra_vfmodule.jinja @@ -27,15 +27,15 @@ }, { "name": "public_net_id", - "value": "${public_net_id}" + "value": "{{public_net_id}}" }, { "name": "mux_gw_private_net_id", - "value": "${mux_gw_net}" + "value": "{{mux_gw_net}}" }, { "name": "mux_gw_private_subnet_id", - "value": "${mux_gw_subnet}" + "value": "{{mux_gw_subnet}}" }, { "name": "mux_gw_private_net_cidr", @@ -43,11 +43,11 @@ }, { "name": "cpe_public_net_id", - "value": "${cpe_public_net}" + "value": "{{cpe_public_net}}" }, { "name": "cpe_public_subnet_id", - "value": "${cpe_public_subnet}" + "value": "{{cpe_public_subnet}}" }, { "name": "cpe_public_net_cidr", @@ -67,7 +67,7 @@ }, { "name": "vgw_name_0", - "value": "zdcpe1cpe01gw01_${suffix}" + "value": "zdcpe1cpe01gw01_{{suffix}}" }, { "name": "mux_ip_addr", @@ -79,11 +79,11 @@ }, { "name": "onap_private_net_id", - "value": "${oam_onap_net}" + "value": "{{oam_onap_net}}" }, { "name": "onap_private_subnet_id", - "value": "${oam_onap_subnet}" + "value": "{{oam_onap_subnet}}" }, { "name": "onap_private_net_cidr", @@ -111,7 +111,7 @@ }, { "name": "pub_key", - "value": "${pub_key}" + "value": "{{pub_key}}" }, { "name": "cloud_env", @@ -120,13 +120,13 @@ ] }, "vf-module-assignments": {}, "vf-module-topology-identifier": { - "vf-module-name": "VGW2BRG-${brg_mac}" + "vf-module-name": "VGW2BRG-{{brg_mac}}" } }, "vnf-resource-assignments": {}, "vnf-topology-identifier-structure": { "nf-type": "vgw", - "vnf-id": "VGW2BRG-${brg_mac}" + "vnf-id": "VGW2BRG-{{brg_mac}}" } } } diff --git a/robot/assets/templates/vcpeutils/template.vcpe_infra_vfmodule.json b/robot/assets/templates/sdnc/template.vcpe_infra_vfmodule.jinja index 1f30e945..8babc7fd 100644 --- a/robot/assets/templates/vcpeutils/template.vcpe_infra_vfmodule.json +++ b/robot/assets/templates/sdnc/template.vcpe_infra_vfmodule.jinja @@ -16,11 +16,11 @@ }, "VNF-API:vnf-topology-information": { "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-type": "${vnf_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}", - "vnf-name": "${vnf_name}" + "service-type": "{{service_type}}", + "vnf-type": "{{vnf_type}}", + "generic-vnf-name": "{{generic_vnf_name}}", + "generic-vnf-type": "{{generic_vnf_type}}", + "vnf-name": "{{vnf_name}}" }, "VNF-API:vnf-parameters": [ { @@ -33,31 +33,31 @@ }, { "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" + "vnf-parameter-value": "{{public_net_id}}" }, { "vnf-parameter-name": "cpe_signal_net_id", - "vnf-parameter-value": "${cpe_signal_net}" + "vnf-parameter-value": "{{cpe_signal_net}}" }, { "vnf-parameter-name": "cpe_signal_subnet_id", - "vnf-parameter-value": "${cpe_signal_subnet}" + "vnf-parameter-value": "{{cpe_signal_subnet}}" }, { "vnf-parameter-name": "cpe_public_net_id", - "vnf-parameter-value": "${cpe_public_net}" + "vnf-parameter-value": "{{cpe_public_net}}" }, { "vnf-parameter-name": "cpe_public_subnet_id", - "vnf-parameter-value": "${cpe_public_subnet}" + "vnf-parameter-value": "{{cpe_public_subnet}}" }, { "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${oam_onap_net}" + "vnf-parameter-value": "{{oam_onap_net}}" }, { "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${oam_onap_subnet}" + "vnf-parameter-value": "{{oam_onap_subnet}}" }, { "vnf-parameter-name": "onap_private_net_cidr", @@ -105,35 +105,35 @@ }, { "vnf-parameter-name": "mr_ip_addr", - "vnf-parameter-value": "${mr_ip_addr}" + "vnf-parameter-value": "{{mr_ip_addr}}" }, { "vnf-parameter-name": "mr_ip_port", - "vnf-parameter-value": "${mr_ip_port}" + "vnf-parameter-value": "{{mr_ip_port}}" }, { "vnf-parameter-name": "vaaa_name_0", - "vnf-parameter-value": "zdcpe1cpe01aaa01_${suffix}" + "vnf-parameter-value": "zdcpe1cpe01aaa01_{{suffix}}" }, { "vnf-parameter-name": "vdns_name_0", - "vnf-parameter-value": "zdcpe1cpe01dns01_${suffix}" + "vnf-parameter-value": "zdcpe1cpe01dns01_{{suffix}}" }, { "vnf-parameter-name": "vdhcp_name_0", - "vnf-parameter-value": "zdcpe1cpe01dhcp01_${suffix}" + "vnf-parameter-value": "zdcpe1cpe01dhcp01_{{suffix}}" }, { "vnf-parameter-name": "vweb_name_0", - "vnf-parameter-value": "zdcpe1cpe01web01_${suffix}" + "vnf-parameter-value": "zdcpe1cpe01web01_{{suffix}}" }, { "vnf-parameter-name": "vnf_id", - "vnf-parameter-value": "vCPE_Infrastructure_demo_app_${suffix}" + "vnf-parameter-value": "vCPE_Infrastructure_demo_app_{{suffix}}" }, { "vnf-parameter-name": "vf_module_id", - "vnf-parameter-value": "vCPE_Intrastructure_${suffix}" + "vnf-parameter-value": "vCPE_Intrastructure_{{suffix}}" }, { "vnf-parameter-name": "dcae_collector_ip", @@ -165,7 +165,7 @@ }, { "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" + "vnf-parameter-value": "{{pub_key}}" }, { "vnf-parameter-name": "cloud_env", diff --git a/robot/assets/templates/vcpeutils/template.vcpe_vgw_vfmodule.json b/robot/assets/templates/sdnc/template.vcpe_vgw_vfmodule.jinja index bd288b4d..daf0d49c 100644 --- a/robot/assets/templates/vcpeutils/template.vcpe_vgw_vfmodule.json +++ b/robot/assets/templates/sdnc/template.vcpe_vgw_vfmodule.jinja @@ -27,15 +27,15 @@ }, { "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" + "vnf-parameter-value": "{{public_net_id}}" }, { "vnf-parameter-name": "mux_gw_private_net_id", - "vnf-parameter-value": "${mux_gw_net}" + "vnf-parameter-value": "{{mux_gw_net}}" }, { "vnf-parameter-name": "mux_gw_private_subnet_id", - "vnf-parameter-value": "${mux_gw_subnet}" + "vnf-parameter-value": "{{mux_gw_subnet}}" }, { "vnf-parameter-name": "mux_gw_private_net_cidr", @@ -43,11 +43,11 @@ }, { "vnf-parameter-name": "cpe_public_net_id", - "vnf-parameter-value": "${cpe_public_net}" + "vnf-parameter-value": "{{cpe_public_net}}" }, { "vnf-parameter-name": "cpe_public_subnet_id", - "vnf-parameter-value": "${cpe_public_subnet}" + "vnf-parameter-value": "{{cpe_public_subnet}}" }, { "vnf-parameter-name": "cpe_public_net_cidr", @@ -67,7 +67,7 @@ }, { "vnf-parameter-name": "vgw_name_0", - "vnf-parameter-value": "zdcpe1cpe01gw01_${suffix}" + "vnf-parameter-value": "zdcpe1cpe01gw01_{{suffix}}" }, { "vnf-parameter-name": "mux_ip_addr", @@ -79,11 +79,11 @@ }, { "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${oam_onap_net}" + "vnf-parameter-value": "{{oam_onap_net}}" }, { "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${oam_onap_subnet}" + "vnf-parameter-value": "{{oam_onap_subnet}}" }, { "vnf-parameter-name": "onap_private_net_cidr", @@ -111,7 +111,7 @@ }, { "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" + "vnf-parameter-value": "{{pub_key}}" }, { "vnf-parameter-name": "cloud_env", @@ -122,7 +122,7 @@ "generic-vnf-name": "GENERIC-VGW-VNF-NAME0", "generic-vnf-type": "GENERIC-VGW-VNF-TYPE", "service-type": "VGW-SERVICE-TYPE", - "vnf-name": "VGW2BRG-${brg_mac}", + "vnf-name": "VGW2BRG-{{brg_mac}}", "vnf-type": "VGW-VNF-TYPE" } } diff --git a/robot/assets/templates/vcpeutils/README.TXT b/robot/assets/templates/vcpeutils/README.TXT deleted file mode 100644 index 8a0482dc..00000000 --- a/robot/assets/templates/vcpeutils/README.TXT +++ /dev/null @@ -1,15 +0,0 @@ -# Test templates using robot -# template.vfw_vfmodule.json -# -# Remaining templates still to be tested with robot -# simple_neutron_heat.yaml -# template.network.json -# template_sniro_data.json -# template_sniro_request.json -# template.vcpe_bng_vfmodule.json -# template.vcpe_brgemu_vfmodule.json -# template.vcpe_gmux_vfmodule.json -# template.vcpe_gwgra_vfmodule.json -# template.vcpe_infra_vfmodule.json -# template.vcpe_vgw_vfmodule.json - diff --git a/robot/assets/templates/vcpeutils/template_sniro_data.sniro b/robot/assets/templates/vcpeutils/template_sniro_data.jinja index 78db76db..78db76db 100644 --- a/robot/assets/templates/vcpeutils/template_sniro_data.sniro +++ b/robot/assets/templates/vcpeutils/template_sniro_data.jinja |