xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-02-28 16:21:08 +00:00
Code Issues Projects Releases Wiki Activity

Extend IMM remote media

Browse Source 
The classical remote media was incomplete and
further needed fixes for IPv6 web sessions.

Change-Id: Idfa1c06c69c96fdd10fce755fc7d73ebd12ee399
This commit is contained in:
Jarrod Johnson 2020-10-26 15:20:13 -04:00
parent a976525a53
commit dac9f7486a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,8 +127,7 @@ class IMMClient(object):
srv = self.imm
if ':' in srv:
srv = '[{0}]'.format(srv)
self.adp_referer = 'https://{0}/designs/imm/index-console.php'.format(
srv)
self.adp_referer = 'https://imm/designs/imm/index-console.php'
if ipmicmd.ipmi_session.password:
self.username = ipmicmd.ipmi_session.userid.decode('utf-8')
self.password = ipmicmd.ipmi_session.password.decode('utf-8')
@ -354,9 +353,9 @@ class IMMClient(object):
'password': self.password,
'SessionTimeout': 60})
headers = {'Connection': 'keep-alive',
'Origin': 'https://1.2.3.4/',
'Host': '1.2.3.4',
'Referer': 'https://1.2.3.4/designs/imm/index.php',
'Origin': 'https://imm/',
'Host': 'imm',
'Referer': 'https://imm/designs/imm/index.php',
'Content-Type': 'application/x-www-form-urlencoded'}
wc.request('POST', '/data/login', adata, headers)
rsp = wc.getresponse()
@ -372,7 +371,8 @@ class IMMClient(object):
else:
self.uploadtoken = {}
wc.set_header('Referer', self.adp_referer)
wc.set_header('Host', self.imm)
wc.set_header('Host', 'imm')
wc.set_header('Origin', 'https://imm/')
return wc
@property
@ -482,6 +482,11 @@ class IMMClient(object):
for uload in item['images']:
if uload['status'] != 0:
yield media.Media(uload['filename'])
for attached in item.get('urls', []):
filename = attached['url']
filename = filename.split('/')[-1]
url = '/'.join(attached['url'].split('/')[:-1])
yield media.Media(filename, url)
def detach_remote_media(self):
mnt = self.wc.grab_json_response(