x
/
nova-zvm-virt-driver
Code Issues Proposed changes

Fix the image_meta problem when create_userid 

Now the image_meta passed from spawn is changed to a dict, but in
resize it still an object. So update to handle these two cases in
create_userid.

Change-Id: I26c9db1c2e607583eaa5574023d6195024ff3a3f
This commit is contained in:
nafei yang 2016-05-26 17:07:38 +08:00
parent 538d20eb95
commit 4ed05b6a87
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/virt/zvm/instance.py
View File

@ -207,9 +207,18 @@ class ZVMInstance(object):
'cpu=%i' % self._instance['vcpus'],
'memory=%im' % self._instance['memory_mb'],
'privilege=%s' % CONF.zvm_user_default_privilege]
if 'name' in image_meta.keys():
kwimage = 'imagename=%s' % image_meta['name']
body.append(kwimage)
# image_meta passed from spawn is a dict, in resize is a object
if isinstance(image_meta, dict):
if 'name' in image_meta.keys():
kwimage = 'imagename=%s' % image_meta['name']
body.append(kwimage)
else:
image_name = getattr(image_meta, 'name')
if image_name:
kwimage = 'imagename=%s' % image_name
body.append(kwimage)
url = self._xcat_url.mkvm('/' + self._name)
try:

2
tox.ini
View File

@ -17,7 +17,7 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
commands = flake8
[testenv:py27]
commands = /bin/cp -r {toxinidir}/nova/virt/zvm/ {toxinidir}/.tox/py27/src/nova/nova/virt/
commands = /bin/cp -r {toxinidir}/nova/virt/zvm {toxinidir}/.tox/py27/src/nova/nova/virt/
python setup.py testr --slowest --testr-args='{posargs}'
[testenv:venv]