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

CP-10900: Add functionality for enabling/disabling/querying the container monitoring on a per-VM-basis to XenCenter

Browse Source 
- Changed 'Enlightenment' to 'Container Enlightenment'

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2015-02-10 11:42:29 +00:00
parent dbebab2563
commit 640aef8c1e
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/SettingsPanels/VMEnlightenmentEditPage.resx
View File

@ -169,13 +169,13 @@
<value>3, 55</value>
</data>
<data name="enlightenCheckBox.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 17</value>
<value>228, 17</value>
</data>
<data name="enlightenCheckBox.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="enlightenCheckBox.Text" xml:space="preserve">
<value>&amp;Enable enlightenment for this VM</value>
<value>&amp;Enable container enlightenment for this VM</value>
</data>
<data name="&gt;&gt;enlightenCheckBox.Name" xml:space="preserve">
<value>enlightenCheckBox</value>

6
XenModel/Actions/DockerContainer/VMEnlightenmentAction.cs
View File

@ -69,14 +69,16 @@ namespace XenAdmin.Actions
public class EnableVMEnlightenmentAction : VMEnlightenmentAction
{
public EnableVMEnlightenmentAction(VM vm, bool suppressHistory)
: base(vm, "register", Messages.ACTION_ENABLE_VM_ENLIGHTENMENT_TITLE, Messages.ACTION_ENABLE_VM_ENLIGHTENMENT_DESCRIPTION, suppressHistory)
: base(vm, "register", String.Format(Messages.ACTION_ENABLE_VM_ENLIGHTENMENT_TITLE, vm.Name),
Messages.ACTION_ENABLE_VM_ENLIGHTENMENT_DESCRIPTION, suppressHistory)
{ }
}
public class DisableVMEnlightenmentAction : VMEnlightenmentAction
{
public DisableVMEnlightenmentAction(VM vm, bool suppressHistory)
: base(vm, "deregister", Messages.ACTION_DISABLE_VM_ENLIGHTENMENT_TITLE, Messages.ACTION_DISABLE_VM_ENLIGHTENMENT_DESCRIPTION, suppressHistory)
: base(vm, "deregister", String.Format(Messages.ACTION_DISABLE_VM_ENLIGHTENMENT_TITLE, vm.Name),
Messages.ACTION_DISABLE_VM_ENLIGHTENMENT_DESCRIPTION, suppressHistory)
{ }
}
}

10
XenModel/Messages.Designer.cs generated
View File

@ -457,7 +457,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Disabling VM enlightenment.
/// Looks up a localized string similar to Disabling .
/// </summary>
public static string ACTION_DISABLE_VM_ENLIGHTENMENT_DESCRIPTION {
get {
@ -466,7 +466,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Disable VM enlightenment.
/// Looks up a localized string similar to Disable container enlightenment on VM &apos;{0}&apos;.
/// </summary>
public static string ACTION_DISABLE_VM_ENLIGHTENMENT_TITLE {
get {
@ -763,7 +763,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Enabling VM enlightenment.
/// Looks up a localized string similar to Enabling.
/// </summary>
public static string ACTION_ENABLE_VM_ENLIGHTENMENT_DESCRIPTION {
get {
@ -772,7 +772,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Enable VM enlightenment.
/// Looks up a localized string similar to Enable container enlightenment on VM &apos;{0}&apos;.
/// </summary>
public static string ACTION_ENABLE_VM_ENLIGHTENMENT_TITLE {
get {
@ -33001,7 +33001,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Enlightenment.
/// Looks up a localized string similar to Container Enlightenment.
/// </summary>
public static string VM_ENLIGHTENMENT {
get {

10
XenModel/Messages.resx
View File

@ -250,10 +250,10 @@
<value>Detaching Multiple Storage Items</value>
</data>
<data name="ACTION_DISABLE_VM_ENLIGHTENMENT_DESCRIPTION" xml:space="preserve">
<value>Disabling VM enlightenment</value>
<value>Disabling </value>
</data>
<data name="ACTION_DISABLE_VM_ENLIGHTENMENT_TITLE" xml:space="preserve">
<value>Disable VM enlightenment</value>
<value>Disable container enlightenment on VM '{0}'</value>
</data>
<data name="ACTION_DISK_ACTIVATED" xml:space="preserve">
<value>Activated disk...</value>
@ -352,10 +352,10 @@
<value>DR cleanup ({0})</value>
</data>
<data name="ACTION_ENABLE_VM_ENLIGHTENMENT_DESCRIPTION" xml:space="preserve">
<value>Enabling VM enlightenment</value>
<value>Enabling</value>
</data>
<data name="ACTION_ENABLE_VM_ENLIGHTENMENT_TITLE" xml:space="preserve">
<value>Enable VM enlightenment</value>
<value>Enable container enlightenment on VM '{0}'</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>
@ -11435,7 +11435,7 @@ To learn more about the XenServer Dynamic Workload Balancing feature or to start
<value>vApp name:\r\n {0}\r\n\r\nSelected VMs:\r\n {1}</value>
</data>
<data name="VM_ENLIGHTENMENT" xml:space="preserve">
<value>Enlightenment</value>
<value>Container Enlightenment</value>
</data>
<data name="VM_GENERAL_TAB_TITLE" xml:space="preserve">
<value>VM General Properties</value>