[Libvirt-cim] [PATCH] [TEST] 2# Adding create_diskpool() function

[Deepti B Kalakeri]

Deepti B Kalakeri wrote:
>
>
> Kaitlin Rupert wrote:
>> Deepti B. Kalakeri wrote:
>>> # HG changeset patch
>>> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
>>> # Date 1210856720 25200
>>> # Node ID 3c476a21c4b4f95f5ff783a199a6feab9d9c66b1
>>> # Parent  a8dbad0a9854623167932386e4bae8a737b46672
>>> [TEST] 2# Adding create_diskpool() function.
>>>
>>> Modified vxml to get the poolname and networkname .
>>> To create the storage pool on machine with libvirt >= 0.4.1
>>> Addressed the review comment.
>>> Added logic to skip the removal of the diskconf file when libvirt >= 
>>> 0.4.1 and CIM_REV > 558.
>>>
>>> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
>>>
>>
>> This patch seems to be missing the xml_get_diskpool_name() change 
>> from the other patch.  Sorry to make you resend this again!
>
>
> I verified this , but I see the xml_get_diskpool_name() in the patch I 
> had sent.
> Please find the same patch attached with the mail.
> Did I miss something ?
>
> Thanks and Regards,
> Deepti.
Sorry Kaitlin, I did not realize that I had missed the vxml.py changes. 
I have submitted the changes for vxml.py separately. Thanks for the 
patience.

Thanks and Regards,
Deepti.
>
> ------------------------------------------------------------------------
>
> Subject:
> [Libvirt-cim] [PATCH] [TEST] 2# Adding create_diskpool() function
> From:
> "Deepti B. Kalakeri" <deeptik at linux.vnet.ibm.com>
> Date:
> Thu, 15 May 2008 06:05:36 -0700
> To:
> libvirt-cim at redhat.com
>
> To:
> libvirt-cim at redhat.com
>
>
> # HG changeset patch
> # User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
> # Date 1210856720 25200
> # Node ID 3c476a21c4b4f95f5ff783a199a6feab9d9c66b1
> # Parent  a8dbad0a9854623167932386e4bae8a737b46672
> [TEST] 2# Adding create_diskpool() function.
>
> Modified vxml to get the poolname and networkname .
> To create the storage pool on machine with libvirt >= 0.4.1
> Addressed the review comment.
> Added logic to skip the removal of the diskconf file when libvirt >= 0.4.1 and CIM_REV > 558.
>
> Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
>
> diff -r a8dbad0a9854 -r 3c476a21c4b4 suites/libvirt-cim/lib/XenKvmLib/common_util.py
> --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu May 15 04:51:47 2008 -0700
> +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py	Thu May 15 06:05:20 2008 -0700
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  #
>  # Copyright 2008 IBM Corp.
>  #
> @@ -33,6 +34,8 @@ from CimTest.Globals import logger, log_
>  from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE
>  from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
>  from XenKvmLib.const import CIM_REV
> +from VirtLib.live import diskpool_list, virsh_version, net_list
> +from XenKvmLib.vxml import PoolXML, NetXML
>
>  test_dpath = "foo"
>  diskpoolconf_rev = 558
> @@ -265,12 +268,20 @@ def conf_file():
>      return status
>
>
> -def cleanup_restore():
> +def cleanup_restore(server, virt):
>      """
>          Restoring back the original diskpool.conf 
>          file.
>      """
>      status = PASS
> +    libvirt_version = virsh_version(server, virt)
> +    # The conf file is not present on  the machine if 
> +    # libvirt_version >= 0.4.1 and CIM_REV > 558
> +    # Hence Skipping the logic to delete the new conf file
> +    # and just returning PASS
> +    if libvirt_version >= '0.4.1' and \
> +       CIM_REV > diskpoolconf_rev:
> +        return status
>      try:
>          if os.path.exists(back_disk_file):
>              os.remove(disk_file)
> @@ -294,3 +305,57 @@ def create_diskpool_file():
>      
>      return conf_file()
>
> +def create_diskpool(server, virt='KVM'):
> +    status = PASS
> +    dpoolname = None
> +    try:
> +        dpool_list = diskpool_list(server, virt='KVM')
> +        if len(dpool_list) > 0:
> +            dpoolname=dpool_list[0]
> +        else:
> +            diskxml = PoolXML(server, virt=virt)
> +            ret = diskxml.create_vpool()
> +            if not ret:
> +                logger.error('Failed to create the disk pool "%s"',
> +                         dpoolname)
> +                status = FAIL
> +            else:
> +                dpoolname=diskxml.xml_get_diskpool_name()
> +    except Exception, detail:
> +        logger.error("Exception: In fn create_diskpool(): %s", detail)
> +        status=FAIL
> +    return status, dpoolname
> +
> +def create_diskpool_conf(server, virt):
> +    libvirt_version = virsh_version(server, virt)
> +    if libvirt_version >= '0.4.1' and \
> +       CIM_REV > diskpoolconf_rev:
> +        status, dpoolname = create_diskpool(server, virt=virt)
> +        diskid = "%s/%s" % ("DiskPool", dpoolname)
> +    else:
> +        status = create_diskpool_file()
> +        diskid = "%s/%s" % ("DiskPool", test_dpath)
> +
> +    return status, diskid
> +
> +
> +def create_netpool_conf(server, virt):
> +    status = PASS
> +    test_network = None
> +    try:
> +        vir_network = net_list(server, virt)
> +        if len(vir_network) > 0:
> +            test_network = vir_network[0]
> +        else:
> +            netxml = NetXML(server, virt=virt)
> +            ret = netxml.create_vnet()
> +            if not ret:
> +                logger.error("Failed to create Virtual Network '%s'",
> +                              test_network)
> +                status = FAIL
> +            else:
> +                test_network = netxml.xml_get_netpool_name()
> +    except Exception, detail:
> +        logger.error("Exception: In fn create_netpool_conf(): %s", detail)
> +        status=FAIL
> +    return status, test_network
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>