diff options
| -rwxr-xr-x | docs/configguide/installation.rst | 18 | ||||
| -rwxr-xr-x | src/qemu/Makefile | 9 | ||||
| -rw-r--r-- | testcases/testcase.py | 10 | ||||
| -rw-r--r-- | tools/pkt_gen/ixnet/ixnetrfc2544.tcl | 4 | ||||
| -rwxr-xr-x | tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl | 2 | ||||
| -rw-r--r-- | vnfs/qemu/qemu.py | 2 |
6 files changed, 29 insertions, 16 deletions
diff --git a/docs/configguide/installation.rst b/docs/configguide/installation.rst index 158bc6bd..b4aaf60b 100755 --- a/docs/configguide/installation.rst +++ b/docs/configguide/installation.rst @@ -35,8 +35,20 @@ A simple VNF that forwards traffic through a VM, using: * Linux Brigde * custom l2fwd module -The VM image can be downloaded from: -http://artifacts.opnfv.org/vswitchperf/vloop-vnf-ubuntu-14.04_20151216.qcow2 +The official VM image is called vloop-vnf and it is available for free +download at OPNFV website. + +vloop-vnf changelog: +==================== + +* `vloop-vnf-ubuntu-14.04_20160303`_ + + * snmpd service is disabled by default to avoid error messages during VM boot + * security updates applied + +* `vloop-vnf-ubuntu-14.04_20151216`_ + + * version with development tools required for build of DPDK and l2fwd Other Requirements ------------------ @@ -103,3 +115,5 @@ running any of the above. For example: .. _a link: http://www.softwarecollections.org/en/scls/rhscl/python33/ .. _virtualenv: https://virtualenv.readthedocs.org/en/latest/ +.. _vloop-vnf-ubuntu-14.04_20160303: http://artifacts.opnfv.org/vswitchperf/vnf/vloop-vnf-ubuntu-14.04_20160303.qcow2 +.. _vloop-vnf-ubuntu-14.04_20151216: http://artifacts.opnfv.org/vswitchperf/vnf/vloop-vnf-ubuntu-14.04_20151216.qcow2 diff --git a/src/qemu/Makefile b/src/qemu/Makefile index 1268f571..4603b273 100755 --- a/src/qemu/Makefile +++ b/src/qemu/Makefile @@ -1,7 +1,7 @@ # makefile to manage qemu package # -# Copyright (c) 2015 OPNFV and Intel Corporation. +# Copyright (c) 2015-2016 OPNFV and Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ include ../package-list.mk WORK_DIR = qemu TAG_DONE_FLAG = $(WORK_DIR)/.$(QEMU_TAG).done +INSTALL_TARGET = force_make force_install CONFIG_CMD = CONFIG_CMD += ./configure CONFIG_CMD += --target-list="x86_64-softmmu" @@ -34,16 +35,10 @@ all: force_make .PHONY: install force_install config force_make -# install depends on make -force_install: force_make - @echo "Finished making $(WORK_DIR) " - config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure $(AT)cd $(WORK_DIR); $(CONFIG_CMD) @echo "Configure done" -INSTALL_TARGET = force_install force_make - force_make: $(WORK_DIR)/Makefile $(AT)cd $(WORK_DIR) && git pull $(QEMU_URL) $(QEMU_TAG) $(AT)echo "git pull done" diff --git a/testcases/testcase.py b/testcases/testcase.py index b6726dc4..8d23014c 100644 --- a/testcases/testcase.py +++ b/testcases/testcase.py @@ -264,9 +264,13 @@ class TestCase(object): while counter < self.deployment.count('v'): guest_dir = S.getValue('GUEST_SHARE_DIR')[counter] - # create shared dir if it doesn't exist - if not os.path.exists(guest_dir): - os.makedirs(guest_dir) + # remove shared dir if it exists to avoid issues with file consistency + if os.path.exists(guest_dir): + tasks.run_task(['rm', '-f', '-r', guest_dir], self._logger, + 'Removing content of shared directory...', True) + + # directory to share files between host and guest + os.makedirs(guest_dir) # copy sources into shared dir only if neccessary if 'testpmd' in self.guest_loopback or 'l2fwd' in self.guest_loopback: diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl b/tools/pkt_gen/ixnet/ixnetrfc2544.tcl index 9ce3aed8..233db040 100644 --- a/tools/pkt_gen/ixnet/ixnetrfc2544.tcl +++ b/tools/pkt_gen/ixnet/ixnetrfc2544.tcl @@ -1,7 +1,7 @@ #!/usr/bin/env tclsh # Copyright (c) 2014, Ixia -# Copyright (c) 2015, Intel Corporation +# Copyright (c) 2015-2016, Intel Corporation # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -158,7 +158,7 @@ proc startRfc2544Test { testSpec trafficSpec } { if {$frameSize < 68 } { if {$rfc2544TestType == "back2back"} { - puts "WARNING: Packet size too small, packet size will be \ + puts "INFO: Packet size too small, packet size will be \ increased to 68 for this test" } } diff --git a/tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl b/tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl index 83aa3afc..0bdba9cd 100755 --- a/tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl +++ b/tools/pkt_gen/ixnet/ixnetrfc2544v2.tcl @@ -196,7 +196,7 @@ proc startRfc2544Test { testSpec trafficSpec } { if {$frameSize < 68 } { if {$rfc2544TestType == "back2back"} { - puts "WARNING: Packet size too small, packet size will be \ + puts "INFO: Packet size too small, packet size will be \ increased to 68 for this test" } } diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index 38394974..cb6d9ecc 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -70,7 +70,7 @@ class IVnfQemu(IVnf): self._cmd = ['sudo', '-E', S.getValue('QEMU_BIN'), '-m', S.getValue('GUEST_MEMORY')[self._number], '-smp', str(S.getValue('GUEST_SMP')[self._number]), - '-cpu', 'host', + '-cpu', 'host,migratable=off', '-drive', 'if=scsi,file=' + S.getValue('GUEST_IMAGE')[self._number], '-boot', 'c', '--enable-kvm', |