Merge pull request #1327 from liangxin1300/20240218_remove_unused_codes

Python 3.12 compatibility

Author: nicholasyang2022

.github/workflows/crmsh-ci.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ['3.10', '3.11']
+        python-version: ['3.10', '3.11', '3.12']
       fail-fast: false
     timeout-minutes: 5
     steps:

crmsh.spec.in

@@ -53,6 +53,7 @@ Requires:       /usr/bin/which
 Requires:       python3 >= 3.4
 Requires:       python3-PyYAML
 Requires:       python3-lxml
+Requires:       python3-packaging
 BuildRequires:  python3-lxml
 BuildRequires:  python3-pip
 BuildRequires:  python3-wheel

crmsh/ra.py

@@ -26,18 +26,6 @@
 # Resource Agents interface (meta-data, parameters, etc)
 #
 
-lrmadmin_prog = "lrmadmin"
-
-
-def lrmadmin(opts, xml=False):
-    """
-    Get information directly from lrmd using lrmadmin.
-    """
-    _rc, l = stdout2list("%s %s" % (lrmadmin_prog, opts))
-    if l and not xml:
-        l = l[1:]  # skip the first line
-    return l
-
 
 def crm_resource(opts):
     '''
@@ -47,26 +35,6 @@ def crm_resource(opts):
     return l
 
 
-@utils.memoize
-def can_use_lrmadmin():
-    from distutils import version
-    # after this glue release all users can get meta-data and
-    # similar from lrmd
-    minimum_glue = "1.0.10"
-    _rc, glue_ver = get_stdout("%s -v" % lrmadmin_prog, stderr_on=False)
-    if not glue_ver:  # lrmadmin probably not found
-        return False
-    v_min = version.LooseVersion(minimum_glue)
-    v_this = version.LooseVersion(glue_ver)
-    if v_this < v_min:
-        return False
-    if userdir.getuser() not in ("root", config.path.crm_daemon_user):
-        return False
-    if not (is_program(lrmadmin_prog) and is_process(pacemaker_execd())):
-        return False
-    return utils.ext_cmd(">/dev/null 2>&1 %s -C" % lrmadmin_prog) == 0
-
-
 @utils.memoize
 def can_use_crm_resource():
     _rc, s = get_stdout("crm_resource --list-ocf-providers", stderr_on=False)
@@ -81,8 +49,6 @@ def ra_classes():
         return cache.retrieve("ra_classes")
     if can_use_crm_resource():
         l = crm_resource("--list-standards")
-    elif can_use_lrmadmin():
-        l = lrmadmin("-C")
     else:
         l = ["heartbeat", "lsb", "nagios", "ocf", "stonith", "systemd"]
     l.sort()
@@ -99,8 +65,6 @@ def ra_providers(ra_type, ra_class="ocf"):
             logger.error("no providers for class %s", ra_class)
             return []
         l = crm_resource("--list-ocf-alternatives %s" % ra_type)
-    elif can_use_lrmadmin():
-        l = lrmadmin("-P %s %s" % (ra_class, ra_type), True)
     else:
         l = []
         if ra_class == "ocf":
@@ -181,8 +145,6 @@ def find_types():
         """
         if can_use_crm_resource():
             l = crm_resource("--list-agents %s" % ra_class)
-        elif can_use_lrmadmin():
-            l = lrmadmin("-T %s" % ra_class)
         else:
             l = os_types(ra_class)
         return l
@@ -211,8 +173,6 @@ def ra_meta(ra_class, ra_type, ra_provider):
         if ra_provider:
             return crm_resource("--show-metadata %s:%s:%s" % (ra_class, ra_provider, ra_type))
         return crm_resource("--show-metadata %s:%s" % (ra_class, ra_type))
-    elif can_use_lrmadmin():
-        return lrmadmin("-M %s %s %s" % (ra_class, ra_type, ra_provider), True)
     else:
         l = []
         if ra_class == "ocf":

crmsh/utils.py

@@ -22,10 +22,12 @@
 import random
 import string
 import grp
+import functools
 from pathlib import Path
 from contextlib import contextmanager, closing
 from stat import S_ISBLK
 from lxml import etree
+from packaging import version
 
 import crmsh.parallax
 from . import corosync
@@ -34,7 +36,6 @@
 from . import constants
 from . import options
 from . import term
-from distutils.version import LooseVersion
 from .constants import SSH_OPTION
 from . import log
 from .prun import prun
@@ -86,6 +87,7 @@ def memoize(function):
     "Decorator to invoke a function once only for any argument"
     memoized = {}
 
+    @functools.wraps(function)
     def inner(*args):
         if args in memoized:
             return memoized[args]
@@ -1825,8 +1827,18 @@ def get_cib_attributes(cib_f, tag, attr_l, dflt_l):
     return val_l
 
 
-def is_larger_than_min_version(version, min_version):
-    return LooseVersion(version) >= LooseVersion(min_version)
+def is_larger_than_min_version(this_version, min_version):
+    """
+    Compare two version strings
+    """
+    version_re = re.compile(version.VERSION_PATTERN, re.VERBOSE | re.IGNORECASE)
+    match_this_version = version_re.search(this_version)
+    if not match_this_version:
+        raise ValueError(f"Invalid version string: {this_version}")
+    match_min_version = version_re.search(min_version)
+    if not match_min_version:
+        raise ValueError(f"Invalid version string: {min_version}")
+    return version.parse(match_this_version.group(0)) >= version.parse(match_min_version.group(0))
 
 
 def is_min_pcmk_ver(min_ver, cib_f=None):

requirements.txt

@@ -1,3 +1,4 @@
 lxml
 PyYAML
 python-dateutil
+packaging

setup.py

@@ -10,7 +10,7 @@
       author_email='[email protected]',
       url='http://crmsh.github.io/',
       packages=['crmsh', 'crmsh.crash_test', 'crmsh.report', 'crmsh.prun'],
-      install_requires=['lxml', 'PyYAML', 'python-dateutil'],
+      install_requires=['lxml', 'PyYAML', 'python-dateutil', 'packaging'],
       scripts=['bin/crm'],
       data_files=[('/usr/share/crmsh', ['doc/crm.8.adoc'])],
       include_package_data=True)

test/run-functional-tests

@@ -187,9 +187,8 @@ create_custom_user() {
 	user_name=$1
 	user_id=$2
 	docker_exec $node_name "useradd -m -s /bin/bash ${user_name} 2>/dev/null"
-	docker_exec $node_name "chmod u+w /etc/sudoers"
-	docker_exec $node_name "echo \"${user_name} ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers"
-	docker_exec $node_name "chmod u-w /etc/sudoers"
+	docker_exec $node_name "echo \"${user_name} ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/${user_name}"
+	docker_exec $node_name "chmod 0440 /etc/sudoers.d/${user_name}"
 	docker_exec $node_name "echo 'export PATH=\$PATH:/usr/sbin/' >> ~${user_name}/.bashrc"
 	docker_exec $node_name "echo -e \"linux\\nlinux\" | passwd ${user_name} 2>/dev/null"
 	docker_exec $node_name "cp -r /root/.ssh ~${user_name}/ && chown ${user_name}:haclient -R ~${user_name}/.ssh"
@@ -222,6 +221,7 @@ deploy_ha_node() {
 	fi
 	docker_exec $node_name "rm -rf /run/nologin"
 	docker_exec $node_name "echo 'StrictHostKeyChecking no' >> /etc/ssh/ssh_config"
+	docker_exec $node_name "systemctl start sshd.service"
 
 	if [ "$node_name" != "qnetd-node" ];then
 	  docker cp $PROJECT_PATH $node_name:/opt/crmsh

test/testcases/bugs.exp

@@ -31,8 +31,8 @@ node node1
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-        op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+        op start timeout=20s interval=0s \
         op stop timeout=15 interval=0s
 primitive p4 Dummy \
         op monitor timeout=20s interval=10s \
@@ -69,8 +69,8 @@ node node1
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-        op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+        op start timeout=20s interval=0s \
         op stop timeout=15 interval=0s
 primitive p4 Dummy \
         op monitor timeout=20s interval=10s \
@@ -170,8 +170,8 @@ node node1
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-        op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+        op start timeout=20s interval=0s \
         op stop timeout=15 interval=0s
 property SAPHanaSR: \
 	hana_ha1_site_lss_WDF1=4
@@ -184,8 +184,8 @@ node node1
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-        op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+        op start timeout=20s interval=0s \
         op stop timeout=15 interval=0s
 property SAPHanaSR: \
 	hana_ha1_site_lss_WDF1=4

test/testcases/bundle.exp

@@ -39,8 +39,8 @@ primitive st stonith:ssh \
 	op stop timeout=15 interval=0s
 primitive st2 stonith:ssh \
 	params hostlist="node1 node2" \
-	op monitor timeout=20 interval=3600 \
-	op start timeout=20 interval=0s \
+	op monitor timeout=20s interval=3600 \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 bundle bundle-test1 \
 	docker image=test \

test/testcases/commit.exp

@@ -75,8 +75,8 @@ primitive p3 Dummy \
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta yoyo-meta="yoyo 2" requires=nothing \
-	op monitor interval=60m timeout=20 \
-	op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 group g1 d1 p2
 group g2 d3

test/testcases/confbasic-xml.exp

@@ -41,8 +41,8 @@
           <nvpair name="hostlist" value="node1 node2" id="st2-instance_attributes-hostlist"/>
         </instance_attributes>
         <operations>
-          <op name="monitor" timeout="20" interval="3600" id="st2-monitor-3600"/>
-          <op name="start" timeout="20" interval="0s" id="st2-start-0s"/>
+          <op name="monitor" timeout="20s" interval="3600" id="st2-monitor-3600"/>
+          <op name="start" timeout="20s" interval="0s" id="st2-start-0s"/>
           <op name="stop" timeout="15" interval="0s" id="st2-stop-0s"/>
         </operations>
       </primitive>
@@ -67,7 +67,7 @@
           <operations>
             <op name="start" timeout="60s" interval="0s" id="d2-start-0s"/>
             <op name="stop" timeout="60s" interval="0s" id="d2-stop-0s"/>
-            <op name="monitor" timeout="30s" interval="10s" id="d2-monitor-10s"/>
+            <op name="monitor" timeout="40s" interval="10s" id="d2-monitor-10s"/>
             <op name="monitor" role="Started" interval="60s" timeout="30s" id="d2-monitor-60s"/>
           </operations>
         </primitive>

test/testcases/confbasic.exp

@@ -89,7 +89,7 @@ primitive d2 Delay \
 	params mondelay=45 \
 	op start timeout=60s interval=0s \
 	op stop timeout=60s interval=0s \
-	op monitor timeout=30s interval=10s \
+	op monitor timeout=40s interval=10s \
 	op monitor role=Started interval=60s timeout=30s
 primitive d3 ocf:pacemaker:Dummy \
 	op monitor timeout=20s interval=10s \
@@ -137,8 +137,8 @@ primitive st stonith:ssh \
 	op stop timeout=15 interval=0s
 primitive st2 stonith:ssh \
 	params hostlist="node1 node2" \
-	op monitor timeout=20 interval=3600 \
-	op start timeout=20 interval=0s \
+	op monitor timeout=20s interval=3600 \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 group g1 d1 d2
 ms m d4

test/testcases/edit.exp

@@ -25,8 +25,8 @@ primitive p2 Dummy
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-	op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 group g1 p1 p2
 op_defaults op-options: \
@@ -46,8 +46,8 @@ primitive p3 Dummy
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-	op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 group g1 p1 p3
 op_defaults op-options: \
@@ -182,8 +182,8 @@ primitive p3 Dummy
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-	op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 group g1 p1 p2 d3
 group g2 d1 d2
@@ -311,8 +311,8 @@ primitive p3 Dummy
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-	op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 group as a0 a1 a9 a2 a3 a4 a5 a6 a7 a8 aErr
 group g1 p1 p2 d3
@@ -418,8 +418,8 @@ primitive p3 Dummy
 primitive st stonith:null \
 	params hostlist=node1 \
 	meta description="some description here" requires=nothing \
-	op monitor interval=60m timeout=20 \
-	op start timeout=20 interval=0s \
+	op monitor interval=60m timeout=20s \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 group as a0 a1 a9 a2 a3 a4 a5 a6 a7 a8 aErr
 group g1 p1 p2 d3

test/testcases/file.exp

@@ -11,17 +11,17 @@ primitive p1 ocf:pacemaker:Dummy \
         op stop timeout=20s interval=0s
 primitive p2 Delay \
 	params startdelay=2 mondelay=2 stopdelay=2 \
-        op monitor timeout=30s interval=10s \
+        op monitor timeout=40s interval=10s \
         op start timeout=30s interval=0s \
-        op stop timeout=30s interval=0s
+        op stop timeout=40s interval=0s
 primitive p3 ocf:pacemaker:Dummy \
         op monitor timeout=20s interval=10s \
         op start timeout=20s interval=0s \
         op stop timeout=20s interval=0s
 primitive st stonith:null \
 	params hostlist=node1 \
-        op monitor timeout=20 interval=3600 \
-	op start timeout=20 interval=0s \
+        op monitor timeout=20s interval=3600 \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 clone c1 p1 \
        meta interleave=true
@@ -56,17 +56,17 @@ primitive p0 ocf:pacemaker:Dummy \
         op stop timeout=20s interval=0s
 primitive p2 Delay \
 	params startdelay=2 mondelay=2 stopdelay=2 \
-        op monitor timeout=30s interval=10s \
+        op monitor timeout=40s interval=10s \
         op start timeout=30s interval=0s \
-        op stop timeout=30s interval=0s
+        op stop timeout=40s interval=0s
 primitive p3 ocf:pacemaker:Dummy \
         op monitor timeout=20s interval=10s \
         op start timeout=20s interval=0s \
         op stop timeout=20s interval=0s
 primitive st stonith:null \
 	params hostlist=node1 \
-        op monitor timeout=20 interval=3600 \
-	op start timeout=20 interval=0s \
+        op monitor timeout=20s interval=3600 \
+	op start timeout=20s interval=0s \
 	op stop timeout=15 interval=0s
 property cib-bootstrap-options: \
 	cluster-recheck-interval=10m

test/testcases/ra.exp

@@ -144,7 +144,7 @@ pcmk_status_retries (integer, [2]): Advanced use only: The maximum number of tim
 
 Operations' defaults (advisory minimum):
 
-    start         timeout=20
+    start         timeout=20s
     stop          timeout=15
-    status        timeout=20
-    monitor       timeout=20 interval=3600
+    status        timeout=20s
+    monitor       timeout=20s interval=3600