diff options
| -rw-r--r-- | tests/adhoc/dmz01.sh | 6 | ||||
| -rw-r--r-- | tests/adhoc/smoke01-clean.sh | 6 | ||||
| -rw-r--r-- | tests/adhoc/smoke01.sh | 10 |
3 files changed, 16 insertions, 6 deletions
diff --git a/tests/adhoc/dmz01.sh b/tests/adhoc/dmz01.sh index 8854ca2..7fc68e1 100644 --- a/tests/adhoc/dmz01.sh +++ b/tests/adhoc/dmz01.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors +# Copyright 2015-2016 Open Platform for NFV Project, Inc. and its contributors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -33,7 +33,9 @@ set -x #echo on -source ~/admin-openrc.sh +source ~/admin-openrc.sh <<EOF +openstack +EOF glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64-dmz --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh index cc8302d..8defb78 100644 --- a/tests/adhoc/smoke01-clean.sh +++ b/tests/adhoc/smoke01-clean.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors +# Copyright 2015-2016 Open Platform for NFV Project, Inc. and its contributors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,6 +26,10 @@ set -x #echo on +source ~/admin-openrc.sh <<EOF +openstack +EOF + instance=$(nova list | awk "/ cirros1 / { print \$2 }") if [ "$instance" != "" ]; then nova delete $instance fi diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh index 911fabb..ec834f3 100644 --- a/tests/adhoc/smoke01.sh +++ b/tests/adhoc/smoke01.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors +# Copyright 2015-2016 Open Platform for NFV Project, Inc. and its contributors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,11 +29,15 @@ set -x #echo on -source ~/admin-openrc.sh +source ~/admin-openrc.sh <<EOF +openstack +EOF openstack service list -glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64 --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare +image=$(openstack image list | awk "/ cirros-0.3.3-x86_64 / { print \$2 }") +if [ "$image" == "" ]; then glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64 --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare +fi neutron net-create public --router:external=true --provider:network_type=flat --provider:physical_network=physnet1 |