From 2d4a7371601290abca1878f07b952dc8d9deff02 Mon Sep 17 00:00:00 2001
From: TerryHowe <terrylhowe@gmail.com>
Date: Wed, 8 Jul 2015 11:21:41 -0600
Subject: 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
---
 openstackclient/tests/network/v2/test_network.py | 48 ------------------------
 1 file changed, 48 deletions(-)

(limited to 'openstackclient/tests')

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 = [
-- 
cgit v1.2.1