diff options
| -rw-r--r-- | moonclient/moonclient/tests.py | 6 | ||||
| -rw-r--r-- | moonclient/moonclient/tests/tests_empty_policy_new_user.json | 20 | ||||
| -rw-r--r-- | moonclient/moonclient/tests/tests_empty_policy_nova.json | 18 | ||||
| -rw-r--r-- | moonclient/moonclient/tests/tests_empty_policy_swift.json | 20 | ||||
| -rw-r--r-- | moonclient/moonclient/tests/tests_external_commands.json | 18 | ||||
| -rwxr-xr-x | tests/run_tests.py | 20 |
6 files changed, 75 insertions, 27 deletions
diff --git a/moonclient/moonclient/tests.py b/moonclient/moonclient/tests.py index de93dc6f..7da7d5ec 100644 --- a/moonclient/moonclient/tests.py +++ b/moonclient/moonclient/tests.py @@ -129,10 +129,13 @@ class TestsLaunch(Lister): description = "" if "auth_name" in test: username = test["auth_name"] + os.environ["OS_USERNAME"] = test["auth_name"] if "auth_password" in test: password = test["auth_password"] + os.environ["OS_PASSWORD"] = test["auth_password"] if "auth_tenant" in test: tenant = test["auth_tenant"] + os.environ["OS_TENANT_NAME"] = test["auth_tenant"] if "auth_host" in test: host = test["auth_host"] if "auth_port" in test: @@ -158,7 +161,7 @@ class TestsLaunch(Lister): data.append(data_tmp) continue data_tmp = list() - tmp_filename = os.path.join("/tmp", uuid4().hex) + tmp_filename = os.path.join("/tmp", "moon_{}.tmp".format(uuid4().hex)) tmp_filename_fd = open(tmp_filename, "w") self.log.debug("test={}".format(test)) if "command" not in test: @@ -189,6 +192,7 @@ class TestsLaunch(Lister): self.app.stdout = stdout_back result_str = open(tmp_filename, "r").read() self.logfile.write("{}".format(result_str)) + os.unlink(tmp_filename) data_tmp.append(group_name) data_tmp.append(test["name"]) if "result" in test: diff --git a/moonclient/moonclient/tests/tests_empty_policy_new_user.json b/moonclient/moonclient/tests/tests_empty_policy_new_user.json index 6d29f4a8..96fb37d9 100644 --- a/moonclient/moonclient/tests/tests_empty_policy_new_user.json +++ b/moonclient/moonclient/tests/tests_empty_policy_new_user.json @@ -10,15 +10,27 @@ }, { + "name": "get cirros image", + "external_command": "wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -o /tmp/cirros.img", + "result": "", + "description": "Download a Cirros image" + }, + { + "name": "install cirros image", + "external_command": "glance image-create --name \"cirros\" --disk-format qcow2 --file /tmp/cirros.img --container-format bare", + "result": "", + "description": "Upload the Cirros image in glance" + }, + { "name": "nova image-list", "external_command": "nova image-list", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.3", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros", "description": "Get an Image ID" }, { - "name": "create teannt test", + "name": "create tenant test", "external_command": "openstack project create test_moonclient", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.3", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros", "description": "Get an Image ID" }, { @@ -30,7 +42,7 @@ { "name": "neutron net-list", "external_command": "neutron net-list", - "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public", + "result": "(?P<uuid_net>[\\w-]+)\\s+\\| ext-net", "description": "Get an Net ID" }, { diff --git a/moonclient/moonclient/tests/tests_empty_policy_nova.json b/moonclient/moonclient/tests/tests_empty_policy_nova.json index e1781c1f..de266d31 100644 --- a/moonclient/moonclient/tests/tests_empty_policy_nova.json +++ b/moonclient/moonclient/tests/tests_empty_policy_nova.json @@ -8,21 +8,33 @@ }, { + "name": "get cirros image", + "external_command": "wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -o /tmp/cirros.img", + "result": "", + "description": "Download a Cirros image" + }, + { + "name": "install cirros image", + "external_command": "glance image-create --name \"cirros\" --disk-format qcow2 --file /tmp/cirros.img --container-format bare", + "result": "", + "description": "Upload the Cirros image in glance" + }, + { "name": "nova image-list", "external_command": "nova image-list", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.*", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros", "description": "Get an Image ID" }, { "name": "neutron net-list", "external_command": "neutron net-list", - "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public", + "result": "(?P<uuid_net>[\\w-]+)\\s+\\| ext-net", "description": "Get an Net ID" }, { "name": "nova boot new server", "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros", "description": "Get an Image ID" }, { diff --git a/moonclient/moonclient/tests/tests_empty_policy_swift.json b/moonclient/moonclient/tests/tests_empty_policy_swift.json index 4c9e1315..93b39d6e 100644 --- a/moonclient/moonclient/tests/tests_empty_policy_swift.json +++ b/moonclient/moonclient/tests/tests_empty_policy_swift.json @@ -35,20 +35,20 @@ { "name": "list tenant", "command": "tenant list", - "no_result": "demo", + "no_result": "admin", "description": "Check if tenant demo is used." }, { - "name": "add tenant demo", - "command": "tenant add demo", + "name": "add tenant admin", + "command": "tenant add admin", "result": "^$", "description": "Add a new tenant", "command_options": "" }, { - "name": "check tenant demo", + "name": "check tenant admin", "command": "tenant list", - "result": "(?P<uuid>\\w+)\\s+demo", + "result": "(?P<uuid>\\w+)\\s+admin", "description": "Check that tenant demo has been correctly added" }, { @@ -74,8 +74,8 @@ { "name": "list tenant", "command": "tenant list", - "result": "demo", - "description": "Check if tenant demo is used." + "result": "admin", + "description": "Check if tenant admin is used." }, { "name": "select_authz_ie", @@ -889,8 +889,8 @@ { "name": "list tenant", "command": "tenant list", - "result": "demo", - "description": "Check if tenant demo is used." + "result": "admin", + "description": "Check if tenant admin is used." }, { @@ -1159,7 +1159,7 @@ "name": "delete_tenant", "command": "tenant delete $uuid", "result": "", - "description": "Delete the tenant demo", + "description": "Delete the tenant admin", "command_options": "" }, { diff --git a/moonclient/moonclient/tests/tests_external_commands.json b/moonclient/moonclient/tests/tests_external_commands.json index d94658cc..25993dd0 100644 --- a/moonclient/moonclient/tests/tests_external_commands.json +++ b/moonclient/moonclient/tests/tests_external_commands.json @@ -118,21 +118,33 @@ }, { + "name": "get cirros image", + "external_command": "wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -o /tmp/cirros.img", + "result": "", + "description": "Download a Cirros image" + }, + { + "name": "install cirros image", + "external_command": "glance image-create --name \"cirros\" --disk-format qcow2 --file /tmp/cirros.img --container-format bare", + "result": "", + "description": "Upload the Cirros image in glance" + }, + { "name": "nova image-list", "external_command": "nova image-list", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros", "description": "Get an Image ID" }, { "name": "neutron net-list", "external_command": "neutron net-list", - "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public", + "result": "(?P<uuid_net>[\\w-]+)\\s+\\| ext-net", "description": "Get an Net ID" }, { "name": "nova boot new server", "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros", "description": "Get an Image ID" }, { diff --git a/tests/run_tests.py b/tests/run_tests.py index e953e86b..8030294f 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -14,6 +14,10 @@ import sys import time import yaml + +PORT_ODL = 8181 +HOST_ODL = "localhost" + parser = argparse.ArgumentParser() parser.add_argument("-r", "--report", @@ -41,31 +45,31 @@ except ImportError: def test_federation(): # Retrieve Moon token - url = urlopen('http://localhost:8080/moon/token', + url = urlopen('http://{host}:{port}/moon/token'.format(host=HOST_ODL, port=PORT_ODL), data='grant_type=password&username=admin&password=console'.encode('utf-8')) code = url.getcode() if code not in (200, 201, 202, 204): - return False, "Not able to retrieve Moon token." + return False, "Not able to retrieve Moon token (error code: {}).".format(code) # Retrieve ODL token auth_handler = HTTPBasicAuthHandler() auth_handler.add_password(realm='Moon', - uri='http://localhost:8080/auth/v1/domains', + uri='http://{host}:{port}/auth/v1/domains'.format(host=HOST_ODL, port=PORT_ODL), user='admin', passwd='console') opener = build_opener(auth_handler) install_opener(opener) - url = urlopen('http://www.example.com/login.html') + url = urlopen('http://{host}:{port}/auth/v1/domains'.format(host=HOST_ODL, port=PORT_ODL)) code = url.getcode() if code not in (200, 201, 202, 204): - return False, "Not able to retrieve ODL token." + return False, "Not able to retrieve ODL token (error code: {}).".format(code) return True, "" def test_moon_openstack(): cmd = "moon test --password console --self" - ret_val = functest_utils.execute_command(cmd, logger, exit_on_error=False) + ret_val = functest_utils.execute_command(cmd, logger) return ret_val @@ -89,6 +93,10 @@ def main(): 'timestart': start_time, 'duration': duration, 'status': test_status, + 'results': { + 'openstack': result_os, + 'opendaylight': result_odl + } } functest_utils.logger_test_results(logger, "moon", |