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.

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. #391

Merged
merged 2 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 7 additions & 26 deletions examples/lenovo_bmc_config_restore.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,6 @@ def lenovo_bmc_config_restore(ip, login_account, login_password, backup_password
'/redfish/v1', response_base_url.status, error_message)}
return result

# Get ServiceBase resource
response_base_url = REDFISH_OBJ.get('/redfish/v1', None)
# Get response_base_url
if response_base_url.status == 200:
manager_url = response_base_url.dict['Managers']['@odata.id']
else:
error_message = utils.get_extended_error(response_base_url)
result = {'ret': False, 'msg': "Url '%s' response Error code %s\nerror_message: %s" % (
'/redfish/v1', response_base_url.status, error_message)}
return result

# Get /redfish/v1/Managers resource
response_manager_url = REDFISH_OBJ.get(manager_url, None)
bmc_time_detail = []
Expand Down Expand Up @@ -210,23 +199,15 @@ def lenovo_bmc_config_restore(ip, login_account, login_password, backup_password
return result

# GET model
system = utils.get_system_url("/redfish/v1", "None", REDFISH_OBJ)
if not system:
result = {'ret': False, 'msg': "This system id is not exist or system member is None"}
base_url = "/redfish/v1"
response_base_url = REDFISH_OBJ.get(base_url, None)
if response_base_url.status != 200:
error_message = utils.get_extended_error(response_base_url)
result = {'ret': False, 'msg': "Url '%s' response Error code %s \nerror_message: %s" % (
base_url, response_base_url.status, error_message)}
REDFISH_OBJ.logout()
return result

for i in range(len(system)):
system_url = system[i]
response_system_url = REDFISH_OBJ.get(system_url, None)
if response_system_url.status != 200:
error_message = utils.get_extended_error(response_system_url)
result = {'ret': False, 'msg': "Url '%s' response Error code %s \nerror_message: %s" % (
system_url, response_system_url.status, error_message)}
REDFISH_OBJ.logout()
return result
model = response_system_url.dict["Model"]

model = utils.get_system_model(response_base_url, REDFISH_OBJ)
restore_body = {}
if "V4" in model.upper():
EncryptData = ""
Expand Down
34 changes: 11 additions & 23 deletions examples/lenovo_set_snmp_global.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ def lenovo_set_snmp_global(ip, login_account, login_password, setting_dict):
result = {'ret': False, 'msg': "Error_message: %s. Please check if username, password and IP are correct" % repr(e)}
return result

system_url = "/redfish/v1/Systems/1"
system_resp = REDFISH_OBJ.get(system_url, None)
if system_resp.status != 200:
error_message = utils.get_extended_error(system_resp)
result = {'ret': False, 'msg': "Url '%s' response Error code %s\nerror_message: %s" % (
system_url, system_resp.status, error_message)}
base_url = "/redfish/v1"
response_base_url = REDFISH_OBJ.get(base_url, None)
if response_base_url.status != 200:
error_message = utils.get_extended_error(response_base_url)
result = {'ret': False, 'msg': "Url '%s' response Error code %s \nerror_message: %s" % (
base_url, response_base_url.status, error_message)}
REDFISH_OBJ.logout()
return result
model = system_resp.dict.get('Model', "")
model = utils.get_system_model(response_base_url, REDFISH_OBJ)

request_url = '/redfish/v1/Managers/1/NetworkProtocol/Oem/Lenovo/SNMP'

Expand Down Expand Up @@ -174,18 +174,6 @@ def lenovo_set_snmp_global(ip, login_account, login_password, setting_dict):
result = {'ret': False, 'msg': 'Input parameter checking failed. Note that snmpv3_agent can only be enabled with contact_person and location being set.'}
REDFISH_OBJ.logout()
return result
if model and "V4" in model:
if 'snmpv1_trap' in setting_dict and setting_dict['snmpv1_trap'] == 'enable':
flag_missing = False
if ('snmpv1_community' in setting_dict and setting_dict['snmpv1_community'] == ''):
flag_missing = True
if ('snmpv1_community' not in setting_dict) and (
len(response_url.dict.get('CommunityNames', [])) == 0 or response_url.dict.get('CommunityNames',[])[0] == ''):
flag_missing = True
if flag_missing == True:
result = {'ret': False, 'msg': 'Input parameter checking failed. Note that snmpv1_trap can only be enabled with snmpv1_community being set.'}
REDFISH_OBJ.logout()
return result

# Build patch body
patch_body = {}
Expand All @@ -208,9 +196,9 @@ def lenovo_set_snmp_global(ip, login_account, login_password, setting_dict):
elif 'snmpv1_trap' in setting_dict and setting_dict['snmpv1_trap'] != 'enable':
patch_body['SNMPTraps']['SNMPv1TrapEnabled'] = False
if 'snmpv3_trap' in setting_dict and setting_dict['snmpv3_trap'] == 'enable':
patch_body['SNMPTraps']['ProtocolEnabled'] = True
patch_body['SNMPTraps']['SNMPv3Trap'] = {'ProtocolEnabled': True}
elif 'snmpv3_trap' in setting_dict and setting_dict['snmpv3_trap'] != 'enable':
patch_body['SNMPTraps']['ProtocolEnabled'] = False
patch_body['SNMPTraps']['SNMPv3Trap'] = {'ProtocolEnabled': False}
if 'port_trap' in setting_dict:
patch_body['SNMPTraps']['Port'] = setting_dict['port_trap']
if 'snmpv1_address' in setting_dict:
Expand All @@ -226,6 +214,7 @@ def lenovo_set_snmp_global(ip, login_account, login_password, setting_dict):

# Perform patch
headers = {"If-Match": etag}
print(request_url, patch_body)
response_url = REDFISH_OBJ.patch(request_url, body=patch_body, headers=headers)
if response_url.status in [200,204]:
result = {'ret': True, 'msg': "The global SNMP info is successfully updated."}
Expand Down Expand Up @@ -334,5 +323,4 @@ def add_parameter():
sys.stdout.write(json.dumps(result['msg'], sort_keys=True, indent=2) + '\n')
else:
sys.stderr.write(result['msg'] + '\n')
sys.exit(1)

sys.exit(1)