acfg.ipv4_interface_setup()
-def autoconfig_create_vm():
+def autoconfig_create_iperf_vm():
"""
Setup IPv4 interfaces
"""
acfg = AutoConfig(rootdir, VPP_AUTO_CONFIGURATION_FILE)
- acfg.create_and_bridge_virtual_interfaces()
+ acfg.destroy_iperf_vm('iperf-server')
+ acfg.create_and_bridge_iperf_virtual_interface()
+ acfg.create_iperf_vm('iperf-server')
def autoconfig_not_implemented():
basic_menu_text = '\nWhat would you like to do?\n\n\
1) List/Create Simple IPv4 Setup\n\
+2) Create an iperf VM and Connect to VPP an interface\n\
9 or q) Back to main menu.'
- # 1) List/Create Simple IPv4 Setup\n\
- # 2) List/Create Create VM and Connect to VPP interfaces\n\
- # 9 or q) Back to main menu.'
-
print "{}".format(basic_menu_text)
input_valid = False
answer = autoconfig_basic_test_menu()
if answer == '1':
autoconfig_ipv4_setup()
- # elif answer == '2':
- # autoconfig_create_vm()
+ elif answer == '2':
+ autoconfig_create_iperf_vm()
elif answer == '9' or answer == 'q':
return
else:
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\
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
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()
cmd = 'modprobe uio_pci_generic'
(ret, stdout, stderr) = VPPUtil.exec_command(cmd)
if ret != 0:
- raise RuntimeError('{} failed on node {} {}'. format(cmd, node['host'], stderr))
+ logging.warning('{} failed on node {} {}'. format(cmd, node['host'], stderr))
+# noinspection PyUnresolvedReferences
def execute_with_args(args):
"""
Execute the configuration utility with agruments.