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

CA-201119: Updating XenModel/XenAPI with the latest SDK

Browse Source 
This commit contains fixes for CA-201119, CA-201361 and CA-202268

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2016-03-04 13:24:43 +00:00
parent cb2fc58654
commit 0e3f001578
3 changed files with 85 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
XenModel/XenAPI/FriendlyErrorNames.Designer.cs generated
View File

@ -115,7 +115,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to XenServer was unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists..
/// Looks up a localized string similar to Unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists..
/// </summary>
public static string AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED {
get {
@ -645,6 +645,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to An emulator required to run this VM failed to start.
/// </summary>
public static string FAILED_TO_START_EMULATOR {
get {
return ResourceManager.GetString("FAILED_TO_START_EMULATOR", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The VM is set up to use a feature that requires it to boot as HVM..
/// </summary>
@ -1383,15 +1392,6 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to The host joining the pool cannot contain any network bond..
/// </summary>
public static string JOINING_HOST_CANNOT_CONTAIN_NETWORK_BOND {
get {
return ResourceManager.GetString("JOINING_HOST_CANNOT_CONTAIN_NETWORK_BOND", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The server joining the pool cannot contain any shared storage..
/// </summary>
@ -1501,7 +1501,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to This type of license file is for previous versions of XenServer. Please upgrade to the new licensing system..
/// Looks up a localized string similar to This type of license file is for previous versions. Please upgrade to the new licensing system..
/// </summary>
public static string LICENSE_FILE_DEPRECATED {
get {
@ -1528,7 +1528,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to XenServer was unable to contact your domain server. Check your settings are correct and that a route to the server exists..
/// Looks up a localized string similar to Unable to contact your domain server. Check your settings are correct and that a route to the server exists..
/// </summary>
public static string LIKEWISE_WINERROR_0251E {
get {
@ -1861,7 +1861,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to XenServer Tools ISO must be ejected from all running VMs in the pool..
/// Looks up a localized string similar to Tools ISO must be ejected from all running VMs in the pool..
/// </summary>
public static string PATCH_PRECHECK_FAILED_ISO_MOUNTED {
get {
@ -1906,7 +1906,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to XenServer build number ({1}) is incompatible with the update build number ({2})..
/// Looks up a localized string similar to Current build number ({1}) is incompatible with the update build number ({2})..
/// </summary>
public static string PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD {
get {
@ -1915,7 +1915,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to XenServer version number ({1}) is incompatible with the update version number regular expression ({2})..
/// Looks up a localized string similar to Current version number ({1}) is incompatible with the update version number regular expression ({2})..
/// </summary>
public static string PATCH_PRECHECK_FAILED_WRONG_SERVER_VERSION {
get {
@ -1977,6 +1977,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to Only one PIF on a bond is allowed to have an IP configuration..
/// </summary>
public static string PIF_BOND_MORE_THAN_ONE_IP {
get {
return ResourceManager.GetString("PIF_BOND_MORE_THAN_ONE_IP", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to A bond must consist of at least two member interfaces.
/// </summary>
@ -2158,7 +2167,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to XenServer was unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists..
/// Looks up a localized string similar to Unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists..
/// </summary>
public static string POOL_AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED {
get {
@ -2238,6 +2247,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to The host joining the pool may not have any bonds, VLANs or tunnels..
/// </summary>
public static string POOL_JOINING_HOST_MUST_ONLY_HAVE_PHYSICAL_PIFS {
get {
return ResourceManager.GetString("POOL_JOINING_HOST_MUST_ONLY_HAVE_PHYSICAL_PIFS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The provision call failed because it ran out of space..
/// </summary>
@ -2307,7 +2325,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to The restore could not be performed because the restore script failed. Your XenServer Backup file may be corrupt. See the logs for more information..
/// Looks up a localized string similar to The restore could not be performed because the restore script failed. Your Backup file may be corrupt. See the logs for more information..
/// </summary>
public static string RESTORE_SCRIPT_FAILED {
get {
@ -4133,15 +4151,6 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to The SR is currently detached on the master..
/// </summary>
public static string SR_DETACHED_ON_MASTER {
get {
return ResourceManager.GetString("SR_DETACHED_ON_MASTER", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The SR operation cannot be performed because a device underlying the SR is in use by the server..
/// </summary>
@ -4151,6 +4160,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to You attempted to migrate a VDI on SR which doesn&apos;t have snapshot capability.
/// </summary>
public static string SR_DOES_NOT_SUPPORT_MIGRATION {
get {
return ResourceManager.GetString("SR_DOES_NOT_SUPPORT_MIGRATION", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The SR is full. Requested size {0} exceeds the maximum size {1}.
/// </summary>
@ -4709,6 +4727,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to This VIF was not mapped to a destination Network in VM.migrate_send operation.
/// </summary>
public static string VIF_NOT_IN_MAP {
get {
return ResourceManager.GetString("VIF_NOT_IN_MAP", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You have reached the maximum number of virtual network interfaces allowed for this virtual machine..
/// </summary>
@ -5322,7 +5349,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to The WLB server said something that XenServer wasn&apos;t expecting or didn&apos;t understand..
/// Looks up a localized string similar to The WLB server said something that your server wasn&apos;t expecting or didn&apos;t understand..
/// </summary>
public static string WLB_MALFORMED_RESPONSE {
get {

39
XenModel/XenAPI/FriendlyErrorNames.resx
View File

@ -136,7 +136,7 @@
<value>Could not enable external authentication.</value>
</data>
<data name="AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED" xml:space="preserve">
<value>XenServer was unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists.</value>
<value>Unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists.</value>
</data>
<data name="AUTH_ENABLE_FAILED_PERMISSION_DENIED" xml:space="preserve">
<value>Failed to enable external authentication, permission on the AD server was denied.</value>
@ -312,6 +312,9 @@
<data name="EVENT_SUBSCRIPTION_PARSE_FAILURE" xml:space="preserve">
<value>The server failed to parse your event subscription. Valid values include: *, class-name, class-name/object-reference.</value>
</data>
<data name="FAILED_TO_START_EMULATOR" xml:space="preserve">
<value>An emulator required to run this VM failed to start</value>
</data>
<data name="FEATURE_REQUIRES_HVM" xml:space="preserve">
<value>The VM is set up to use a feature that requires it to boot as HVM.</value>
</data>
@ -558,9 +561,6 @@
<data name="JOINING_HOST_CANNOT_BE_MASTER_OF_OTHER_HOSTS" xml:space="preserve">
<value>The server joining the pool cannot already be a master of another pool.</value>
</data>
<data name="JOINING_HOST_CANNOT_CONTAIN_NETWORK_BOND" xml:space="preserve">
<value>The host joining the pool cannot contain any network bond.</value>
</data>
<data name="JOINING_HOST_CANNOT_CONTAIN_SHARED_SRS" xml:space="preserve">
<value>The server joining the pool cannot contain any shared storage.</value>
</data>
@ -598,7 +598,7 @@
<value>Your license has expired</value>
</data>
<data name="LICENSE_FILE_DEPRECATED" xml:space="preserve">
<value>This type of license file is for previous versions of XenServer. Please upgrade to the new licensing system.</value>
<value>This type of license file is for previous versions. Please upgrade to the new licensing system.</value>
</data>
<data name="LICENSE_HOST_POOL_MISMATCH" xml:space="preserve">
<value>Host and pool have incompatible licenses.</value>
@ -607,7 +607,7 @@
<value>There was an error processing your license. Please contact your support representative</value>
</data>
<data name="LIKEWISE_WINERROR_0251E" xml:space="preserve">
<value>XenServer was unable to contact your domain server. Check your settings are correct and that a route to the server exists.</value>
<value>Unable to contact your domain server. Check your settings are correct and that a route to the server exists.</value>
</data>
<data name="LOCATION_NOT_UNIQUE" xml:space="preserve">
<value>A VDI with the specified location already exists within the SR</value>
@ -718,7 +718,7 @@
<value>The specified patch is applied and cannot be destroyed.</value>
</data>
<data name="PATCH_PRECHECK_FAILED_ISO_MOUNTED" xml:space="preserve">
<value>XenServer Tools ISO must be ejected from all running VMs in the pool.</value>
<value>Tools ISO must be ejected from all running VMs in the pool.</value>
</data>
<data name="PATCH_PRECHECK_FAILED_OUT_OF_SPACE" xml:space="preserve">
<value>The patch precheck stage failed: the server does not have enough space.</value>
@ -733,10 +733,10 @@
<value>The update precheck stage failed: there are one or more VMs still running on the server. All VMs must be shut down or suspended before the update can be applied.</value>
</data>
<data name="PATCH_PRECHECK_FAILED_WRONG_SERVER_BUILD" xml:space="preserve">
<value>XenServer build number ({1}) is incompatible with the update build number ({2}).</value>
<value>Current build number ({1}) is incompatible with the update build number ({2}).</value>
</data>
<data name="PATCH_PRECHECK_FAILED_WRONG_SERVER_VERSION" xml:space="preserve">
<value>XenServer version number ({1}) is incompatible with the update version number regular expression ({2}).</value>
<value>Current version number ({1}) is incompatible with the update version number regular expression ({2}).</value>
</data>
<data name="PBD_EXISTS" xml:space="preserve">
<value>A PBD already exists connecting the SR to the server</value>
@ -756,6 +756,9 @@
<data name="PIF_ALREADY_BONDED" xml:space="preserve">
<value>You cannot create a bond of an interface which is a member of an existing bond.</value>
</data>
<data name="PIF_BOND_MORE_THAN_ONE_IP" xml:space="preserve">
<value>Only one PIF on a bond is allowed to have an IP configuration.</value>
</data>
<data name="PIF_BOND_NEEDS_MORE_MEMBERS" xml:space="preserve">
<value>A bond must consist of at least two member interfaces</value>
</data>
@ -817,7 +820,7 @@
<value>Could not enable external authentication: {1}</value>
</data>
<data name="POOL_AUTH_ENABLE_FAILED_DOMAIN_LOOKUP_FAILED" xml:space="preserve">
<value>XenServer was unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists.</value>
<value>Unable to contact your domain server to enable external authentication. Check that your settings are correct and a route to the server exists.</value>
</data>
<data name="POOL_AUTH_ENABLE_FAILED_DUPLICATE_HOSTNAME" xml:space="preserve">
<value>Failed to enable external authentication, a duplicate hostname was detected.</value>
@ -843,6 +846,9 @@
<data name="POOL_JOINING_HOST_MUST_HAVE_SAME_PRODUCT_VERSION" xml:space="preserve">
<value>The server joining the pool must have the same product version as the pool master.</value>
</data>
<data name="POOL_JOINING_HOST_MUST_ONLY_HAVE_PHYSICAL_PIFS" xml:space="preserve">
<value>The host joining the pool may not have any bonds, VLANs or tunnels.</value>
</data>
<data name="PROVISION_FAILED_OUT_OF_SPACE" xml:space="preserve">
<value>The provision call failed because it ran out of space.</value>
</data>
@ -870,7 +876,7 @@ Authorized Roles: {1}</value>
<value>Cannot restore on this server because it was saved on an incompatible version</value>
</data>
<data name="RESTORE_SCRIPT_FAILED" xml:space="preserve">
<value>The restore could not be performed because the restore script failed. Your XenServer Backup file may be corrupt. See the logs for more information.</value>
<value>The restore could not be performed because the restore script failed. Your Backup file may be corrupt. See the logs for more information.</value>
</data>
<data name="RESTORE_TARGET_MGMT_IF_NOT_IN_BACKUP" xml:space="preserve">
<value>The restore could not be performed because the server's current management interface is not in the backup. The interfaces mentioned in the backup are:</value>
@ -1478,12 +1484,12 @@ Authorized Roles: {1}</value>
<data name="SR_BACKEND_FAILURE_99" xml:space="preserve">
<value>Only 1 LUN may be used with shared LVM</value>
</data>
<data name="SR_DETACHED_ON_MASTER" xml:space="preserve">
<value>The SR is currently detached on the master.</value>
</data>
<data name="SR_DEVICE_IN_USE" xml:space="preserve">
<value>The SR operation cannot be performed because a device underlying the SR is in use by the server.</value>
</data>
<data name="SR_DOES_NOT_SUPPORT_MIGRATION" xml:space="preserve">
<value>You attempted to migrate a VDI on SR which doesn't have snapshot capability</value>
</data>
<data name="SR_FULL" xml:space="preserve">
<value>The SR is full. Requested size {0} exceeds the maximum size {1}</value>
</data>
@ -1676,6 +1682,9 @@ Authorized Roles: {1}</value>
<data name="VIF_IN_USE" xml:space="preserve">
<value>Network has active VIFs</value>
</data>
<data name="VIF_NOT_IN_MAP" xml:space="preserve">
<value>This VIF was not mapped to a destination Network in VM.migrate_send operation</value>
</data>
<data name="VLAN_TAG_INVALID" xml:space="preserve">
<value>You tried to create a VLAN, but the tag you gave ({0}) was invalid -- it must be between 0 and 4094.</value>
</data>
@ -1875,7 +1884,7 @@ Authorized Roles: {1}</value>
<value>WLB rejected the server's request as malformed.</value>
</data>
<data name="WLB_MALFORMED_RESPONSE" xml:space="preserve">
<value>The WLB server said something that XenServer wasn't expecting or didn't understand.</value>
<value>The WLB server said something that your server wasn't expecting or didn't understand.</value>
</data>
<data name="WLB_NOT_INITIALIZED" xml:space="preserve">
<value>No WLB connection is configured.</value>

14
XenModel/XenAPI/Message.cs
View File

@ -44,7 +44,7 @@ namespace XenAPI
/// </summary>
public partial class Message : XenObject<Message>
{
public enum MessageType { POOL_CPU_FEATURES_UP, POOL_CPU_FEATURES_DOWN, HOST_CPU_FEATURES_UP, HOST_CPU_FEATURES_DOWN, BOND_STATUS_CHANGED, VMPP_SNAPSHOT_ARCHIVE_ALREADY_EXISTS, VMPP_ARCHIVE_MISSED_EVENT, VMPP_SNAPSHOT_MISSED_EVENT, VMPP_XAPI_LOGON_FAILURE, VMPP_LICENSE_ERROR, VMPP_ARCHIVE_TARGET_UNMOUNT_FAILED, VMPP_ARCHIVE_TARGET_MOUNT_FAILED, VMPP_ARCHIVE_SUCCEEDED, VMPP_ARCHIVE_FAILED_0, VMPP_ARCHIVE_LOCK_FAILED, VMPP_SNAPSHOT_FAILED, VMPP_SNAPSHOT_SUCCEEDED, VMPP_SNAPSHOT_LOCK_FAILED, LICENSE_SERVER_VERSION_OBSOLETE, LICENSE_SERVER_UNREACHABLE, LICENSE_NOT_AVAILABLE, GRACE_LICENSE, LICENSE_EXPIRED, LICENSE_SERVER_UNAVAILABLE, LICENSE_SERVER_CONNECTED, MULTIPATH_PERIODIC_ALERT, EXTAUTH_IN_POOL_IS_NON_HOMOGENEOUS, EXTAUTH_INIT_IN_HOST_FAILED, WLB_OPTIMIZATION_ALERT, WLB_CONSULTATION_FAILED, ALARM, PBD_PLUG_FAILED_ON_SERVER_START, POOL_MASTER_TRANSITION, HOST_CLOCK_WENT_BACKWARDS, HOST_CLOCK_SKEW_DETECTED, HOST_SYNC_DATA_FAILED, VM_CLONED, VM_CRASHED, VM_RESUMED, VM_SUSPENDED, VM_REBOOTED, VM_SHUTDOWN, VM_STARTED, VCPU_QOS_FAILED, VBD_QOS_FAILED, VIF_QOS_FAILED, IP_CONFIGURED_PIF_CAN_UNPLUG, METADATA_LUN_BROKEN, METADATA_LUN_HEALTHY, HA_HOST_WAS_FENCED, HA_HOST_FAILED, HA_PROTECTED_VM_RESTART_FAILED, HA_POOL_DROP_IN_PLAN_EXISTS_FOR, HA_POOL_OVERCOMMITTED, HA_NETWORK_BONDING_ERROR, HA_XAPI_HEALTHCHECK_APPROACHING_TIMEOUT, HA_STATEFILE_APPROACHING_TIMEOUT, HA_HEARTBEAT_APPROACHING_TIMEOUT, HA_STATEFILE_LOST, LICENSE_EXPIRES_SOON, LICENSE_DOES_NOT_SUPPORT_POOLING, unknown };
public enum MessageType { POOL_CPU_FEATURES_UP, POOL_CPU_FEATURES_DOWN, HOST_CPU_FEATURES_UP, HOST_CPU_FEATURES_DOWN, BOND_STATUS_CHANGED, VMPP_SNAPSHOT_ARCHIVE_ALREADY_EXISTS, VMPP_ARCHIVE_MISSED_EVENT, VMPP_SNAPSHOT_MISSED_EVENT, VMPP_XAPI_LOGON_FAILURE, VMPP_LICENSE_ERROR, VMPP_ARCHIVE_TARGET_UNMOUNT_FAILED, VMPP_ARCHIVE_TARGET_MOUNT_FAILED, VMPP_ARCHIVE_SUCCEEDED, VMPP_ARCHIVE_FAILED_0, VMPP_ARCHIVE_LOCK_FAILED, VMPP_SNAPSHOT_FAILED, VMPP_SNAPSHOT_SUCCEEDED, VMPP_SNAPSHOT_LOCK_FAILED, LICENSE_SERVER_VERSION_OBSOLETE, LICENSE_SERVER_UNREACHABLE, LICENSE_NOT_AVAILABLE, GRACE_LICENSE, LICENSE_SERVER_UNAVAILABLE, LICENSE_SERVER_CONNECTED, LICENSE_EXPIRED, LICENSE_EXPIRES_SOON, LICENSE_DOES_NOT_SUPPORT_POOLING, MULTIPATH_PERIODIC_ALERT, EXTAUTH_IN_POOL_IS_NON_HOMOGENEOUS, EXTAUTH_INIT_IN_HOST_FAILED, WLB_OPTIMIZATION_ALERT, WLB_CONSULTATION_FAILED, ALARM, PBD_PLUG_FAILED_ON_SERVER_START, POOL_MASTER_TRANSITION, HOST_CLOCK_WENT_BACKWARDS, HOST_CLOCK_SKEW_DETECTED, HOST_SYNC_DATA_FAILED, VM_CLONED, VM_CRASHED, VM_RESUMED, VM_SUSPENDED, VM_REBOOTED, VM_SHUTDOWN, VM_STARTED, VCPU_QOS_FAILED, VBD_QOS_FAILED, VIF_QOS_FAILED, IP_CONFIGURED_PIF_CAN_UNPLUG, METADATA_LUN_BROKEN, METADATA_LUN_HEALTHY, HA_HOST_WAS_FENCED, HA_HOST_FAILED, HA_PROTECTED_VM_RESTART_FAILED, HA_POOL_DROP_IN_PLAN_EXISTS_FOR, HA_POOL_OVERCOMMITTED, HA_NETWORK_BONDING_ERROR, HA_XAPI_HEALTHCHECK_APPROACHING_TIMEOUT, HA_STATEFILE_APPROACHING_TIMEOUT, HA_HEARTBEAT_APPROACHING_TIMEOUT, HA_STATEFILE_LOST, unknown };
public MessageType Type
{
@ -96,12 +96,16 @@ namespace XenAPI
return MessageType.LICENSE_NOT_AVAILABLE;
case "GRACE_LICENSE":
return MessageType.GRACE_LICENSE;
case "LICENSE_EXPIRED":
return MessageType.LICENSE_EXPIRED;
case "LICENSE_SERVER_UNAVAILABLE":
return MessageType.LICENSE_SERVER_UNAVAILABLE;
case "LICENSE_SERVER_CONNECTED":
return MessageType.LICENSE_SERVER_CONNECTED;
case "LICENSE_EXPIRED":
return MessageType.LICENSE_EXPIRED;
case "LICENSE_EXPIRES_SOON":
return MessageType.LICENSE_EXPIRES_SOON;
case "LICENSE_DOES_NOT_SUPPORT_POOLING":
return MessageType.LICENSE_DOES_NOT_SUPPORT_POOLING;
case "MULTIPATH_PERIODIC_ALERT":
return MessageType.MULTIPATH_PERIODIC_ALERT;
case "EXTAUTH_IN_POOL_IS_NON_HOMOGENEOUS":
@ -170,10 +174,6 @@ namespace XenAPI
return MessageType.HA_HEARTBEAT_APPROACHING_TIMEOUT;
case "HA_STATEFILE_LOST":
return MessageType.HA_STATEFILE_LOST;
case "LICENSE_EXPIRES_SOON":
return MessageType.LICENSE_EXPIRES_SOON;
case "LICENSE_DOES_NOT_SUPPORT_POOLING":
return MessageType.LICENSE_DOES_NOT_SUPPORT_POOLING;
default:
return MessageType.unknown;
}