openstack/deb-python-pyvmomi
Code Issues Proposed changes

Fix SessionOrientedStub and StubAdapterAccessor

Browse Source
This commit is contained in:
Parth Gala
2014-07-02 17:41:43 -07:00
parent 1d9e042f9a
commit 30f78ab40c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pyVmomi/SoapAdapter.py
View File

@@ -1441,10 +1441,10 @@ class SessionOrientedStub(StubAdapterBase):
''' '''
assert callable(loginMethod) assert callable(loginMethod)
assert retryCount >= 0 assert retryCount >= 0
StubAdapterBase.__init__(self, version=soapStub.version)
self.lock = threading.Lock() self.lock = threading.Lock()
self.soapStub = soapStub self.soapStub = soapStub
self.version = soapStub.version
self.state = self.STATE_UNAUTHENTICATED self.state = self.STATE_UNAUTHENTICATED
self.loginMethod = loginMethod self.loginMethod = loginMethod

11
pyVmomi/StubAdapterAccessorImpl.py
View File

@@ -1,5 +1,5 @@
# VMware vSphere Python SDK # VMware vSphere Python SDK
# Copyright (c) 2008-2013 VMware, Inc. All Rights Reserved. # Copyright (c) 2008-2014 VMware, Inc. All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -38,4 +38,11 @@ class StubAdapterAccessorMixin:
if not self._pc: if not self._pc:
si = self._siType("ServiceInstance", self) si = self._siType("ServiceInstance", self)
self._pc = si.RetrieveContent().propertyCollector self._pc = si.RetrieveContent().propertyCollector
return self._pc.RetrieveContents([filterSpec])[0].propSet[0].val result = self._pc.RetrievePropertiesEx(specSet=[filterSpec],
options=self._pcType.RetrieveOptions(maxObjects=1))
objectContent = result.objects[0]
if len(objectContent.propSet) > 0:
return objectContent.propSet[0].val
if len(objectContent.missingSet) > 0 and objectContent.missingSet[0].fault:
raise objectContent.missingSet[0].fault
return None