Merge pull request #1300 from liangxin1300/20240109_crm_configure_service_stopped

[crmsh-4.6] Dev: ui_context: Skip querying CIB when in a sublevel or help command

Author: liangxin1300

crmsh/constants.py

@@ -511,4 +511,6 @@
 RSC_ROLE_PROMOTED_LEGACY = "Master"
 RSC_ROLE_UNPROMOTED_LEGACY = "Slave"
 PCMK_VERSION_DEFAULT = "2.0.0"
+
+NON_FUNCTIONAL_COMMANDS = ('help', 'cd', 'ls', 'quit', 'up')
 # vim:ts=4:sw=4:et:

crmsh/ui_context.py

@@ -82,6 +82,10 @@ def run(self, line):
                     cmd = True
                     break
             if cmd:
+                if self.command_name not in constants.NON_FUNCTIONAL_COMMANDS:
+                    entry = self.current_level()
+                    if 'requires' in dir(entry) and not entry.requires():
+                        self.fatal_error("Missing requirements")
                 utils.check_user_access(self.current_level().name)
                 rv = self.execute_command() is not False
         except (ValueError, IOError) as e:
@@ -239,8 +243,7 @@ def previous_level(self):
     def enter_level(self, level):
         '''
         Pushes an instance of the given UILevel
-        subclass onto self.stack. Checks prerequirements
-        for the level (if any).
+        subclass onto self.stack.
         '''
         # on entering new level we need to set the
         # interactive option _before_ creating the level
@@ -251,8 +254,6 @@ def enter_level(self, level):
         self._in_transit = True
 
         entry = level()
-        if 'requires' in dir(entry) and not entry.requires():
-            self.fatal_error("Missing requirements")
         self.stack.append(entry)
         self.clear_readline_cache()
 
@@ -320,7 +321,8 @@ def up(self):
         '''
         ok = True
         if len(self.stack) > 1:
-            ok = self.current_level().end_game(no_questions_asked=self._in_transit) is not False
+            if self.command_name and self.command_name not in constants.NON_FUNCTIONAL_COMMANDS:
+                ok = self.current_level().end_game(no_questions_asked=self._in_transit) is not False
             self.stack.pop()
             self.clear_readline_cache()
         return ok
@@ -341,7 +343,9 @@ def quit(self, rc=0):
         '''
         Exit from the top level
         '''
-        ok = self.current_level().end_game()
+        ok = True
+        if self.command_name and self.command_name not in constants.NON_FUNCTIONAL_COMMANDS:
+            ok = self.current_level().end_game()
         if options.interactive and not options.batch:
             if constants.need_reset:
                 utils.ext_cmd("reset")

test/features/bootstrap_options.feature

@@ -14,6 +14,7 @@ Feature: crmsh bootstrap process - options
 
   @clean
   Scenario: Check help output
+    When    Run "crm configure help primitive" OK		
     When    Run "crm -h" on "hanode1"
     Then    Output is the same with expected "crm" help output
     When    Run "crm cluster init -h" on "hanode1"