diff options
Diffstat (limited to 'extras')
| -rwxr-xr-x | extras/vpp_config/scripts/cp-data.sh | 1 | ||||
| -rwxr-xr-x | extras/vpp_config/vpp_config.py | 14 | ||||
| -rw-r--r-- | extras/vpp_config/vpplib/VPPUtil.py | 19 |
3 files changed, 19 insertions, 15 deletions
diff --git a/extras/vpp_config/scripts/cp-data.sh b/extras/vpp_config/scripts/cp-data.sh index fa7166189c2..a0f9b3569df 100755 --- a/extras/vpp_config/scripts/cp-data.sh +++ b/extras/vpp_config/scripts/cp-data.sh @@ -73,7 +73,6 @@ sudo cp data/auto-config.yaml $ROOTDIR/vpp/vpp-config/configs/. sudo cp data/cloud-config.iso $ROOTDIR/vpp/vpp-config/configs/. sudo cp data/iperf-centos.xml.template $ROOTDIR/vpp/vpp-config/configs/. sudo cp data/iperf-ubuntu.xml.template $ROOTDIR/vpp/vpp-config/configs/. -sudo cp data/xenial-mod.img $ROOTDIR/vpp/vpp-config/images/. sudo cp data/80-vpp.conf.template $ROOTDIR/vpp/vpp-config/dryrun/sysctl.d/. sudo cp data/grub.template $ROOTDIR/vpp/vpp-config/dryrun/default/. sudo cp data/startup.conf.template $ROOTDIR/vpp/vpp-config/dryrun/vpp/. 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() diff --git a/extras/vpp_config/vpplib/VPPUtil.py b/extras/vpp_config/vpplib/VPPUtil.py index 6f13a437826..ade905e24f7 100644 --- a/extras/vpp_config/vpplib/VPPUtil.py +++ b/extras/vpp_config/vpplib/VPPUtil.py @@ -21,7 +21,7 @@ from collections import Counter # VPP_VERSION = '1707' # VPP_VERSION = '1710' -VPP_VERSION = '1801' +VPP_VERSION = '1804' class VPPUtil(object): @@ -175,6 +175,9 @@ class VPPUtil(object): self._install_vpp_pkg_ubuntu(node, 'vpp-api-lua') self._install_vpp_pkg_ubuntu(node, 'vpp-dev') self._install_vpp_pkg_ubuntu(node, 'vpp-dbg') + self._install_vpp_pkg_ubuntu(node, 'vpp-nsh-plugin') + self._install_vpp_pkg_ubuntu(node, 'vpp-nsh-plugin-dbg') + self._install_vpp_pkg_ubuntu(node, 'vpp-nsh-plugin-dev') def _install_vpp_centos(self, node, fdio_release=VPP_VERSION, centos_version='centos7'): @@ -233,12 +236,14 @@ class VPPUtil(object): self._install_vpp_pkg_centos(node, 'vpp-lib') self._install_vpp_pkg_centos(node, 'vpp') self._install_vpp_pkg_centos(node, 'vpp-plugins') - # jadfix Check with Ole - # self._install_vpp_pkg_centos(node, 'vpp-dpdk-devel') self._install_vpp_pkg_centos(node, 'vpp-api-python') self._install_vpp_pkg_centos(node, 'vpp-api-java') self._install_vpp_pkg_centos(node, 'vpp-api-lua') self._install_vpp_pkg_centos(node, 'vpp-devel') + self._install_vpp_pkg_centos(node, 'vpp-debuginfo') + self._install_vpp_pkg_centos(node, 'vpp-nsh-plugin') + self._install_vpp_pkg_centos(node, 'vpp-nsh-plugin-devel') + self._install_vpp_pkg_centos(node, 'vpp-selinux-policy') def install_vpp(self, node): """ @@ -302,6 +307,9 @@ class VPPUtil(object): if len(pkgs) > 0: if 'version' in pkgs[0]: logging.info("Uninstall Ubuntu Packages") + self._uninstall_vpp_pkg_ubuntu(node, 'vpp-nsh-plugin-dev') + self._uninstall_vpp_pkg_ubuntu(node, 'vpp-nsh-plugin-dbg') + self._uninstall_vpp_pkg_ubuntu(node, 'vpp-nsh-plugin') self._uninstall_vpp_pkg_ubuntu(node, 'vpp-api-python') self._uninstall_vpp_pkg_ubuntu(node, 'vpp-api-java') self._uninstall_vpp_pkg_ubuntu(node, 'vpp-api-lua') @@ -332,11 +340,14 @@ class VPPUtil(object): if len(pkgs) > 0: if 'version' in pkgs[0]: logging.info("Uninstall CentOS Packages") + self._uninstall_vpp_pkg_centos(node, 'vpp-selinux-policy') + self._uninstall_vpp_pkg_centos(node, 'vpp-nsh-plugin-devel') + self._uninstall_vpp_pkg_centos(node, 'vpp-nsh-plugin') + self._uninstall_vpp_pkg_centos(node, 'vpp-debuginfo') self._uninstall_vpp_pkg_centos(node, 'vpp-api-python') self._uninstall_vpp_pkg_centos(node, 'vpp-api-java') self._uninstall_vpp_pkg_centos(node, 'vpp-api-lua') self._uninstall_vpp_pkg_centos(node, 'vpp-plugins') - self._uninstall_vpp_pkg_centos(node, 'vpp-dpdk-devel') self._uninstall_vpp_pkg_centos(node, 'vpp-devel') self._uninstall_vpp_pkg_centos(node, 'vpp') self._uninstall_vpp_pkg_centos(node, 'vpp-lib') |