On 09/04/13 02:20 AM, [email protected] wrote:
From: Yunping Zheng <[email protected]>
This patch support using macvtap nic in test, when using macvtap nic
better have a switch support macvtap, if not, need have a host with
two nic device when using this patch.
if you want to use macvtap in your test, just configure
"nettype = macvtap"
in your configure file.
Hi Yunping, thanks for your patches! However, they don't apply cleanly
against the latest next, given that we've moved some arch specific code
(the network flag constants) to a file named arch.py, see below:
diff --git a/virttest/utils_net.py b/virttest/utils_net.py
index 49dbe10..cc3d67e 100644
--- a/virttest/utils_net.py
+++ b/virttest/utils_net.py
@@ -1,19 +1,24 @@
import platform, openvswitch, re, os, socket, fcntl, struct, logging, random
+import ctypes, math, time
import shelve, commands
-from autotest.client import utils
+from autotest.client import utils, os_dep
from autotest.client.shared import error
import propcan, utils_misc
-
ARCH = platform.machine()
if ARCH == "ppc64":
# From include/linux/sockios.h
SIOCSIFHWADDR = 0x8924
SIOCGIFHWADDR = 0x8927
+ SIOCGIFFLAGS = 0x8913
SIOCSIFFLAGS = 0x8914
+ SIOCGIFADDR = 0x8915
+ SIOCSIFADDR = 0x8916
SIOCGIFINDEX = 0x8933
SIOCBRADDIF = 0x89a2
SIOCBRDELIF = 0x89a3
+ SIOCGIFNETMASK = 0x891B
+ SIOCSIFNETMASK = 0x891C
# From linux/include/linux/if_tun.h
TUNSETIFF = 0x800454ca
TUNGETIFF = 0x400454d2
@@ -27,9 +32,14 @@ else:
# From include/linux/sockios.h
SIOCSIFHWADDR = 0x8924
SIOCGIFHWADDR = 0x8927
+ SIOCGIFFLAGS = 0x8913
SIOCSIFFLAGS = 0x8914
+ SIOCGIFADDR = 0x8915
+ SIOCSIFADDR = 0x8916
SIOCGIFINDEX = 0x8933
SIOCBRADDIF = 0x89a2
+ SIOCGIFNETMASK = 0x891B
+ SIOCSIFNETMASK = 0x891C
SIOCBRDELIF = 0x89a3
# From linux/include/linux/if_tun.h
TUNSETIFF = 0x400454ca
@@ -41,6 +51,12 @@ else:
# From linux/include/linux/if.h
IFF_UP = 0x1
^ Here, this part is not applicable anymore, making your entire set not
applicable. Could you please rebase it?
I have one more request. I'd like you to:
1) Document the existence of the new params in the base config file
2) Document how to enable it on the wiki
I'm marking your patches as superseded, and wait for an updated version.
Thank you very much for your time and sorry for the inconvenience!
Lucas
_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel
