Add new command GetVolumeInventory / GetSessions / GetVirtualMedia (#55433)
This commit is contained in:
XuLei Ren
jctanner
parent
d8314e1a45
commit
46c44a4359
2 changed files with 246 additions and 2 deletions
|
|
@ -161,6 +161,25 @@ class RedfishUtils(object):
|
|||
self.accounts_uri = accounts
|
||||
return {'ret': True}
|
||||
|
||||
def _find_sessionservice_resource(self, uri):
|
||||
response = self.get_request(self.root_uri + uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
data = response['data']
|
||||
if 'SessionService' not in data:
|
||||
return {'ret': False, 'msg': "SessionService resource not found"}
|
||||
else:
|
||||
session_service = data["SessionService"]["@odata.id"]
|
||||
response = self.get_request(self.root_uri + session_service)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
data = response['data']
|
||||
sessions = data['Sessions']['@odata.id']
|
||||
if sessions[-1:] == '/':
|
||||
sessions = sessions[:-1]
|
||||
self.sessions_uri = sessions
|
||||
return {'ret': True}
|
||||
|
||||
def _find_systems_resource(self, uri):
|
||||
response = self.get_request(self.root_uri + uri)
|
||||
if response['ret'] is False:
|
||||
|
|
@ -460,6 +479,89 @@ class RedfishUtils(object):
|
|||
def get_multi_disk_inventory(self):
|
||||
return self.aggregate(self.get_disk_inventory)
|
||||
|
||||
def get_volume_inventory(self, systems_uri):
|
||||
result = {'entries': []}
|
||||
controller_list = []
|
||||
volume_list = []
|
||||
volume_results = []
|
||||
# Get these entries, but does not fail if not found
|
||||
properties = ['Id', 'Name', 'RAIDType', 'VolumeType', 'BlockSizeBytes',
|
||||
'Capacity', 'CapacityBytes', 'CapacitySources',
|
||||
'Encrypted', 'EncryptionTypes', 'Identifiers',
|
||||
'Operations', 'OptimumIOSizeBytes', 'AccessCapabilities',
|
||||
'AllocatedPools', 'Status']
|
||||
|
||||
# Find Storage service
|
||||
response = self.get_request(self.root_uri + systems_uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
data = response['data']
|
||||
|
||||
if 'SimpleStorage' not in data and 'Storage' not in data:
|
||||
return {'ret': False, 'msg': "SimpleStorage and Storage resource \
|
||||
not found"}
|
||||
|
||||
if 'Storage' in data:
|
||||
# Get a list of all storage controllers and build respective URIs
|
||||
storage_uri = data[u'Storage'][u'@odata.id']
|
||||
response = self.get_request(self.root_uri + storage_uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
result['ret'] = True
|
||||
data = response['data']
|
||||
|
||||
if data.get('Members'):
|
||||
for controller in data[u'Members']:
|
||||
controller_list.append(controller[u'@odata.id'])
|
||||
for c in controller_list:
|
||||
uri = self.root_uri + c
|
||||
response = self.get_request(uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
data = response['data']
|
||||
|
||||
if 'Volumes' in data:
|
||||
# Get a list of all volumes and build respective URIs
|
||||
volumes_uri = data[u'Volumes'][u'@odata.id']
|
||||
response = self.get_request(self.root_uri + volumes_uri)
|
||||
data = response['data']
|
||||
|
||||
if data.get('Members'):
|
||||
for volume in data[u'Members']:
|
||||
volume_list.append(volume[u'@odata.id'])
|
||||
for v in volume_list:
|
||||
uri = self.root_uri + v
|
||||
response = self.get_request(uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
data = response['data']
|
||||
|
||||
volume_result = {}
|
||||
for property in properties:
|
||||
if property in data:
|
||||
if data[property] is not None:
|
||||
volume_result[property] = data[property]
|
||||
|
||||
# Get related Drives Id
|
||||
drive_id_list = []
|
||||
if 'Links' in data:
|
||||
if 'Drives' in data[u'Links']:
|
||||
for link in data[u'Links'][u'Drives']:
|
||||
drive_id_link = link[u'@odata.id']
|
||||
drive_id = drive_id_link.split("/")[-1]
|
||||
drive_id_list.append({'Id': drive_id})
|
||||
volume_result['Linked_drives'] = drive_id_list
|
||||
|
||||
volume_results.append(volume_result)
|
||||
result["entries"].append(volume_results)
|
||||
else:
|
||||
return {'ret': False, 'msg': "Storage resource not found"}
|
||||
|
||||
return result
|
||||
|
||||
def get_multi_volume_inventory(self):
|
||||
return self.aggregate(self.get_volume_inventory)
|
||||
|
||||
def restart_manager_gracefully(self):
|
||||
result = {}
|
||||
key = "Actions"
|
||||
|
|
@ -630,6 +732,39 @@ class RedfishUtils(object):
|
|||
return response
|
||||
return {'ret': True}
|
||||
|
||||
def get_sessions(self):
|
||||
result = {}
|
||||
# listing all users has always been slower than other operations, why?
|
||||
session_list = []
|
||||
sessions_results = []
|
||||
# Get these entries, but does not fail if not found
|
||||
properties = ['Description', 'Id', 'Name', 'UserName']
|
||||
|
||||
response = self.get_request(self.root_uri + self.sessions_uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
result['ret'] = True
|
||||
data = response['data']
|
||||
|
||||
for sessions in data[u'Members']:
|
||||
session_list.append(sessions[u'@odata.id']) # session_list[] are URIs
|
||||
|
||||
# for each session, get details
|
||||
for uri in session_list:
|
||||
session = {}
|
||||
response = self.get_request(self.root_uri + uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
data = response['data']
|
||||
|
||||
for property in properties:
|
||||
if property in data:
|
||||
session[property] = data[property]
|
||||
|
||||
sessions_results.append(session)
|
||||
result["entries"] = sessions_results
|
||||
return result
|
||||
|
||||
def get_firmware_update_capabilities(self):
|
||||
result = {}
|
||||
response = self.get_request(self.root_uri + self.update_uri)
|
||||
|
|
@ -1276,6 +1411,69 @@ class RedfishUtils(object):
|
|||
inventory['entries']))
|
||||
return dict(ret=ret, entries=entries)
|
||||
|
||||
def get_virtualmedia(self, resource_uri):
|
||||
result = {}
|
||||
virtualmedia_list = []
|
||||
virtualmedia_results = []
|
||||
key = "VirtualMedia"
|
||||
# Get these entries, but does not fail if not found
|
||||
properties = ['Description', 'ConnectedVia', 'Id', 'MediaTypes',
|
||||
'Image', 'ImageName', 'Name', 'WriteProtected',
|
||||
'TransferMethod', 'TransferProtocolType']
|
||||
|
||||
response = self.get_request(self.root_uri + resource_uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
result['ret'] = True
|
||||
data = response['data']
|
||||
|
||||
if key not in data:
|
||||
return {'ret': False, 'msg': "Key %s not found" % key}
|
||||
|
||||
virtualmedia_uri = data[key]["@odata.id"]
|
||||
|
||||
# Get a list of all virtual media and build respective URIs
|
||||
response = self.get_request(self.root_uri + virtualmedia_uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
result['ret'] = True
|
||||
data = response['data']
|
||||
|
||||
for virtualmedia in data[u'Members']:
|
||||
virtualmedia_list.append(virtualmedia[u'@odata.id'])
|
||||
|
||||
for n in virtualmedia_list:
|
||||
virtualmedia = {}
|
||||
uri = self.root_uri + n
|
||||
response = self.get_request(uri)
|
||||
if response['ret'] is False:
|
||||
return response
|
||||
data = response['data']
|
||||
|
||||
for property in properties:
|
||||
if property in data:
|
||||
virtualmedia[property] = data[property]
|
||||
|
||||
virtualmedia_results.append(virtualmedia)
|
||||
result["entries"] = virtualmedia_results
|
||||
return result
|
||||
|
||||
def get_multi_virtualmedia(self):
|
||||
ret = True
|
||||
entries = []
|
||||
|
||||
# Because _find_managers_resource() only find last Manager uri in self.manager_uri, not one list. This should be 1 issue.
|
||||
# I have to put manager_uri into list to reduce future changes when the issue is fixed.
|
||||
resource_uris = [self.manager_uri]
|
||||
|
||||
for resource_uri in resource_uris:
|
||||
virtualmedia = self.get_virtualmedia(resource_uri)
|
||||
ret = virtualmedia.pop('ret') and ret
|
||||
if 'entries' in virtualmedia:
|
||||
entries.append(({'resource_uri': resource_uri},
|
||||
virtualmedia['entries']))
|
||||
return dict(ret=ret, entries=entries)
|
||||
|
||||
def get_psu_inventory(self):
|
||||
result = {}
|
||||
psu_list = []
|
||||
|
|
|
|||
|
|
@ -91,6 +91,36 @@ EXAMPLES = '''
|
|||
password: "{{ password }}"
|
||||
timeout: 20
|
||||
|
||||
- name: Get Virtual Media information
|
||||
redfish_facts:
|
||||
category: Manager
|
||||
command: GetVirtualMedia
|
||||
baseuri: "{{ baseuri }}"
|
||||
username: "{{ username }}"
|
||||
password: "{{ password }}"
|
||||
- debug:
|
||||
msg: "{{ redfish_facts.virtual_media.entries | to_nice_json }}"
|
||||
|
||||
- name: Get Volume Inventory
|
||||
redfish_facts:
|
||||
category: Systems
|
||||
command: GetVolumeInventory
|
||||
baseuri: "{{ baseuri }}"
|
||||
username: "{{ username }}"
|
||||
password: "{{ password }}"
|
||||
- debug:
|
||||
msg: "{{ redfish_facts.volume.entries | to_nice_json }}"
|
||||
|
||||
- name: Get Session information
|
||||
redfish_facts:
|
||||
category: Sessions
|
||||
command: GetSessions
|
||||
baseuri: "{{ baseuri }}"
|
||||
username: "{{ username }}"
|
||||
password: "{{ password }}"
|
||||
- debug:
|
||||
msg: "{{ redfish_facts.session.entries | to_nice_json }}"
|
||||
|
||||
- name: Get default inventory information
|
||||
redfish_facts:
|
||||
baseuri: "{{ baseuri }}"
|
||||
|
|
@ -184,12 +214,13 @@ from ansible.module_utils.redfish_utils import RedfishUtils
|
|||
CATEGORY_COMMANDS_ALL = {
|
||||
"Systems": ["GetSystemInventory", "GetPsuInventory", "GetCpuInventory",
|
||||
"GetMemoryInventory", "GetNicInventory",
|
||||
"GetStorageControllerInventory", "GetDiskInventory",
|
||||
"GetStorageControllerInventory", "GetDiskInventory", "GetVolumeInventory",
|
||||
"GetBiosAttributes", "GetBootOrder", "GetBootOverride"],
|
||||
"Chassis": ["GetFanInventory", "GetPsuInventory", "GetChassisPower", "GetChassisThermals", "GetChassisInventory"],
|
||||
"Accounts": ["ListUsers"],
|
||||
"Sessions": ["GetSessions"],
|
||||
"Update": ["GetFirmwareInventory", "GetFirmwareUpdateCapabilities"],
|
||||
"Manager": ["GetManagerNicInventory", "GetLogs"],
|
||||
"Manager": ["GetManagerNicInventory", "GetVirtualMedia", "GetLogs"],
|
||||
}
|
||||
|
||||
CATEGORY_COMMANDS_DEFAULT = {
|
||||
|
|
@ -197,6 +228,7 @@ CATEGORY_COMMANDS_DEFAULT = {
|
|||
"Chassis": "GetFanInventory",
|
||||
"Accounts": "ListUsers",
|
||||
"Update": "GetFirmwareInventory",
|
||||
"Sessions": "GetSessions",
|
||||
"Manager": "GetManagerNicInventory"
|
||||
}
|
||||
|
||||
|
|
@ -279,6 +311,8 @@ def main():
|
|||
result["storage_controller"] = rf_utils.get_multi_storage_controller_inventory()
|
||||
elif command == "GetDiskInventory":
|
||||
result["disk"] = rf_utils.get_multi_disk_inventory()
|
||||
elif command == "GetVolumeInventory":
|
||||
result["volume"] = rf_utils.get_multi_volume_inventory()
|
||||
elif command == "GetBiosAttributes":
|
||||
result["bios_attribute"] = rf_utils.get_multi_bios_attributes()
|
||||
elif command == "GetBootOrder":
|
||||
|
|
@ -326,6 +360,16 @@ def main():
|
|||
elif command == "GetFirmwareUpdateCapabilities":
|
||||
result["firmware_update_capabilities"] = rf_utils.get_firmware_update_capabilities()
|
||||
|
||||
elif category == "Sessions":
|
||||
# excute only if we find SessionService resources
|
||||
resource = rf_utils._find_sessionservice_resource(rf_uri)
|
||||
if resource['ret'] is False:
|
||||
module.fail_json(msg=resource['msg'])
|
||||
|
||||
for command in command_list:
|
||||
if command == "GetSessions":
|
||||
result["session"] = rf_utils.get_sessions()
|
||||
|
||||
elif category == "Manager":
|
||||
# execute only if we find a Manager service resource
|
||||
resource = rf_utils._find_managers_resource(rf_uri)
|
||||
|
|
@ -335,6 +379,8 @@ def main():
|
|||
for command in command_list:
|
||||
if command == "GetManagerNicInventory":
|
||||
result["manager_nics"] = rf_utils.get_multi_nic_inventory(category)
|
||||
elif command == "GetVirtualMedia":
|
||||
result["virtual_media"] = rf_utils.get_multi_virtualmedia()
|
||||
elif command == "GetLogs":
|
||||
result["log"] = rf_utils.get_logs()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue