From a95f3d79edc7d3c47c6a6d730e6f2b9382cd7d4c Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Thu, 18 Oct 2018 14:27:12 -0400 Subject: [PATCH] Make config_management input instructions clearer The config_management tool is expecting an IP address in CIDR notation. Change the text output to the user to reflect this. Change-Id: I316ea1d16c7662f7778765b9f5b9c1f770bd0d69 Closes-Bug: 1798613 Signed-off-by: Kevin Smith --- .../controllerconfig/config_management.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/controllerconfig/controllerconfig/controllerconfig/config_management.py b/controllerconfig/controllerconfig/controllerconfig/config_management.py index 922496dfec..2296b0f9eb 100644 --- a/controllerconfig/controllerconfig/controllerconfig/config_management.py +++ b/controllerconfig/controllerconfig/controllerconfig/config_management.py @@ -89,7 +89,8 @@ def configure_management(): continue 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: management_cidr = netaddr.IPNetwork(user_input) management_ip = management_cidr.ip @@ -102,10 +103,11 @@ def configure_management(): break except (netaddr.AddrFormatError, ValueError): print ("Invalid CIDR - " - "please enter a valid management address CIDR") + "please enter a valid management IP address in " + "CIDR notation.") while True: - user_input = raw_input("Enter management gateway address [" + + user_input = raw_input("Enter management gateway IP address [" + str(management_network[1]) + "]: ") if user_input == "": user_input = management_network[1] @@ -119,11 +121,12 @@ def configure_management(): break except (netaddr.AddrFormatError, ValueError): print ("Invalid address - " - "please enter a valid management gateway address") + "please enter a valid management gateway IP address") min_addresses = 8 while True: - user_input = raw_input("Enter System Controller subnet: ") + user_input = raw_input("Enter System Controller subnet in " + "CIDR notation: ") try: system_controller_subnet = cutils.validate_network_str( user_input, min_addresses)