summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
005e4d5)
Change-Id: If278d7c6dda9e29736f5aa6f1cb04b49da378509
Signed-off-by: jdenisco <jdenisco@cisco.com>
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/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/.
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/.
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\
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\
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\
# 5) Dry Run from {}/vpp/vpp-config/auto-config.yaml (will not ask questions).\n\
# 6) Install QEMU patch (Needed when running openstack).\n\
if len(answer) > 1:
print "Please enter only 1 character."
continue
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:
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'
autoconfig_apply()
elif answer == '4':
autoconfig_install()
autoconfig_apply()
elif answer == '4':
autoconfig_install()
- elif answer == '5':
- autoconfig_basic_test()
- elif answer == '9' or answer == 'q':
return
else:
autoconfig_not_implemented()
return
else:
autoconfig_not_implemented()
# VPP_VERSION = '1707'
# VPP_VERSION = '1710'
# VPP_VERSION = '1707'
# VPP_VERSION = '1710'
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-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'):
def _install_vpp_centos(self, node, fdio_release=VPP_VERSION,
centos_version='centos7'):
self._install_vpp_pkg_centos(node, 'vpp-lib')
self._install_vpp_pkg_centos(node, 'vpp')
self._install_vpp_pkg_centos(node, 'vpp-plugins')
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-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):
"""
def install_vpp(self, node):
"""
if len(pkgs) > 0:
if 'version' in pkgs[0]:
logging.info("Uninstall Ubuntu Packages")
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')
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')
if len(pkgs) > 0:
if 'version' in pkgs[0]:
logging.info("Uninstall CentOS Packages")
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-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')
self._uninstall_vpp_pkg_centos(node, 'vpp-devel')
self._uninstall_vpp_pkg_centos(node, 'vpp')
self._uninstall_vpp_pkg_centos(node, 'vpp-lib')