← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to tools/xenserver/vm_vdi_cleaner.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-08-16 14:04:11 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20120816140411-0mr4n241wmk30t9l
Tags: upstream-2012.2~f3
Import upstream version 2012.2~f3

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/xenserver/vm_vdi_cleaner.py
17
17
"""vm_vdi_cleaner.py - List or clean orphaned VDIs/instances on XenServer."""
18
18
 
19
19
import doctest
20
 
import optparse
21
20
import os
22
21
import sys
23
22
import XenAPI
34
33
from nova import flags
35
34
from nova.openstack.common import cfg
36
35
from nova.openstack.common import timeutils
37
 
from nova.virt.xenapi import connection as xenapi_conn
 
36
from nova.virt.xenapi import driver as xenapi_driver
38
37
 
39
38
 
40
39
CONF = cfg.CONF
286
285
        raise Exception("`zombie_instance_updated_at_window` has to be longer"
287
286
                " than `resize_confirm_window`.")
288
287
 
289
 
    xenapi = xenapi_conn.XenAPIDriver()
 
288
    xenapi = xenapi_driver.XenAPIDriver()
290
289
 
291
290
    if command == "list-vdis":
292
291
        if CONF.verbose: