diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-01-10 12:04:14 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-01-10 20:24:29 +0000 |
| commit | 6ed47a473114ccc9b2644293ac945490ebce65a9 (patch) | |
| tree | 1939a1ea34ac56735ca9cc97544bf49181673e3f /test/ete | |
| parent | 453ca898ef1d80af91767d7481bc3b1dbee03d41 (diff) | |
Use username/password in RC files to delete zones
Change-Id: Iea0dd80fa407e898f6e07b9131860c0c04bb5778
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
(cherry picked from commit ab4e57206abec8d507f3ffa3a1d0bbb8aaf2ad5c)
Diffstat (limited to 'test/ete')
| -rw-r--r-- | test/ete/labs/gwu/onap-openstack-template.env | 4 | ||||
| -rwxr-xr-x | test/ete/scripts/dns-zones/delete-dns-zones.sh | 2 | ||||
| -rwxr-xr-x | test/ete/scripts/install_openstack_cli.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index c97371a55..cfd3490f8 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -54,9 +54,9 @@ parameters: openstack_region: RegionOne - horizon_url: http://controller.neo.futurewei.com/horizon + horizon_url: http://stack.local.enacct.com/horizon - keystone_url: http://controller.neo.futurewei.com:5000 + keystone_url: http://stack.local.enacct.com:5000 cloud_env: RegionOne diff --git a/test/ete/scripts/dns-zones/delete-dns-zones.sh b/test/ete/scripts/dns-zones/delete-dns-zones.sh index 00438b419..54cafecd8 100755 --- a/test/ete/scripts/dns-zones/delete-dns-zones.sh +++ b/test/ete/scripts/dns-zones/delete-dns-zones.sh @@ -13,7 +13,7 @@ MULTICLOUD_IP=$($WORKSPACE/test/ete/scripts/get-floating-ip.sh onap-multi-servic export MULTICLOUD_PLUGIN_ENDPOINT=http://$MULTICLOUD_IP:9005/api/multicloud-titanium_cloud/v0/pod25_RegionOne -export TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{"auth": {"identity": {"methods": ["password"],"password": {"user": {"name": "demo","password": "onapdemo"}}},"scope": {"project":{"domain":{"name":"Default"},"name": "'$1'" } }}}' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //") +export TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{"auth": {"identity": {"methods": ["password"],"password": {"user": {"name": "'$OS_USERNAME'","password": "'$OS_PASSWORD'"}}},"scope": {"project":{"domain":{"name":"Default"},"name": "'$1'" } }}}' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //") ZONES=$(curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/dns-delegate/v2/zones | jq '.["zones"][] | .name' | tr -d '"' ) diff --git a/test/ete/scripts/install_openstack_cli.sh b/test/ete/scripts/install_openstack_cli.sh index a6a0438f9..c7af2d5f7 100755 --- a/test/ete/scripts/install_openstack_cli.sh +++ b/test/ete/scripts/install_openstack_cli.sh @@ -26,7 +26,7 @@ else source ${ONAP_VENV}/bin/activate pip install --upgrade pip - pip install --upgrade python-openstackclient python-heatclient + pip install --upgrade python-openstackclient python-heatclient python-designateclient echo "ONAP_VENV=${ONAP_VENV}" >> $WORKSPACE/env.properties fi |