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

Merge pull request #1200 from MihaelaStoica/CP-17932

Browse Source 
CP-17932: Ensure that the correct units are displayed for the PVS cac…
This commit is contained in:
Konstantina Chremmou 2016-10-12 14:51:44 +01:00 committed by GitHub
commit 346656d53e
3 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,6 +285,18 @@ namespace XenAdmin.Controls.CustomDataGraph
}
dataSet.Type = DataType.Gpu;
}
else if (settype.StartsWith("pvscache"))
{
if (settype.Contains("traffic") || settype.EndsWith("evicted"))
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.BytesPerSecond, RangeScaleMode.Auto);
else if (settype.EndsWith("read_total") || settype.EndsWith("read_hits") || settype.EndsWith("read_misses"))
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.CountsPerSecond, RangeScaleMode.Auto);
else if (settype.Contains("utilization"))
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;
}
else
{
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.None, RangeScaleMode.Auto);
@ -785,7 +797,7 @@ namespace XenAdmin.Controls.CustomDataGraph
}
}
public enum DataType { Cpu, Memory, Disk, Storage, Network, Latency, LoadAverage, Gpu, Custom };
public enum DataType { Cpu, Memory, Disk, Storage, Network, Latency, LoadAverage, Gpu, Pvs, Custom };
public static class DatatypeExtensions
{
@ -809,6 +821,8 @@ namespace XenAdmin.Controls.CustomDataGraph
return Messages.DATATYPE_LOADAVERAGE;
case DataType.Gpu:
return Messages.DATATYPE_GPU;
case DataType.Pvs:
return Messages.DATATYPE_PVS;
default:
return Messages.DATATYPE_CUSTOM;
}

11
XenModel/Messages.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -9965,6 +9965,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to PVS Cache.
/// </summary>
public static string DATATYPE_PVS {
get {
return ResourceManager.GetString("DATATYPE_PVS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Storage.
/// </summary>

39
XenModel/Messages.resx
View File

@ -288,27 +288,27 @@
<data name="ACTION_DISABLED_PVS_READ_CACHING" xml:space="preserve">
<value>Disabled PVS read caching for selected VMs</value>
</data>
<data name="ACTION_DISABLE_LIVE_PATCHING" xml:space="preserve">
<value>Disable live patching</value>
</data>
<data name="ACTION_DISABLE_PVS_READ_CACHING" xml:space="preserve">
<value>Disable PVS read caching</value>
</data>
<data name="ACTION_DISABLE_PVS_READ_CACHING_FOR" xml:space="preserve">
<value>Disabling PVS read caching for VM '{0}'</value>
</data>
<data name="ACTION_DISABLE_LIVE_PATCHING" xml:space="preserve">
<value>Disable live patching</value>
</data>
<data name="ACTION_DISABLE_VM_ENLIGHTENMENT_DESCRIPTION" xml:space="preserve">
<value>Disabling </value>
</data>
<data name="ACTION_DISABLE_VM_ENLIGHTENMENT_TITLE" xml:space="preserve">
<value>Disable container management on VM '{0}'</value>
</data>
<data name="ACTION_DISABLING_PVS_READ_CACHING" xml:space="preserve">
<value>Disabling PVS read caching for selected VMs</value>
</data>
<data name="ACTION_DISABLING_LIVE_PATCHING" xml:space="preserve">
<value>Disabling live patching for '{0}'</value>
</data>
<data name="ACTION_DISABLING_PVS_READ_CACHING" xml:space="preserve">
<value>Disabling PVS read caching for selected VMs</value>
</data>
<data name="ACTION_DISK_ACTIVATED" xml:space="preserve">
<value>Activated disk...</value>
</data>
@ -408,27 +408,27 @@
<data name="ACTION_ENABLED_PVS_READ_CACHING" xml:space="preserve">
<value>Enabled PVS read caching for selected VMs</value>
</data>
<data name="ACTION_ENABLE_LIVE_PATCHING" xml:space="preserve">
<value>Enable live patching</value>
</data>
<data name="ACTION_ENABLE_PVS_READ_CACHING" xml:space="preserve">
<value>Enable PVS read caching</value>
</data>
<data name="ACTION_ENABLE_PVS_READ_CACHING_FOR" xml:space="preserve">
<value>Enabling PVS read caching for VM '{0}' on site '{1}'</value>
</data>
<data name="ACTION_ENABLE_LIVE_PATCHING" xml:space="preserve">
<value>Enable live patching</value>
</data>
<data name="ACTION_ENABLE_VM_ENLIGHTENMENT_DESCRIPTION" xml:space="preserve">
<value>Enabling</value>
</data>
<data name="ACTION_ENABLE_VM_ENLIGHTENMENT_TITLE" xml:space="preserve">
<value>Enable container management on VM '{0}'</value>
</data>
<data name="ACTION_ENABLING_PVS_READ_CACHING" xml:space="preserve">
<value>Enabling PVS read caching for selected VMs</value>
</data>
<data name="ACTION_ENABLING_LIVE_PATCHING" xml:space="preserve">
<value>Enabling live patching for '{0}'</value>
</data>
<data name="ACTION_ENABLING_PVS_READ_CACHING" xml:space="preserve">
<value>Enabling PVS read caching for selected VMs</value>
</data>
<data name="ACTION_EXPORT_DESCRIPTION_BLOCK_CHECKSUM_FAILED" xml:space="preserve">
<value>Export failed due to a block checksum mismatch. Please retry the export.</value>
</data>
@ -2634,6 +2634,9 @@ Do you want to continue?</value>
<data name="CONFIRM_DELETE_POLICY_0" xml:space="preserve">
<value>Do you want to delete policy '{0}'?</value>
</data>
<data name="CONFIRM_DELETE_PVS_SITE" xml:space="preserve">
<value>Are you sure you want to delete '{0}'?</value>
</data>
<data name="CONFIRM_DELETE_TAG" xml:space="preserve">
<value>Are you sure you want to delete the tag '{0}' from all managed resources?</value>
</data>
@ -3577,6 +3580,9 @@ For optimal performance and reliability during VM migration, ensure that the net
<data name="DATATYPE_NETWORK" xml:space="preserve">
<value>Network</value>
</data>
<data name="DATATYPE_PVS" xml:space="preserve">
<value>PVS Cache</value>
</data>
<data name="DATATYPE_STORAGE" xml:space="preserve">
<value>Storage</value>
</data>
@ -9694,6 +9700,9 @@ Press OK to continue the wizard and return to the server and follow the instruct
<data name="PVS_CACHE_NOT_CONFIGURED" xml:space="preserve">
<value>Not configured</value>
</data>
<data name="PVS_SITE_CANNOT_BE_REMOVED" xml:space="preserve">
<value>This PVS site cannot be removed because it contains running proxies.</value>
</data>
<data name="PVS_SITE_DIALOG_TITLE" xml:space="preserve">
<value>PVS Servers on site {0}'</value>
</data>
@ -13246,10 +13255,4 @@ You will need to navigate to the Console on each of the selected VMs to complete
<data name="YOU_ARE_HERE" xml:space="preserve">
<value>You are here</value>
</data>
<data name="CONFIRM_DELETE_PVS_SITE" xml:space="preserve">
<value>Are you sure you want to delete '{0}'?</value>
</data>
<data name="PVS_SITE_CANNOT_BE_REMOVED" xml:space="preserve">
<value>This PVS site cannot be removed because it contains running proxies.</value>
</data>
</root>