tests: Update the version command in netperf

This will help to remove the blank lines in the results file. And
make the format suitable for further result analyze.
Signed-off-by: NYiqiao Pu <ypu@redhat.com>
Acked-by: NFeng Yang <fyang@redhat.com>

tests/netperf.py

@@ -141,8 +141,6 @@ def run_netperf(test, params, env):
         server_ctl = vm.wait_for_login(nic_index=1, timeout=login_timeout)
         server_ctl_ip = vm.get_address(1)
 
-
-
     logging.debug(commands.getoutput("numactl --hardware"))
     logging.debug(commands.getoutput("numactl --show"))
     # pin guest vcpus/memory/vhost threads to last numa node of host by default
@@ -255,12 +253,16 @@ def start_test(server, server_ctl, host, clients, resultsdir, l=60,
     guest_ver_cmd = params.get("guest_ver_cmd", "uname -r")
     fd = open("%s/netperf-result.%s.RHS" % (resultsdir, time.time()), "w")
 
-    test.write_test_keyval({ 'kvm-userspace-ver': commands.getoutput(ver_cmd) })
-    test.write_test_keyval({ 'guest-kernel-ver': ssh_cmd(server_ctl, guest_ver_cmd) })
+    test.write_test_keyval({ 'kvm-userspace-ver': \
+                                        commands.getoutput(ver_cmd).strip() })
+    test.write_test_keyval({ 'guest-kernel-ver': ssh_cmd(server_ctl,
+                                                     guest_ver_cmd).strip() })
     test.write_test_keyval({ 'session-length': l })
 
-    fd.write('### kvm-userspace-ver : %s\n' % commands.getoutput(ver_cmd) )
-    fd.write('### guest-kernel-ver : %s\n' % ssh_cmd(server_ctl, guest_ver_cmd) )
+    fd.write('### kvm-userspace-ver : %s\n' % \
+                                         commands.getoutput(ver_cmd).strip() )
+    fd.write('### guest-kernel-ver : %s\n' % ssh_cmd(server_ctl,
+                                                      guest_ver_cmd).strip() )
     fd.write('### kvm_version : %s\n' % os.uname()[2] )
     fd.write('### session-length : %s\n' % l )