Skip to content
This repository was archived by the owner on Feb 19, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion c/OMakefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#

API_MAJOR=2
API_MINOR=2
API_MINOR=3
API_VER=$(API_MAJOR).$(API_MINOR)

C_GEN_FOLDER=$(BINDINGS_TMP)/c_gen
Expand Down
7 changes: 6 additions & 1 deletion c/xen_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ xen_api_version_to_string(xen_api_version version)
return "2.1";
case xen_api_version_2_2:
return "2.2";
case xen_api_version_2_3:
return "2.3";
default:
return "Unknown";
}
Expand Down Expand Up @@ -325,7 +327,10 @@ set_api_version(xen_session *session)

if (major_version == (int64_t)2)
{
if (minor_version == (int64_t)2)
if (minor_version == (int64_t)3)
session->api_version = xen_api_version_2_3;

else if (minor_version == (int64_t)2)
session->api_version = xen_api_version_2_2;

else if (minor_version == (int64_t)1)
Expand Down
3 changes: 2 additions & 1 deletion c/xen_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ typedef enum xen_api_version
xen_api_version_2_0 = 11,
xen_api_version_2_1 = 12,
xen_api_version_2_2 = 13,
xen_api_latest_version = 13,
xen_api_version_2_3 = 14,
xen_api_latest_version = 14,
xen_api_unknown_version = 99,
/* Also change xen_api_version_to_string() and set_api_version() in xen_common.c */
} xen_api_version;
Expand Down
5 changes: 4 additions & 1 deletion csharp/src/Helper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public enum API_Version
API_2_0 = 11, // XenServer 6.2 (Clearwater)
API_2_1 = 12, // XenServer 6.2 with vGPU (vGPU)
API_2_2 = 13, // XenServer 6.2 Hotfix XS62ESP1004 (Felton)
LATEST = 13,
API_2_3 = 14, //
LATEST = 14,
// Don't forget to change LATEST above, and APIVersionString below.
UNKNOWN = 99
}
Expand Down Expand Up @@ -89,6 +90,8 @@ public static string APIVersionString(API_Version v)
return "2.1";
case API_Version.API_2_2:
return "2.2";
case API_Version.API_2_3:
return "2.3";
default:
return "Unknown";
}
Expand Down
10 changes: 7 additions & 3 deletions java/lib/com/xensource/xenapi/APIVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,18 @@

public enum APIVersion
{
API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, API_1_8, API_1_9, API_1_10, API_2_0, API_2_1, API_2_2, UNKNOWN;
API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, API_1_8, API_1_9, API_1_10, API_2_0, API_2_1, API_2_2, API_2_3, UNKNOWN;

public static APIVersion latest()
{
return API_2_2;
return API_2_3;
}

public static APIVersion fromMajorMinor(long major, long minor)
{
if (major == 2 && minor == 2) {
if (major == 2 && minor == 3) {
return API_2_3;
} else if (major == 2 && minor == 2) {
return API_2_2;
} else if (major == 2 && minor == 1) {
return API_2_1;
Expand Down Expand Up @@ -102,6 +104,8 @@ public String toString()
return "2.1";
case API_2_2:
return "2.2";
case API_2_3:
return "2.3";
default:
return "Unknown";
}
Expand Down