openstack/charm-nova-cloud-controller
Code Issues Proposed changes

stop using deprecated delete helpers

Browse Source
This commit is contained in:
Ryan Beisner 2015-10-16 05:41:09 +00:00
parent 0f8976fb18
commit 027dc7c9e0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/basic_deployment.py
View File

@ -136,6 +136,11 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
self.nova_compute_sentry = self.d.sentry.unit['nova-compute/0'] self.nova_compute_sentry = self.d.sentry.unit['nova-compute/0']
self.glance_sentry = self.d.sentry.unit['glance/0'] self.glance_sentry = self.d.sentry.unit['glance/0']
u.log.debug('openstack release val: {}'.format(
self._get_openstack_release()))
u.log.debug('openstack release str: {}'.format(
self._get_openstack_release_string()))
# Authenticate admin with keystone # Authenticate admin with keystone
self.keystone = u.authenticate_keystone_admin(self.keystone_sentry, self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
user='admin', user='admin',
@ -664,7 +669,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
message = "api paste config error: {}".format(ret) message = "api paste config error: {}".format(ret)
amulet.raise_status(amulet.FAIL, msg=message) amulet.raise_status(amulet.FAIL, msg=message)
def test_402_image_instance_create(self): def test_400_image_instance_create(self):
"""Create an image/instance, verify they exist, and delete them.""" """Create an image/instance, verify they exist, and delete them."""
# NOTE(coreycb): Skipping failing test on essex until resolved. essex # NOTE(coreycb): Skipping failing test on essex until resolved. essex
# nova API calls are getting "Malformed request url # nova API calls are getting "Malformed request url
@ -696,8 +701,11 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
message = "nova cirros instance does not exist" message = "nova cirros instance does not exist"
amulet.raise_status(amulet.FAIL, msg=message) amulet.raise_status(amulet.FAIL, msg=message)
u.delete_image(self.glance, image) u.delete_resource(self.glance.images, image.id,
u.delete_instance(self.nova_demo, instance) msg="glance image")
u.delete_resource(self.nova_demo.servers, instance.id,
msg="nova instance")
def test_900_restart_on_config_change(self): def test_900_restart_on_config_change(self):
"""Verify that the specified services are restarted when the config """Verify that the specified services are restarted when the config