|
13 | 13 | # License for the specific language governing permissions and limitations |
14 | 14 | # under the License. |
15 | 15 |
|
| 16 | +import json |
16 | 17 | import uuid |
17 | 18 |
|
18 | 19 | from openstackclient.tests.functional.network.v2 import common |
19 | 20 |
|
20 | 21 |
|
21 | 22 | class NetworkQosPolicyTests(common.NetworkTests): |
22 | 23 | """Functional tests for QoS policy""" |
23 | | - HEADERS = ['Name'] |
24 | | - FIELDS = ['name'] |
25 | | - |
26 | | - @classmethod |
27 | | - def setUpClass(cls): |
28 | | - common.NetworkTests.setUpClass() |
29 | | - if cls.haz_network: |
30 | | - cls.NAME = uuid.uuid4().hex |
31 | | - |
32 | | - opts = cls.get_opts(cls.FIELDS) |
33 | | - raw_output = cls.openstack( |
34 | | - 'network qos policy create ' + |
35 | | - cls.NAME + |
36 | | - opts |
37 | | - ) |
38 | | - cls.assertOutput(cls.NAME + "\n", raw_output) |
39 | | - |
40 | | - @classmethod |
41 | | - def tearDownClass(cls): |
42 | | - try: |
43 | | - if cls.haz_network: |
44 | | - raw_output = cls.openstack( |
45 | | - 'network qos policy delete ' + |
46 | | - cls.NAME |
47 | | - ) |
48 | | - cls.assertOutput('', raw_output) |
49 | | - finally: |
50 | | - super(NetworkQosPolicyTests, cls).tearDownClass() |
51 | 24 |
|
52 | 25 | def setUp(self): |
53 | 26 | super(NetworkQosPolicyTests, self).setUp() |
54 | 27 | # Nothing in this class works with Nova Network |
55 | 28 | if not self.haz_network: |
56 | 29 | self.skipTest("No Network service present") |
57 | 30 |
|
| 31 | + self.NAME = uuid.uuid4().hex |
| 32 | + cmd_output = json.loads(self.openstack( |
| 33 | + 'network qos policy create -f json ' + |
| 34 | + self.NAME |
| 35 | + )) |
| 36 | + self.addCleanup(self.openstack, |
| 37 | + 'network qos policy delete ' + self.NAME) |
| 38 | + self.assertEqual(self.NAME, cmd_output['name']) |
| 39 | + |
| 40 | + def test_qos_rule_create_delete(self): |
| 41 | + # This is to check the output of qos policy delete |
| 42 | + policy_name = uuid.uuid4().hex |
| 43 | + self.openstack('network qos policy create -f json ' + policy_name) |
| 44 | + raw_output = self.openstack( |
| 45 | + 'network qos policy delete ' + policy_name) |
| 46 | + self.assertEqual('', raw_output) |
| 47 | + |
58 | 48 | def test_qos_policy_list(self): |
59 | | - opts = self.get_opts(self.HEADERS) |
60 | | - raw_output = self.openstack('network qos policy list' + opts) |
61 | | - self.assertIn(self.NAME, raw_output) |
| 49 | + cmd_output = json.loads(self.openstack( |
| 50 | + 'network qos policy list -f json')) |
| 51 | + self.assertIn(self.NAME, [p['Name'] for p in cmd_output]) |
62 | 52 |
|
63 | 53 | def test_qos_policy_show(self): |
64 | | - opts = self.get_opts(self.FIELDS) |
65 | | - raw_output = self.openstack('network qos policy show ' + self.NAME + |
66 | | - opts) |
67 | | - self.assertEqual(self.NAME + "\n", raw_output) |
| 54 | + cmd_output = json.loads(self.openstack( |
| 55 | + 'network qos policy show -f json ' + self.NAME)) |
| 56 | + self.assertEqual(self.NAME, cmd_output['name']) |
68 | 57 |
|
69 | 58 | def test_qos_policy_set(self): |
70 | 59 | self.openstack('network qos policy set --share ' + self.NAME) |
71 | | - opts = self.get_opts(['shared']) |
72 | | - raw_output = self.openstack('network qos policy show ' + self.NAME + |
73 | | - opts) |
74 | | - self.assertEqual("True\n", raw_output) |
| 60 | + cmd_output = json.loads(self.openstack( |
| 61 | + 'network qos policy show -f json ' + self.NAME)) |
| 62 | + self.assertTrue(cmd_output['shared']) |
75 | 63 |
|
76 | 64 | def test_qos_policy_default(self): |
77 | 65 | self.openstack('network qos policy set --default ' + self.NAME) |
78 | | - opts = self.get_opts(['is_default']) |
79 | | - raw_output = self.openstack('network qos policy show ' + self.NAME + |
80 | | - opts) |
81 | | - self.assertEqual("True\n", raw_output) |
| 66 | + cmd_output = json.loads(self.openstack( |
| 67 | + 'network qos policy show -f json ' + self.NAME)) |
| 68 | + self.assertTrue(cmd_output['is_default']) |
82 | 69 |
|
83 | 70 | self.openstack('network qos policy set --no-default ' + self.NAME) |
84 | | - opts = self.get_opts(['is_default']) |
85 | | - raw_output = self.openstack('network qos policy show ' + self.NAME + |
86 | | - opts) |
87 | | - self.assertEqual("False\n", raw_output) |
| 71 | + cmd_output = json.loads(self.openstack( |
| 72 | + 'network qos policy show -f json ' + self.NAME)) |
| 73 | + self.assertFalse(cmd_output['is_default']) |
0 commit comments