Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend indentation in changes for CA-359124 & CA-360426

Browse Source 
Refactor all tabs into 4x spaces

Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
This commit is contained in:
Danilo Del Busso 2021-11-09 12:19:22 +00:00
parent 7e007cd6ef
commit e169f0bfcc
No known key found for this signature in database
GPG Key ID: 55F556F9A25CB037
2 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
XenAdmin/Wizards/GenericPages/SelectMultipleVMNetworkPage.cs
View File

@ -43,27 +43,27 @@ using XenCenterLib;
namespace XenAdmin.Wizards.GenericPages
{
/// <summary>
/// Class representing the page of the ImportAppliance wizard where the user specifies
/// a network for the VMs in the appliance that require network access.
/// </summary>
internal abstract partial class SelectMultipleVMNetworkPage : XenTabPage
{
/// <summary>
/// Class representing the page of the ImportAppliance wizard where the user specifies
/// a network for the VMs in the appliance that require network access.
/// </summary>
internal abstract partial class SelectMultipleVMNetworkPage : XenTabPage
{
private bool m_buttonNextEnabled;
private bool m_buttonPreviousEnabled;
private Dictionary<string, VmMapping> m_vmMappings;
private struct NetworkDetail
{
public string SysId { get; set; }
public string NetworkId { get; set; }
{
public string SysId { get; set; }
public string NetworkId { get; set; }
public string MACAddress { get; set; }
}
}
protected SelectMultipleVMNetworkPage()
{
InitializeComponent();
}
{
InitializeComponent();
}
protected override void OnLoad(EventArgs e)
{
@ -120,8 +120,8 @@ namespace XenAdmin.Wizards.GenericPages
protected override void PageLoadedCore(PageLoadedDirection direction)
{
SetButtonPreviousEnabled(true);
SetButtonNextEnabled(true);
}
SetButtonNextEnabled(true);
}
public override void PageCancelled(ref bool cancel)
{
@ -219,34 +219,34 @@ namespace XenAdmin.Wizards.GenericPages
return m_buttonPreviousEnabled;
}
public Dictionary<string, VmMapping> VmMappings
{
get
{
foreach (DataGridViewRow row in m_dataGridView.Rows)
{
var networkDetail = (NetworkDetail)row.Cells[0].Tag;
public Dictionary<string, VmMapping> VmMappings
{
get
{
foreach (DataGridViewRow row in m_dataGridView.Rows)
{
var networkDetail = (NetworkDetail)row.Cells[0].Tag;
if (m_vmMappings.ContainsKey(networkDetail.SysId))
{
var mapping = m_vmMappings[networkDetail.SysId];
if (m_vmMappings.ContainsKey(networkDetail.SysId))
{
var mapping = m_vmMappings[networkDetail.SysId];
if (row.Cells[1].Value is ToStringWrapper<XenAPI.Network> selectedItem)
{
mapping.Networks[networkDetail.NetworkId] = selectedItem.item;
mapping.VIFs[networkDetail.MACAddress] = selectedItem.item;
}
}
}
}
}
return m_vmMappings;
}
set
{
m_vmMappings = value;
}
}
return m_vmMappings;
}
set
{
m_vmMappings = value;
}
}
public Dictionary<string, string> RawMappings
{
@ -277,25 +277,25 @@ namespace XenAdmin.Wizards.GenericPages
OnPageUpdated();
}
private DataGridViewComboBoxCell FillGridComboBox(object targetRef, string vsId)
{
var cb = new DataGridViewComboBoxCell {FlatStyle = FlatStyle.Flat, Sorted = true};
private DataGridViewComboBoxCell FillGridComboBox(object targetRef, string vsId)
{
var cb = new DataGridViewComboBoxCell {FlatStyle = FlatStyle.Flat, Sorted = true};
var availableNetworks = TargetConnection.Cache.Networks.Where(net => ShowNetwork(targetRef, net, vsId));
foreach (XenAPI.Network netWork in availableNetworks)
{
if (!Messages.IMPORT_SELECT_NETWORK_PAGE_NETWORK_FILTER.Contains(netWork.Name()))
{
var wrapperItem = new ToStringWrapper<XenAPI.Network>(netWork, netWork.Name());
foreach (XenAPI.Network netWork in availableNetworks)
{
if (!Messages.IMPORT_SELECT_NETWORK_PAGE_NETWORK_FILTER.Contains(netWork.Name()))
{
var wrapperItem = new ToStringWrapper<XenAPI.Network>(netWork, netWork.Name());
if (!cb.Items.Contains(wrapperItem))
cb.Items.Add(wrapperItem);
}
}
if (!cb.Items.Contains(wrapperItem))
cb.Items.Add(wrapperItem);
}
}
return cb;
}
return cb;
}
private bool ShowNetwork(object targetRef, XenAPI.Network network, string vsId)
{
@ -321,21 +321,21 @@ namespace XenAdmin.Wizards.GenericPages
}
private void m_dataGridView_CellEnter(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex != m_colTargetNet.Index || e.RowIndex < 0 || e.RowIndex >= m_dataGridView.RowCount)
return;
{
if (e.ColumnIndex != m_colTargetNet.Index || e.RowIndex < 0 || e.RowIndex >= m_dataGridView.RowCount)
return;
m_dataGridView.BeginEdit(false);
m_dataGridView.BeginEdit(false);
if (m_dataGridView.EditingControl != null && m_dataGridView.EditingControl is ComboBox)
(m_dataGridView.EditingControl as ComboBox).DroppedDown = true;
}
if (m_dataGridView.EditingControl != null && m_dataGridView.EditingControl is ComboBox)
(m_dataGridView.EditingControl as ComboBox).DroppedDown = true;
}
private void m_dataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
{
m_dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
IsDirty = true;
}
private void m_dataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)
{
m_dataGridView.CommitEdit(DataGridViewDataErrorContexts.Commit);
IsDirty = true;
}
private void buttonRefresh_Click(object sender, EventArgs e)
{

47
XenModel/Mappings/VmMapping.cs
View File

@ -34,44 +34,45 @@ using XenAPI;
namespace XenAdmin.Mappings
{
public class VmMapping
{
public VmMapping()
{
Storage = new Dictionary<string, SR>();
public class VmMapping
{
public VmMapping()
{
Storage = new Dictionary<string, SR>();
StorageToAttach = new Dictionary<string, VDI>();
Networks = new Dictionary<string, XenAPI.Network>();
Networks = new Dictionary<string, XenAPI.Network>();
VIFs = new Dictionary<string, XenAPI.Network>();
}
public string VmNameLabel { get; set; }
public string VmNameLabel { get; set; }
public ulong Capacity { get; set; }
public ulong CpuCount { get; set; }
public ulong Memory { get; set; }
public string BootParams { get; set; }
public string PlatformSettings { get; set; }
/// <summary>
/// OpaqueRef of the target pool or host
/// </summary>
public object XenRef { get; set; }
/// <summary>
/// OpaqueRef of the target pool or host
/// </summary>
public object XenRef { get; set; }
/// <summary>
/// Name of the target pool or host
/// </summary>
public string TargetName { get; set; }
/// <summary>
/// Name of the target pool or host
/// </summary>
public string TargetName { get; set; }
/// <summary>
/// Keyed on the id in the ovf file
/// </summary>
public Dictionary<string, SR> Storage { get; set; }
/// <summary>
/// Keyed on the id in the ovf file
/// </summary>
public Dictionary<string, SR> Storage { get; set; }
public Dictionary<string, VDI> StorageToAttach { get; set; }
/// <summary>
/// Keyed on the id in the ovf file
/// </summary>
public Dictionary<string, XenAPI.Network> Networks { get; set; }
/// <summary>
/// Keyed on the id in the ovf file
/// </summary>
public Dictionary<string, XenAPI.Network> Networks { get; set; }
public Dictionary<string, XenAPI.Network> VIFs { get; set; }
public override bool Equals(object obj)