Looks good, applied! On Thu, Dec 27, 2012 at 3:37 AM, Amos Kong <[email protected]> wrote: > some options were added into netperf.py, but it's only assigned for > netperf_win, this patch adds them for linux netperf. > Enable bridge parameters by default, use can fix it in tests.cfg if it's > needed. > > We experientially suggest test-time should be not less than 60s. > > Signed-off-by: Amos Kong <[email protected]> > --- > tests/cfg/netperf.cfg | 23 ++++++++++++++++++++--- > 1 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/tests/cfg/netperf.cfg b/tests/cfg/netperf.cfg > index 56bc54d..ca845dc 100644 > --- a/tests/cfg/netperf.cfg > +++ b/tests/cfg/netperf.cfg > @@ -8,13 +8,16 @@ > image_snapshot = yes > nics += ' nic2' > # nic1 is for control, nic2 is for data connection > - # bridge_nic1 = virbr0 > + netdst_nic1 = virbr0 > nic_model_nic1 = virtio > - # bridge_nic2 = switch > + netdst_nic2 = switch > nic_model_nic2 = e1000 > netperf_files = netperf-2.6.0.tar.bz2 > setup_cmd = "cd /tmp && rm -rf netperf-2.6.0 && tar xvfj > netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure --enable-burst > --enable-demo=yes && make" > - # configure netperf test parameters > + # configure netperf test parameters, some seconds will be took to > + # wait all the clients work, this wait time should be less than > + # 0.5 * l, the wait time will augments if you have move > + # threads. So experientially suggest l should be not less than 60. > l = 60 > protocols = "TCP_STREAM TCP_MAERTS TCP_RR" > sessions = "1 2 4" > @@ -22,6 +25,19 @@ > sizes = "64 256 512 1024" > sizes_rr = "64 256 512 1024" > numa_node = -1 > + username_client = root > + password_client = 123456 > + shell_client_client = ssh > + shell_port_client = 22 > + shell_prompt_client = \[root@.{0,50}][\#\$] > + shell_port_host = 22 > + password_host = 123456 > + username_host = root > + os_type_client = linux > + os_type_host = linux > + shell_prompt_host = \[root@.{0,50}][\#\$] > + ver_cmd = rpm -qa |grep kvm > + > # this script is used to setup test env for (linux)guest/host > # before performance testing > # rh_perf_envsetup_script = scripts/rh_perf_envsetup.sh > @@ -34,6 +50,7 @@ > client = localhost > # to test exthost <-> guest: > # client = <external host ip> > + > - netperf_win: > only Windows > # only support guest run netserver and host run netperf now. > -- > 1.7.1 > > _______________________________________________ > Virt-test-devel mailing list > [email protected] > https://www.redhat.com/mailman/listinfo/virt-test-devel
-- Lucas _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
