[PATCH] [TEST] #2 Modifying devices.py to fix tc 01_netport.py which was failing on F9 libvirt-cim rpm
7:50 a.m.
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1213940983 25200
# Node ID 2384eeff23be0643b12d908640bef054622c6a41
# Parent 93dbca94a762bb2ba443025db96d43977484c40d
[TEST] #2 Modifying devices.py to fix tc 01_netport.py which was failing on F9 libvirt-cim
rpm.
Change in Patch 2
-----------------
Modified the changeset no from 598 to 599.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 93dbca94a762 -r 2384eeff23be suites/libvirt-cim/lib/XenKvmLib/devices.py
--- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Thu Jun 19 01:42:12 2008 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Thu Jun 19 22:49:43 2008 -0700
@@ -26,9 +26,19 @@ from CimTest import CimExt
from CimTest import CimExt
from CimTest import Globals
from XenKvmLib import assoc
+from XenKvmLib.const import CIM_REV
from XenKvmLib.classes import get_typed_class
-LinkTechnology_Ethernet = 2
+net_rev = 599
+
+# The branch has to be removed once the new rpm
+# including the changes in revision 599 is available.
+# The value of LinkTechnology should be set to 2 for
+# network, bridge and ethernet type interfaces.
+if net_rev > CIM_REV:
+ LinkTechnology_Ethernet = 0
+else:
+ LinkTechnology_Ethernet = 2
class CIM_Instance:
def __init__(self, inst):
5:19 p.m.
+# The branch has to be removed once the new rpm
+# including the changes in revision 599 is available.
+# The value of LinkTechnology should be set to 2 for
+# network, bridge and ethernet type interfaces.
+if net_rev > CIM_REV:
You'll want this to be net_rev >= CIM_REV because the change went in
with changeset 599.
--
Kaitlin Rupert
IBM Linux Technology Center
kaitlin(a)linux.vnet.ibm.com
8:22 p.m.
Kaitlin Rupert wrote:
> +# The branch has to be removed once the new rpm
> +# including the changes in revision 599 is available.
> +# The value of LinkTechnology should be set to 2 for
> +# network, bridge and ethernet type interfaces.
> +if net_rev > CIM_REV:
You'll want this to be net_rev >= CIM_REV because the change went in
with changeset 599.
If we make this condition as net_rev >= CIM_REV, then for the case where
net_rev == CIM_REV = 599 , the LinkTechnology_Ethernet = 0 instead of
LinkTechnology_Ethernet = 2 which is not what is expected , correct ?
7:06 p.m.
Deepti B Kalakeri wrote:
Kaitlin Rupert wrote:
>> +# The branch has to be removed once the new rpm
>> +# including the changes in revision 599 is available.
>> +# The value of LinkTechnology should be set to 2 for
>> +# network, bridge and ethernet type interfaces.
>> +if net_rev > CIM_REV:
>
> You'll want this to be net_rev >= CIM_REV because the change went in
> with changeset 599.
>
If we make this condition as net_rev >= CIM_REV, then for the case where
net_rev == CIM_REV = 599 , the LinkTechnology_Ethernet = 0 instead of
LinkTechnology_Ethernet = 2 which is not what is expected , correct ?
Oops, sorry Deepti. You're right. I misread the patch when I looked at
it on Friday.
--
Kaitlin Rupert
IBM Linux Technology Center
kaitlin(a)linux.vnet.ibm.com
5933
days inactive
5935
days old
3 comments
3 participants
participants (3)
-
Deepti B Kalakeri -
Deepti B. Kalakeri
-
Kaitlin Rupert