From 0ffaf93faf781c47fa8907f2ba876a91afdac88c Mon Sep 17 00:00:00 2001 From: Anton Studenov Date: Wed, 22 Mar 2017 11:35:24 +0300 Subject: [PATCH] Fix deployment --fromenv option * Updated config that created by fromenv option to new format Change-Id: I1e0a7dd1d12a97ff39cb9c4c243440510f5b2445 --- tests/functional/test_cli_deployment.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/functional/test_cli_deployment.py b/tests/functional/test_cli_deployment.py index 8f9d6fa3..29956fa4 100644 --- a/tests/functional/test_cli_deployment.py +++ b/tests/functional/test_cli_deployment.py @@ -46,20 +46,23 @@ class DeploymentTestCase(unittest.TestCase): self.rally.env.update(utils.TEST_ENV) self.rally("deployment create --name t_create_env --fromenv") config = json.loads(self.rally("deployment config")) + self.assertIn("creds", config) + self.assertIn("openstack", config["creds"]) + oscreds = config["creds"]["openstack"] self.assertEqual(utils.TEST_ENV["OS_USERNAME"], - config["admin"]["username"]) + oscreds["admin"]["username"]) self.assertEqual(utils.TEST_ENV["OS_PASSWORD"], - config["admin"]["password"]) - if "project_name" in config["admin"]: + oscreds["admin"]["password"]) + if "project_name" in oscreds["admin"]: # keystone v3 self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"], - config["admin"]["project_name"]) + oscreds["admin"]["project_name"]) else: # keystone v2 self.assertEqual(utils.TEST_ENV["OS_TENANT_NAME"], - config["admin"]["tenant_name"]) + oscreds["admin"]["tenant_name"]) self.assertEqual(utils.TEST_ENV["OS_AUTH_URL"], - config["auth_url"]) + oscreds["auth_url"]) def test_destroy(self): self.rally.env.update(utils.TEST_ENV) @@ -87,7 +90,7 @@ class DeploymentTestCase(unittest.TestCase): self.rally.env.update(utils.TEST_ENV) self.rally("deployment create --name t_create_env --fromenv") config = json.loads(self.rally("deployment config")) - config["auth_url"] = "http://foo/" + config["creds"]["openstack"]["auth_url"] = "http://foo/" file = utils.JsonTempFile(config) self.rally("deployment recreate --deployment t_create_env " "--filename %s" % file.filename)