From 6ab176218ebe50c203e0932158b22e952894abf4 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 27 Jul 2020 11:54:24 -0400 Subject: [PATCH 1/2] Add '..' to range operators The perl-style range operator exists in some tools, we might as well support that alongside the usual '-' operator and ':' python style operator. --- confluent_server/confluent/noderange.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/confluent_server/confluent/noderange.py b/confluent_server/confluent/noderange.py index be35829e..17375150 100644 --- a/confluent_server/confluent/noderange.py +++ b/confluent_server/confluent/noderange.py @@ -250,6 +250,8 @@ class NodeRange(object): return nodes if ':' in element: # : range for less ambiguity return self.expandrange(element, ':') + elif '..' in element: + return self.expandrange(element, '..') elif '-' in element: return self.expandrange(element, '-') elif '+' in element: From 99f9e852da10710e9c4b710ec7997ec4b4cbb77f Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 28 Jul 2020 11:15:48 -0400 Subject: [PATCH 2/2] 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]