mirror of
https://opendev.org/openstack/python-openstackclient.git
synced 2026-01-17 07:20:45 +00:00
6109dfcf63
This patch implements "ip floating delete" command for both compute and network. Also includes unit tests. Change-Id: Ie61f0faad65ec90f9d9956ae463412be8d963d05 partial-Bug: 1519502 Related-to: blueprint neutron-client Co-Authored-By: Tang Chen <chen.tang@easystack.cn>
105 lines
3.3 KiB
Python
105 lines
3.3 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import mock
|
|
|
|
from openstackclient.network.v2 import floating_ip
|
|
from openstackclient.tests.compute.v2 import fakes as compute_fakes
|
|
from openstackclient.tests.network.v2 import fakes as network_fakes
|
|
|
|
|
|
# Tests for Neutron network
|
|
#
|
|
class TestFloatingIPNetwork(network_fakes.TestNetworkV2):
|
|
|
|
def setUp(self):
|
|
super(TestFloatingIPNetwork, self).setUp()
|
|
|
|
# Get a shortcut to the network client
|
|
self.network = self.app.client_manager.network
|
|
|
|
|
|
class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
|
|
|
|
# The floating ip to be deleted.
|
|
floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
|
|
|
|
def setUp(self):
|
|
super(TestDeleteFloatingIPNetwork, self).setUp()
|
|
|
|
self.network.delete_ip = mock.Mock(return_value=self.floating_ip)
|
|
self.network.find_ip = mock.Mock(return_value=self.floating_ip)
|
|
|
|
# Get the command object to test
|
|
self.cmd = floating_ip.DeleteFloatingIP(self.app, self.namespace)
|
|
|
|
def test_floating_ip_delete(self):
|
|
arglist = [
|
|
self.floating_ip.id,
|
|
]
|
|
verifylist = [
|
|
('floating_ip', self.floating_ip.id),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.take_action(parsed_args)
|
|
|
|
self.network.find_ip.assert_called_with(self.floating_ip.id)
|
|
self.network.delete_ip.assert_called_with(self.floating_ip)
|
|
self.assertIsNone(result)
|
|
|
|
|
|
# Tests for Nova network
|
|
#
|
|
class TestFloatingIPCompute(compute_fakes.TestComputev2):
|
|
|
|
def setUp(self):
|
|
super(TestFloatingIPCompute, self).setUp()
|
|
|
|
# Get a shortcut to the compute client
|
|
self.compute = self.app.client_manager.compute
|
|
|
|
|
|
class TestDeleteFloatingIPCompute(TestFloatingIPCompute):
|
|
|
|
# The floating ip to be deleted.
|
|
floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
|
|
|
|
def setUp(self):
|
|
super(TestDeleteFloatingIPCompute, self).setUp()
|
|
|
|
self.app.client_manager.network_endpoint_enabled = False
|
|
|
|
self.compute.floating_ips.delete.return_value = None
|
|
|
|
# Return value of utils.find_resource()
|
|
self.compute.floating_ips.get.return_value = self.floating_ip
|
|
|
|
# Get the command object to test
|
|
self.cmd = floating_ip.DeleteFloatingIP(self.app, None)
|
|
|
|
def test_floating_ip_delete(self):
|
|
arglist = [
|
|
self.floating_ip.id,
|
|
]
|
|
verifylist = [
|
|
('floating_ip', self.floating_ip.id),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
result = self.cmd.take_action(parsed_args)
|
|
|
|
self.compute.floating_ips.delete.assert_called_with(
|
|
self.floating_ip.id
|
|
)
|
|
self.assertIsNone(result)
|