Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-178985: Removed ova.xml import from XenCenter

Browse Source 
because it has been broken and we decided not to keep this feature

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2015-11-25 11:01:28 +00:00
parent bf1bbd8475
commit 4586832d5f
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XenAdmin/Wizards/ImportWizard/ImportSourcePage.cs
View File

@ -57,7 +57,7 @@ namespace XenAdmin.Wizards.ImportWizard
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private readonly string[] m_supportedImageTypes = new[] { ".vhd", ".vmdk" };//CA-61385: remove ".vdi", ".wim" support for Boston
private readonly string[] m_supportedApplianceTypes = new[] { ".ovf", ".ova", ".ova.gz" };
private readonly string[] m_supportedXvaTypes = new[] {".xva", "ova.xml"};
private readonly string[] m_supportedXvaTypes = new[] { ".xva" };
/// <summary>
/// Stores the last valid selected appliance
@ -211,8 +211,6 @@ namespace XenAdmin.Wizards.ImportWizard
public bool IsWIM { get; private set; }
public bool IsXvaVersion1 { get; private set; }
public ulong DiskCapacity { get; private set; }
#endregion
@ -244,9 +242,7 @@ namespace XenAdmin.Wizards.ImportWizard
FileInfo info = new FileInfo(m_textBoxFile.Text);
ImageLength = info.Length > 0 ? (ulong)info.Length : 0;
DiskCapacity = IsXvaVersion1
? GetTotalSizeFromXmlGeneva() //Geneva style
: GetTotalSizeFromXmlXva(GetXmlStringFromTarXVA()); //xva style
DiskCapacity = GetTotalSizeFromXmlXva(GetXmlStringFromTarXVA()); //xva style
}
catch (Exception)
{
@ -474,8 +470,8 @@ namespace XenAdmin.Wizards.ImportWizard
return false;
}
if (ext == "ova.xml")
IsXvaVersion1 = true;
if (ext == "ova.xml")
return false; //not supported anymore
TypeOfImport = ImportWizard.ImportType.Xva;
return true;

10
XenModel/Actions/VM/ImportVmAction.cs
View File

@ -120,15 +120,7 @@ namespace XenAdmin.Actions
try
{
string vmRef;
if (m_filename.EndsWith("ova.xml"))//importing version 1 from of VM
{
m_filename = m_filename.Replace("ova.xml", "");
vmRef = GetVmRef(applyVersionOneFiles());
}
else//importing current format of VM
vmRef = GetVmRef(applyFile());
string vmRef = GetVmRef(applyFile());
if (Cancelling)
throw new CancelledException();