File 0011-medium-bootstrap-Check-required-arguments-... of Package crmsh

Overview Repositories Revisions Requests Users Attributes Meta

File 0011-medium-bootstrap-Check-required-arguments-to-geo-joi.patch of Package crmsh

From b646485281a1d02c64e054723635f85b3d7f02bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 3 May 2017 16:24:14 +0200
Subject: [PATCH 11/12] medium: bootstrap: Check required arguments to geo-join
 (bsc#1037421)

---
 crmsh/ui_cluster.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/crmsh/ui_cluster.py b/crmsh/ui_cluster.py
index 8f58a97e..8730aa41 100644
--- a/crmsh/ui_cluster.py
+++ b/crmsh/ui_cluster.py
@@ -306,8 +306,17 @@ If stage is not specified, each stage will be invoked in sequence.
         return True
 
     def _parse_clustermap(self, clusters):
+        '''
+        Helper function to parse the cluster map into a dictionary:
+
+        name=ip; name2=ip2 -> { name: ip, name2: ip2 }
+        '''
+        if clusters is None:
+            return None
         try:
             return dict([re.split('[=:]+', o) for o in re.split('[ ,;]+', clusters)])
+        except TypeError:
+            return None
         except ValueError:
             return None
 
@@ -379,6 +388,13 @@ Cluster Description
         parser.add_option("-c", "--cluster-node", help="IP address of an already-configured geo cluster or arbitrator", dest="node", metavar="IP")
         parser.add_option("--clusters", help="Cluster description (see geo-init for details)", dest="clusters", metavar="DESC")
         options, args = parser.parse_args(list(args))
+        errs = []
+        if options.node is None:
+            errs.append("The --cluster-node argument is required.")
+        if options.clusters is None:
+            errs.append("The --clusters argument is required.")
+        if len(errs) > 0:
+            parser.error(" ".join(errs))
         clustermap = self._parse_clustermap(options.clusters)
         if clustermap is None:
             parser.error("Invalid cluster description format")
-- 
2.12.2

Places

File 0011-medium-bootstrap-Check-required-arguments-to-geo-joi.patch of Package crmsh

Places