summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
authorliboNet <libo.zhu@intel.com>2018-04-27 11:01:17 +0800
committerliboNet <libo.zhu@intel.com>2018-04-27 11:01:17 +0800
commit278d6163886ad72ac52b19b237ba902082474d5a (patch)
treefd3ca906dc5ac0f820a98da81ab740cc66445362 /ocata
parentb73c759ceb608d50a67564bf5695060722505b6b (diff)
Fix the token parse issue while get openstack auth
remove the mismatch \r sign and use cat -v to show the exact result Change-Id: Ida7da6da7dbb0eb9bfe67e470bbfbe892505f90d Issue-ID: MULTICLOUD-200 Signed-off-by: liboNet <libo.zhu@intel.com>
Diffstat (limited to 'ocata')
-rw-r--r--ocata/vagrant/test/test-compute.sh2
-rw-r--r--ocata/vagrant/test/test-identity.sh2
-rw-r--r--ocata/vagrant/test/test-image.sh2
-rw-r--r--ocata/vagrant/test/test-network.sh2
-rw-r--r--ocata/vagrant/test/test-orchestration.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/ocata/vagrant/test/test-compute.sh b/ocata/vagrant/test/test-compute.sh
index 50c62863..0c0fce1a 100644
--- a/ocata/vagrant/test/test-compute.sh
+++ b/ocata/vagrant/test/test-compute.sh
@@ -2,7 +2,7 @@
set -ex
MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
-TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
+TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/\r//g" | sed "s/^.*: //" | cat -v)
PROJECT_ID=$(curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects 2>/dev/null | python -mjson.tool | grep -B5 "name.*\"admin" | grep '\"id\"' | cut -f4 -d'"')
curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/os-hypervisors
curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/os-hypervisors/detail
diff --git a/ocata/vagrant/test/test-identity.sh b/ocata/vagrant/test/test-identity.sh
index e09fef75..6adb8822 100644
--- a/ocata/vagrant/test/test-identity.sh
+++ b/ocata/vagrant/test/test-identity.sh
@@ -2,7 +2,7 @@
set -ex
MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
-TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
+TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/\r//g" | sed "s/^.*: //" | cat -v)
curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v2.0/tenants
curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects
curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/catalog
diff --git a/ocata/vagrant/test/test-image.sh b/ocata/vagrant/test/test-image.sh
index 6b4b2e2e..4b977938 100644
--- a/ocata/vagrant/test/test-image.sh
+++ b/ocata/vagrant/test/test-image.sh
@@ -2,7 +2,7 @@
set -ex
MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
-TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
+TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/\r//g" | sed "s/^.*: //" | cat -v)
#curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/image/v2/images
PROJECT_ID=$(curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects 2>/dev/null | python -mjson.tool | grep -B5 "name.*\"admin" | grep '\"id\"' | cut -f4 -d'"')
curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects/$PROJECT_ID
diff --git a/ocata/vagrant/test/test-network.sh b/ocata/vagrant/test/test-network.sh
index b011c0f2..8b822164 100644
--- a/ocata/vagrant/test/test-network.sh
+++ b/ocata/vagrant/test/test-network.sh
@@ -2,7 +2,7 @@
set -ex
MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
-TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
+TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/\r//g" | sed "s/^.*: //" | cat -v)
#curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/networks
NETWORK_ID=$(curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X POST -d '{"network":{ "name": "testnetwork1"}}' $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/networks 2>/dev/null | python -mjson.tool | grep '"id"' | cut -f4 -d'"')
echo $NETWORK_ID
diff --git a/ocata/vagrant/test/test-orchestration.sh b/ocata/vagrant/test/test-orchestration.sh
index 3d2bdc30..239d3a6b 100644
--- a/ocata/vagrant/test/test-orchestration.sh
+++ b/ocata/vagrant/test/test-orchestration.sh
@@ -2,5 +2,5 @@
set -ex
MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne
-TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/^.*: //")
+TOKEN=$(curl -v -s -H "Content-Type: application/json" -X POST -d '{ }' $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/auth/tokens 2>&1 | grep X-Subject-Token | sed "s/\r//g" | sed "s/^.*: //" | cat -v)
curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/orchestration/stacks