openstack
/
python-dracclient
Code Issues Proposed changes

Merge "Provide last system inventory time" into stable/queens

This commit is contained in:
Zuul 2020-10-23 19:23:09 +00:00 committed by Gerrit Code Review
parent 6cf36ac8b7 6e2fa8ddf0
commit b54fc5d08f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dracclient/resources/inventory.py
View File

@ -64,7 +64,8 @@ Video = collections.namedtuple(
System = collections.namedtuple( System = collections.namedtuple(
'System', 'System',
['id', 'lcc_version', 'model', 'service_tag', 'uuid']) ['id', 'lcc_version', 'model', 'service_tag', 'uuid',
'last_system_inventory_time'])
class InventoryManagement(object): class InventoryManagement(object):
@ -252,7 +253,9 @@ class InventoryManagement(object):
service_tag=self._get_system_attr(drac_system, 'ServiceTag'), service_tag=self._get_system_attr(drac_system, 'ServiceTag'),
model=self._get_system_attr(drac_system, 'Model'), model=self._get_system_attr(drac_system, 'Model'),
lcc_version=self._get_system_attr(drac_system, lcc_version=self._get_system_attr(drac_system,
'LifecycleControllerVersion')) 'LifecycleControllerVersion'),
last_system_inventory_time=self._get_system_attr(
drac_system, 'LastSystemInventoryTime').split('.')[0])
def _get_system_attr(self, drac_system, attr_name): def _get_system_attr(self, drac_system, attr_name):
return utils.get_wsman_resource_attr(drac_system, return utils.get_wsman_resource_attr(drac_system,

3
dracclient/tests/test_inventory.py
View File

@ -168,7 +168,8 @@ class ClientInventoryManagementTestCase(base.BaseTest):
uuid='ebd4edd3-dfd7-4c7d-a2c8-562b3c23b811', uuid='ebd4edd3-dfd7-4c7d-a2c8-562b3c23b811',
service_tag='A1B2C3D', service_tag='A1B2C3D',
model='PowerEdge R630', model='PowerEdge R630',
lcc_version='2.1.0') lcc_version='2.1.0',
last_system_inventory_time='20200902160859')
mock_requests.post( mock_requests.post(
'https://1.2.3.4:443/wsman', 'https://1.2.3.4:443/wsman',
text=test_utils.LifecycleControllerEnumerations[ text=test_utils.LifecycleControllerEnumerations[

1
dracclient/tests/wsman_mocks/system_view-enum-ok.xml
View File

@ -17,6 +17,7 @@
<n1:LifecycleControllerVersion>2.1.0</n1:LifecycleControllerVersion> <n1:LifecycleControllerVersion>2.1.0</n1:LifecycleControllerVersion>
<n1:Model>PowerEdge R630</n1:Model> <n1:Model>PowerEdge R630</n1:Model>
<n1:ServiceTag>A1B2C3D</n1:ServiceTag> <n1:ServiceTag>A1B2C3D</n1:ServiceTag>
<n1:LastSystemInventoryTime>20200902160859.000000+000</n1:LastSystemInventoryTime>
<n1:UUID>ebd4edd3-dfd7-4c7d-a2c8-562b3c23b811</n1:UUID> <n1:UUID>ebd4edd3-dfd7-4c7d-a2c8-562b3c23b811</n1:UUID>
</n1:DCIM_SystemView> </n1:DCIM_SystemView>
</wsman:Items> </wsman:Items>