openstack/rally
Code Issues Proposed changes

Merge "[verify] Fix obtaining project id"

Browse Source
This commit is contained in:
Jenkins 2016-09-05 00:13:53 +00:00 committed by Gerrit Code Review
commit 9312a0fdab
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rally/verification/tempest/config.py
View File

@ -485,8 +485,7 @@ class TempestResourcesContext(utils.RandomNameGeneratorMixin):
def _create_network_resources(self):
neutron_wrapper = network.NeutronWrapper(self.clients, self)
tenant_name = self.clients.keystone().tenant_name
tenant_id = self.clients.keystone().get_project_id(tenant_name)
tenant_id = self.clients.keystone.auth_ref.project_id
LOG.debug("Creating network resources: network, subnet, router")
net = neutron_wrapper.create_network(
tenant_id, subnets_num=1, add_router=True,

4
tests/ci/rally_verify.py
View File

@ -205,12 +205,10 @@ def main():
clients.nova().flavors.delete(flavor.id)
LOG.info("Creating a shared network.")
tenant_name = clients.keystone().tenant_name
tenant_id = clients.keystone().get_project_id(tenant_name)
net_body = {
"network": {
"name": "shared-net-%s" % str(uuid.uuid4()),
"tenant_id": tenant_id,
"tenant_id": clients.keystone.auth_ref.project_id,
"shared": True
}
}