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-11372: XenCenter: Update the model with the latest api bindings, including the new cifs specific errors

Browse Source 
-Updated bindings to XenCenterBindings-92004c

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2015-03-05 19:23:36 +00:00
parent 2b2cb9f9f4
commit e5ab2d6370
9 changed files with 163 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
XenModel/XenAPI/FriendlyErrorNames.resx
View File

@ -543,6 +543,9 @@
<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>
@ -699,6 +702,9 @@
<data name="PATCH_PRECHECK_FAILED_ISO_MOUNTED" xml:space="preserve">
<value>XenServer Tools ISO must be ejected from all running VMs.</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>
</data>
<data name="PATCH_PRECHECK_FAILED_PREREQUISITE_MISSING" xml:space="preserve">
<value>The update precheck stage failed: prerequisite updates are missing.</value>
</data>
@ -751,7 +757,7 @@
<value>PIF has no network configuration</value>
</data>
<data name="PIF_HAS_NO_V6_NETWORK_CONFIGURATION" xml:space="preserve">
<value>PIF has no IPv6 configuration (mode curently set to 'none')</value>
<value>PIF has no IPv6 configuration (mode currently set to 'none')</value>
</data>
<data name="PIF_INCOMPATIBLE_PRIMARY_ADDRESS_TYPE" xml:space="preserve">
<value>The primary address types are not compatible</value>
@ -917,6 +923,18 @@ Authorized Roles: {1}</value>
<data name="SR_BACKEND_FAILURE_110" xml:space="preserve">
<value>VDI resize failed</value>
</data>
<data name="SR_BACKEND_FAILURE_111" xml:space="preserve">
<value>CIFS mount error</value>
</data>
<data name="SR_BACKEND_FAILURE_112" xml:space="preserve">
<value>CIFS unmount error</value>
</data>
<data name="SR_BACKEND_FAILURE_113" xml:space="preserve">
<value>CIFS mount point already attached</value>
</data>
<data name="SR_BACKEND_FAILURE_114" xml:space="preserve">
<value>Failed to remove CIFS mount point</value>
</data>
<data name="SR_BACKEND_FAILURE_120" xml:space="preserve">
<value>Netapp Target parameter missing in Dconf string</value>
</data>
@ -1245,8 +1263,23 @@ Authorized Roles: {1}</value>
<value>Unsupported kernel: neither 2.6 nor 3.x.</value>
</data>
<data name="SR_BACKEND_FAILURE_449" xml:space="preserve">
<value>Only 1 LUN may be used with shared OCFS</value>
</data>
<data name="SR_BACKEND_FAILURE_450" xml:space="preserve">
<value>OCFS mount error</value>
</data>
<data name="SR_BACKEND_FAILURE_451" xml:space="preserve">
<value>OCFS unmount error</value>
</data>
<data name="SR_BACKEND_FAILURE_452" xml:space="preserve">
<value>OCFS filesystem creation error</value>
</data>
<data name="SR_BACKEND_FAILURE_453" xml:space="preserve">
<value>tapdisk experienced an error</value>
</data>
<data name="SR_BACKEND_FAILURE_454" xml:space="preserve">
<value>CIFS SR is not licensed on this host</value>
</data>
<data name="SR_BACKEND_FAILURE_46" xml:space="preserve">
<value>The VDI is not available</value>
</data>
@ -1497,7 +1530,7 @@ Authorized Roles: {1}</value>
<value>The uuid you supplied was invalid.</value>
</data>
<data name="V6D_FAILURE" xml:space="preserve">
<value>There was a problem with the license daemon (v6d). Is it running?</value>
<value>There was a problem with the license daemon (v6d).</value>
</data>
<data name="VALUE_NOT_SUPPORTED" xml:space="preserve">
<value>You attempted to set value {1} for field {0} that is not supported. {2}</value>
@ -1571,6 +1604,9 @@ Authorized Roles: {1}</value>
<data name="VDI_NOT_SPARSE" xml:space="preserve">
<value>The VDI is not stored using a sparse format. It is not possible to query and manipulate only the changed blocks (or 'block differences' or 'disk deltas') between two VDIs. Please select a VDI which uses a sparse-aware technology such as VHD.</value>
</data>
<data name="VDI_ON_BOOT_MODE_INCOMPATIBLE_WITH_OPERATION" xml:space="preserve">
<value>This operation is not permitted on VMs containing VDIs in the 'on-boot=reset' mode</value>
</data>
<data name="VDI_READONLY" xml:space="preserve">
<value>The operation required write access but VDI {0} is read-only</value>
</data>

14
XenModel/XenAPI/Host.cs
View File

@ -1060,7 +1060,7 @@ namespace XenAPI
/// <summary>
/// Get the display field of the given host.
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_host">The opaque_ref of the given host</param>
@ -1327,7 +1327,7 @@ namespace XenAPI
/// <summary>
/// Set the display field of the given host.
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_host">The opaque_ref of the given host</param>
@ -2316,7 +2316,7 @@ namespace XenAPI
/// <summary>
/// Enable console output to the physical display device next time this host boots
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_host">The opaque_ref of the given host</param>
@ -2327,7 +2327,7 @@ namespace XenAPI
/// <summary>
/// Enable console output to the physical display device next time this host boots
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_host">The opaque_ref of the given host</param>
@ -2338,7 +2338,7 @@ namespace XenAPI
/// <summary>
/// Disable console output to the physical display device next time this host boots
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_host">The opaque_ref of the given host</param>
@ -2349,7 +2349,7 @@ namespace XenAPI
/// <summary>
/// Disable console output to the physical display device next time this host boots
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_host">The opaque_ref of the given host</param>
@ -3262,7 +3262,7 @@ namespace XenAPI
/// <summary>
/// indicates whether the host is configured to output its console to a physical display device
/// First published in .
/// First published in Unreleased.
/// </summary>
public virtual host_display display
{

16
XenModel/XenAPI/PGPU.cs
View File

@ -312,7 +312,7 @@ namespace XenAPI
/// <summary>
/// Get the dom0_access field of the given PGPU.
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pgpu">The opaque_ref of the given pgpu</param>
@ -323,7 +323,7 @@ namespace XenAPI
/// <summary>
/// Get the is_system_display_device field of the given PGPU.
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pgpu">The opaque_ref of the given pgpu</param>
@ -491,7 +491,7 @@ namespace XenAPI
/// <summary>
///
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pgpu">The opaque_ref of the given pgpu</param>
@ -502,7 +502,7 @@ namespace XenAPI
/// <summary>
///
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pgpu">The opaque_ref of the given pgpu</param>
@ -513,7 +513,7 @@ namespace XenAPI
/// <summary>
///
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pgpu">The opaque_ref of the given pgpu</param>
@ -524,7 +524,7 @@ namespace XenAPI
/// <summary>
///
/// First published in .
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pgpu">The opaque_ref of the given pgpu</param>
@ -721,7 +721,7 @@ namespace XenAPI
/// <summary>
/// The accessibility of this device from dom0
/// First published in .
/// First published in Unreleased.
/// </summary>
public virtual pgpu_dom0_access dom0_access
{
@ -740,7 +740,7 @@ namespace XenAPI
/// <summary>
/// Is this device the system display device
/// First published in .
/// First published in Unreleased.
/// </summary>
public virtual bool is_system_display_device
{

122
XenModel/XenAPI/Relation.cs
View File

@ -51,47 +51,13 @@ namespace XenAPI
{
Dictionary<Type, Relation[]> relations = new Dictionary<Type, Relation[]>();
relations.Add(typeof(Proxy_Role), new Relation[] {
new Relation("subroles", "role", "subroles"),
relations.Add(typeof(Proxy_Pool), new Relation[] {
new Relation("metadata_VDIs", "VDI", "metadata_of_pool"),
});
relations.Add(typeof(Proxy_Network), new Relation[] {
new Relation("PIFs", "PIF", "network"),
new Relation("VIFs", "VIF", "network"),
});
relations.Add(typeof(Proxy_VMPP), new Relation[] {
new Relation("VMs", "VM", "protection_policy"),
});
relations.Add(typeof(Proxy_VDI), new Relation[] {
new Relation("crash_dumps", "crashdump", "VDI"),
new Relation("VBDs", "VBD", "VDI"),
new Relation("snapshots", "VDI", "snapshot_of"),
});
relations.Add(typeof(Proxy_VM), new Relation[] {
new Relation("attached_PCIs", "PCI", "attached_VMs"),
new Relation("VGPUs", "VGPU", "VM"),
new Relation("consoles", "console", "VM"),
new Relation("VTPMs", "VTPM", "VM"),
new Relation("VIFs", "VIF", "VM"),
new Relation("crash_dumps", "crashdump", "VM"),
new Relation("VBDs", "VBD", "VM"),
new Relation("children", "VM", "parent"),
new Relation("snapshots", "VM", "snapshot_of"),
});
relations.Add(typeof(Proxy_DR_task), new Relation[] {
new Relation("introduced_SRs", "SR", "introduced_by"),
});
relations.Add(typeof(Proxy_VM_appliance), new Relation[] {
new Relation("VMs", "VM", "appliance"),
});
relations.Add(typeof(Proxy_Task), new Relation[] {
new Relation("subtasks", "task", "subtask_of"),
relations.Add(typeof(Proxy_SR), new Relation[] {
new Relation("VDIs", "VDI", "SR"),
new Relation("PBDs", "PBD", "SR"),
});
relations.Add(typeof(Proxy_GPU_group), new Relation[] {
@ -99,12 +65,48 @@ namespace XenAPI
new Relation("PGPUs", "PGPU", "GPU_group"),
});
relations.Add(typeof(Proxy_Session), new Relation[] {
new Relation("tasks", "task", "session"),
});
relations.Add(typeof(Proxy_Subject), new Relation[] {
new Relation("roles", "subject", "roles"),
});
relations.Add(typeof(Proxy_Bond), new Relation[] {
new Relation("slaves", "PIF", "bond_slave_of"),
});
relations.Add(typeof(Proxy_Pool), new Relation[] {
new Relation("metadata_VDIs", "VDI", "metadata_of_pool"),
relations.Add(typeof(Proxy_Role), new Relation[] {
new Relation("subroles", "role", "subroles"),
});
relations.Add(typeof(Proxy_Pool_patch), new Relation[] {
new Relation("host_patches", "host_patch", "pool_patch"),
});
relations.Add(typeof(Proxy_VM_appliance), new Relation[] {
new Relation("VMs", "VM", "appliance"),
});
relations.Add(typeof(Proxy_PIF), new Relation[] {
new Relation("tunnel_transport_PIF_of", "tunnel", "transport_PIF"),
new Relation("tunnel_access_PIF_of", "tunnel", "access_PIF"),
new Relation("VLAN_slave_of", "VLAN", "tagged_PIF"),
new Relation("bond_master_of", "Bond", "master"),
});
relations.Add(typeof(Proxy_DR_task), new Relation[] {
new Relation("introduced_SRs", "SR", "introduced_by"),
});
relations.Add(typeof(Proxy_Network), new Relation[] {
new Relation("PIFs", "PIF", "network"),
new Relation("VIFs", "VIF", "network"),
});
relations.Add(typeof(Proxy_Task), new Relation[] {
new Relation("subtasks", "task", "subtask_of"),
});
relations.Add(typeof(Proxy_PGPU), new Relation[] {
@ -119,15 +121,26 @@ namespace XenAPI
new Relation("VGPUs", "VGPU", "type"),
});
relations.Add(typeof(Proxy_PIF), new Relation[] {
new Relation("tunnel_transport_PIF_of", "tunnel", "transport_PIF"),
new Relation("tunnel_access_PIF_of", "tunnel", "access_PIF"),
new Relation("VLAN_slave_of", "VLAN", "tagged_PIF"),
new Relation("bond_master_of", "Bond", "master"),
relations.Add(typeof(Proxy_VDI), new Relation[] {
new Relation("crash_dumps", "crashdump", "VDI"),
new Relation("VBDs", "VBD", "VDI"),
new Relation("snapshots", "VDI", "snapshot_of"),
});
relations.Add(typeof(Proxy_Subject), new Relation[] {
new Relation("roles", "subject", "roles"),
relations.Add(typeof(Proxy_VMPP), new Relation[] {
new Relation("VMs", "VM", "protection_policy"),
});
relations.Add(typeof(Proxy_VM), new Relation[] {
new Relation("attached_PCIs", "PCI", "attached_VMs"),
new Relation("VGPUs", "VGPU", "VM"),
new Relation("consoles", "console", "VM"),
new Relation("VTPMs", "VTPM", "VM"),
new Relation("VIFs", "VIF", "VM"),
new Relation("crash_dumps", "crashdump", "VM"),
new Relation("VBDs", "VBD", "VM"),
new Relation("children", "VM", "parent"),
new Relation("snapshots", "VM", "snapshot_of"),
});
relations.Add(typeof(Proxy_Host), new Relation[] {
@ -141,19 +154,6 @@ namespace XenAPI
new Relation("PBDs", "PBD", "host"),
});
relations.Add(typeof(Proxy_Session), new Relation[] {
new Relation("tasks", "task", "session"),
});
relations.Add(typeof(Proxy_Pool_patch), new Relation[] {
new Relation("host_patches", "host_patch", "pool_patch"),
});
relations.Add(typeof(Proxy_SR), new Relation[] {
new Relation("VDIs", "VDI", "SR"),
new Relation("PBDs", "PBD", "SR"),
});
return relations;
}

41
XenModel/XenAPI/Task.cs
View File

@ -63,7 +63,8 @@ namespace XenAPI
string[] error_info,
Dictionary<string, string> other_config,
XenRef<Task> subtask_of,
List<XenRef<Task>> subtasks)
List<XenRef<Task>> subtasks,
string backtrace)
{
this.uuid = uuid;
this.name_label = name_label;
@ -81,6 +82,7 @@ namespace XenAPI
this.other_config = other_config;
this.subtask_of = subtask_of;
this.subtasks = subtasks;
this.backtrace = backtrace;
}
/// <summary>
@ -110,6 +112,7 @@ namespace XenAPI
other_config = update.other_config;
subtask_of = update.subtask_of;
subtasks = update.subtasks;
backtrace = update.backtrace;
}
internal void UpdateFromProxy(Proxy_Task proxy)
@ -130,6 +133,7 @@ namespace XenAPI
other_config = proxy.other_config == null ? null : Maps.convert_from_proxy_string_string(proxy.other_config);
subtask_of = proxy.subtask_of == null ? null : XenRef<Task>.Create(proxy.subtask_of);
subtasks = proxy.subtasks == null ? null : XenRef<Task>.Create(proxy.subtasks);
backtrace = proxy.backtrace == null ? null : (string)proxy.backtrace;
}
public Proxy_Task ToProxy()
@ -151,6 +155,7 @@ namespace XenAPI
result_.other_config = Maps.convert_to_proxy_string_string(other_config);
result_.subtask_of = (subtask_of != null) ? subtask_of : "";
result_.subtasks = (subtasks != null) ? Helper.RefListToStringArray(subtasks) : new string[] {};
result_.backtrace = (backtrace != null) ? backtrace : "";
return result_;
}
@ -176,6 +181,7 @@ namespace XenAPI
other_config = Maps.convert_from_proxy_string_string(Marshalling.ParseHashTable(table, "other_config"));
subtask_of = Marshalling.ParseRef<Task>(table, "subtask_of");
subtasks = Marshalling.ParseSetRef<Task>(table, "subtasks");
backtrace = Marshalling.ParseString(table, "backtrace");
}
public bool DeepEquals(Task other, bool ignoreCurrentOperations)
@ -202,7 +208,8 @@ namespace XenAPI
Helper.AreEqual2(this._error_info, other._error_info) &&
Helper.AreEqual2(this._other_config, other._other_config) &&
Helper.AreEqual2(this._subtask_of, other._subtask_of) &&
Helper.AreEqual2(this._subtasks, other._subtasks);
Helper.AreEqual2(this._subtasks, other._subtasks) &&
Helper.AreEqual2(this._backtrace, other._backtrace);
}
public override string SaveChanges(Session session, string opaqueRef, Task server)
@ -431,6 +438,17 @@ namespace XenAPI
return XenRef<Task>.Create(session.proxy.task_get_subtasks(session.uuid, (_task != null) ? _task : "").parse());
}
/// <summary>
/// Get the backtrace field of the given task.
/// First published in Unreleased.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_task">The opaque_ref of the given task</param>
public static string get_backtrace(Session session, string _task)
{
return (string)session.proxy.task_get_backtrace(session.uuid, (_task != null) ? _task : "").parse();
}
/// <summary>
/// Set the other_config field of the given task.
/// First published in XenServer 4.1.
@ -823,5 +841,24 @@ namespace XenAPI
}
}
private List<XenRef<Task>> _subtasks;
/// <summary>
/// Function call trace for debugging.
/// First published in Unreleased.
/// </summary>
public virtual string backtrace
{
get { return _backtrace; }
set
{
if (!Helper.AreEqual(value, _backtrace))
{
_backtrace = value;
Changed = true;
NotifyPropertyChanged("backtrace");
}
}
}
private string _backtrace;
}
}

4
XenModel/XenAPI/VM.cs
View File

@ -3581,7 +3581,7 @@ namespace XenAPI
/// <summary>
/// List all the SR's that are required for the VM to be recovered
/// First published in .
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_vm">The opaque_ref of the given vm</param>
@ -3593,7 +3593,7 @@ namespace XenAPI
/// <summary>
/// List all the SR's that are required for the VM to be recovered
/// First published in .
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_vm">The opaque_ref of the given vm</param>

4
XenModel/XenAPI/VM_guest_metrics.cs
View File

@ -458,7 +458,7 @@ namespace XenAPI
private bool _PV_drivers_up_to_date;
/// <summary>
/// free/used/total memory
/// This field exists but has no data. Use the memory and memory_internal_free RRD data-sources instead.
/// </summary>
public virtual Dictionary<string, string> memory
{
@ -476,7 +476,7 @@ namespace XenAPI
private Dictionary<string, string> _memory;
/// <summary>
/// disk configuration/free space
/// This field exists but has no data.
/// </summary>
public virtual Dictionary<string, string> disks
{

4
XenModel/XenAPI/vbd_type.cs
View File

@ -37,7 +37,7 @@ namespace XenAPI
{
public enum vbd_type
{
CD, Disk, unknown
CD, Disk, Floppy, unknown
}
public static class vbd_type_helper
@ -50,6 +50,8 @@ namespace XenAPI
return "CD";
case vbd_type.Disk:
return "Disk";
case vbd_type.Floppy:
return "Floppy";
default:
return "unknown";
}

4
XenModel/XenAPI/vm_operations.cs
View File

@ -37,7 +37,7 @@ namespace XenAPI
{
public enum vm_operations
{
snapshot, clone, copy, create_template, revert, checkpoint, snapshot_with_quiesce, provision, start, start_on, pause, unpause, clean_shutdown, clean_reboot, hard_shutdown, power_state_reset, hard_reboot, suspend, csvm, resume, resume_on, pool_migrate, migrate_send, get_boot_record, send_sysrq, send_trigger, query_services, shutdown, changing_memory_live, awaiting_memory_live, changing_dynamic_range, changing_static_range, changing_memory_limits, changing_shadow_memory, changing_shadow_memory_live, changing_VCPUs, changing_VCPUs_live, assert_operation_valid, data_source_op, update_allowed_operations, make_into_template, import, export, metadata_export, reverting, destroy, unknown
snapshot, clone, copy, create_template, revert, checkpoint, snapshot_with_quiesce, provision, start, start_on, pause, unpause, clean_shutdown, clean_reboot, hard_shutdown, power_state_reset, hard_reboot, suspend, csvm, resume, resume_on, pool_migrate, migrate_send, get_boot_record, send_sysrq, send_trigger, query_services, shutdown, call_plugin, changing_memory_live, awaiting_memory_live, changing_dynamic_range, changing_static_range, changing_memory_limits, changing_shadow_memory, changing_shadow_memory_live, changing_VCPUs, changing_VCPUs_live, assert_operation_valid, data_source_op, update_allowed_operations, make_into_template, import, export, metadata_export, reverting, destroy, unknown
}
public static class vm_operations_helper
@ -102,6 +102,8 @@ namespace XenAPI
return "query_services";
case vm_operations.shutdown:
return "shutdown";
case vm_operations.call_plugin:
return "call_plugin";
case vm_operations.changing_memory_live:
return "changing_memory_live";
case vm_operations.awaiting_memory_live: