openstack/python-openstackclient
Code Issues Proposed changes

Merge "Show "target_project_id" attribute properly for network rbac object"

Browse Source
This commit is contained in:
Jenkins 2016-08-05 13:38:32 +00:00 committed by Gerrit Code Review
commit 6dd3f45e39
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
functional/tests/network/v2/test_network_rbac.py
View File

@ -12,8 +12,6 @@
import uuid import uuid
import testtools
from functional.common import test from functional.common import test
@ -57,18 +55,13 @@ class NetworkRBACTests(test.TestCase):
raw_output = self.openstack('network rbac show ' + self.ID + opts) raw_output = self.openstack('network rbac show ' + self.ID + opts)
self.assertEqual(self.ID + "\n", raw_output) self.assertEqual(self.ID + "\n", raw_output)
# TODO(Huanxuan Ao): This test can pass after bug
# https://bugs.launchpad.net/python-openstackclient/+bug/1608903 fixed.
@testtools.skip(
'Skip because of the bug '
'https://bugs.launchpad.net/python-openstackclient/+bug/1608903')
def test_network_rbac_set(self): def test_network_rbac_set(self):
opts = self.get_opts(self.FIELDS) opts = self.get_opts(self.FIELDS)
project_id = self.openstack( project_id = self.openstack(
'project create ' + self.PROJECT_NAME + opts) 'project create ' + self.PROJECT_NAME + opts)
self.openstack('network rbac set ' + self.ID + self.openstack('network rbac set ' + self.ID +
' --target-project ' + self.PROJECT_NAME) ' --target-project ' + self.PROJECT_NAME)
opts = self.get_opts(['target_project']) opts = self.get_opts(['target_project_id'])
raw_output_rbac = self.openstack('network rbac show ' + self.ID + opts) raw_output_rbac = self.openstack('network rbac show ' + self.ID + opts)
raw_output_project = self.openstack( raw_output_project = self.openstack(
'project delete ' + self.PROJECT_NAME) 'project delete ' + self.PROJECT_NAME)

2
openstackclient/network/v2/network_rbac.py
View File

@ -33,7 +33,7 @@ def _get_columns(item):
columns.append('project_id') columns.append('project_id')
if 'target_tenant' in columns: if 'target_tenant' in columns:
columns.remove('target_tenant') columns.remove('target_tenant')
columns.append('target_project') columns.append('target_project_id')
return tuple(sorted(columns)) return tuple(sorted(columns))

2
openstackclient/tests/network/v2/fakes.py
View File

@ -520,7 +520,7 @@ class FakeNetworkRBAC(object):
loaded=True) loaded=True)
# Set attributes with special mapping in OpenStack SDK. # Set attributes with special mapping in OpenStack SDK.
rbac.project_id = rbac_attrs['tenant_id'] rbac.project_id = rbac_attrs['tenant_id']
rbac.target_project = rbac_attrs['target_tenant'] rbac.target_project_id = rbac_attrs['target_tenant']
return rbac return rbac
@staticmethod @staticmethod

4
openstackclient/tests/network/v2/test_network_rbac.py
View File

@ -49,7 +49,7 @@ class TestCreateNetworkRBAC(TestNetworkRBAC):
'object_id', 'object_id',
'object_type', 'object_type',
'project_id', 'project_id',
'target_project', 'target_project_id',
) )
data = [ data = [
@ -383,7 +383,7 @@ class TestShowNetworkRBAC(TestNetworkRBAC):
'object_id', 'object_id',
'object_type', 'object_type',
'project_id', 'project_id',
'target_project', 'target_project_id',
) )
data = [ data = [