summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2017-01-27 20:05:00 -0600
committerDean Troyer <dtroyer@gmail.com>2017-01-27 20:05:04 -0600
commitfab4fcc397ce8d0ea1c817d14e5787689d0ef7ac (patch)
tree446614df8890766358f77baba38b7642d613877d
parentca763793cc71d9e62cd526fe50d763000c549248 (diff)
downloadpython-openstackclient-fab4fcc397ce8d0ea1c817d14e5787689d0ef7ac.tar.gz
Fix network create --project
SDK 0.9.13 needs to see project_id in the attributes, not tenant_id. Closes-bug: 1659878 Change-Id: Iff7abe8bd00cbe087c07579596c40af8b0a73302
-rw-r--r--openstackclient/network/v2/network.py2
-rw-r--r--openstackclient/tests/unit/network/v2/test_network.py4
2 files changed, 6 insertions, 0 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 17ce0f7f..655147d9 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -93,7 +93,9 @@ def _get_attrs(client_manager, parsed_args):
parsed_args.project,
parsed_args.project_domain,
).id
+ # TODO(dtroyer): Remove tenant_id when we clean up the SDK refactor
attrs['tenant_id'] = project_id
+ attrs['project_id'] = project_id
# "network set" command doesn't support setting availability zone hints.
if 'availability_zone_hints' in parsed_args and \
diff --git a/openstackclient/tests/unit/network/v2/test_network.py b/openstackclient/tests/unit/network/v2/test_network.py
index c5283443..b405bef9 100644
--- a/openstackclient/tests/unit/network/v2/test_network.py
+++ b/openstackclient/tests/unit/network/v2/test_network.py
@@ -185,7 +185,9 @@ class TestCreateNetworkIdentityV3(TestNetwork):
'name': self._network.name,
'shared': True,
'description': self._network.description,
+ # TODO(dtroyer): Remove tenant_id when we clean up the SDK refactor
'tenant_id': self.project.id,
+ 'project_id': self.project.id,
'is_default': True,
'router:external': True,
'provider:network_type': 'vlan',
@@ -319,7 +321,9 @@ class TestCreateNetworkIdentityV2(TestNetwork):
self.network.create_network.assert_called_once_with(**{
'admin_state_up': True,
'name': self._network.name,
+ # TODO(dtroyer): Remove tenant_id when we clean up the SDK refactor
'tenant_id': self.project.id,
+ 'project_id': self.project.id,
})
self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data)