summaryrefslogtreecommitdiff
path: root/openstackclient/tests/network
diff options
context:
space:
mode:
authorTerryHowe <terrylhowe@gmail.com>2015-07-08 11:21:41 -0600
committerTerryHowe <terrylhowe@gmail.com>2015-07-08 11:21:41 -0600
commit2d4a7371601290abca1878f07b952dc8d9deff02 (patch)
tree475a7c00dff090413847ce88843a29db175f5392 /openstackclient/tests/network
parentf07f71661f8e215844dff6156781975041a3b1c4 (diff)
downloadpython-openstackclient-2d4a7371601290abca1878f07b952dc8d9deff02.tar.gz
Remove the --dhcp option to network list
The --dhcp option lists agents, not networks. This does not make a lot of sense. Another command should be created to list agents. BackwardsIncompatibleImpact Closes-Bug: #1472613 Change-Id: I5ecfe3fc046a07eb64a4dabd41dbd99de7c2215f
Diffstat (limited to 'openstackclient/tests/network')
-rw-r--r--openstackclient/tests/network/v2/test_network.py48
1 files changed, 0 insertions, 48 deletions
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 36133a3b..61541823 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -278,7 +278,6 @@ class TestListNetwork(common.TestNetworkBase):
arglist = []
verifylist = [
('external', False),
- ('dhcp', None),
('long', False),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -306,7 +305,6 @@ class TestListNetwork(common.TestNetworkBase):
]
verifylist = [
('external', True),
- ('dhcp', None),
('long', False),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -334,7 +332,6 @@ class TestListNetwork(common.TestNetworkBase):
]
verifylist = [
('long', True),
- ('dhcp', None),
('external', False),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -377,51 +374,6 @@ class TestListNetwork(common.TestNetworkBase):
self.assertEqual(list(data), datalist)
-@mock.patch(
- 'openstackclient.api.network_v2.APIv2.dhcp_agent_list'
-)
-class TestListDhcpAgent(common.TestNetworkBase):
-
- def setUp(self):
- super(TestListDhcpAgent, self).setUp()
-
- # Get the command object to test
- self.cmd = network.ListNetwork(self.app, self.namespace)
-
- self.DHCP_LIST = [
- {'id': '1'},
- {'id': '2'},
- ]
-
- def test_list_dhcp(self, n_mock):
- n_mock.return_value = self.DHCP_LIST
-
- arglist = [
- '--dhcp', 'dhcpid',
- ]
- verifylist = [
- ('external', False),
- ('dhcp', 'dhcpid'),
- ('long', False),
- ]
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
- # DisplayCommandBase.take_action() returns two tuples
- columns, data = self.cmd.take_action(parsed_args)
-
- # Set expected values
- n_mock.assert_called_with(
- dhcp_id='dhcpid',
- )
-
- self.assertEqual(('ID',), columns)
- datalist = [
- ('1',),
- ('2',),
- ]
- self.assertEqual(datalist, list(data))
-
-
class TestSetNetwork(common.TestNetworkBase):
def test_set_this(self):
arglist = [