summaryrefslogtreecommitdiffstats
path: root/robot
diff options
context:
space:
mode:
Diffstat (limited to 'robot')
-rw-r--r--robot/assets/asdc/base_vfw/base_vfw.yaml32
-rw-r--r--robot/assets/asdc/base_vlb/base_vlb.yaml24
-rw-r--r--robot/assets/asdc/base_vlb/dnsscaling.yaml20
-rw-r--r--robot/resources/demo_preload.robot10
4 files changed, 14 insertions, 72 deletions
diff --git a/robot/assets/asdc/base_vfw/base_vfw.yaml b/robot/assets/asdc/base_vfw/base_vfw.yaml
index 1c22c9b7..a0a23094 100644
--- a/robot/assets/asdc/base_vfw/base_vfw.yaml
+++ b/robot/assets/asdc/base_vfw/base_vfw.yaml
@@ -1,25 +1,5 @@
##########################################################################
#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
##########################################################################
heat_template_version: 2013-05-23
@@ -256,7 +236,7 @@ resources:
__cloud_env__ : { get_param: cloud_env }
template: |
#!/bin/bash
-
+
# Create configuration files
mkdir /opt/config
echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
@@ -272,7 +252,7 @@ resources:
echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt
echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
-
+
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh
cd /opt
@@ -323,7 +303,7 @@ resources:
__cloud_env__ : { get_param: cloud_env }
template: |
#!/bin/bash
-
+
# Create configuration files
mkdir /opt/config
echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt
@@ -338,7 +318,7 @@ resources:
echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt
echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
-
+
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
cd /opt
@@ -387,7 +367,7 @@ resources:
__cloud_env__ : { get_param: cloud_env }
template: |
#!/bin/bash
-
+
# Create configuration files
mkdir /opt/config
echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt
@@ -399,7 +379,7 @@ resources:
echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt
echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
-
+
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh
cd /opt
diff --git a/robot/assets/asdc/base_vlb/base_vlb.yaml b/robot/assets/asdc/base_vlb/base_vlb.yaml
index 4a94b218..cbf0d4d4 100644
--- a/robot/assets/asdc/base_vlb/base_vlb.yaml
+++ b/robot/assets/asdc/base_vlb/base_vlb.yaml
@@ -1,25 +1,5 @@
##########################################################################
#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
##########################################################################
heat_template_version: 2013-05-23
@@ -186,12 +166,12 @@ resources:
my_keypair:
type: OS::Nova::KeyPair
properties:
- name:
+ name:
str_replace:
template: base_rand
params:
base: { get_param: key_name }
- rand: { get_resource: random-str }
+ rand: { get_resource: random-str }
public_key: { get_param: pub_key }
save_private_key: false
diff --git a/robot/assets/asdc/base_vlb/dnsscaling.yaml b/robot/assets/asdc/base_vlb/dnsscaling.yaml
index 856df1a4..125eb583 100644
--- a/robot/assets/asdc/base_vlb/dnsscaling.yaml
+++ b/robot/assets/asdc/base_vlb/dnsscaling.yaml
@@ -1,25 +1,5 @@
##########################################################################
#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
##########################################################################
heat_template_version: 2013-05-23
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index 94bdab3f..6c7d0547 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -19,6 +19,8 @@ ${ADD_DEMO_CUSTOMER_BODY} robot/assets/templates/aai/add_demo_customer.templat
${AAI_INDEX_PATH} /aai/v8
${VF_MODULES_NAME} _Demo_VFModules.json
${FILE_CACHE} /share/
+${DEMO_PREFIX} demo
+
*** Keywords ***
Load Customer And Models
@@ -39,10 +41,10 @@ Load Models
[Documentation] Use openECOMP to Orchestrate a service.
[Arguments] ${customer_name}
Set Test Variable ${CUSTOMER_NAME} ${customer_name}
- ${status} ${value}= Run Keyword And Ignore Error Distribute Model vFW demoVFW
- ${status} ${value}= Run Keyword And Ignore Error Distribute Model vLB demoVLB
- ${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPE demoVCPE
- ${status} ${value}= Run Keyword And Ignore Error Distribute Model vIMS demoVIMS
+ ${status} ${value}= Run Keyword And Ignore Error Distribute Model vFW ${DEMO_PREFIX}VFW
+ ${status} ${value}= Run Keyword And Ignore Error Distribute Model vLB ${DEMO_PREFIX}VLB
+ ${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPE ${DEMO_PREFIX}VCPE
+ ##${status} ${value}= Run Keyword And Ignore Error Distribute Model vIMS ${DEMO_PREFIX}VIMS
Distribute Model
[Arguments] ${service} ${modelName}