Skip to content

Commit a1f2f4a

Browse files
author
reedip
committed
TrivialOrder: Rearrange Class Names
As per the comment given by Steve Martinelli in https://review.openstack.org/#/c/278209/ , the following patch just rearranges the classes as per the Alphabetical order. TrivialFix Change-Id: Ib8f0f703df4ef7d7ee6180ff8bd8a47062ae5b0f
1 parent 0dfc50e commit a1f2f4a

3 files changed

Lines changed: 63 additions & 63 deletions

File tree

doc/source/command-objects/subnet.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ subnet
44

55
Network v2
66

7+
subnet delete
8+
-------------
9+
10+
Delete a subnet
11+
12+
.. program:: subnet delete
13+
.. code:: bash
14+
15+
os subnet delete
16+
<subnet>
17+
18+
.. _subnet_delete-subnet:
19+
.. describe:: <subnet>
20+
21+
Subnet to delete (name or ID)
22+
723
subnet list
824
-----------
925

@@ -34,19 +50,3 @@ Show subnet details
3450
.. describe:: <subnet>
3551

3652
Subnet to show (name or ID)
37-
38-
subnet delete
39-
-------------
40-
41-
Delete a subnet
42-
43-
.. program:: subnet delete
44-
.. code:: bash
45-
46-
os subnet delete
47-
<subnet>
48-
49-
.. _subnet_delete-subnet:
50-
.. describe:: <subnet>
51-
52-
Subnet to delete (name or ID)

openstackclient/network/v2/subnet.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,24 @@ def _get_columns(item):
3838
return tuple(sorted(columns))
3939

4040

41+
class DeleteSubnet(command.Command):
42+
"""Delete subnet"""
43+
44+
def get_parser(self, prog_name):
45+
parser = super(DeleteSubnet, self).get_parser(prog_name)
46+
parser.add_argument(
47+
'subnet',
48+
metavar="<subnet>",
49+
help="Subnet to delete (name or ID)"
50+
)
51+
return parser
52+
53+
def take_action(self, parsed_args):
54+
client = self.app.client_manager.network
55+
client.delete_subnet(
56+
client.find_subnet(parsed_args.subnet))
57+
58+
4159
class ListSubnet(command.Lister):
4260
"""List subnets"""
4361

@@ -89,21 +107,3 @@ def take_action(self, parsed_args):
89107
columns = _get_columns(obj)
90108
data = utils.get_item_properties(obj, columns, formatters=_formatters)
91109
return (columns, data)
92-
93-
94-
class DeleteSubnet(command.Command):
95-
"""Delete subnet"""
96-
97-
def get_parser(self, prog_name):
98-
parser = super(DeleteSubnet, self).get_parser(prog_name)
99-
parser.add_argument(
100-
'subnet',
101-
metavar="<subnet>",
102-
help=("Subnet to delete (name or ID)")
103-
)
104-
return parser
105-
106-
def take_action(self, parsed_args):
107-
client = self.app.client_manager.network
108-
client.delete_subnet(
109-
client.find_subnet(parsed_args.subnet))

openstackclient/tests/network/v2/test_subnet.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,35 @@ def setUp(self):
2828
self.network = self.app.client_manager.network
2929

3030

31+
class TestDeleteSubnet(TestSubnet):
32+
33+
# The subnet to delete.
34+
_subnet = network_fakes.FakeSubnet.create_one_subnet()
35+
36+
def setUp(self):
37+
super(TestDeleteSubnet, self).setUp()
38+
39+
self.network.delete_subnet = mock.Mock(return_value=None)
40+
41+
self.network.find_subnet = mock.Mock(return_value=self._subnet)
42+
43+
# Get the command object to test
44+
self.cmd = subnet_v2.DeleteSubnet(self.app, self.namespace)
45+
46+
def test_delete(self):
47+
arglist = [
48+
self._subnet.name,
49+
]
50+
verifylist = [
51+
('subnet', self._subnet.name),
52+
]
53+
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
54+
55+
result = self.cmd.take_action(parsed_args)
56+
self.network.delete_subnet.assert_called_with(self._subnet)
57+
self.assertIsNone(result)
58+
59+
3160
class TestListSubnet(TestSubnet):
3261
# The subnets going to be listed up.
3362
_subnet = network_fakes.FakeSubnet.create_subnets(count=3)
@@ -181,32 +210,3 @@ def test_show_all_options(self):
181210

182211
self.assertEqual(self.columns, columns)
183212
self.assertEqual(list(self.data), list(data))
184-
185-
186-
class TestDeleteSubnet(TestSubnet):
187-
188-
# The subnet to delete.
189-
_subnet = network_fakes.FakeSubnet.create_one_subnet()
190-
191-
def setUp(self):
192-
super(TestDeleteSubnet, self).setUp()
193-
194-
self.network.delete_subnet = mock.Mock(return_value=None)
195-
196-
self.network.find_subnet = mock.Mock(return_value=self._subnet)
197-
198-
# Get the command object to test
199-
self.cmd = subnet_v2.DeleteSubnet(self.app, self.namespace)
200-
201-
def test_delete(self):
202-
arglist = [
203-
self._subnet.name,
204-
]
205-
verifylist = [
206-
('subnet', self._subnet.name),
207-
]
208-
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
209-
210-
result = self.cmd.take_action(parsed_args)
211-
self.network.delete_subnet.assert_called_with(self._subnet)
212-
self.assertIsNone(result)

0 commit comments

Comments
 (0)