Minor changes (#1437)

Include:
- Dev: Remove unused code about hb_delnode
- Dev: crash_test.utils: Reuse color constants from crmsh.constants
- Dev: ui_configure: Remove _keywords interface and unused code

Author: liangxin1300

crmsh/config.py

@@ -269,7 +269,6 @@ def get(self, value):
         'crm_dtd_dir': opt_dir('%(datadir)s/pacemaker'),
         'pe_state_dir': opt_dir('%(varlib)s/pacemaker/pengine'),
         'heartbeat_dir': opt_dir('%(varlib)s/heartbeat'),
-        'hb_delnode': opt_program('', ('%(datadir)s/heartbeat/hb_delnode',)),
         'hawk_wizards': opt_dir('%(wwwdir)s/hawk/config/wizard'),
     },
     'color': {

crmsh/constants.py

@@ -4,80 +4,6 @@
 from .ordereddict import odict
 
 
-# A list of all keywords introduced in the
-# CIB language.
-keywords = {
-    "node": "element",
-    "primitive": "element",
-    "resource": "element",
-    "group": "element",
-    "bundle": "element",
-    "clone": "element",
-    "ms": "element",
-    "master": "element",
-    "location": "element",
-    "colocation": "element",
-    "collocation": "element",
-    "order": "element",
-    "rsc_ticket": "element",
-    "rsc_template": "element",
-    "property": "element",
-    "rsc_defaults": "element",
-    "op_defaults": "element",
-    "acl_target": "element",
-    "acl_group": "element",
-    "user": "element",
-    "role": "element",
-    "fencing_topology": "element",
-    "fencing-topology": "element",
-    "tag": "element",
-    "alert": "element",
-    "monitor": "element",
-    "params": "subelement",
-    "meta": "subelement",
-    "attributes": "subelement",
-    "utilization": "subelement",
-    "operations": "subelement",
-    "op": "subelement",
-    "rule": "subelement",
-    "to": "subelement",
-    "inf": "value",
-    "INFINITY": "value",
-    "and": "op",
-    "or": "op",
-    "lt": "op",
-    "gt": "op",
-    "lte": "op",
-    "gte": "op",
-    "eq": "op",
-    "ne": "op",
-    "defined": "op",
-    "not_defined": "op",
-    "in_range": "op",
-    "in": "op",
-    "date_spec": "op",
-    "spec": "op",
-    "date": "value",
-    "yes": "value",
-    "no": "value",
-    "true": "value",
-    "false": "value",
-    "on": "value",
-    "off": "value",
-    "normal": "value",
-    "member": "value",
-    "ping": "value",
-    "remote": "value",
-    "start": "value",
-    "stop": "value",
-    "Mandatory": "value",
-    "Optional": "value",
-    "Serialize": "value",
-    "ref": "value",
-    "xpath": "value",
-    "xml": "element",
-}
-
 cib_cli_map = {
     "node": "node",
     "primitive": "primitive",

crmsh/crash_test/utils.py

@@ -9,15 +9,16 @@
 from . import config
 from crmsh import log
 from crmsh.sh import ShellUtils
+from crmsh import constants
 
 
 logger = log.setup_logger(__name__)
 
 
-CRED = '\033[31m'
-CYELLOW = '\033[33m'
-CGREEN = '\033[32m'
-CEND = '\033[0m'
+CRED = constants.RED
+CYELLOW = constants.YELLOW
+CGREEN = constants.GREEN
+CEND = constants.END
 
 LEVEL = {
     "info": logging.INFO,

crmsh/ui_configure.py

@@ -540,12 +540,6 @@ def do_regression_testing(self, context, param):
     def do_showobjects(self, context):
         cib_factory.showobjects()
 
-    @command.name('_keywords')
-    @command.skill_level('administrator')
-    def do_keywords(self, context):
-        for k, v in sorted(iter(constants.keywords.items()), key=lambda v: v[0].lower()):
-            print("%-16s %s" % (k, v))
-
     @command.level(ui_ra.RA)
     def do_ra(self):
         pass

crmsh/ui_node.py

@@ -287,7 +287,6 @@ class NodeMgmt(command.UI):
                    shutdown="0"
        />'""")
     node_clear_state_118 = "stonith_admin --confirm %s"
-    hb_delnode = config.path.hb_delnode + " '%s'"
     crm_node = "crm_node"
     node_fence = "crm_attribute -t status -N '%s' -n terminate -v true"
     dc = "crmadmin -D"

doc/website-v1/configuration.adoc

@@ -72,7 +72,6 @@ ocf_root = /usr/lib/ocf
 crm_dtd_dir = /usr/share/pacemaker
 pe_state_dir = /var/lib/pacemaker/pengine
 heartbeat_dir = /var/lib/heartbeat
-hb_delnode = /usr/share/heartbeat/hb_delnode
 
 [color]
 style = color

etc/crm.conf.in

@@ -50,7 +50,6 @@ ocf_root = @OCF_ROOT_DIR@
 ; crm_dtd_dir = <detected>
 ; pe_state_dir = <detected>
 ; heartbeat_dir = <detected>
-; hb_delnode = /usr/share/heartbeat/hb_delnode
 
 ; [color]
 ; style = color

test/unittests/test.conf

@@ -8,4 +8,3 @@ ocf_root = .
 crm_dtd_dir = .
 pe_state_dir = .
 heartbeat_dir = .
-hb_delnode = ./hb_delnode