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

Merge pull request #250 from xenserver/xs64bit

Browse Source 
Xs64bit
This commit is contained in:
Gabor Apati-Nagy 2014-10-23 15:29:28 +01:00
commit ebae872ccf
13 changed files with 270 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
XenModel/XenAPI/FriendlyErrorNames.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.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -1960,7 +1960,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to PIF has no IPv6 configuration (mode currently set to &apos;none&apos;).
/// Looks up a localized string similar to PIF has no IPv6 configuration (mode curently set to &apos;none&apos;).
/// </summary>
public static string PIF_HAS_NO_V6_NETWORK_CONFIGURATION {
get {
@ -3431,6 +3431,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to tapdisk experienced an error.
/// </summary>
public static string SR_BACKEND_FAILURE_449 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_449", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The VDI is not available.
/// </summary>
@ -3980,6 +3989,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to The SR is not attached..
/// </summary>
public static string SR_NOT_ATTACHED {
get {
return ResourceManager.GetString("SR_NOT_ATTACHED", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The SR operation cannot be performed because the SR is not empty..
/// </summary>
@ -4673,6 +4691,33 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to You attempted an operation which needs the cooperative shutdown feature on a VM which lacks it..
/// </summary>
public static string VM_LACKS_FEATURE_SHUTDOWN {
get {
return ResourceManager.GetString("VM_LACKS_FEATURE_SHUTDOWN", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You attempted an operation which needs the VM cooperative suspend feature on a VM which lacks it..
/// </summary>
public static string VM_LACKS_FEATURE_SUSPEND {
get {
return ResourceManager.GetString("VM_LACKS_FEATURE_SUSPEND", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You attempted an operation which needs the VM hotplug-vcpu feature on a VM which lacks it..
/// </summary>
public static string VM_LACKS_FEATURE_VCPU_HOTPLUG {
get {
return ResourceManager.GetString("VM_LACKS_FEATURE_VCPU_HOTPLUG", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The specified VM has too little memory to be started..
/// </summary>

23
XenModel/XenAPI/FriendlyErrorNames.resx
View File

@ -112,10 +112,10 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ACTIVATION_WHILE_NOT_FREE" xml:space="preserve">
<value>An activation key can only be applied when the edition is set to 'free'.</value>
@ -751,7 +751,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 currently set to 'none')</value>
<value>PIF has no IPv6 configuration (mode curently set to 'none')</value>
</data>
<data name="PIF_INCOMPATIBLE_PRIMARY_ADDRESS_TYPE" xml:space="preserve">
<value>The primary address types are not compatible</value>
@ -1244,6 +1244,9 @@ Authorized Roles: {1}</value>
<data name="SR_BACKEND_FAILURE_448" xml:space="preserve">
<value>Unsupported kernel: neither 2.6 nor 3.x.</value>
</data>
<data name="SR_BACKEND_FAILURE_449" xml:space="preserve">
<value>tapdisk experienced an error</value>
</data>
<data name="SR_BACKEND_FAILURE_46" xml:space="preserve">
<value>The VDI is not available</value>
</data>
@ -1427,6 +1430,9 @@ Authorized Roles: {1}</value>
<data name="SR_IS_CACHE_SR" xml:space="preserve">
<value>The SR is currently being used as a local cache SR.</value>
</data>
<data name="SR_NOT_ATTACHED" xml:space="preserve">
<value>The SR is not attached.</value>
</data>
<data name="SR_NOT_EMPTY" xml:space="preserve">
<value>The SR operation cannot be performed because the SR is not empty.</value>
</data>
@ -1667,6 +1673,15 @@ Authorized Roles: {1}</value>
<data name="VM_IS_TEMPLATE" xml:space="preserve">
<value>The operation attempted is not valid for templates</value>
</data>
<data name="VM_LACKS_FEATURE_SHUTDOWN" xml:space="preserve">
<value>You attempted an operation which needs the cooperative shutdown feature on a VM which lacks it.</value>
</data>
<data name="VM_LACKS_FEATURE_SUSPEND" xml:space="preserve">
<value>You attempted an operation which needs the VM cooperative suspend feature on a VM which lacks it.</value>
</data>
<data name="VM_LACKS_FEATURE_VCPU_HOTPLUG" xml:space="preserve">
<value>You attempted an operation which needs the VM hotplug-vcpu feature on a VM which lacks it.</value>
</data>
<data name="VM_MEMORY_SIZE_TOO_LOW" xml:space="preserve">
<value>The specified VM has too little memory to be started.</value>
</data>
@ -1835,4 +1850,4 @@ Authorized Roles: {1}</value>
<data name="XMLRPC_UNMARSHAL_FAILURE" xml:space="preserve">
<value>The server failed to unmarshal the XMLRPC message; it was expecting one element and received something else.</value>
</data>
</root>
</root>

4
XenModel/XenAPI/HTTP.cs
View File

@ -413,15 +413,13 @@ namespace XenAPI
{
return DO_HTTP(uri, proxy, false, timeout_ms,
string.Format("PUT {0} HTTP/1.0", uri.PathAndQuery),
string.Format("Host: {0}", uri.Host),
string.Format("Content-Length: {0}", ContentLength));
}
public static Stream GET(Uri uri, IWebProxy proxy, int timeout_ms)
{
return DO_HTTP(uri, proxy, false, timeout_ms,
string.Format("GET {0} HTTP/1.0", uri.PathAndQuery),
string.Format("Host: {0}", uri.Host));
string.Format("GET {0} HTTP/1.0", uri.PathAndQuery));
}
/// <summary>

6
XenModel/XenAPI/Helper.cs
View File

@ -49,10 +49,10 @@ namespace XenAPI
API_1_10 = 10, // XenServer 6.1 (Tampa)
API_2_0 = 11, // XenServer 6.2 (Clearwater)
API_2_1 = 12, // XenServer 6.2 with vGPU (vGPU)
API_2_2 = 13, // vdi.copy change in XS62ESP1004 (Hotfix Fox)
API_2_3 = 14, // XenServer xs64bit
API_2_2 = 13, // XenServer 6.2 Hotfix XS62ESP1004 (Felton)
API_2_3 = 14, //
LATEST = 14,
// Don't forget to change LATEST above, and APIVersionString() below.
// Don't forget to change LATEST above, and APIVersionString below.
UNKNOWN = 99
}

47
XenModel/XenAPI/Maps.cs
View File

@ -884,6 +884,53 @@ namespace XenAPI
return result;
}
internal static Dictionary<XenRef<VIF>, string>
convert_from_proxy_XenRefVIF_string(Object o)
{
Hashtable table = (Hashtable)o;
Dictionary<XenRef<VIF>, string> result = new Dictionary<XenRef<VIF>, string>();
if (table != null)
{
foreach (string key in table.Keys)
{
try
{
XenRef<VIF> k = XenRef<VIF>.Create(key);
string v = table[key] == null ? null : (string)table[key];
result[k] = v;
}
catch
{
continue;
}
}
}
return result;
}
internal static Hashtable
convert_to_proxy_XenRefVIF_string(Dictionary<XenRef<VIF>, string> table)
{
CookComputing.XmlRpc.XmlRpcStruct result = new CookComputing.XmlRpc.XmlRpcStruct();
if (table != null)
{
foreach (XenRef<VIF> key in table.Keys)
{
try
{
string k = (key != null) ? key : "";
string v = (table[key] != null) ? table[key] : "";
result[k] = v;
}
catch
{
continue;
}
}
}
return result;
}
internal static Dictionary<XenRef<VIF>, XenRef<Network>>
convert_from_proxy_XenRefVIF_XenRefNetwork(Object o)
{

41
XenModel/XenAPI/Network.cs
View File

@ -60,7 +60,8 @@ namespace XenAPI
string bridge,
Dictionary<string, XenRef<Blob>> blobs,
string[] tags,
network_default_locking_mode default_locking_mode)
network_default_locking_mode default_locking_mode,
Dictionary<XenRef<VIF>, string> assigned_ips)
{
this.uuid = uuid;
this.name_label = name_label;
@ -75,6 +76,7 @@ namespace XenAPI
this.blobs = blobs;
this.tags = tags;
this.default_locking_mode = default_locking_mode;
this.assigned_ips = assigned_ips;
}
/// <summary>
@ -101,6 +103,7 @@ namespace XenAPI
blobs = update.blobs;
tags = update.tags;
default_locking_mode = update.default_locking_mode;
assigned_ips = update.assigned_ips;
}
internal void UpdateFromProxy(Proxy_Network proxy)
@ -118,6 +121,7 @@ namespace XenAPI
blobs = proxy.blobs == null ? null : Maps.convert_from_proxy_string_XenRefBlob(proxy.blobs);
tags = proxy.tags == null ? new string[] {} : (string [])proxy.tags;
default_locking_mode = proxy.default_locking_mode == null ? (network_default_locking_mode) 0 : (network_default_locking_mode)Helper.EnumParseDefault(typeof(network_default_locking_mode), (string)proxy.default_locking_mode);
assigned_ips = proxy.assigned_ips == null ? null : Maps.convert_from_proxy_XenRefVIF_string(proxy.assigned_ips);
}
public Proxy_Network ToProxy()
@ -136,6 +140,7 @@ namespace XenAPI
result_.blobs = Maps.convert_to_proxy_string_XenRefBlob(blobs);
result_.tags = tags;
result_.default_locking_mode = network_default_locking_mode_helper.ToString(default_locking_mode);
result_.assigned_ips = Maps.convert_to_proxy_XenRefVIF_string(assigned_ips);
return result_;
}
@ -158,6 +163,7 @@ namespace XenAPI
blobs = Maps.convert_from_proxy_string_XenRefBlob(Marshalling.ParseHashTable(table, "blobs"));
tags = Marshalling.ParseStringArray(table, "tags");
default_locking_mode = (network_default_locking_mode)Helper.EnumParseDefault(typeof(network_default_locking_mode), Marshalling.ParseString(table, "default_locking_mode"));
assigned_ips = Maps.convert_from_proxy_XenRefVIF_string(Marshalling.ParseHashTable(table, "assigned_ips"));
}
public bool DeepEquals(Network other, bool ignoreCurrentOperations)
@ -181,7 +187,8 @@ namespace XenAPI
Helper.AreEqual2(this._bridge, other._bridge) &&
Helper.AreEqual2(this._blobs, other._blobs) &&
Helper.AreEqual2(this._tags, other._tags) &&
Helper.AreEqual2(this._default_locking_mode, other._default_locking_mode);
Helper.AreEqual2(this._default_locking_mode, other._default_locking_mode) &&
Helper.AreEqual2(this._assigned_ips, other._assigned_ips);
}
public override string SaveChanges(Session session, string opaqueRef, Network server)
@ -437,6 +444,17 @@ namespace XenAPI
return (network_default_locking_mode)Helper.EnumParseDefault(typeof(network_default_locking_mode), (string)session.proxy.network_get_default_locking_mode(session.uuid, (_network != null) ? _network : "").parse());
}
/// <summary>
/// Get the assigned_ips field of the given network.
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_network">The opaque_ref of the given network</param>
public static Dictionary<XenRef<VIF>, string> get_assigned_ips(Session session, string _network)
{
return Maps.convert_from_proxy_XenRefVIF_string(session.proxy.network_get_assigned_ips(session.uuid, (_network != null) ? _network : "").parse());
}
/// <summary>
/// Set the name/label field of the given network.
/// First published in XenServer 4.0.
@ -881,5 +899,24 @@ namespace XenAPI
}
}
private network_default_locking_mode _default_locking_mode;
/// <summary>
/// The IP addresses assigned to VIFs on networks that have active xapi-managed DHCP
/// First published in XenServer Creedence.
/// </summary>
public virtual Dictionary<XenRef<VIF>, string> assigned_ips
{
get { return _assigned_ips; }
set
{
if (!Helper.AreEqual(value, _assigned_ips))
{
_assigned_ips = value;
Changed = true;
NotifyPropertyChanged("assigned_ips");
}
}
}
private Dictionary<XenRef<VIF>, string> _assigned_ips;
}
}

78
XenModel/XenAPI/PCI.cs
View File

@ -55,7 +55,9 @@ namespace XenAPI
XenRef<Host> host,
string pci_id,
List<XenRef<PCI>> dependencies,
Dictionary<string, string> other_config)
Dictionary<string, string> other_config,
string subsystem_vendor_name,
string subsystem_device_name)
{
this.uuid = uuid;
this.class_name = class_name;
@ -65,6 +67,8 @@ namespace XenAPI
this.pci_id = pci_id;
this.dependencies = dependencies;
this.other_config = other_config;
this.subsystem_vendor_name = subsystem_vendor_name;
this.subsystem_device_name = subsystem_device_name;
}
/// <summary>
@ -86,6 +90,8 @@ namespace XenAPI
pci_id = update.pci_id;
dependencies = update.dependencies;
other_config = update.other_config;
subsystem_vendor_name = update.subsystem_vendor_name;
subsystem_device_name = update.subsystem_device_name;
}
internal void UpdateFromProxy(Proxy_PCI proxy)
@ -98,6 +104,8 @@ namespace XenAPI
pci_id = proxy.pci_id == null ? null : (string)proxy.pci_id;
dependencies = proxy.dependencies == null ? null : XenRef<PCI>.Create(proxy.dependencies);
other_config = proxy.other_config == null ? null : Maps.convert_from_proxy_string_string(proxy.other_config);
subsystem_vendor_name = proxy.subsystem_vendor_name == null ? null : (string)proxy.subsystem_vendor_name;
subsystem_device_name = proxy.subsystem_device_name == null ? null : (string)proxy.subsystem_device_name;
}
public Proxy_PCI ToProxy()
@ -111,6 +119,8 @@ namespace XenAPI
result_.pci_id = (pci_id != null) ? pci_id : "";
result_.dependencies = (dependencies != null) ? Helper.RefListToStringArray(dependencies) : new string[] {};
result_.other_config = Maps.convert_to_proxy_string_string(other_config);
result_.subsystem_vendor_name = (subsystem_vendor_name != null) ? subsystem_vendor_name : "";
result_.subsystem_device_name = (subsystem_device_name != null) ? subsystem_device_name : "";
return result_;
}
@ -128,6 +138,8 @@ namespace XenAPI
pci_id = Marshalling.ParseString(table, "pci_id");
dependencies = Marshalling.ParseSetRef<PCI>(table, "dependencies");
other_config = Maps.convert_from_proxy_string_string(Marshalling.ParseHashTable(table, "other_config"));
subsystem_vendor_name = Marshalling.ParseString(table, "subsystem_vendor_name");
subsystem_device_name = Marshalling.ParseString(table, "subsystem_device_name");
}
public bool DeepEquals(PCI other)
@ -144,7 +156,9 @@ namespace XenAPI
Helper.AreEqual2(this._host, other._host) &&
Helper.AreEqual2(this._pci_id, other._pci_id) &&
Helper.AreEqual2(this._dependencies, other._dependencies) &&
Helper.AreEqual2(this._other_config, other._other_config);
Helper.AreEqual2(this._other_config, other._other_config) &&
Helper.AreEqual2(this._subsystem_vendor_name, other._subsystem_vendor_name) &&
Helper.AreEqual2(this._subsystem_device_name, other._subsystem_device_name);
}
public override string SaveChanges(Session session, string opaqueRef, PCI server)
@ -274,6 +288,28 @@ namespace XenAPI
return Maps.convert_from_proxy_string_string(session.proxy.pci_get_other_config(session.uuid, (_pci != null) ? _pci : "").parse());
}
/// <summary>
/// Get the subsystem_vendor_name field of the given PCI.
/// First published in .
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pci">The opaque_ref of the given pci</param>
public static string get_subsystem_vendor_name(Session session, string _pci)
{
return (string)session.proxy.pci_get_subsystem_vendor_name(session.uuid, (_pci != null) ? _pci : "").parse();
}
/// <summary>
/// Get the subsystem_device_name field of the given PCI.
/// First published in .
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pci">The opaque_ref of the given pci</param>
public static string get_subsystem_device_name(Session session, string _pci)
{
return (string)session.proxy.pci_get_subsystem_device_name(session.uuid, (_pci != null) ? _pci : "").parse();
}
/// <summary>
/// Set the other_config field of the given PCI.
/// First published in XenServer 6.0.
@ -474,5 +510,43 @@ namespace XenAPI
}
}
private Dictionary<string, string> _other_config;
/// <summary>
/// Subsystem vendor name
/// First published in .
/// </summary>
public virtual string subsystem_vendor_name
{
get { return _subsystem_vendor_name; }
set
{
if (!Helper.AreEqual(value, _subsystem_vendor_name))
{
_subsystem_vendor_name = value;
Changed = true;
NotifyPropertyChanged("subsystem_vendor_name");
}
}
}
private string _subsystem_vendor_name;
/// <summary>
/// Subsystem device name
/// First published in .
/// </summary>
public virtual string subsystem_device_name
{
get { return _subsystem_device_name; }
set
{
if (!Helper.AreEqual(value, _subsystem_device_name))
{
_subsystem_device_name = value;
Changed = true;
NotifyPropertyChanged("subsystem_device_name");
}
}
}
private string _subsystem_device_name;
}
}

12
XenModel/XenAPI/PIF.cs
View File

@ -665,7 +665,7 @@ namespace XenAPI
/// <summary>
/// Get the properties field of the given PIF.
/// First published in .
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pif">The opaque_ref of the given pif</param>
@ -1208,7 +1208,7 @@ namespace XenAPI
/// <param name="_ipv6_gateway"> First published in XenServer 6.0.</param>
/// <param name="_primary_address_type"> First published in XenServer 6.0.</param>
/// <param name="_managed"> First published in XenServer 6.2 SP1.</param>
/// <param name="_properties"> First published in .</param>
/// <param name="_properties"> First published in XenServer Creedence.</param>
public static XenRef<PIF> db_introduce(Session session, string _device, string _network, string _host, string _mac, long _mtu, long _vlan, bool _physical, ip_configuration_mode _ip_configuration_mode, string _ip, string _netmask, string _gateway, string _dns, string _bond_slave_of, string _vlan_master_of, bool _management, Dictionary<string, string> _other_config, bool _disallow_unplug, ipv6_configuration_mode _ipv6_configuration_mode, string[] _ipv6, string _ipv6_gateway, primary_address_type _primary_address_type, bool _managed, Dictionary<string, string> _properties)
{
return XenRef<PIF>.Create(session.proxy.pif_db_introduce(session.uuid, (_device != null) ? _device : "", (_network != null) ? _network : "", (_host != null) ? _host : "", (_mac != null) ? _mac : "", _mtu.ToString(), _vlan.ToString(), _physical, ip_configuration_mode_helper.ToString(_ip_configuration_mode), (_ip != null) ? _ip : "", (_netmask != null) ? _netmask : "", (_gateway != null) ? _gateway : "", (_dns != null) ? _dns : "", (_bond_slave_of != null) ? _bond_slave_of : "", (_vlan_master_of != null) ? _vlan_master_of : "", _management, Maps.convert_to_proxy_string_string(_other_config), _disallow_unplug, ipv6_configuration_mode_helper.ToString(_ipv6_configuration_mode), _ipv6, (_ipv6_gateway != null) ? _ipv6_gateway : "", primary_address_type_helper.ToString(_primary_address_type), _managed, Maps.convert_to_proxy_string_string(_properties)).parse());
@ -1241,7 +1241,7 @@ namespace XenAPI
/// <param name="_ipv6_gateway"> First published in XenServer 6.0.</param>
/// <param name="_primary_address_type"> First published in XenServer 6.0.</param>
/// <param name="_managed"> First published in XenServer 6.2 SP1.</param>
/// <param name="_properties"> First published in .</param>
/// <param name="_properties"> First published in XenServer Creedence.</param>
public static XenRef<Task> async_db_introduce(Session session, string _device, string _network, string _host, string _mac, long _mtu, long _vlan, bool _physical, ip_configuration_mode _ip_configuration_mode, string _ip, string _netmask, string _gateway, string _dns, string _bond_slave_of, string _vlan_master_of, bool _management, Dictionary<string, string> _other_config, bool _disallow_unplug, ipv6_configuration_mode _ipv6_configuration_mode, string[] _ipv6, string _ipv6_gateway, primary_address_type _primary_address_type, bool _managed, Dictionary<string, string> _properties)
{
return XenRef<Task>.Create(session.proxy.async_pif_db_introduce(session.uuid, (_device != null) ? _device : "", (_network != null) ? _network : "", (_host != null) ? _host : "", (_mac != null) ? _mac : "", _mtu.ToString(), _vlan.ToString(), _physical, ip_configuration_mode_helper.ToString(_ip_configuration_mode), (_ip != null) ? _ip : "", (_netmask != null) ? _netmask : "", (_gateway != null) ? _gateway : "", (_dns != null) ? _dns : "", (_bond_slave_of != null) ? _bond_slave_of : "", (_vlan_master_of != null) ? _vlan_master_of : "", _management, Maps.convert_to_proxy_string_string(_other_config), _disallow_unplug, ipv6_configuration_mode_helper.ToString(_ipv6_configuration_mode), _ipv6, (_ipv6_gateway != null) ? _ipv6_gateway : "", primary_address_type_helper.ToString(_primary_address_type), _managed, Maps.convert_to_proxy_string_string(_properties)).parse());
@ -1271,7 +1271,7 @@ namespace XenAPI
/// <summary>
/// Set the value of a property of the PIF
/// First published in .
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pif">The opaque_ref of the given pif</param>
@ -1284,7 +1284,7 @@ namespace XenAPI
/// <summary>
/// Set the value of a property of the PIF
/// First published in .
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_pif">The opaque_ref of the given pif</param>
@ -1860,7 +1860,7 @@ namespace XenAPI
/// <summary>
/// Additional configuration properties for the interface.
/// First published in .
/// First published in XenServer Creedence.
/// </summary>
public virtual Dictionary<string, string> properties
{

25
XenModel/XenAPI/Proxy.cs
View File

@ -2015,14 +2015,14 @@ namespace XenAPI
[XmlRpcMethod("Async.VM.assert_can_be_recovered")]
Response<string>
async_vm_assert_can_be_recovered(string session, string _vm, string _session_to);
[XmlRpcMethod("VM.get_SRs_required_for_recovery")]
Response<string []>
vm_get_srs_required_for_recovery(string session, string _self, string _session_to);
vm_get_srs_required_for_recovery(string session, string _vm, string _session_to);
[XmlRpcMethod("Async.VM.get_SRs_required_for_recovery")]
Response<string>
async_vm_get_srs_required_for_recovery(string session, string _self, string _session_to);
async_vm_get_srs_required_for_recovery(string session, string _vm, string _session_to);
[XmlRpcMethod("VM.recover")]
Response<string>
@ -2534,11 +2534,11 @@ namespace XenAPI
[XmlRpcMethod("VM_appliance.get_SRs_required_for_recovery")]
Response<string []>
vm_appliance_get_srs_required_for_recovery(string session, string _self, string _session_to);
vm_appliance_get_srs_required_for_recovery(string session, string _vm_appliance, string _session_to);
[XmlRpcMethod("Async.VM_appliance.get_SRs_required_for_recovery")]
Response<string>
async_vm_appliance_get_srs_required_for_recovery(string session, string _self, string _session_to);
async_vm_appliance_get_srs_required_for_recovery(string session, string _vm_appliance, string _session_to);
[XmlRpcMethod("VM_appliance.recover")]
Response<string>
@ -3596,6 +3596,10 @@ namespace XenAPI
Response<string>
network_get_default_locking_mode(string session, string _network);
[XmlRpcMethod("network.get_assigned_ips")]
Response<Object>
network_get_assigned_ips(string session, string _network);
[XmlRpcMethod("network.set_name_label")]
Response<string>
network_set_name_label(string session, string _network, string _label);
@ -6132,6 +6136,14 @@ namespace XenAPI
Response<Object>
pci_get_other_config(string session, string _pci);
[XmlRpcMethod("PCI.get_subsystem_vendor_name")]
Response<string>
pci_get_subsystem_vendor_name(string session, string _pci);
[XmlRpcMethod("PCI.get_subsystem_device_name")]
Response<string>
pci_get_subsystem_device_name(string session, string _pci);
[XmlRpcMethod("PCI.set_other_config")]
Response<string>
pci_set_other_config(string session, string _pci, Object _other_config);
@ -6902,6 +6914,7 @@ namespace XenAPI
public Object blobs;
public string [] tags;
public string default_locking_mode;
public Object assigned_ips;
}
[XmlRpcMissingMapping(MappingAction.Ignore)]
@ -7243,6 +7256,8 @@ namespace XenAPI
public string pci_id;
public string [] dependencies;
public Object other_config;
public string subsystem_vendor_name;
public string subsystem_device_name;
}
[XmlRpcMissingMapping(MappingAction.Ignore)]

2
XenModel/XenAPI/Session.cs
View File

@ -277,7 +277,7 @@ namespace XenAPI
}
}
}
public void login_with_password(string username, string password, string version, string originator)
{
try

8
XenModel/XenAPI/VM.cs
View File

@ -3581,10 +3581,10 @@ namespace XenAPI
/// <summary>
/// List all the SR's that are required for the VM to be recovered
/// First published in XenServer 6.2.
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_vm">The opaque_ref of the given VM</param>
/// <param name="_vm">The opaque_ref of the given vm</param>
/// <param name="_session_to">The session to which the SRs of the VM have to be recovered.</param>
public static List<XenRef<SR>> get_SRs_required_for_recovery(Session session, string _vm, string _session_to)
{
@ -3593,10 +3593,10 @@ namespace XenAPI
/// <summary>
/// List all the SR's that are required for the VM to be recovered
/// First published in XenServer 6.2.
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_vm">The opaque_ref of the given VM</param>
/// <param name="_vm">The opaque_ref of the given vm</param>
/// <param name="_session_to">The session to which the SRs of the VM have to be recovered.</param>
public static XenRef<Task> async_get_SRs_required_for_recovery(Session session, string _vm, string _session_to)
{

8
XenModel/XenAPI/VM_appliance.cs
View File

@ -439,10 +439,10 @@ namespace XenAPI
/// <summary>
/// Get the list of SRs required by the VM appliance to recover.
/// First published in XenServer 6.2.
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_vm_appliance">The opaque_ref of the given VM_appliance</param>
/// <param name="_vm_appliance">The opaque_ref of the given vm_appliance</param>
/// <param name="_session_to">The session to which the list of SRs have to be recovered .</param>
public static List<XenRef<SR>> get_SRs_required_for_recovery(Session session, string _vm_appliance, string _session_to)
{
@ -451,10 +451,10 @@ namespace XenAPI
/// <summary>
/// Get the list of SRs required by the VM appliance to recover.
/// First published in XenServer 6.2.
/// First published in XenServer Creedence.
/// </summary>
/// <param name="session">The session</param>
/// <param name="_vm_appliance">The opaque_ref of the given VM_appliance</param>
/// <param name="_vm_appliance">The opaque_ref of the given vm_appliance</param>
/// <param name="_session_to">The session to which the list of SRs have to be recovered .</param>
public static XenRef<Task> async_get_SRs_required_for_recovery(Session session, string _vm_appliance, string _session_to)
{

4
XenModel/XenAPI/task_allowed_operations.cs
View File

@ -37,7 +37,7 @@ namespace XenAPI
{
public enum task_allowed_operations
{
cancel, unknown
cancel, destroy, unknown
}
public static class task_allowed_operations_helper
@ -48,6 +48,8 @@ namespace XenAPI
{
case task_allowed_operations.cancel:
return "cancel";
case task_allowed_operations.destroy:
return "destroy";
default:
return "unknown";
}