Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-368577: Prevent crashing when the OVF envelope has been created for a disk image import. Some code tidy.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2022-07-06 13:06:10 +01:00
parent ae9d7120e9
commit 7c87333439
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
XenAdmin/Wizards/ImportWizard/ImportSelectHostPage.cs
View File

@ -87,15 +87,23 @@ namespace XenAdmin.Wizards.ImportWizard
set set
{ {
_selectedOvfEnvelope = value; _selectedOvfEnvelope = value;
vgpuSettings.Clear(); vgpuSettings.Clear();
hardwarePlatformSettings.Clear(); hardwarePlatformSettings.Clear();
vendorDeviceSettings.Clear(); vendorDeviceSettings.Clear();
if (_selectedOvfEnvelope == null) if (_selectedOvfEnvelope == null)
return; return;
foreach (var vsType in ((VirtualSystemCollection_Type)SelectedOvfEnvelope.Item).Content) var vsColl = SelectedOvfEnvelope.Item as VirtualSystemCollection_Type;
if (vsColl == null && SelectedOvfEnvelope.Item is VirtualSystemCollection_Type)
vsColl = new VirtualSystemCollection_Type {Content = new[] {SelectedOvfEnvelope.Item}};
if (vsColl == null)
return;
foreach (var vsType in vsColl.Content)
{ {
var vhs = OVF.FindVirtualHardwareSectionByAffinity(SelectedOvfEnvelope, vsType.id, "xen"); var vhs = OVF.FindVirtualHardwareSectionByAffinity(SelectedOvfEnvelope, vsType.id, "xen");
var data = vhs.VirtualSystemOtherConfigurationData; var data = vhs.VirtualSystemOtherConfigurationData;
@ -115,11 +123,11 @@ namespace XenAdmin.Wizards.ImportWizard
} }
} }
protected override string InstructionText { get { return Messages.IMPORT_WIZARD_DESTINATION_INSTRUCTIONS; } } protected override string InstructionText => Messages.IMPORT_WIZARD_DESTINATION_INSTRUCTIONS;
protected override string TargetServerText { get { return Messages.IMPORT_WIZARD_DESTINATION_DESTINATION; } } protected override string TargetServerText => Messages.IMPORT_WIZARD_DESTINATION_DESTINATION;
protected override string TargetServerSelectionIntroText { get { return Messages.IMPORT_WIZARD_DESTINATION_TABLE_INTRO; } } protected override string TargetServerSelectionIntroText => Messages.IMPORT_WIZARD_DESTINATION_TABLE_INTRO;
protected override void OnChosenItemChanged() protected override void OnChosenItemChanged()
{ {
@ -149,7 +157,7 @@ namespace XenAdmin.Wizards.ImportWizard
ShowWarning(string.Join("\n", warnings)); ShowWarning(string.Join("\n", warnings));
if (ConnectionSelectionChanged != null) if (ConnectionSelectionChanged != null)
ConnectionSelectionChanged(ChosenItem != null ? ChosenItem.Connection : null); ConnectionSelectionChanged(ChosenItem?.Connection);
} }
protected override DelayLoadingOptionComboBoxItem CreateDelayLoadingOptionComboBoxItem(IXenObject xenItem) protected override DelayLoadingOptionComboBoxItem CreateDelayLoadingOptionComboBoxItem(IXenObject xenItem)
@ -207,8 +215,7 @@ namespace XenAdmin.Wizards.ImportWizard
foreach (var setting in vendorDeviceSettings) foreach (var setting in vendorDeviceSettings)
{ {
bool hasVendorDevice; if (!bool.TryParse(setting.Value.Value, out var hasVendorDevice))
if (!bool.TryParse(setting.Value.Value, out hasVendorDevice))
continue; continue;
if (hasVendorDevice && dundeeOrNewerHosts.Length == 0) if (hasVendorDevice && dundeeOrNewerHosts.Length == 0)