summaryrefslogtreecommitdiff
path: root/openstackclient/tests/unit/network
diff options
context:
space:
mode:
authorBernard Cafarelli <bcafarel@redhat.com>2018-09-04 17:52:46 +0200
committerBernard Cafarelli <bcafarel@redhat.com>2018-09-05 10:45:37 +0200
commita5865b176304b92736a71cd6ad2dd1199c588ba5 (patch)
treea2aaf7ffbd2ce73af57ba2d495b1b1e97ff3806a /openstackclient/tests/unit/network
parent0461b7ce0c23f7aebb60ee362d1d89cfa38abe4b (diff)
downloadpython-openstackclient-a5865b176304b92736a71cd6ad2dd1199c588ba5.tar.gz
Partially Revert "Add command to unset information from Subnet-pools"
We do not support removing a prefix from a subnet pool, only updating with a larger prefix (which is handled by the set command) This reverts commit 063c722a110031883e9615064092644de6df8da2. Change-Id: I11224fbdb94dc1caef42a8a64cbcebaf1dc542fe Story: #1670230 Task: #13697
Diffstat (limited to 'openstackclient/tests/unit/network')
-rw-r--r--openstackclient/tests/unit/network/v2/test_subnet_pool.py35
1 files changed, 1 insertions, 34 deletions
diff --git a/openstackclient/tests/unit/network/v2/test_subnet_pool.py b/openstackclient/tests/unit/network/v2/test_subnet_pool.py
index 81f0278f..3d8f1028 100644
--- a/openstackclient/tests/unit/network/v2/test_subnet_pool.py
+++ b/openstackclient/tests/unit/network/v2/test_subnet_pool.py
@@ -1016,9 +1016,7 @@ class TestUnsetSubnetPool(TestSubnetPool):
def setUp(self):
super(TestUnsetSubnetPool, self).setUp()
self._subnetpool = network_fakes.FakeSubnetPool.create_one_subnet_pool(
- {'prefixes': ['10.0.10.0/24', '10.1.10.0/24',
- '10.2.10.0/24'],
- 'tags': ['green', 'red']})
+ {'tags': ['green', 'red']})
self.network.find_subnet_pool = mock.Mock(
return_value=self._subnetpool)
self.network.update_subnet_pool = mock.Mock(return_value=None)
@@ -1026,37 +1024,6 @@ class TestUnsetSubnetPool(TestSubnetPool):
# Get the command object to test
self.cmd = subnet_pool.UnsetSubnetPool(self.app, self.namespace)
- def test_unset_subnet_pool(self):
- arglist = [
- '--pool-prefix', '10.0.10.0/24',
- '--pool-prefix', '10.1.10.0/24',
- self._subnetpool.name,
- ]
- verifylist = [
- ('prefixes', ['10.0.10.0/24', '10.1.10.0/24']),
- ('subnet_pool', self._subnetpool.name),
- ]
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
- result = self.cmd.take_action(parsed_args)
- attrs = {'prefixes': ['10.2.10.0/24']}
- self.network.update_subnet_pool.assert_called_once_with(
- self._subnetpool, **attrs)
- self.assertIsNone(result)
-
- def test_unset_subnet_pool_prefix_not_existent(self):
- arglist = [
- '--pool-prefix', '10.100.1.1/25',
- self._subnetpool.name,
- ]
- verifylist = [
- ('prefixes', ['10.100.1.1/25']),
- ('subnet_pool', self._subnetpool.name),
- ]
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
- self.assertRaises(exceptions.CommandError,
- self.cmd.take_action,
- parsed_args)
-
def _test_unset_tags(self, with_tags=True):
if with_tags:
arglist = ['--tag', 'red', '--tag', 'blue']