diff options
author | spisarski <s.pisarski@cablelabs.com> | 2017-07-24 11:27:59 -0600 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2017-07-24 11:27:59 -0600 |
commit | 3d6ec1eeaf70ae4e46042946f8bd35d5b5380401 (patch) | |
tree | 9d2881a2f73de6e779d266ceb6798ec3930d42ea /snaps/openstack/create_network.py | |
parent | feae63d11f8295a0d9327496f42949ad5b67fca4 (diff) |
Fixed problems when setting the OpenStack project ID.
There were several calls to retrieve the project ID that required
named parameters which was causing the utility function to always
return None. Additionally, when creating the dict() required by the
Neutron create API 'body' parameter key 'project_id' is not supported
and still uses 'tenant_id'.
As these problems should have been found earlier, this patch also
extends the tests for networks, subnets, ports, and security groups
to use 'tenant_id' rather than 'project_id'.
JIRA: SNAPS-143
Change-Id: Ic69e56145ea6070718d821edd22a1d0f9970995d
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/create_network.py')
-rw-r--r-- | snaps/openstack/create_network.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/snaps/openstack/create_network.py b/snaps/openstack/create_network.py index 4f27eec..2f26c43 100644 --- a/snaps/openstack/create_network.py +++ b/snaps/openstack/create_network.py @@ -190,7 +190,6 @@ class NetworkSettings: if not self.name or len(self.name) < 1: raise NetworkSettingsError('Name required for networks') - raise NetworkSettingsError('Name required for networks') def get_project_id(self, os_creds): """ @@ -203,8 +202,8 @@ class NetworkSettings: else: if self.project_name: keystone = keystone_utils.keystone_client(os_creds) - project = keystone_utils.get_project(keystone, - self.project_name) + project = keystone_utils.get_project( + keystone=keystone, project_name=self.project_name) if project: return project.id @@ -231,7 +230,7 @@ class NetworkSettings: if self.project_name: project_id = self.get_project_id(os_creds) if project_id: - out['project_id'] = project_id + out['tenant_id'] = project_id else: raise NetworkSettingsError( 'Could not find project ID for project named - ' + @@ -345,12 +344,13 @@ class SubnetSettings: out['name'] = self.name if self.project_name: keystone = keystone_utils.keystone_client(os_creds) - project = keystone_utils.get_project(keystone, self.project_name) + project = keystone_utils.get_project( + keystone=keystone, project_name=self.project_name) project_id = None if project: project_id = project.id if project_id: - out['project_id'] = project_id + out['tenant_id'] = project_id else: raise SubnetSettingsError( 'Could not find project ID for project named - ' + @@ -492,7 +492,8 @@ class PortSettings: project_id = None if self.project_name: keystone = keystone_utils.keystone_client(os_creds) - project = keystone_utils.get_project(keystone, self.project_name) + project = keystone_utils.get_project( + keystone=keystone, project_name=self.project_name) if project: project_id = project.id @@ -512,7 +513,7 @@ class PortSettings: out['name'] = self.name if self.project_name: if project_id: - out['project_id'] = project_id + out['tenant_id'] = project_id else: raise PortSettingsError( 'Could not find project ID for project named - ' + |