starlingx/config
Code Issues Proposed changes

Merge "Make config_management input instructions clearer"

Browse Source
This commit is contained in:
Zuul
2018-10-23 13:31:38 +00:00
committed by Gerrit Code Review
parent 9aae9d637c a95f3d79ed
commit 8a1afec67c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
controllerconfig/controllerconfig/controllerconfig/config_management.py
View File

@@ -89,7 +89,8 @@ def configure_management():
continue continue
while True: while True:
user_input = raw_input("Enter management address CIDR: ") user_input = raw_input("Enter management IP address in CIDR "
"notation, ie. ip/prefix_length: ")
try: try:
management_cidr = netaddr.IPNetwork(user_input) management_cidr = netaddr.IPNetwork(user_input)
management_ip = management_cidr.ip management_ip = management_cidr.ip
@@ -102,10 +103,11 @@ def configure_management():
break break
except (netaddr.AddrFormatError, ValueError): except (netaddr.AddrFormatError, ValueError):
print ("Invalid CIDR - " print ("Invalid CIDR - "
"please enter a valid management address CIDR") "please enter a valid management IP address in "
"CIDR notation.")
while True: while True:
user_input = raw_input("Enter management gateway address [" + user_input = raw_input("Enter management gateway IP address [" +
str(management_network[1]) + "]: ") str(management_network[1]) + "]: ")
if user_input == "": if user_input == "":
user_input = management_network[1] user_input = management_network[1]
@@ -119,11 +121,12 @@ def configure_management():
break break
except (netaddr.AddrFormatError, ValueError): except (netaddr.AddrFormatError, ValueError):
print ("Invalid address - " print ("Invalid address - "
"please enter a valid management gateway address") "please enter a valid management gateway IP address")
min_addresses = 8 min_addresses = 8
while True: while True:
user_input = raw_input("Enter System Controller subnet: ") user_input = raw_input("Enter System Controller subnet in "
"CIDR notation: ")
try: try:
system_controller_subnet = cutils.validate_network_str( system_controller_subnet = cutils.validate_network_str(
user_input, min_addresses) user_input, min_addresses)