diff --git a/XenOvfApi/DiskInfo.cs b/XenOvfApi/DiskInfo.cs
new file mode 100644
index 000000000..3b5ba6f0c
--- /dev/null
+++ b/XenOvfApi/DiskInfo.cs
@@ -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
+{
+ ///
+ /// value pair identifing the VHD file and Drive it will be created from.
+ ///
+ public class DiskInfo
+ {
+ private bool _added;
+ private string _vhdFileName;
+ private string _driveId;
+ private string _capacitySize;
+ private string _physicalSize;
+ private int _disktype = 0;
+ ///
+ /// File name to be created representing the "VHD".
+ ///
+ public string VhdFileName
+ {
+ get
+ {
+ return _vhdFileName;
+ }
+ set
+ {
+ _vhdFileName = value;
+ }
+ }
+ ///
+ /// Drive Identifier: "PHYSICALDRIVE0", (From Win32_DiskDrive.DeviceID) ManagementObject["DeviceID"]
+ ///
+ public string DriveId
+ {
+ get
+ {
+ return _driveId;
+ }
+ set
+ {
+ _driveId = value;
+ }
+ }
+ ///
+ /// Max Capacity of VHD
+ ///
+ public string CapacitySize
+ {
+ get
+ {
+ return _capacitySize;
+ }
+ set
+ {
+ _capacitySize = value;
+ }
+ }
+ ///
+ /// Current Size
+ ///
+ public string PhysicalSize
+ {
+ get
+ {
+ return _physicalSize;
+ }
+ set
+ {
+ _physicalSize = value;
+ }
+ }
+ ///
+ /// Gives the type of drive
+ /// Hard Disk Image = 0
+ /// ISO Disk Image = 1
+ ///
+ public int DiskType
+ {
+ get
+ {
+ return _disktype;
+ }
+ set
+ {
+ _disktype = value;
+ }
+ }
+ ///
+ ///
+ ///
+ public bool Added
+ {
+ get { return _added; }
+ set { _added = value; }
+ }
+ }
+
+ ///
+ ///
+ ///
+ public enum DeviceType
+ {
+ ///
+ /// IDE Controller Device (equals CIM ResourceType)
+ ///
+ IDE = 5,
+ ///
+ /// SCSI Controller Device (equals CIM ResourceType)
+ ///
+ SCSI = 6
+ };
+}
diff --git a/XenOvfApi/OVF.cs b/XenOvfApi/OVF.cs
index 28e907eeb..2a01e770d 100644
--- a/XenOvfApi/OVF.cs
+++ b/XenOvfApi/OVF.cs
@@ -45,114 +45,6 @@ using XenCenterLib.Compression;
namespace XenOvf
{
-
- ///
- /// value pair identifing the VHD file and Drive it will be created from.
- ///
- public class DiskInfo
- {
- private bool _added;
- private string _vhdFileName;
- private string _driveId;
- private string _capacitySize;
- private string _physicalSize;
- private int _disktype = 0;
- ///
- /// File name to be created representing the "VHD".
- ///
- public string VhdFileName
- {
- get
- {
- return _vhdFileName;
- }
- set
- {
- _vhdFileName = value;
- }
- }
- ///
- /// Drive Identifier: "PHYSICALDRIVE0", (From Win32_DiskDrive.DeviceID) ManagementObject["DeviceID"]
- ///
- public string DriveId
- {
- get
- {
- return _driveId;
- }
- set
- {
- _driveId = value;
- }
- }
- ///
- /// Max Capacity of VHD
- ///
- public string CapacitySize
- {
- get
- {
- return _capacitySize;
- }
- set
- {
- _capacitySize = value;
- }
- }
- ///
- /// Current Size
- ///
- public string PhysicalSize
- {
- get
- {
- return _physicalSize;
- }
- set
- {
- _physicalSize = value;
- }
- }
- ///
- /// Gives the type of drive
- /// Hard Disk Image = 0
- /// ISO Disk Image = 1
- ///
- public int DiskType
- {
- get
- {
- return _disktype;
- }
- set
- {
- _disktype = value;
- }
- }
- ///
- ///
- ///
- public bool Added
- {
- get { return _added; }
- set { _added = value; }
- }
- }
- ///
- ///
- ///
- public enum DeviceType
- {
- ///
- /// IDE Controller Device (equals CIM ResourceType)
- ///
- IDE = 5,
- ///
- /// SCSI Controller Device (equals CIM ResourceType)
- ///
- SCSI = 6
- };
-
public partial class OVF
{
///
@@ -6366,98 +6258,4 @@ namespace XenOvf
public uint address = 0;
}
}
- ///
- /// Enumerations for OVF Events { Start, Progress, End, Unknown }
- ///
- public enum OvfEventType
- {
- ///
- /// Start Event
- ///
- Start,
- ///
- /// Progress Event
- ///
- Progress,
- ///
- /// End Event
- ///
- End,
- ///
- /// Unknown Event
- ///
- Unknown
- }
- ///
- /// Ovf Event Arguments that give detail status.
- ///
- public class OvfEventArgs : EventArgs
- {
- private OvfEventType _type = OvfEventType.Unknown;
- private ulong _total;
- private ulong _transfered;
- private string _target;
- private string _message;
- ///
- /// Constructor
- ///
- /// target identifier
- /// message
- public OvfEventArgs(string target, string message)
- {
- _target = target;
- _message = message;
- }
- ///
- /// Constructor
- ///
- /// type of event
- /// target identifier
- /// message
- /// bytes transfered
- /// total bytes to transfer
- public OvfEventArgs(OvfEventType type, string target, string message, ulong transfered, ulong total)
- {
- _type = type;
- _target = target;
- _message = message;
- _total = total;
- _transfered = transfered;
- }
- ///
- /// String identifing target
- ///
- public string Target
- {
- get { return _target; }
- }
- ///
- /// Free form message
- ///
- public string Message
- {
- get { return _message; }
- }
- ///
- /// Total number of bytes to transfer
- ///
- public ulong Total
- {
- get { return _total; }
- }
- ///
- /// Number of bytes transfered.
- ///
- public ulong Transfered
- {
- get { return _transfered; }
- }
- ///
- /// event type
- ///
- public OvfEventType Type
- {
- get { return _type; }
- }
- }
}
diff --git a/XenOvfApi/OvfEventArgs.cs b/XenOvfApi/OvfEventArgs.cs
new file mode 100644
index 000000000..22f5a7c4c
--- /dev/null
+++ b/XenOvfApi/OvfEventArgs.cs
@@ -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
+{
+ ///
+ /// Enumerations for OVF Events { Start, Progress, End, Unknown }
+ ///
+ public enum OvfEventType
+ {
+ ///
+ /// Start Event
+ ///
+ Start,
+ ///
+ /// Progress Event
+ ///
+ Progress,
+ ///
+ /// End Event
+ ///
+ End,
+ ///
+ /// Unknown Event
+ ///
+ Unknown
+ }
+
+ ///
+ /// Ovf Event Arguments that give detail status.
+ ///
+ public class OvfEventArgs : EventArgs
+ {
+ private OvfEventType _type = OvfEventType.Unknown;
+ private ulong _total;
+ private ulong _transfered;
+ private string _target;
+ private string _message;
+
+ ///
+ /// Constructor
+ ///
+ /// target identifier
+ /// message
+ public OvfEventArgs(string target, string message)
+ {
+ _target = target;
+ _message = message;
+ }
+ ///
+ /// Constructor
+ ///
+ /// type of event
+ /// target identifier
+ /// message
+ /// bytes transfered
+ /// total bytes to transfer
+ public OvfEventArgs(OvfEventType type, string target, string message, ulong transfered, ulong total)
+ {
+ _type = type;
+ _target = target;
+ _message = message;
+ _total = total;
+ _transfered = transfered;
+ }
+ ///
+ /// String identifing target
+ ///
+ public string Target
+ {
+ get { return _target; }
+ }
+ ///
+ /// Free form message
+ ///
+ public string Message
+ {
+ get { return _message; }
+ }
+ ///
+ /// Total number of bytes to transfer
+ ///
+ public ulong Total
+ {
+ get { return _total; }
+ }
+ ///
+ /// Number of bytes transfered.
+ ///
+ public ulong Transfered
+ {
+ get { return _transfered; }
+ }
+ ///
+ /// event type
+ ///
+ public OvfEventType Type
+ {
+ get { return _type; }
+ }
+ }
+}
diff --git a/XenOvfApi/XenOvfApi.csproj b/XenOvfApi/XenOvfApi.csproj
index 6dc917af6..f7f3b9b36 100644
--- a/XenOvfApi/XenOvfApi.csproj
+++ b/XenOvfApi/XenOvfApi.csproj
@@ -54,6 +54,8 @@
Code
+
+
Code
@@ -194,7 +196,7 @@
-
+
\ No newline at end of file