diff options
| -rwxr-xr-x | docs/userguide/yardstick.rst | 4 | ||||
| -rw-r--r-- | fuel-plugin-vsperf/vagrant/README.md | 8 | ||||
| -rwxr-xr-x | fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh | 9 | ||||
| -rw-r--r-- | vswitches/ovs.py | 2 | ||||
| -rw-r--r-- | vswitches/ovs_dpdk_vhost.py | 1 | ||||
| -rw-r--r-- | vswitches/ovs_vanilla.py | 1 |
6 files changed, 13 insertions, 12 deletions
diff --git a/docs/userguide/yardstick.rst b/docs/userguide/yardstick.rst index 7f09668d..3d249e1b 100755 --- a/docs/userguide/yardstick.rst +++ b/docs/userguide/yardstick.rst @@ -13,7 +13,7 @@ validation of installation of OPNFV platform. In the future, Yardstick will support two options of vswitchperf testcase execution: - plugin mode, which will execute native vswitchperf testcases; Tests will - be executed the same way as today, but test results will be processed and + be executed natively by vsperf, and test results will be processed and reported by yardstick. - traffic generator mode, which will run vswitchperf in **trafficgen** mode only; Yardstick framework will be used to launch VNFs and to configure @@ -71,7 +71,7 @@ Testcase customization Yardstick testcases are described by YAML files. vswitchperf specific testcases are part of the vswitchperf repository and their yaml files can be found at -``yardstick/tests`` directory. For detailed description of yaml file sctructure, +``yardstick/tests`` directory. For detailed description of yaml file structure, please see yardstick documentation and testcase samples. Only vswitchperf specific parts will be discussed here. diff --git a/fuel-plugin-vsperf/vagrant/README.md b/fuel-plugin-vsperf/vagrant/README.md new file mode 100644 index 00000000..fa0fd823 --- /dev/null +++ b/fuel-plugin-vsperf/vagrant/README.md @@ -0,0 +1,8 @@ +Build fuel plugin +================== + +The plugin build support Ubuntu 14.04 + +1. sudo apt-get install vagrant virtualbox + +2. vagrant up diff --git a/fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh b/fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh index 77b6a33d..80fc3353 100755 --- a/fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh +++ b/fuel-plugin-vsperf/vagrant/build_fuel_plugin.sh @@ -1,11 +1,6 @@ #!/bin/bash sudo apt-get update -y -sudo apt-get install createrepo rpm dpkg-dev -y -sudo apt-get install python-setuptools -y -sudo apt-get install python-pip -y -sudo easy_install pip -sudo pip install fuel-plugin-builder -sudo apt-get install ruby -y -sudo gem install rubygems-update +sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev sudo gem install fpm +sudo pip install fuel-plugin-builder fpb --debug --build /vswitchperf/fuel-plugin-vsperf diff --git a/vswitches/ovs.py b/vswitches/ovs.py index 115ab19b..659f7cfa 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -46,7 +46,7 @@ class IVSwitchOvs(IVSwitch, tasks.Process): """See IVswitch for general description """ self._logger = logging.getLogger(__name__) - self._expect = None + self._expect = r'bridge|INFO|ovs-vswitchd' self._timeout = 30 self._bridges = {} self._vswitchd_args = ['--pidfile=' + self._vswitchd_pidfile_path, diff --git a/vswitches/ovs_dpdk_vhost.py b/vswitches/ovs_dpdk_vhost.py index 2d424bc5..0950c426 100644 --- a/vswitches/ovs_dpdk_vhost.py +++ b/vswitches/ovs_dpdk_vhost.py @@ -39,7 +39,6 @@ class OvsDpdkVhost(IVSwitchOvs): def __init__(self): super(OvsDpdkVhost, self).__init__() self._logger = logging.getLogger(__name__) - self._expect = r'EAL: Master l*core \d+ is ready' vswitchd_args = [] diff --git a/vswitches/ovs_vanilla.py b/vswitches/ovs_vanilla.py index 89023a79..f880dfaf 100644 --- a/vswitches/ovs_vanilla.py +++ b/vswitches/ovs_vanilla.py @@ -41,7 +41,6 @@ class OvsVanilla(IVSwitchOvs): self._logger = logging.getLogger(__name__) self._vswitchd_args += ["unix:%s" % self.get_db_sock_path()] self._vswitchd_args += settings.getValue('VSWITCHD_VANILLA_ARGS') - self._expect = "db.sock: connected" self._module_manager = ModuleManager() def start(self): |