xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-03-22 11:27:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge "Try generic method for media attach"

Browse Source
This commit is contained in:
Zuul 2019-07-01 18:48:36 +00:00 committed by Gerrit Code Review
commit 06cf9a89ee
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pyghmi/redfish/command.py
View File

@ -1418,7 +1418,16 @@ class Command(object):
if vmcoll:
vmlist = self._do_web_request(vmcoll)
vmurls = [x['@odata.id'] for x in vmlist.get('Members', [])]
return self.oem.attach_remote_media(url, username, password, vmurls)
try:
self.oem.attach_remote_media(url, username, password, vmurls)
except exc.BypassGenericBehavior:
return
for vmurl in vmurls:
vminfo = self._do_web_request(vmurl, cache=False)
if vminfo['ConnectedVia'] != 'NotConnected':
continue
self._do_web_request(vmurl, {'Image': url, 'Inserted': True}, 'PATCH')
break
def detach_remote_media(self):
bmcinfo = self._do_web_request(self._bmcurl)
@ -1429,7 +1438,7 @@ class Command(object):
for vminfo in self._do_bulk_requests(vmurls):
vminfo, currl = vminfo
if vminfo['Image']:
self._do_web_request(currl, {'Image': None}, method='PATCH')
self._do_web_request(currl, {'Image': None, 'Inserted': False}, method='PATCH')
def upload_media(self, filename, progress=None):
"""Upload a file to be hosted on the target BMC

1
pyghmi/redfish/oem/lenovo/xcc.py
View File

@ -436,6 +436,7 @@ class OEMHandler(generic.OEMHandler):
if vminfo['ConnectedVia'] != 'NotConnected':
continue
self._do_web_request(vmurl, {'Image': url, 'Inserted': True}, 'PATCH')
raise pygexc.BypassGenericBehavior()
break
def upload_media(self, filename, progress=None):