On 07/11/2013 09:19 PM, Xu Wang wrote:

Default network card name was set as 'eth1' or 'em1'. But when os has no network card named like that, FAIL would occured. This patch added check if default name exists in the network card list and if not, change the default value into the 1st one in the list.

Signed-off-by: Xu Wang <cngesaint@gmail.com> --- .../27_definesystem_macvtap_dev.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/27_definesystem_macvtap_dev.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/27_definesystem_macvtap_dev.py index 36bf52f..e096e98 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/27_definesystem_macvtap_dev.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/27_definesystem_macvtap_dev.py @@ -30,6 +30,7 @@ #

import sys +import os from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS, SKIP from VirtLib import utils @@ -132,6 +133,14 @@ def main(): else: source_dev = "eth1"

+ # The default device name may not named 'eth1' or 'em1' so this case would + # return FAIL. The following code will check if default device exists in + # the network card list and if not, source_dev will be changed into the 1st + # network card in the list. + net_info = os.popen('ip addr').read() + if net_info.find(source_dev) == -1: + source_dev = net_info.split(': ')[3] + guest_defined = False

try:

Could a similar check be added to 28_definesystem_with_vsi_profile.py? The comments in that module were from me when I was going through all the tests. How about RASD/06_parent_net_pool.py? John