Add wait for delete method to resource and add two proxy methods to wait for delete for servers and stacks. Change-Id: Iaff65457e94ffd5f64f5951f0c2ba211f4f06bdd
191 lines
7.4 KiB
Python
191 lines
7.4 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.
|
|
|
|
from openstack.compute.v2 import _proxy
|
|
from openstack.compute.v2 import extension
|
|
from openstack.compute.v2 import flavor
|
|
from openstack.compute.v2 import image
|
|
from openstack.compute.v2 import keypair
|
|
from openstack.compute.v2 import limits
|
|
from openstack.compute.v2 import server
|
|
from openstack.compute.v2 import server_interface
|
|
from openstack.compute.v2 import server_ip
|
|
from openstack.tests.unit import test_proxy_base
|
|
|
|
|
|
class TestComputeProxy(test_proxy_base.TestProxyBase):
|
|
def setUp(self):
|
|
super(TestComputeProxy, self).setUp()
|
|
self.proxy = _proxy.Proxy(self.session)
|
|
|
|
def test_extension_find(self):
|
|
self.verify_find('openstack.compute.v2.extension.Extension.find',
|
|
self.proxy.find_extension)
|
|
|
|
def test_extensions(self):
|
|
self.verify_list(self.proxy.extensions, extension.Extension,
|
|
paginated=False)
|
|
|
|
def test_flavor_create(self):
|
|
self.verify_create(self.proxy.create_flavor, flavor.Flavor)
|
|
|
|
def test_flavor_delete(self):
|
|
self.verify_delete(self.proxy.delete_flavor, flavor.Flavor, False)
|
|
|
|
def test_flavor_delete_ignore(self):
|
|
self.verify_delete(self.proxy.delete_flavor, flavor.Flavor, True)
|
|
|
|
def test_flavor_find(self):
|
|
self.verify_find('openstack.compute.v2.flavor.Flavor.find',
|
|
self.proxy.find_flavor)
|
|
|
|
def test_flavor_get(self):
|
|
self.verify_get(self.proxy.get_flavor, flavor.Flavor)
|
|
|
|
def test_flavors_detailed(self):
|
|
self.verify_list(self.proxy.flavors, flavor.FlavorDetail,
|
|
paginated=True,
|
|
method_kwargs={"details": True, "query": 1},
|
|
expected_kwargs={"query": 1})
|
|
|
|
def test_flavors_not_detailed(self):
|
|
self.verify_list(self.proxy.flavors, flavor.Flavor,
|
|
paginated=True,
|
|
method_kwargs={"details": False, "query": 1},
|
|
expected_kwargs={"query": 1})
|
|
|
|
def test_flavor_update(self):
|
|
self.verify_update(self.proxy.update_flavor, flavor.Flavor)
|
|
|
|
def test_image_delete(self):
|
|
self.verify_delete(self.proxy.delete_image, image.Image, False)
|
|
|
|
def test_image_delete_ignore(self):
|
|
self.verify_delete(self.proxy.delete_image, image.Image, True)
|
|
|
|
def test_image_find(self):
|
|
self.verify_find('openstack.compute.v2.image.Image.find',
|
|
self.proxy.find_image)
|
|
|
|
def test_image_get(self):
|
|
self.verify_get(self.proxy.get_image, image.Image)
|
|
|
|
def test_images_detailed(self):
|
|
self.verify_list(self.proxy.images, image.ImageDetail,
|
|
paginated=True,
|
|
method_kwargs={"details": True, "query": 1},
|
|
expected_kwargs={"query": 1})
|
|
|
|
def test_images_not_detailed(self):
|
|
self.verify_list(self.proxy.images, image.Image,
|
|
paginated=True,
|
|
method_kwargs={"details": False, "query": 1},
|
|
expected_kwargs={"query": 1})
|
|
|
|
def test_keypair_create(self):
|
|
self.verify_create(self.proxy.create_keypair, keypair.Keypair)
|
|
|
|
def test_keypair_delete(self):
|
|
self.verify_delete(self.proxy.delete_keypair, keypair.Keypair, False)
|
|
|
|
def test_keypair_delete_ignore(self):
|
|
self.verify_delete(self.proxy.delete_keypair, keypair.Keypair, True)
|
|
|
|
def test_keypair_find(self):
|
|
self.verify_find('openstack.compute.v2.keypair.Keypair.find',
|
|
self.proxy.find_keypair)
|
|
|
|
def test_keypair_get(self):
|
|
self.verify_get(self.proxy.get_keypair, keypair.Keypair)
|
|
|
|
def test_keypairs(self):
|
|
self.verify_list(self.proxy.keypairs, keypair.Keypair,
|
|
paginated=False)
|
|
|
|
def test_keypair_update(self):
|
|
self.verify_update(self.proxy.update_keypair, keypair.Keypair)
|
|
|
|
def test_limits_get(self):
|
|
self.verify_get(self.proxy.get_limits, limits.Limits, value=[])
|
|
|
|
def test_server_interface_create(self):
|
|
self.verify_create(self.proxy.create_server_interface,
|
|
server_interface.ServerInterface)
|
|
|
|
def test_server_interface_delete(self):
|
|
self.verify_delete(self.proxy.delete_server_interface,
|
|
server_interface.ServerInterface, False)
|
|
|
|
def test_server_interface_delete_ignore(self):
|
|
self.verify_delete(self.proxy.delete_server_interface,
|
|
server_interface.ServerInterface, True)
|
|
|
|
def test_server_interface_find(self):
|
|
self.verify_find(
|
|
'openstack.compute.v2.server_interface.ServerInterface.find',
|
|
self.proxy.find_server_interface)
|
|
|
|
def test_server_interface_get(self):
|
|
self.verify_get(self.proxy.get_server_interface,
|
|
server_interface.ServerInterface)
|
|
|
|
def test_server_interfaces(self):
|
|
self.verify_list(self.proxy.server_interfaces,
|
|
server_interface.ServerInterface,
|
|
paginated=False)
|
|
|
|
def test_server_interface_update(self):
|
|
self.verify_update(self.proxy.update_server_interface,
|
|
server_interface.ServerInterface)
|
|
|
|
def test_server_ip_find(self):
|
|
self.verify_find('openstack.compute.v2.server_ip.ServerIP.find',
|
|
self.proxy.find_server_ip)
|
|
|
|
def test_server_ips(self):
|
|
self.verify_list(self.proxy.server_ips, server_ip.ServerIP,
|
|
paginated=False)
|
|
|
|
def test_server_create_attrs(self):
|
|
self.verify_create(self.proxy.create_server, server.Server)
|
|
|
|
def test_server_delete(self):
|
|
self.verify_delete(self.proxy.delete_server, server.Server, False)
|
|
|
|
def test_server_delete_ignore(self):
|
|
self.verify_delete(self.proxy.delete_server, server.Server, True)
|
|
|
|
def test_server_find(self):
|
|
self.verify_find('openstack.compute.v2.server.Server.find',
|
|
self.proxy.find_server)
|
|
|
|
def test_server_get(self):
|
|
self.verify_get(self.proxy.get_server, server.Server)
|
|
|
|
def test_servers_detailed(self):
|
|
self.verify_list(self.proxy.servers, server.ServerDetail,
|
|
paginated=True,
|
|
method_kwargs={"details": True,
|
|
"changes_since": 1, "image": 2},
|
|
expected_kwargs={"changes-since": 1, "image": 2})
|
|
|
|
def test_servers_not_detailed(self):
|
|
self.verify_list(self.proxy.servers, server.Server,
|
|
paginated=True,
|
|
method_kwargs={"details": False,
|
|
"changes_since": 1, "image": 2},
|
|
expected_kwargs={"paginated": True,
|
|
"changes-since": 1, "image": 2})
|
|
|
|
def test_server_update(self):
|
|
self.verify_update(self.proxy.update_server, server.Server)
|