Some pyVmomi types present themselves as string types (i.e., isinstance(val, str) == True), but those objects shadow certain string methods that the serializer relies on. Thus, serializing these objects fails. This change causes the serializer to convert those objects to their string representation before serializing. A test case is included; this test fails on Py3 without the change in question, and passes with it.
61 lines
2.3 KiB
Python
61 lines
2.3 KiB
Python
# VMware vSphere Python SDK
|
|
# Copyright (c) 2008-2015 VMware, Inc. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
import tests
|
|
import vcr
|
|
|
|
|
|
from pyVmomi import SoapAdapter
|
|
from pyVmomi import SoapStubAdapter
|
|
from pyVmomi import vim
|
|
|
|
|
|
class SerializerTests(tests.VCRTestBase):
|
|
|
|
def test_simple_request_serializer(self):
|
|
def request_matcher(r1, r2):
|
|
soap_msg = ('<soapenv:Body>'
|
|
'<RetrieveServiceContent xmlns="urn:vim25">'
|
|
'<_this type="ServiceInstance">'
|
|
'ServiceInstance'
|
|
'</_this>'
|
|
'</RetrieveServiceContent>'
|
|
'</soapenv:Body>')
|
|
if soap_msg in r1.body.decode("utf-8"):
|
|
return True
|
|
raise SystemError('serialization error occurred')
|
|
|
|
my_vcr = vcr.VCR()
|
|
my_vcr.register_matcher('request_matcher', request_matcher)
|
|
|
|
with my_vcr.use_cassette(
|
|
'test_simple_request_serializer.yaml',
|
|
cassette_library_dir=tests.fixtures_path,
|
|
record_mode='none',
|
|
match_on=['request_matcher']) as cass:
|
|
host = 'vcsa'
|
|
port = 443
|
|
stub = SoapStubAdapter(host, port)
|
|
si = vim.ServiceInstance("ServiceInstance", stub)
|
|
content = si.RetrieveContent()
|
|
self.assertTrue(content is not None)
|
|
self.assertTrue(
|
|
'<_this type="ServiceInstance">ServiceInstance</_this>'
|
|
in cass.requests[0].body.decode("utf-8"))
|
|
|
|
def test_serialize_object(self):
|
|
val = vim.vm.device.VirtualDeviceSpec.FileOperation()
|
|
# This line should not raise an exception, especially on Python 3.
|
|
SoapAdapter.Serialize(val)
|