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

Renamed properties DataSet.Type and DataSourceItem.DataType to Category.

Browse Source 
The old name was not reflecting what they were.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2021-07-27 13:22:32 +01:00
parent c2ea499057
commit 9eac324ed9
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
XenAdmin/Controls/CustomDataGraph/DataSet.cs
View File

@ -57,10 +57,7 @@ namespace XenAdmin.Controls.CustomDataGraph
private bool _hide;
private bool _deselected;
/// <summary>
/// A guess at the data type
/// </summary>
public DataType Type;
public DataType Category;
/// <summary>
/// What it really is
/// </summary>
@ -143,7 +140,7 @@ namespace XenAdmin.Controls.CustomDataGraph
}
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.NanoSeconds, RangeScaleMode.Auto);
dataSet.Type = DataType.Latency;
dataSet.Category = DataType.Latency;
}
else if (settype.StartsWith("vif") || settype.StartsWith("pif"))
{
@ -151,7 +148,7 @@ namespace XenAdmin.Controls.CustomDataGraph
Unit unit = settype.EndsWith("errors") ? Unit.CountsPerSecond : Unit.BytesPerSecond;
dataSet.CustomYRange = new DataRange(1, 0, 1, unit, RangeScaleMode.Auto);
dataSet.Type = DataType.Network;
dataSet.Category = DataType.Network;
}
else if (settype.StartsWith("vbd"))
{
@ -172,11 +169,11 @@ namespace XenAdmin.Controls.CustomDataGraph
else
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.BytesPerSecond, RangeScaleMode.Auto);
dataSet.Type = DataType.Disk;
dataSet.Category = DataType.Disk;
}
else if ((settype.Contains("memory") || settype.Contains("allocation")) && !settype.Contains("utilisation"))
{
dataSet.Type = settype.Contains("gpu") ? DataType.Gpu : DataType.Memory;
dataSet.Category = settype.Contains("gpu") ? DataType.Gpu : DataType.Memory;
dataSet.MultiplyingFactor = settype.Contains("kib") || settype == "memory_internal_free"
? (int)Util.BINARY_KILO
@ -219,28 +216,28 @@ namespace XenAdmin.Controls.CustomDataGraph
{
dataSet.CustomYRange = new DataRange(100, 0, 10, Unit.Percentage, RangeScaleMode.Auto);
dataSet.MultiplyingFactor = 100;
dataSet.Type = DataType.LoadAverage;
dataSet.Category = DataType.LoadAverage;
}
else if (settype.EndsWith("-avg-freq"))
{
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.MegaHertz, RangeScaleMode.Auto);
dataSet.Type = DataType.Cpu;
dataSet.Category = DataType.Cpu;
}
else if (settype.StartsWith("cpu") || settype == "avg_cpu" || settype.StartsWith("runstate"))
{
dataSet.CustomYRange = new DataRange(100, 0, 10, Unit.Percentage, RangeScaleMode.Fixed);
dataSet.MultiplyingFactor = 100;
dataSet.Type = DataType.Cpu;
dataSet.Category = DataType.Cpu;
}
else if (settype.StartsWith("io_throughput"))
{
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.BytesPerSecond, RangeScaleMode.Auto);
dataSet.MultiplyingFactor = (int)Util.BINARY_MEGA; //xapi units are in mebibytes/sec
dataSet.Type = DataType.Storage;
dataSet.Category = DataType.Storage;
}
else if (settype.StartsWith("sr"))
{
dataSet.Type = DataType.Storage;
dataSet.Category = DataType.Storage;
if (settype.EndsWith("cache_size"))
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.Bytes, RangeScaleMode.Auto);
@ -251,19 +248,19 @@ namespace XenAdmin.Controls.CustomDataGraph
{
//xapi units are in requests/sec
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.CountsPerSecond, RangeScaleMode.Auto);
dataSet.Type = DataType.Storage;
dataSet.Category = DataType.Storage;
}
else if (settype.StartsWith("iowait"))
{
dataSet.CustomYRange = new DataRange(100, 0, 10, Unit.Percentage, RangeScaleMode.Auto);
dataSet.MultiplyingFactor = 100;
dataSet.Type = DataType.Storage;
dataSet.Category = DataType.Storage;
}
else if (settype.StartsWith("inflight") || settype.StartsWith("avgqu_sz"))
{
//xapi units are in requests
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.None, RangeScaleMode.Auto);
dataSet.Type = DataType.Storage;
dataSet.Category = DataType.Storage;
}
else if (settype.StartsWith("gpu"))
{
@ -282,7 +279,7 @@ namespace XenAdmin.Controls.CustomDataGraph
dataSet.CustomYRange = new DataRange(100, 0, 10, Unit.Percentage, RangeScaleMode.Fixed);
dataSet.MultiplyingFactor = 100;
}
dataSet.Type = DataType.Gpu;
dataSet.Category = DataType.Gpu;
}
else if (settype.StartsWith("pvsaccelerator"))
{
@ -294,25 +291,25 @@ namespace XenAdmin.Controls.CustomDataGraph
dataSet.CustomYRange = new DataRange(100, 0, 10, Unit.Percentage, RangeScaleMode.Fixed); // values range from 0 to 100
else
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.None, RangeScaleMode.Auto);
dataSet.Type = DataType.Pvs;
dataSet.Category = DataType.Pvs;
}
else if (settype.StartsWith("read_latency") || settype.StartsWith("write_latency"))
{
// Units are microseconds
dataSet.MultiplyingFactor = 1000;
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.NanoSeconds, RangeScaleMode.Auto);
dataSet.Type = DataType.Latency;
dataSet.Category = DataType.Latency;
}
else if (settype.StartsWith("read") || settype.StartsWith("write"))
{
// Units are Bytes/second
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.BytesPerSecond, RangeScaleMode.Auto);
dataSet.Type = DataType.Storage;
dataSet.Category = DataType.Storage;
}
else
{
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.None, RangeScaleMode.Auto);
dataSet.Type = DataType.Custom;
dataSet.Category = DataType.Custom;
}
return dataSet;

4
XenAdmin/Controls/CustomDataGraph/GraphHelpers.cs
View File

@ -130,7 +130,7 @@ namespace XenAdmin.Controls.CustomDataGraph
public Color Color;
public bool ColorChanged;
public string Uuid;
public DataType DataType;
public DataType Category;
public DataSourceItem(Data_source ds, string friendlyname, Color color, string uuid)
{
@ -145,7 +145,7 @@ namespace XenAdmin.Controls.CustomDataGraph
: this(ds, friendlyname, color, uuid)
{
DataSet dataSet = DataSet.Create(uuid, xo);
DataType = dataSet.Type;
Category = dataSet.Category;
}
public string GetDataSource()

2
XenAdmin/Dialogs/GraphDetailsDialog.cs
View File

@ -323,7 +323,7 @@ namespace XenAdmin.Dialogs
this.dsi = dataSourceItem;
var displayOnGraphCell = new DataGridViewCheckBoxCell { Value = displayOnGraph };
var datasourceCell = new DataGridViewTextBoxCell { Value = dsi.ToString() };
var typeCell = new DataGridViewTextBoxCell { Value = dsi.DataType.ToStringI18N() };
var typeCell = new DataGridViewTextBoxCell { Value = dsi.Category.ToStringI18N() };
var colourCell = new DataGridViewTextBoxCell { Value = dsi.Color };
Cells.AddRange(displayOnGraphCell, datasourceCell, typeCell, colourCell);
}