From 216467b3454bca97106463957da88290f8a47fa7 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Tue, 17 Jul 2012 21:51:52 +0000 Subject: [PATCH] Fixes XenAPI driver import in vm_vdi_cleaner xenapi/connection.py was renamed xenapi/driver.py, it appears, but vm_vdi_cleaner was not updated. Also removed unused optparse import. Fixes bug 1025912 Change-Id: Ia1a93400dc24455fe91fdf4283eb32bcca4037cf --- tools/xenserver/vm_vdi_cleaner.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index b0e9d981c3c4..f04adc74e62a 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -17,7 +17,6 @@ """vm_vdi_cleaner.py - List or clean orphaned VDIs/instances on XenServer.""" import doctest -import optparse import os import sys import XenAPI @@ -34,7 +33,7 @@ from nova import exception from nova import flags from nova.openstack.common import cfg from nova.openstack.common import timeutils -from nova.virt.xenapi import connection as xenapi_conn +from nova.virt.xenapi import driver as xenapi_driver CONF = cfg.CONF @@ -286,7 +285,7 @@ def main(): raise Exception("`zombie_instance_updated_at_window` has to be longer" " than `resize_confirm_window`.") - xenapi = xenapi_conn.XenAPIDriver() + xenapi = xenapi_driver.XenAPIDriver() if command == "list-vdis": if CONF.verbose: