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

[CA-11044] & [CA-109243] Added new pool-join reasons and associated messages.

Browse Source 
These will cover the following two cases, for XenServer v6.2.0 and later:
1) a licensed host cannot be added to an unlicensed pool;
2) an unlicensed host cannot be added to a licensed pool.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2013-07-03 13:05:37 +01:00
parent 1979258607
commit 2a66b0a43f
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
XenModel/Messages.Designer.cs generated
View File

@ -20805,6 +20805,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to You cannot add a licensed server to an unlicensed pool.
/// </summary>
public static string NEWPOOL_LICENSED_HOST_UNLICENSED_MASTER {
get {
return ResourceManager.GetString("NEWPOOL_LICENSED_HOST_UNLICENSED_MASTER", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This server does not have the same XenServer license edition as the pool master.
/// </summary>
@ -20877,6 +20886,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to You cannot add an unlicensed server to a licensed pool.
/// </summary>
public static string NEWPOOL_UNLICENSED_HOST_LICENSED_MASTER {
get {
return ResourceManager.GetString("NEWPOOL_UNLICENSED_HOST_LICENSED_MASTER", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to NFS SR [{0}].
/// </summary>

6
XenModel/Messages.resx
View File

@ -7121,6 +7121,9 @@ You should only proceed if you have verified that these settings are correct.</v
<data name="NEWPOOL_IS_A_POOL" xml:space="preserve">
<value>This server is master of an existing pool</value>
</data>
<data name="NEWPOOL_LICENSED_HOST_UNLICENSED_MASTER" xml:space="preserve">
<value>You cannot add a licensed server to an unlicensed pool</value>
</data>
<data name="NEWPOOL_LICENSEMISMATCH" xml:space="preserve">
<value>This server does not have the same XenServer license edition as the pool master</value>
</data>
@ -7145,6 +7148,9 @@ You should only proceed if you have verified that these settings are correct.</v
<data name="NEWPOOL_SLAVE_ROLE" xml:space="preserve">
<value>Your current role on the slave is not authorized to add the slave to a pool</value>
</data>
<data name="NEWPOOL_UNLICENSED_HOST_LICENSED_MASTER" xml:space="preserve">
<value>You cannot add an unlicensed server to a licensed pool</value>
</data>
<data name="NEWSR_ACTION" xml:space="preserve">
<value>NFS SR [{0}]</value>
</data>

14
XenModel/PoolJoinRules.cs
View File

@ -58,6 +58,8 @@ namespace XenAdmin.Core
NotSameLinuxPack,
PaidHostFreeMaster,
FreeHostPaidMaster,
LicensedHostUnlicensedMaster,
UnlicensedHostLicensedMaster,
LicenseMismatch,
DifferentServerVersion,
DifferentCPUs,
@ -116,10 +118,14 @@ namespace XenAdmin.Core
return Reason.DifferentServerVersion;
if (FreeHostPaidMaster(slaveHost, masterHost, allowLicenseUpgrade))
return Reason.FreeHostPaidMaster;
return Helpers.ClearwaterOrGreater(masterHost) ?
Reason.UnlicensedHostLicensedMaster :
Reason.FreeHostPaidMaster;
if (PaidHostFreeMaster(slaveHost, masterHost))
return Reason.PaidHostFreeMaster;
return Helpers.ClearwaterOrGreater(masterHost) ?
Reason.LicensedHostUnlicensedMaster :
Reason.PaidHostFreeMaster;
if (LicenseMismatch(slaveHost, masterHost))
return Reason.LicenseMismatch;
@ -178,6 +184,10 @@ namespace XenAdmin.Core
return Messages.NEWPOOL_PAID_HOST_FREE_MASTER;
case Reason.FreeHostPaidMaster:
return Messages.NEWPOOL_FREE_HOST_PAID_MASTER;
case Reason.LicensedHostUnlicensedMaster:
return Messages.NEWPOOL_LICENSED_HOST_UNLICENSED_MASTER;
case Reason.UnlicensedHostLicensedMaster:
return Messages.NEWPOOL_UNLICENSED_HOST_LICENSED_MASTER;
case Reason.LicenseMismatch:
return Messages.NEWPOOL_LICENSEMISMATCH;
case Reason.DifferentServerVersion: