From c87724b50dd883a2c250fd9f4c383eddf3ec7e48 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Wed, 20 Sep 2017 05:00:13 -0700 Subject: add function test cases Change-Id: Ic0c5eecdcbb3d5ab460c79235f4e0df4b4932f7b Issue-Id: MULTICLOUD-95 Signed-off-by: Guo Ruijing --- ocata/vagrant/Vagrantfile | 5 ++--- ocata/vagrant/test/test-compute.sh | 16 ++++++++++++++++ ocata/vagrant/test/test-extensions.sh | 2 +- ocata/vagrant/test/test-identity.sh | 9 +++++++++ ocata/vagrant/test/test-image.sh | 8 ++++++++ ocata/vagrant/test/test-network.sh | 15 +++++++++++++++ ocata/vagrant/test/test-orchestration.sh | 6 ++++++ ocata/vagrant/test/test-proxy.sh | 8 -------- ocata/vagrant/test/test1.sh | 6 ------ ocata/vagrant/test/test_multicloud.sh | 4 +++- ocata/vagrant/test/tests | 7 +++++-- 11 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 ocata/vagrant/test/test-compute.sh create mode 100644 ocata/vagrant/test/test-identity.sh create mode 100644 ocata/vagrant/test/test-image.sh create mode 100644 ocata/vagrant/test/test-network.sh create mode 100644 ocata/vagrant/test/test-orchestration.sh delete mode 100644 ocata/vagrant/test/test-proxy.sh delete mode 100644 ocata/vagrant/test/test1.sh diff --git a/ocata/vagrant/Vagrantfile b/ocata/vagrant/Vagrantfile index d8b0f955..ac529ef8 100644 --- a/ocata/vagrant/Vagrantfile +++ b/ocata/vagrant/Vagrantfile @@ -31,11 +31,10 @@ Vagrant.configure("2") do |config| end end - config.vm.define "multicloud" do |config| - config.vm.hostname = "multicloud" + config.vm.define "onap" do |config| + config.vm.hostname = "onap" config.vm.network "private_network", ip: "192.168.0.30" config.vm.network :private_network, ip: "192.168.1.30" - #config.vm.provision "shell", path: "setup_multivm.sh", privileged: false config.vm.provision "shell", path: "test/test_multicloud.sh", privileged: false end diff --git a/ocata/vagrant/test/test-compute.sh b/ocata/vagrant/test/test-compute.sh new file mode 100644 index 00000000..f68c31f1 --- /dev/null +++ b/ocata/vagrant/test/test-compute.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -ex + +MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/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/^.*: //") +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 +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/projects/$PROJECT_ID +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/flavors +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/flavors/1 +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X DELETE $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/flavors/93 || true +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X POST -d '{"flavor":{"id":"93","vcpus": 4,"name": "test222", "ram":4096, "os-flavor-access:is_public":true,"disk":10 , "swap":1024, "OS-FLV-EXT-DATA:ephemeral":0 }}' $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/flavors +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/flavors/93 +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X DELETE $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/flavors/93 +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/compute/v2.1/$PROJECT_ID/servers diff --git a/ocata/vagrant/test/test-extensions.sh b/ocata/vagrant/test/test-extensions.sh index 084d0f8a..c4cfd004 100644 --- a/ocata/vagrant/test/test-extensions.sh +++ b/ocata/vagrant/test/test-extensions.sh @@ -1,6 +1,6 @@ #!/bin/bash +set -ex MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne curl -v -s -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions - curl -v -s -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions/epa-caps diff --git a/ocata/vagrant/test/test-identity.sh b/ocata/vagrant/test/test-identity.sh new file mode 100644 index 00000000..67386106 --- /dev/null +++ b/ocata/vagrant/test/test-identity.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -ex + +MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/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/^.*: //") +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 +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/endpoints diff --git a/ocata/vagrant/test/test-image.sh b/ocata/vagrant/test/test-image.sh new file mode 100644 index 00000000..6312bf76 --- /dev/null +++ b/ocata/vagrant/test/test-image.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -ex + +MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/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/^.*: //") +#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 new file mode 100644 index 00000000..49b1c445 --- /dev/null +++ b/ocata/vagrant/test/test-network.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -ex + +MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/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/^.*: //") +#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 +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 HEAD $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/networks/$NETWORK_ID +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X DELETE $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/networks/$NETWORK_ID +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/subnets +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/ports +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/security-groups +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/network/v2.0/security-group-rules diff --git a/ocata/vagrant/test/test-orchestration.sh b/ocata/vagrant/test/test-orchestration.sh new file mode 100644 index 00000000..11f281e4 --- /dev/null +++ b/ocata/vagrant/test/test-orchestration.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -ex + +MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/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/^.*: //") +curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/orchestration/stacks diff --git a/ocata/vagrant/test/test-proxy.sh b/ocata/vagrant/test/test-proxy.sh deleted file mode 100644 index f12b2e0f..00000000 --- a/ocata/vagrant/test/test-proxy.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/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/^.*: //") -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 -curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v3/endpoints diff --git a/ocata/vagrant/test/test1.sh b/ocata/vagrant/test/test1.sh deleted file mode 100644 index b0a75eb2..00000000 --- a/ocata/vagrant/test/test1.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9004/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne -curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET http://172.16.77.40:9004/api/multicloud-ocata/v0/swagger.json -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/^.*: //") -curl -v -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/identity/v2.0/tenants diff --git a/ocata/vagrant/test/test_multicloud.sh b/ocata/vagrant/test/test_multicloud.sh index dc007431..1c2534ae 100644 --- a/ocata/vagrant/test/test_multicloud.sh +++ b/ocata/vagrant/test/test_multicloud.sh @@ -1,6 +1,8 @@ #!/bin/bash +set -ex + sudo apt-get update -y -sudo apt-get install -y docker.io +sudo apt-get install -y docker.io git clone http://gerrit.onap.org/r/multicloud/openstack cd openstack/ocata/docker diff --git a/ocata/vagrant/test/tests b/ocata/vagrant/test/tests index 1c1d1d1d..276fcd6f 100644 --- a/ocata/vagrant/test/tests +++ b/ocata/vagrant/test/tests @@ -1,3 +1,6 @@ -test1.sh test-extensions.sh -test-proxy.sh +test-identity.sh +test-compute.sh +test-image.sh +test-network.sh +test-orchestration.sh -- cgit 1.2.3-korg