X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvpp_config%2Fvpp_config.py;h=145bf4ea03c9e62a6a56edc2fa996b6fc136582c;hb=refs%2Fchanges%2F91%2F16591%2F4;hp=a5d57bf3972b6535d2f60b491d24bb7bf919c502;hpb=4dc8397629a30f3462ad695496ee3f943d85457d;p=vpp.git

diff --git a/extras/vpp_config/vpp_config.py b/extras/vpp_config/vpp_config.py
index a5d57bf3972..145bf4ea03c 100755
--- a/extras/vpp_config/vpp_config.py
+++ b/extras/vpp_config/vpp_config.py
@@ -427,8 +427,14 @@ def autoconfig_install():
             question = "Do you want to install VPP [Y/n]? "
             answer = autoconfig_yn(question, 'y')
             if answer == 'y':
+                question = "Do you want to install the release version [Y/n]? "
+                answer = autoconfig_yn(question, 'y')
+                if answer == 'y':
+                    branch = 'release'
+                else:
+                    branch = 'master'
                 logger.setLevel(logging.INFO)
-                vutil.install_vpp(node)
+                vutil.install_vpp(node, branch)
 
     # Set the logging level back
     logger.setLevel(logging.ERROR)
@@ -549,12 +555,10 @@ 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\
+2) Dry Run (Saves the configuration files in {}/vpp/vpp-config/dryrun.\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 +572,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 +601,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()