diff options
11 files changed, 60 insertions, 4 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index fb5bd03e9..de33b08e0 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -10,6 +10,8 @@ if [ "$#" -ne 1 ]; then fi ENV_FILE=$1 +source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh + for n in $(seq 1 5); do $WORKSPACE/test/ete/scripts/teardown-onap.sh diff --git a/test/ete/labs/windriver/Integration-SB-00-DNS-openrc b/test/ete/labs/windriver/Integration-SB-00-DNS-openrc new file mode 100644 index 000000000..cfbe22fe6 --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-00-DNS-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=a813ac529c6d4b44a3308ed38bcd7480 +export OS_PROJECT_NAME=Integration-SB-00 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.5:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=RegionOne +export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-00-openrc b/test/ete/labs/windriver/Integration-SB-00-openrc new file mode 100644 index 000000000..8b55dbddc --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-00-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=41d6d38489bd40b09ea8a6b6b852dcbd +export OS_PROJECT_NAME=Integration-SB-00 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=RegionOne +export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-01-DNS-openrc b/test/ete/labs/windriver/Integration-SB-01-DNS-openrc new file mode 100644 index 000000000..e9007da94 --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-01-DNS-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=4318a6c5788449cc97c88fd745b554b9 +export OS_PROJECT_NAME=Integration-SB-01 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.5:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=RegionOne +export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-01-openrc b/test/ete/labs/windriver/Integration-SB-01-openrc new file mode 100644 index 000000000..78469b23c --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-01-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=087050388b204c73a3e418dd2c1fe30b +export OS_PROJECT_NAME=Integration-SB-01 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=RegionOne +export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-02-DNS-openrc b/test/ete/labs/windriver/Integration-SB-02-DNS-openrc new file mode 100644 index 000000000..968904d34 --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-02-DNS-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=89fee629f5f044739fb64380be63b6da +export OS_PROJECT_NAME=Integration-SB-02 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.5:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=RegionOne +export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-02-openrc b/test/ete/labs/windriver/Integration-SB-02-openrc new file mode 100644 index 000000000..3531c11ee --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-02-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=ebb0ea7144004bacac1e39ff23105fa7 +export OS_PROJECT_NAME=Integration-SB-02 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=RegionOne +export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-03-DNS-openrc b/test/ete/labs/windriver/Integration-SB-03-DNS-openrc index f0bcf33ae..44073b759 100644 --- a/test/ete/labs/windriver/Integration-SB-03-DNS-openrc +++ b/test/ete/labs/windriver/Integration-SB-03-DNS-openrc @@ -3,7 +3,7 @@ export OS_PROJECT_NAME=Integration-SB-03 export OS_USER_DOMAIN_NAME=Default export OS_USERNAME=demo export OS_PASSWORD=onapdemo -export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_AUTH_URL=http://10.12.25.5:5000/v3 export OS_IDENTITY_API_VERSION=3 export OS_REGION_NAME=RegionOne export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-04-DNS-openrc b/test/ete/labs/windriver/Integration-SB-04-DNS-openrc index 6a3b74496..d7ba190a7 100644 --- a/test/ete/labs/windriver/Integration-SB-04-DNS-openrc +++ b/test/ete/labs/windriver/Integration-SB-04-DNS-openrc @@ -3,7 +3,7 @@ export OS_PROJECT_NAME=Integration-SB-04 export OS_USER_DOMAIN_NAME=Default export OS_USERNAME=demo export OS_PASSWORD=onapdemo -export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_AUTH_URL=http://10.12.25.5:5000/v3 export OS_IDENTITY_API_VERSION=3 export OS_REGION_NAME=RegionOne export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-SB-05-DNS-openrc b/test/ete/labs/windriver/Integration-SB-05-DNS-openrc index b245c914d..f7612630c 100644 --- a/test/ete/labs/windriver/Integration-SB-05-DNS-openrc +++ b/test/ete/labs/windriver/Integration-SB-05-DNS-openrc @@ -3,7 +3,7 @@ export OS_PROJECT_NAME=Integration-SB-05 export OS_USER_DOMAIN_NAME=Default export OS_USERNAME=demo export OS_PASSWORD=onapdemo -export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_AUTH_URL=http://10.12.25.5:5000/v3 export OS_IDENTITY_API_VERSION=3 export OS_REGION_NAME=RegionOne export OS_INTERFACE=public diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh index 9b742e8fd..dbbee2816 100755 --- a/test/ete/scripts/teardown-onap.sh +++ b/test/ete/scripts/teardown-onap.sh @@ -28,7 +28,7 @@ sleep 1 ROUTERS=$(openstack router list -c ID -f value) echo $ROUTERS for ROUTER in $ROUTERS; do - echo $ZONENAME; + echo $ROUTER; PORTS=$(openstack router show $ROUTER -c "interfaces_info" -f "value" | jq -r '.[].port_id') for PORT in $PORTS; do openstack router remove port $ROUTER $PORT |