xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2026-04-02 00:03:30 +00:00
Code Issues Projects Releases Wiki Activity

Add support for new RDOC API

Browse Source 
RDOC API is changing, must detect
and adapt to change.

Change-Id: Id85f51874d8a57ab996c508815970f670bc1cfbc
This commit is contained in:
Jarrod Johnson
2022-09-27 10:32:27 -04:00
parent 212fbc265d
commit 527846e322
2 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pyghmi/ipmi/oem/lenovo/imm.py
View File

@@ -1851,18 +1851,31 @@ class XCCClient(IMMClient):
self.weblogout()
def upload_media(self, filename, progress=None, data=None):
xid = random.randint(0, 1000000000)
wc = self.wc
self._refresh_token()
uploadthread = webclient.FileUploader(
self.wc, '/upload?X-Progress-ID={0}'.format(xid), filename, data)
rsp, statu = wc.grab_json_response_with_status('/rdocupload')
newmode = False
if statu == 404:
xid = random.randint(0, 1000000000)
uploadthread = webclient.FileUploader(
wc, '/upload?X-Progress-ID={0}'.format(xid), filename, data)
else:
newmode = True
uploadthread = webclient.FileUploader(
wc, '/rdocupload', filename, data)
uploadthread.start()
while uploadthread.isAlive():
uploadthread.join(3)
rsp = self.wc.grab_json_response(
'/upload/progress?X-Progress-ID={0}'.format(xid))
if progress and rsp['state'] == 'uploading':
progress({'phase': 'upload',
'progress': 100.0 * rsp['received'] / rsp['size']})
if newmode:
if progress:
progress({'phase': 'upload',
'progress': 100 * wc.get_upload_progress()})
else:
rsp = self.wc.grab_json_response(
'/upload/progress?X-Progress-ID={0}'.format(xid))
if progress and rsp['state'] == 'uploading':
progress({'phase': 'upload',
'progress': 100.0 * rsp['received'] / rsp['size']})
self._refresh_token()
rsp = json.loads(uploadthread.rsp)
if progress:

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

@@ -875,18 +875,31 @@ class OEMHandler(generic.OEMHandler):
'XCC does not have required license for operation')
def upload_media(self, filename, progress=None, data=None):
xid = random.randint(0, 1000000000)
wc = self.wc
self._refresh_token()
uploadthread = webclient.FileUploader(
self.wc, '/upload?X-Progress-ID={0}'.format(xid), filename, data)
rsp, statu = wc.grab_json_response_with_status('/rdocupload')
newmode = False
if statu == 404:
xid = random.randint(0, 1000000000)
uploadthread = webclient.FileUploader(
wc, '/upload?X-Progress-ID={0}'.format(xid), filename, data)
else:
newmode = True
uploadthread = webclient.FileUploader(
wc, '/rdocupload', filename, data)
uploadthread.start()
while uploadthread.isAlive():
uploadthread.join(3)
rsp = self.wc.grab_json_response(
'/upload/progress?X-Progress-ID={0}'.format(xid))
if progress and rsp['state'] == 'uploading':
progress({'phase': 'upload',
'progress': 100.0 * rsp['received'] / rsp['size']})
if newmode:
if progress:
progress({'phase': 'upload',
'progress': 100 * wc.get_upload_progress()})
else:
rsp = self.wc.grab_json_response(
'/upload/progress?X-Progress-ID={0}'.format(xid))
if progress and rsp['state'] == 'uploading':
progress({'phase': 'upload',
'progress': 100.0 * rsp['received'] / rsp['size']})
self._refresh_token()
rsp = json.loads(uploadthread.rsp)
if progress: