openstack/rally-openstack
Code Issues Proposed changes

Fix deployment --fromenv option

Browse Source 
* Updated config that created by fromenv option to new format

Change-Id: I1e0a7dd1d12a97ff39cb9c4c243440510f5b2445
This commit is contained in:
Anton Studenov 2017-03-22 11:35:24 +03:00
parent 61e0804cc0
commit 0ffaf93faf
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/functional/test_cli_deployment.py
View File

@ -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)