Moved classes DiskInfo and OvfEventArgs and enums DeviceType and OvfEventType to

a different file to reduce a bit the size of the OVF.cs file.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2014-01-06 09:08:48 +00:00
parent 07e5adc306
commit 7e73622570
4 changed files with 277 additions and 203 deletions

142
XenOvfApi/DiskInfo.cs Normal file
View File

@ -0,0 +1,142 @@
/* Copyright (c) Citrix Systems Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms,
* with or without modification, are permitted provided
* that the following conditions are met:
*
* * Redistributions of source code must retain the above
* copyright notice, this list of conditions and the
* following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
namespace XenOvf
{
/// <summary>
/// value pair identifing the VHD file and Drive it will be created from.
/// </summary>
public class DiskInfo
{
private bool _added;
private string _vhdFileName;
private string _driveId;
private string _capacitySize;
private string _physicalSize;
private int _disktype = 0;
/// <summary>
/// File name to be created representing the "VHD".
/// </summary>
public string VhdFileName
{
get
{
return _vhdFileName;
}
set
{
_vhdFileName = value;
}
}
/// <summary>
/// Drive Identifier: "PHYSICALDRIVE0", (From Win32_DiskDrive.DeviceID) ManagementObject["DeviceID"]
/// </summary>
public string DriveId
{
get
{
return _driveId;
}
set
{
_driveId = value;
}
}
/// <summary>
/// Max Capacity of VHD
/// </summary>
public string CapacitySize
{
get
{
return _capacitySize;
}
set
{
_capacitySize = value;
}
}
/// <summary>
/// Current Size
/// </summary>
public string PhysicalSize
{
get
{
return _physicalSize;
}
set
{
_physicalSize = value;
}
}
/// <summary>
/// Gives the type of drive
/// Hard Disk Image = 0
/// ISO Disk Image = 1
/// </summary>
public int DiskType
{
get
{
return _disktype;
}
set
{
_disktype = value;
}
}
/// <summary>
///
/// </summary>
public bool Added
{
get { return _added; }
set { _added = value; }
}
}
/// <summary>
///
/// </summary>
public enum DeviceType
{
/// <summary>
/// IDE Controller Device (equals CIM ResourceType)
/// </summary>
IDE = 5,
/// <summary>
/// SCSI Controller Device (equals CIM ResourceType)
/// </summary>
SCSI = 6
};
}

View File

@ -45,114 +45,6 @@ using XenCenterLib.Compression;
namespace XenOvf
{
/// <summary>
/// value pair identifing the VHD file and Drive it will be created from.
/// </summary>
public class DiskInfo
{
private bool _added;
private string _vhdFileName;
private string _driveId;
private string _capacitySize;
private string _physicalSize;
private int _disktype = 0;
/// <summary>
/// File name to be created representing the "VHD".
/// </summary>
public string VhdFileName
{
get
{
return _vhdFileName;
}
set
{
_vhdFileName = value;
}
}
/// <summary>
/// Drive Identifier: "PHYSICALDRIVE0", (From Win32_DiskDrive.DeviceID) ManagementObject["DeviceID"]
/// </summary>
public string DriveId
{
get
{
return _driveId;
}
set
{
_driveId = value;
}
}
/// <summary>
/// Max Capacity of VHD
/// </summary>
public string CapacitySize
{
get
{
return _capacitySize;
}
set
{
_capacitySize = value;
}
}
/// <summary>
/// Current Size
/// </summary>
public string PhysicalSize
{
get
{
return _physicalSize;
}
set
{
_physicalSize = value;
}
}
/// <summary>
/// Gives the type of drive
/// Hard Disk Image = 0
/// ISO Disk Image = 1
/// </summary>
public int DiskType
{
get
{
return _disktype;
}
set
{
_disktype = value;
}
}
/// <summary>
///
/// </summary>
public bool Added
{
get { return _added; }
set { _added = value; }
}
}
/// <summary>
///
/// </summary>
public enum DeviceType
{
/// <summary>
/// IDE Controller Device (equals CIM ResourceType)
/// </summary>
IDE = 5,
/// <summary>
/// SCSI Controller Device (equals CIM ResourceType)
/// </summary>
SCSI = 6
};
public partial class OVF
{
/// <summary>
@ -6366,98 +6258,4 @@ namespace XenOvf
public uint address = 0;
}
}
/// <summary>
/// Enumerations for OVF Events { Start, Progress, End, Unknown }
/// </summary>
public enum OvfEventType
{
/// <summary>
/// Start Event
/// </summary>
Start,
/// <summary>
/// Progress Event
/// </summary>
Progress,
/// <summary>
/// End Event
/// </summary>
End,
/// <summary>
/// Unknown Event
/// </summary>
Unknown
}
/// <summary>
/// Ovf Event Arguments that give detail status.
/// </summary>
public class OvfEventArgs : EventArgs
{
private OvfEventType _type = OvfEventType.Unknown;
private ulong _total;
private ulong _transfered;
private string _target;
private string _message;
/// <summary>
/// Constructor
/// </summary>
/// <param name="target">target identifier</param>
/// <param name="message">message</param>
public OvfEventArgs(string target, string message)
{
_target = target;
_message = message;
}
/// <summary>
/// Constructor
/// </summary>
/// <param name="type">type of event</param>
/// <param name="target">target identifier</param>
/// <param name="message">message</param>
/// <param name="transfered">bytes transfered</param>
/// <param name="total">total bytes to transfer</param>
public OvfEventArgs(OvfEventType type, string target, string message, ulong transfered, ulong total)
{
_type = type;
_target = target;
_message = message;
_total = total;
_transfered = transfered;
}
/// <summary>
/// String identifing target
/// </summary>
public string Target
{
get { return _target; }
}
/// <summary>
/// Free form message
/// </summary>
public string Message
{
get { return _message; }
}
/// <summary>
/// Total number of bytes to transfer
/// </summary>
public ulong Total
{
get { return _total; }
}
/// <summary>
/// Number of bytes transfered.
/// </summary>
public ulong Transfered
{
get { return _transfered; }
}
/// <summary>
/// event type
/// </summary>
public OvfEventType Type
{
get { return _type; }
}
}
}

132
XenOvfApi/OvfEventArgs.cs Normal file
View File

@ -0,0 +1,132 @@
/* Copyright (c) Citrix Systems Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms,
* with or without modification, are permitted provided
* that the following conditions are met:
*
* * Redistributions of source code must retain the above
* copyright notice, this list of conditions and the
* following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
using System;
namespace XenOvf
{
/// <summary>
/// Enumerations for OVF Events { Start, Progress, End, Unknown }
/// </summary>
public enum OvfEventType
{
/// <summary>
/// Start Event
/// </summary>
Start,
/// <summary>
/// Progress Event
/// </summary>
Progress,
/// <summary>
/// End Event
/// </summary>
End,
/// <summary>
/// Unknown Event
/// </summary>
Unknown
}
/// <summary>
/// Ovf Event Arguments that give detail status.
/// </summary>
public class OvfEventArgs : EventArgs
{
private OvfEventType _type = OvfEventType.Unknown;
private ulong _total;
private ulong _transfered;
private string _target;
private string _message;
/// <summary>
/// Constructor
/// </summary>
/// <param name="target">target identifier</param>
/// <param name="message">message</param>
public OvfEventArgs(string target, string message)
{
_target = target;
_message = message;
}
/// <summary>
/// Constructor
/// </summary>
/// <param name="type">type of event</param>
/// <param name="target">target identifier</param>
/// <param name="message">message</param>
/// <param name="transfered">bytes transfered</param>
/// <param name="total">total bytes to transfer</param>
public OvfEventArgs(OvfEventType type, string target, string message, ulong transfered, ulong total)
{
_type = type;
_target = target;
_message = message;
_total = total;
_transfered = transfered;
}
/// <summary>
/// String identifing target
/// </summary>
public string Target
{
get { return _target; }
}
/// <summary>
/// Free form message
/// </summary>
public string Message
{
get { return _message; }
}
/// <summary>
/// Total number of bytes to transfer
/// </summary>
public ulong Total
{
get { return _total; }
}
/// <summary>
/// Number of bytes transfered.
/// </summary>
public ulong Transfered
{
get { return _transfered; }
}
/// <summary>
/// event type
/// </summary>
public OvfEventType Type
{
get { return _type; }
}
}
}

View File

@ -54,6 +54,8 @@
<Compile Include="Conversions.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DiskInfo.cs" />
<Compile Include="OvfEventArgs.cs" />
<Compile Include="Definitions\Microsoft.cs">
<SubType>Code</SubType>
</Compile>
@ -194,7 +196,7 @@
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties Reset="1" AssemblyVersion="1" AssemblyFileVersion="1" StartDate="20090814" />
<UserProperties StartDate="20090814" AssemblyFileVersion="1" AssemblyVersion="1" Reset="1" />
</VisualStudio>
</ProjectExtensions>
</Project>