openstack
/
nova
Code Issues Proposed changes

Merge "Fix VMware Hyper console url parameter error."

This commit is contained in:
Jenkins 2013-04-29 21:46:00 +00:00 committed by Gerrit Code Review
parent a56c2305c7 2e16432ae0
commit 83f71e2181
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nova/tests/test_vmwareapi.py
View File

@ -19,6 +19,8 @@
"""
Test suite for VMwareAPI.
"""
import mox
import urllib2
from nova.compute import power_state
from nova.compute import task_states
@ -33,6 +35,21 @@ from nova.tests.vmwareapi import db_fakes
from nova.tests.vmwareapi import stubs
from nova.virt.vmwareapi import driver
from nova.virt.vmwareapi import fake as vmwareapi_fake
from nova.virt.vmwareapi import vm_util
class fake_vm_ref(object):
def __init__(self):
self.value = 4
self._type = 'VirtualMachine'
class fake_http_resp(object):
def __init__(self):
self.code = 200
def read(self):
return "console log"
class VMwareAPIVMTestCase(test.TestCase):
@ -308,7 +325,17 @@ class VMwareAPIVMTestCase(test.TestCase):
pass
def test_get_console_output(self):
pass
vm_ref = fake_vm_ref()
result = fake_http_resp()
self._create_instance_in_the_db()
self.mox.StubOutWithMock(vm_util, 'get_vm_ref_from_name')
self.mox.StubOutWithMock(urllib2, 'urlopen')
vm_util.get_vm_ref_from_name(mox.IgnoreArg(), self.instance['name']).\
AndReturn(vm_ref)
urllib2.urlopen(mox.IgnoreArg()).AndReturn(result)
self.mox.ReplayAll()
self.conn.get_console_output(self.instance)
class VMwareAPIHostTestCase(test.TestCase):

2
nova/virt/vmwareapi/vmops.py
View File

@ -1086,7 +1086,7 @@ class VMwareVMOps(object):
vm_ref = vm_util.get_vm_ref_from_name(self._session, instance['name'])
if vm_ref is None:
raise exception.InstanceNotFound(instance_id=instance['uuid'])
param_list = {"id": str(vm_ref)}
param_list = {"id": str(vm_ref.value)}
base_url = "%s://%s/screen?%s" % (self._session._scheme,
self._session._host_ip,
urllib.urlencode(param_list))