summaryrefslogtreecommitdiff
path: root/openstackclient/tests/functional
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-22 19:02:35 +0000
committerGerrit Code Review <review@openstack.org>2017-06-22 19:02:35 +0000
commitfe82f4b281112634eb5a71694de5fcc9cde95ca3 (patch)
tree9c44479d8f2472bce57802485e2944178faec28c /openstackclient/tests/functional
parentef25135e7aefa79904f9f895412e85ebad5a8507 (diff)
parentccb743cf0fd96df93f28d526a0d39b5f87c981ef (diff)
downloadpython-openstackclient-fe82f4b281112634eb5a71694de5fcc9cde95ca3.tar.gz
Merge "Add direction field to QoS bandwidth limit."
Diffstat (limited to 'openstackclient/tests/functional')
-rw-r--r--openstackclient/tests/functional/network/v2/test_network_qos_rule.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/openstackclient/tests/functional/network/v2/test_network_qos_rule.py b/openstackclient/tests/functional/network/v2/test_network_qos_rule.py
index c6437d9c..056bc1f6 100644
--- a/openstackclient/tests/functional/network/v2/test_network_qos_rule.py
+++ b/openstackclient/tests/functional/network/v2/test_network_qos_rule.py
@@ -169,6 +169,8 @@ class NetworkQosRuleTestsBandwidthLimit(common.NetworkTests):
MAX_KBPS_MODIFIED = 15000
MAX_BURST_KBITS = 1400
MAX_BURST_KBITS_MODIFIED = 1800
+ RULE_DIRECTION = 'egress'
+ RULE_DIRECTION_MODIFIED = 'ingress'
HEADERS = ['ID']
FIELDS = ['id']
TYPE = 'bandwidth-limit'
@@ -187,6 +189,7 @@ class NetworkQosRuleTestsBandwidthLimit(common.NetworkTests):
'--type ' + cls.TYPE + ' ' +
'--max-kbps ' + str(cls.MAX_KBPS) + ' ' +
'--max-burst-kbits ' + str(cls.MAX_BURST_KBITS) + ' ' +
+ '--' + cls.RULE_DIRECTION + ' ' +
cls.QOS_POLICY_NAME +
opts
)
@@ -226,14 +229,13 @@ class NetworkQosRuleTestsBandwidthLimit(common.NetworkTests):
self.openstack('network qos rule set --max-kbps ' +
str(self.MAX_KBPS_MODIFIED) + ' --max-burst-kbits ' +
str(self.MAX_BURST_KBITS_MODIFIED) + ' ' +
+ '--' + self.RULE_DIRECTION_MODIFIED + ' ' +
self.QOS_POLICY_NAME + ' ' + self.RULE_ID)
- opts = self.get_opts(['max_kbps'])
+ opts = self.get_opts(['direction', 'max_burst_kbps', 'max_kbps'])
raw_output = self.openstack('network qos rule show ' +
self.QOS_POLICY_NAME + ' ' + self.RULE_ID +
opts)
- self.assertEqual(str(self.MAX_KBPS_MODIFIED) + "\n", raw_output)
- opts = self.get_opts(['max_burst_kbps'])
- raw_output = self.openstack('network qos rule show ' +
- self.QOS_POLICY_NAME + ' ' + self.RULE_ID +
- opts)
- self.assertEqual(str(self.MAX_BURST_KBITS_MODIFIED) + "\n", raw_output)
+ expected = (str(self.RULE_DIRECTION_MODIFIED) + "\n" +
+ str(self.MAX_BURST_KBITS_MODIFIED) + "\n" +
+ str(self.MAX_KBPS_MODIFIED) + "\n")
+ self.assertEqual(expected, raw_output)