Dev: bootstrap: Minor refactoring of the get_address_list function

Author: liangxin1300

crmsh/bootstrap.py

@@ -1325,16 +1325,23 @@ def get_address_list() -> typing.List[str]:
     else:
         valid_func = Validation.valid_ucast_ip
 
+    if _context.yes_to_all:
+        loop_count = len(_context.default_ip_list)
+    else:
+        # non-interative mode
+        # will ask for each interface, max is Context.MAX_LINK_NUM
+        loop_count = min(Context.MAX_LINK_NUM, len(_context.interfaces_inst.nic_list))
+
     ringXaddr_list = []
-    loop_count = min(Context.MAX_LINK_NUM, len(_context.default_ip_list))
     for i in range(loop_count):
+        # at non-interactive mode, need to confirm after default ip list been consumed
+        if i >= len(_context.default_ip_list) and not confirm("\nAdd another ring?"):
+            break
         addr = prompt_for_string("Address for ring{}".format(i),
                 default=pick_default_value(_context.default_ip_list, ringXaddr_list),
                 valid_func=valid_func,
                 prev_value=ringXaddr_list)
         ringXaddr_list.append(addr)
-        if i < (loop_count - 1) and not confirm("\nAdd another ring?"):
-            break
 
     return ringXaddr_list