Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatible with BHS machines. #373

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Compatible with BHS machines. #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions examples/add_event_subscriptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,16 @@ def add_event_subscriptions(ip, login_account, login_password, destination, subs

# Perform post to create new subscription
response_add_subscriptions = REDFISH_OBJ.post(subscriptions_url,body=parameter, headers=headers)
if response_add_subscriptions.status == 200 or response_add_subscriptions.status == 201:
if response_add_subscriptions.status == 200:
rt_link = login_host + "/" + response_add_subscriptions.dict["@odata.id"]
id = rt_link.split("/")[-1]
result = {"ret":True,"msg":"Add event subscriptions successfully,subscription id is " + id + ",subscription's link is:" + rt_link}
result = {"ret": True, "msg": "Add event subscriptions successfully,subscription id is " + id + ",subscription's link is:" + rt_link}
return result
elif response_add_subscriptions.status == 201:
location = response_add_subscriptions.getheader("Location")
rt_link = login_host + location
id = rt_link.split("/")[-1]
result = {"ret": True, "msg": "Add event subscriptions successfully,subscription id is " + id + ",subscription's link is:" + rt_link}
return result
else:
error_message = utils.get_extended_error(response_add_subscriptions)
Expand Down
22 changes: 16 additions & 6 deletions examples/mount_virtual_media.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def mount_virtual_media(ip, login_account, login_password, fsprotocol, fsip, fsp
for i in range(count):
manager_url = response_url.dict['Members'][i]['@odata.id']
response_x_url = REDFISH_OBJ.get(manager_url, None)
model = response_x_url.dict['Model']
virtual_media_url = ""
if response_x_url.status == 200:
# Get the virtual media url
Expand Down Expand Up @@ -149,16 +150,22 @@ def mount_virtual_media(ip, login_account, login_password, fsprotocol, fsip, fsp
# Mount virtual media via patch
if members_url.split('/')[-1].startswith("EXT"):
body = {}
if fsprotocol.lower() == "nfs":
image_uri = fsip + fsport + ":" + fsdir + "/" + image
elif fsprotocol.lower() == "cifs":
image_uri = "//" + fsip + fsport + fsdir + "/" + image
if fsprotocol.lower() == "cifs":
if "V4" in model.upper():
image_uri = "smb://" + fsip + fsport + fsdir + "/" + image
else:
image_uri = "//" + fsip + fsport + fsdir + "/" + image
elif fsprotocol.lower() == "nfs":
if "V4" in model.upper():
image_uri = fsprotocol.lower() + "://" + fsip + fsport + fsdir + "/" + image
else:
image_uri = fsip + fsport + ":" + fsdir + "/" + image
else:
image_uri = fsprotocol.lower() + "://" + fsip + fsport + fsdir + "/" + image
if inserted is None:
inserted = 1
if fsprotocol.lower() == "cifs" or safe_https is True:
body = {"Image": image_uri, "TransferProtocolType": fsprotocol.upper(),
body = {"Image": image_uri,
"UserName": fsusername, "Password": fspassword,
"WriteProtected": bool(writeprotocol), "Inserted": bool(inserted)}
else:
Expand Down Expand Up @@ -244,7 +251,7 @@ def mount_virtual_media(ip, login_account, login_password, fsprotocol, fsip, fsp

def check_param(fsprotocol, fsip, fsport, fsdir, image, imageurl, fsusername, fspassword):
"""Validation parameters"""
port = (lambda fsport: ":" + fsport if fsport else fsport)
port = (lambda fsport: ":" + fsport.strip(":") if fsport else fsport)
dir = (lambda fsdir: "/" + fsdir.strip("/") if fsdir else fsdir)
if imageurl:
try:
Expand Down Expand Up @@ -291,6 +298,9 @@ def add_parameter():
Example of HTTPS/NFS:
"python mount_virtual_media.py -i 10.10.10.10 -u USERID -p PASSW0RD --imageurl https://10.10.10.11/fspath/isoname.img"
"python mount_virtual_media.py -i 10.10.10.10 -u USERID -p PASSW0RD --fsprotocol HTTPS --fsip 10.10.10.11 --fsdir /fspath/ --image isoname.img"
Example of CIFS:
"python mount_virtual_media.py -i 10.10.10.10 -u USERID -p PASSW0RD --fsprotocol CIFS --fsip 10.10.10.11 --fsdir /fspath/ --fsusername username --fspassword password --image isoname.img"
"python mount_virtual_media.py -i 10.10.10.10 -u USERID -p PASSW0RD --imageurl cifs://10.10.10.11/fspath/isoname.img"
''')
add_helpmessage(argget)
args = argget.parse_args()
Expand Down