From 91b18eadfb2ca83d9291281210342dfefa7694b2 Mon Sep 17 00:00:00 2001 From: zhongjun Date: Wed, 30 Aug 2017 14:30:26 +0800 Subject: Add some test case in test_post_execute.py 1.add some test case in test_post_execute.py. 2.rename test_execute.py to test_prepare_execute.py and add clearup handle in test function. Change-Id: I1ed27ce6f0a5ba8bbd56544ae8d53e14f7daa9ea Signed-off-by: zhongjun --- tests/data/openrc_conf/admin-openrc.sh | 9 +++++++++ tests/data/openrc_conf/globals.yml | 12 ++++++++++++ tests/data/openrc_conf/globals_odl.yml | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 tests/data/openrc_conf/admin-openrc.sh create mode 100644 tests/data/openrc_conf/globals.yml create mode 100644 tests/data/openrc_conf/globals_odl.yml (limited to 'tests/data/openrc_conf') diff --git a/tests/data/openrc_conf/admin-openrc.sh b/tests/data/openrc_conf/admin-openrc.sh new file mode 100644 index 00000000..3db0bcf3 --- /dev/null +++ b/tests/data/openrc_conf/admin-openrc.sh @@ -0,0 +1,9 @@ +export OS_PROJECT_DOMAIN_NAME=Default +export OS_USER_DOMAIN_NAME=Default +export OS_PROJECT_NAME=admin +export OS_TENANT_NAME=admin +export OS_USERNAME=admin +export OS_PASSWORD=keystone +export OS_AUTH_URL=http://10.20.11.11:35357/v3 +export OS_INTERFACE=internal +export OS_IDENTITY_API_VERSION=3 diff --git a/tests/data/openrc_conf/globals.yml b/tests/data/openrc_conf/globals.yml new file mode 100644 index 00000000..6d663125 --- /dev/null +++ b/tests/data/openrc_conf/globals.yml @@ -0,0 +1,12 @@ +docker_namespace: kolla +docker_registry: 10.20.11.2:4000 +enable_ceph: 'yes' +enable_cinder: 'yes' +keepalived_interface: ens9 +kolla_external_vip_interface: ens3 +kolla_internal_vip_address: 10.20.11.11 +network_interface: ens3 +neutron_external_interface: ens8 +openstack_release: 4.0.2 +storage_interface: ens3 +tunnel_interface: ens3 diff --git a/tests/data/openrc_conf/globals_odl.yml b/tests/data/openrc_conf/globals_odl.yml new file mode 100644 index 00000000..50df4084 --- /dev/null +++ b/tests/data/openrc_conf/globals_odl.yml @@ -0,0 +1,13 @@ +docker_namespace: kolla +docker_registry: 10.20.11.2:4000 +enable_ceph: 'yes' +enable_cinder: 'yes' +keepalived_interface: ens9 +kolla_external_vip_interface: ens3 +kolla_internal_vip_address: 10.20.11.11 +network_interface: ens3 +neutron_external_interface: ens8 +openstack_release: 4.0.2 +storage_interface: ens3 +tunnel_interface: ens3 +opendaylight_leader_ip_address: 10.20.7.3 \ No newline at end of file -- cgit 1.2.3-korg