diff --git a/confluent_server/confluent/messages.py b/confluent_server/confluent/messages.py index 924196be..ec421e84 100644 --- a/confluent_server/confluent/messages.py +++ b/confluent_server/confluent/messages.py @@ -1280,6 +1280,7 @@ class UserCollection(ConfluentMessage): entry = { 'uid': user['uid'], 'username': user['name'], + 'expiration': user.get('expiration', None), 'privilege_level': user['access']['privilege_level'] } userlist.append(entry) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py index abc61eb8..6c4189cd 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py @@ -613,6 +613,7 @@ class IpmiHandler(object): uid=data['uid'], username=data['name'], privilege_level=data['access']['privilege_level'], + expiration=data.get('expiration', None), name=self.node)) return elif self.op == 'update':