From 908c566b73fff66143f490b309f566306244b10c Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 28 Jul 2020 11:15:48 -0400 Subject: [PATCH] Allow deletion of blank volume names --- confluent_server/confluent/plugins/hardwaremanagement/ipmi.py | 2 ++ .../confluent/plugins/hardwaremanagement/redfish.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 2aeb56a6..aa53de83 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -1035,6 +1035,8 @@ class IpmiHandler(object): return self._create_storage(storelem) def _delete_storage(self, storelem): + if len(storelem) < 2: + storelem.append('') if len(storelem) < 2 or storelem[0] != 'volumes': raise exc.InvalidArgumentException('Must target a specific volume') volname = storelem[-1] diff --git a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py index bd0a1342..7d16d224 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py @@ -894,6 +894,8 @@ class IpmiHandler(object): return self._create_storage(storelem) def _delete_storage(self, storelem): + if len(storelem) < 2: + storelem.append('') if len(storelem) < 2 or storelem[0] != 'volumes': raise exc.InvalidArgumentException('Must target a specific volume') volname = storelem[-1]