summaryrefslogtreecommitdiffstats
path: root/extras/vpp_config/vpp_config.py
diff options
context:
space:
mode:
authorjdenisco <jdenisco@cisco.com>2018-11-06 16:10:04 -0500
committerDamjan Marion <dmarion@me.com>2018-11-07 01:13:16 +0000
commitb98750980683b08281f86f868ca96559b6a982d8 (patch)
tree20ac3ff2df1d6210f4d76168eaa7620154254201 /extras/vpp_config/vpp_config.py
parent005e4d50416d15368a6687076c7c934f89470f72 (diff)
Update the vpp config utility
Change-Id: If278d7c6dda9e29736f5aa6f1cb04b49da378509 Signed-off-by: jdenisco <jdenisco@cisco.com>
Diffstat (limited to 'extras/vpp_config/vpp_config.py')
-rwxr-xr-xextras/vpp_config/vpp_config.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/extras/vpp_config/vpp_config.py b/extras/vpp_config/vpp_config.py
index a5d57bf3972..1182b244684 100755
--- a/extras/vpp_config/vpp_config.py
+++ b/extras/vpp_config/vpp_config.py
@@ -550,11 +550,9 @@ def autoconfig_main_menu():
main_menu_text = '\nWhat would you like to do?\n\n\
1) Show basic system information\n\
2) Dry Run (Will save the configuration files in {}/vpp/vpp-config/dryrun for inspection)\n\
- and user input in {}/vpp/vpp-config/configs/auto-config.yaml\n\
3) Full configuration (WARNING: This will change the system configuration)\n\
4) List/Install/Uninstall VPP.\n\
-5) Execute some basic tests.\n\
-9 or q) Quit'.format(rootdir, rootdir)
+q) Quit'.format(rootdir, rootdir)
# 5) Dry Run from {}/vpp/vpp-config/auto-config.yaml (will not ask questions).\n\
# 6) Install QEMU patch (Needed when running openstack).\n\
@@ -568,14 +566,12 @@ def autoconfig_main_menu():
if len(answer) > 1:
print "Please enter only 1 character."
continue
- if re.findall(r'[Qq1-79]', answer):
+ if re.findall(r'[Qq1-4]', answer):
input_valid = True
answer = answer[0].lower()
else:
- print "Please enter a character between 1 and 5 or 9."
+ print "Please enter a character between 1 and 4 or q."
- if answer == '9':
- answer = 'q'
return answer
@@ -599,9 +595,7 @@ def autoconfig_main():
autoconfig_apply()
elif answer == '4':
autoconfig_install()
- elif answer == '5':
- autoconfig_basic_test()
- elif answer == '9' or answer == 'q':
+ elif answer == 'q':
return
else:
autoconfig_not_implemented()