Skip to content

Commit 2bf3fdb

Browse files
committed
Dev: bootstrap: Minor refactoring of the get_address_list function
1 parent d0af55a commit 2bf3fdb

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

crmsh/bootstrap.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,15 +1325,23 @@ def get_address_list() -> typing.List[str]:
13251325
else:
13261326
valid_func = Validation.valid_ucast_ip
13271327

1328+
if _context.yes_to_all or _context.nic_addr_list:
1329+
loop_count = len(_context.default_ip_list)
1330+
else:
1331+
# interative mode or without -i option specified
1332+
loop_count = min(Context.MAX_LINK_NUM, len(_context.interfaces_inst.nic_list))
1333+
13281334
ringXaddr_list = []
1329-
loop_count = min(Context.MAX_LINK_NUM, len(_context.default_ip_list))
13301335
for i in range(loop_count):
13311336
addr = prompt_for_string("Address for ring{}".format(i),
13321337
default=pick_default_value(_context.default_ip_list, ringXaddr_list),
13331338
valid_func=valid_func,
13341339
prev_value=ringXaddr_list)
13351340
ringXaddr_list.append(addr)
1336-
if i < (loop_count - 1) and not confirm("\nAdd another ring?"):
1341+
# only confirm when not the last loop and without -i option specified
1342+
if not _context.nic_addr_list and \
1343+
i < (loop_count - 1) and \
1344+
not confirm("\nAdd another ring?"):
13371345
break
13381346

13391347
return ringXaddr_list

0 commit comments

Comments
 (0)