# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1216686405 25200 # Node ID 76bf5dc66e914b68807882983a827116909338b4 # Parent d279e40c73d27e7fced47c2c63ba0fd2b0b56cf6 [TEST] #2 Fixes to support the ReferencedConfiguration VSMS param. These changes are needed to create a test case that tests the ReferencedConfiguration VSMS parameter. Fixes: -Add ref_config param to create_using_definesystem() - allows the caller to specify a reference for the ReferenceConfiguration param -Add enumerate_names() - Calls EnumerateInstanceNames() so the caller can get a list of CS references -Fix default_vssd_rasd_str() so that is a mac address is supplied to the function, it is used instead of one of the const.<> values. Updates: -Add LXC network mac address Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r d279e40c73d2 -r 76bf5dc66e91 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Thu Aug 07 16:10:53 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Jul 21 17:26:45 2008 -0700 @@ -65,8 +65,8 @@ return (0, cs) -def create_using_definesystem(domain_name, ip, - params=None, exp_err=None, virt='Xen'): +def create_using_definesystem(domain_name, ip, params=None, ref_config=' ', + exp_err=None, virt='Xen'): bug = "85673" try: class_vsms = eval('vsms.' + \ @@ -90,7 +90,7 @@ service.DefineSystem(SystemSettings=vssd, ResourceSettings=rasd, - ReferenceConfiguration=' ') + ReferenceConfiguration=ref_config) except pywbem.CIMError, (rc, desc): if rc == exp_rc and desc.find(exp_desc) >= 0: logger.info('Got expected rc code and error string.') diff -r d279e40c73d2 -r 76bf5dc66e91 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Thu Aug 07 16:10:53 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Mon Jul 21 17:26:45 2008 -0700 @@ -268,10 +268,14 @@ return vssd.mof(), [d.mof(), m.mof()] class_nasd = get_nasd_class(virt) - if virt == 'KVM': + if net_mac != const.Xen_default_mac: + pass + elif virt == 'KVM': net_mac= const.KVM_default_mac elif virt == 'XenFV': net_mac = const.XenFV_default_mac + elif virt == 'LXC': + net_mac = const.LXC_default_mac n = class_nasd( type=net_type, mac=net_mac,

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1216686405 25200 # Node ID adf7be19f36383916980d55d138761244cb3e389 # Parent 76bf5dc66e914b68807882983a827116909338b4 [TEST] #2 Add VSMS 10_referenced_config.py. This test creates a guest using default RASDS. Then another guest is defined using a reference of the first guest an the value for the ReferencedConfiguration parameter. This second guest is created with an additional network interface. The test verifies that the second guest is defined properly. It also verifies that the second guest has 2 network interfaces: one with a mac address that matches that of the first guest and one with a different mac address. This test current fails on LXC because the test suite doesn't pass a console device to the DefineSystem(). Will fix this in a follow up patch. Updates: -Create a network pool and then destroy the pool when test is complete. -Use VSSD ref instead of CS ref Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r 76bf5dc66e91 -r adf7be19f363 suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py Mon Jul 21 17:26:45 2008 -0700 @@ -0,0 +1,175 @@ +#!/usr/bin/python +# +# Copyright 2008 IBM Corp. +# +# Authors: +# Kaitlin Rupert <karupert(a)us.ibm.com&gt; +# +# 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 +# + +import sys +import pywbem +from XenKvmLib.common_util import create_using_definesystem, \ + call_request_state_change, \ + poll_for_state_change, get_cs_instance, \ + create_netpool_conf, destroy_netpool +from XenKvmLib import vsms +from VirtLib import utils +from CimTest.Globals import logger, do_main +from CimTest.ReturnCodes import FAIL, PASS +from XenKvmLib.test_doms import destroy_and_undefine_domain +from XenKvmLib.classes import get_typed_class +from XenKvmLib.assoc import AssociatorNames +from XenKvmLib.test_xml import dumpxml + +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] +test_dom = 'rstest_domain' +test_dom2 = 'rstest_domain2' + +mac = "aa:aa:aa:00:00:00" + +REQUESTED_STATE = 2 +TIME = "00000000000000.000000:000" + +def setup_first_guest(ip, virt): + status = create_using_definesystem(test_dom, ip, virt=virt) + if status != PASS: + logger.error("Unable to define %s using DefineSystem()" % test_dom) + return FAIL + + rc = call_request_state_change(test_dom, ip, REQUESTED_STATE, TIME, virt) + if rc != 0: + logger.error("Unable to start %s" % test_dom) + return FAIL + + status, cs = poll_for_state_change(ip, virt, test_dom, REQUESTED_STATE) + if status != PASS: + logger.error("Unable to start %s" % test_dom) + return FAIL + + return PASS + +def get_vssd_ref(ip, virt): + rc, cs = get_cs_instance(test_dom, ip, virt) + if rc != 0: + return None + + cn = "ComputerSystem" + ccn = get_typed_class(virt, cn) + vssd = AssociatorNames(ip, 'SettingsDefineState', cn, virt=virt, + Name = test_dom, CreationClassName = ccn) + + if len(vssd) != 1: + logger.error("Returned %i vssd insts for '%s'", len(vssd), test_dom) + return None + + return vssd[0] + +def get_vssd_rasd(virt): + vssd, def_rasd = vsms.default_vssd_rasd_str(dom_name=test_dom2, + net_type='network', + net_mac=mac, virt=virt) + + rasd = [] + for inst in def_rasd: + cn = get_typed_class(virt, "NetResourceAllocationSettingData") + if cn in inst: + rasd.append(inst) + + params = {} + + if len(rasd) != 1: + return params + + params['vssd'] = vssd + params['rasd'] = rasd + + return params + +def get_dom_macs(server, dom, virt): + mac_list = [] + + myxml = dumpxml(dom, server, virt=virt) + + lines = myxml.splitlines() + for l in lines: + if l.find("mac address=") != -1: + mac = l.split('=')[1] + mac = mac.lstrip('\'') + mac = mac.rstrip('\'/>') + mac_list.append(mac) + + return mac_list + +@do_main(sup_types) +def main(): + options = main.options + + try: + status, net_name = create_netpool_conf(options.ip, options.virt, False) + if status != PASS: + logger.error('Unable to find a network pool') + return FAIL + + status = setup_first_guest(options.ip, options.virt) + if status != PASS: + raise Exception("Unable to start %s" % test_dom) + + ref = get_vssd_ref(options.ip, options.virt) + if ref is None: + raise Exception("Unable to get %s reference" % test_dom) + + define_params = get_vssd_rasd(options.virt) + if len(define_params) != 2: + raise Exception("Unable to build VSSD and RASD instances for %s" % \ + test_dom2) + + status = create_using_definesystem(test_dom2, options.ip, + params=define_params, ref_config=ref, + virt=options.virt) + if status != PASS: + raise Exception("Unable to define %s" % test_dom2) + + dom1_mac_list = get_dom_macs(options.ip, test_dom, options.virt) + if len(dom1_mac_list) != 1: + raise Exception("%s has %d macs, expected 1" % (test_dom, + len(dom1_mac_list))) + + dom2_mac_list = get_dom_macs(options.ip, test_dom2, options.virt) + if len(dom2_mac_list) != 2: + raise Exception("%s has %d macs, expected 2" % (test_dom2, + len(dom2_mac_list))) + + for item in dom2_mac_list: + if item != mac and item != dom1_mac_list[0]: + raise Exception("%s has unexpected mac value, exp: %s %s" % \ + (item, mac, dom1_mac_list[0])) + + status = PASS + + except Exception, details: + logger.error(details) + status = FAIL + + destroy_netpool(options.ip, options.virt, net_name) + destroy_and_undefine_domain(test_dom, options.ip, options.virt) + destroy_and_undefine_domain(test_dom2, options.ip, options.virt) + + return status + +if __name__ == "__main__": + sys.exit(main()) +

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1218212683 25200 # Node ID 55b78429571c289fee32af48898d4d7f23c1cbdd # Parent adf7be19f36383916980d55d138761244cb3e389 [TEST] Fix calls to create_using_definesystem() to support new param. This call now how has a ref_config param. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r adf7be19f363 -r 55b78429571c suites/libvirt-cim/cimtest/Memory/02_defgetmem.py --- a/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Mon Jul 21 17:26:45 2008 -0700 +++ b/suites/libvirt-cim/cimtest/Memory/02_defgetmem.py Fri Aug 08 09:24:43 2008 -0700 @@ -64,8 +64,11 @@ undefine_test_domain(default_dom, options.ip) + try: - rc = create_using_definesystem(default_dom, options.ip, None, None, options.virt) + rc = create_using_definesystem(default_dom, options.ip, params=None, + ref_config='', exp_err=None, + virt=options.virt) if rc != 0: raise Exception("Unable to create domain %s using DefineSys()" % default_dom) diff -r adf7be19f363 -r 55b78429571c suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py --- a/suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py Mon Jul 21 17:26:45 2008 -0700 +++ b/suites/libvirt-cim/cimtest/Processor/02_definesys_get_procs.py Fri Aug 08 09:24:43 2008 -0700 @@ -75,9 +75,9 @@ undefine_test_domain(default_dom, options.ip) try: - rc = create_using_definesystem(default_dom, options.ip, - None, None, - options.virt) + rc = create_using_definesystem(default_dom, options.ip, params=None, + ref_config=' ', exp_err=None, + virt=options.virt) if rc != 0: raise Exception("Unable create domain %s using DefineSystem()" \ % default_dom) diff -r adf7be19f363 -r 55b78429571c suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py Mon Jul 21 17:26:45 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/03_definesystem_ess.py Fri Aug 08 09:24:43 2008 -0700 @@ -52,8 +52,8 @@ 'exp_desc' : exp_desc } - rc = create_using_definesystem(dname, options.ip, - params, exp_err, virt=options.virt) + rc = create_using_definesystem(dname, options.ip, params, ref_config=' ', + exp_err=exp_err, virt=options.virt) if rc != PASS: logger.error('DefineSystem should NOT return OK with a wrong ss input') diff -r adf7be19f363 -r 55b78429571c suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py Mon Jul 21 17:26:45 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/04_definesystem_ers.py Fri Aug 08 09:24:43 2008 -0700 @@ -51,8 +51,9 @@ 'exp_desc' : exp_desc } - rc = create_using_definesystem(dname, options.ip, - params, exp_err, virt=options.virt) + + rc = create_using_definesystem(dname, options.ip, params, ref_config=' ', + exp_err=exp_err, virt=options.virt) if rc != PASS: logger.error('DefineSystem should NOT return OK with a wrong ss input')