[Libvirt-cim] [PATCH] [TEST] Removing redundant test
Sharad Mishra
snmishra at us.ibm.com
Thu Mar 31 21:08:28 UTC 2011
# HG changeset patch
# User Sharad Mishra <snmishra at us.ibm.com>
# Date 1301605604 25200
# Node ID 4bcde13186e6c9985efc3a11f050c76cf3daf3fa
# Parent c1d9565fff50d8aaa7990088b16a8364f563187a
[TEST] Removing redundant test.
This test is no longer needed as libvirt-cim does not
check for duplicate mac addresses. This check is now
done by libvirt.
Signed-off-by: Sharad Mishra <snmishra at us.ibm.com>
diff -r c1d9565fff50 -r 4bcde13186e6 suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py Thu Mar 31 13:50:32 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2009 IBM Corp.
-#
-# Authors:
-# Yogananth subramanian <anantyog at linux.vnet.ibm.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# This testcase verifies definig network interface with conflicting MAC
-#
-
-from sys import exit
-from random import randint
-from pywbem import CIM_ERR_FAILED
-from XenKvmLib.vsms_util import add_net_res
-from XenKvmLib.vsms import get_vsms_class, get_nasd_class
-from XenKvmLib.vxml import get_class
-from CimTest.Globals import logger
-from CimTest.ReturnCodes import FAIL, PASS, SKIP
-from XenKvmLib.const import default_network_name, do_main
-from XenKvmLib.common_util import create_netpool_conf, destroy_netpool
-from XenKvmLib.classes import get_typed_class
-from XenKvmLib.enumclass import GetInstance, EnumNames
-from XenKvmLib.const import get_provider_version
-
-sup_types = ['Xen', 'KVM', 'XenFV']
-default_dom = 'net_domain1'
-test_dom = 'brgtest_domain2'
-nmac = '99:aa:bb:cc:ee:ff'
-ntype = 'network'
-npool_name = default_network_name + str(randint(1, 100))
-exp_rc = CIM_ERR_FAILED
-exp_desc = "Conflicting MAC Addresses"
-
-dup_mac_rev = 929
-
-def cleanup_env(ip, virt, npool_name, cxml):
- cxml.cim_destroy(ip)
- cxml.undefine(ip)
- destroy_netpool(ip, virt, npool_name)
-
-def start_dom(cxml,ip,dom):
- ret = cxml.cim_define(ip)
- if not ret:
- status = cxml.verify_error_msg(exp_rc, exp_desc)
- if status != PASS:
- raise Exception("Got unexpected rc code %s and description %s"
- % (cxml.err_rc, cxml.err_desc))
- return FAIL
- ret = cxml.cim_start(ip)
- if ret:
- status = cxml.verify_error_msg(exp_rc, exp_desc)
- cxml.undefine(ip)
- if status != PASS:
- raise Exception("Got unexpected rc code %s and description %s"
- % (cxml.err_rc, cxml.err_desc))
- return FAIL
- return PASS
-
- at do_main(sup_types)
-def main():
- options = main.options
-
- rev, changeset = get_provider_version(options.virt, options.ip)
- if rev < dup_mac_rev:
- logger.error("Test only valid with provider version > %d", dup_mac_rev)
- return SKIP
-
- status, net_name = create_netpool_conf(options.ip, options.virt,
- use_existing=False,
- net_name=npool_name)
- if status != PASS:
- logger.error('Unable to create network pool')
- return FAIL
- cxml = get_class(options.virt)(default_dom, mac=nmac,
- ntype=ntype, net_name=npool_name)
- try:
- status = start_dom(cxml, options.ip, default_dom)
- if status == FAIL:
- raise Exception("Starting %s domain failed, got unexpeceted rc"
- "code %s and description %s" % (default_dom,
- cxml.err_rc, cxml.err_desc))
-
- except Exception, details:
- logger.error(details)
- destroy_netpool(options.ip, options.virt, net_name)
- return FAIL
-
- sxml = get_class(options.virt)(test_dom, mac=nmac,
- ntype=ntype, net_name=npool_name)
- try:
- status = start_dom(sxml, options.ip, test_dom)
-
- if status == PASS:
- sxml.cim_destroy(options.ip)
- sxml.undefine(options.ip)
- raise Exception("Was able to create two domains with"
- "Conflicting MAC Addresses")
-
- service = get_vsms_class(options.virt)(options.ip)
- classname = get_typed_class(options.virt, 'VirtualSystemSettingData')
- netpool = EnumNames(options.ip, classname)
-
- if options.virt == "XenFV":
- prefix = "Xen"
- else:
- prefix = options.virt
-
- inst_id = '%s:%s' % (prefix, default_dom)
- vssd_ref = None
- for i in range(0, len(netpool)):
- ret_pool = netpool[i].keybindings['InstanceID']
- if ret_pool == inst_id:
- vssd_ref = netpool[i]
- break
- if vssd_ref == None:
- raise Exception("Failed to get vssd_ref for '%s'"% default_dom)
-
- nasd = get_nasd_class(options.virt)(type=ntype, mac=nmac,
- name=default_dom,
- virt_net=npool_name)
- net_attr = { 'ntype' : ntype,
- 'net_name' : npool_name,
- 'nmac' : nmac
- }
-
- ret = add_net_res(options.ip, service, options.virt, cxml,
- vssd_ref, nasd, net_attr)
- if ret == PASS:
- raise Exception("AddRS should NOT return OK with duplicate MAC")
- else:
- status = PASS
-
- except Exception, details:
- logger.error(details)
- status = FAIL
-
- cleanup_env(options.ip, options.virt, npool_name, cxml)
- return status
-
-if __name__ == "__main__":
- exit(main())
-
More information about the Libvirt-cim
mailing list