openstack/deb-python-pyvmomi
Code Issues Proposed changes

No captitalized name allowed

Browse Source 
The default setting of allowCapitalizedNames is False.
This commit is contained in:
Guangmu Zhu
2016-05-12 13:03:41 +08:00
parent 350f6c9089
commit 41109fe843
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pyVim/task.py
View File

@@ -28,7 +28,7 @@ many VIM operations return 'tasks' which can have varying completion
times. times.
""" """
from pyVmomi import Vmodl, Vim from pyVmomi import vmodl, vim
## ##
@@ -112,7 +112,7 @@ def WaitForTask(task,
""" """
if si is None: if si is None:
si = Vim.ServiceInstance("ServiceInstance", task._stub) si = vim.ServiceInstance("ServiceInstance", task._stub)
if pc is None: if pc is None:
pc = si.content.propertyCollector pc = si.content.propertyCollector
@@ -123,11 +123,11 @@ def WaitForTask(task,
version, state = None, None version, state = None, None
# Loop looking for updates till the state moves to a completed state. # Loop looking for updates till the state moves to a completed state.
while state not in (Vim.TaskInfo.State.success, Vim.TaskInfo.State.error): while state not in (vim.TaskInfo.State.success, vim.TaskInfo.State.error):
try: try:
version, state = GetTaskStatus(task, version, pc) version, state = GetTaskStatus(task, version, pc)
progressUpdater.UpdateIfNeeded() progressUpdater.UpdateIfNeeded()
except Vmodl.Fault.ManagedObjectNotFound as e: except vmodl.fault.ManagedObjectNotFound as e:
print("Task object has been deleted: %s" % e.obj) print("Task object has been deleted: %s" % e.obj)
break break
@@ -167,7 +167,7 @@ def WaitForTasks(tasks,
return return
if si is None: if si is None:
si = Vim.ServiceInstance("ServiceInstance", tasks[0]._stub) si = vim.ServiceInstance("ServiceInstance", tasks[0]._stub)
if pc is None: if pc is None:
pc = si.content.propertyCollector pc = si.content.propertyCollector
if results is None: if results is None:
@@ -203,13 +203,13 @@ def WaitForTasks(tasks,
if not progressUpdater: if not progressUpdater:
continue continue
if state == Vim.TaskInfo.State.success: if state == vim.TaskInfo.State.success:
progressUpdater.Update('completed') progressUpdater.Update('completed')
progressUpdaters.pop(taskId) progressUpdaters.pop(taskId)
# cache the results, as task objects could expire if one # cache the results, as task objects could expire if one
# of the tasks take a longer time to complete # of the tasks take a longer time to complete
results.append(task.info.result) results.append(task.info.result)
elif state == Vim.TaskInfo.State.error: elif state == vim.TaskInfo.State.error:
err = task.info.error err = task.info.error
progressUpdater.Update('error: %s' % str(err)) progressUpdater.Update('error: %s' % str(err))
if raiseOnError: if raiseOnError:
@@ -250,15 +250,15 @@ def CreateTasksFilter(pc, tasks):
return None return None
# First create the object specification as the task object. # First create the object specification as the task object.
objspecs = [Vmodl.Query.PropertyCollector.ObjectSpec(obj=task) objspecs = [vmodl.query.PropertyCollector.ObjectSpec(obj=task)
for task in tasks] for task in tasks]
# Next, create the property specification as the state. # Next, create the property specification as the state.
propspec = Vmodl.Query.PropertyCollector.PropertySpec( propspec = vmodl.query.PropertyCollector.PropertySpec(
type=Vim.Task, pathSet=[], all=True) type=vim.Task, pathSet=[], all=True)
# Create a filter spec with the specified object and property spec. # Create a filter spec with the specified object and property spec.
filterspec = Vmodl.Query.PropertyCollector.FilterSpec() filterspec = vmodl.query.PropertyCollector.FilterSpec()
filterspec.objectSet = objspecs filterspec.objectSet = objspecs
filterspec.propSet = [propspec] filterspec.propSet = [propspec]
@@ -272,7 +272,7 @@ def CheckForQuestionPending(task):
""" """
vm = task.info.entity vm = task.info.entity
if vm is not None and isinstance(vm, Vim.VirtualMachine): if vm is not None and isinstance(vm, vim.VirtualMachine):
qst = vm.runtime.question qst = vm.runtime.question
if qst is not None: if qst is not None:
raise TaskBlocked("Task blocked, User Intervention required") raise TaskBlocked("Task blocked, User Intervention required")