summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-27 03:03:08 +0000
committerGerrit Code Review <review@openstack.org>2017-04-27 03:03:08 +0000
commit19a7081aa0dd7303e908969d65879ce13ef3cc27 (patch)
treeae24da79b1c189cbe278c42f0051699c7cc9dce8 /openstackclient/common
parent7939fea6e779f769ad6ee15225e35cd4a002a58e (diff)
parent871450abcd89f9bb5ee9f75cdef3b812695eae93 (diff)
downloadpython-openstackclient-19a7081aa0dd7303e908969d65879ce13ef3cc27.tar.gz
Merge "Fix quota functional tests for nova-net"
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/quota.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index ec4c8b51..73dfd909 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -299,7 +299,6 @@ class SetQuota(command.Command):
identity_client = self.app.client_manager.identity
compute_client = self.app.client_manager.compute
volume_client = self.app.client_manager.volume
- network_client = self.app.client_manager.network
compute_kwargs = {}
for k, v in COMPUTE_QUOTAS.items():
value = getattr(parsed_args, k, None)
@@ -352,7 +351,11 @@ class SetQuota(command.Command):
volume_client.quotas.update(
project,
**volume_kwargs)
- if network_kwargs:
+ if (
+ network_kwargs and
+ self.app.client_manager.is_network_endpoint_enabled()
+ ):
+ network_client = self.app.client_manager.network
network_client.update_quota(
project,
**network_kwargs)