summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-28 04:43:40 +0000
committerGerrit Code Review <review@openstack.org>2017-01-28 04:43:40 +0000
commita6817d024014ecf2e873b009098a81fd179d7dd8 (patch)
tree921a9c18d293f645abc3dbd63b01467cfcd7f887
parent4a12280999eed4f35e9e2d61a475ffc7c2b001b2 (diff)
parentfab4fcc397ce8d0ea1c817d14e5787689d0ef7ac (diff)
downloadpython-openstackclient-a6817d024014ecf2e873b009098a81fd179d7dd8.tar.gz
Merge "Fix network create --project"
-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)