提交 b29534a6 编写于 作者: M Martin Kletzander 提交者: Cole Robinson

esx: Fix connection to ESX 5.1

After separating 5.x and 5.1 versions of ESX, we forgot to add 5.1
into the list of allowed connections, so connections to 5.1 fail since
v1.0.0-rc1-5-g1e7cd395
(cherry picked from commit bab7752c)
上级 48aaabd9
...@@ -718,6 +718,7 @@ esxConnectToHost(virConnectPtr conn, ...@@ -718,6 +718,7 @@ esxConnectToHost(virConnectPtr conn,
priv->host->productVersion != esxVI_ProductVersion_ESX41 && priv->host->productVersion != esxVI_ProductVersion_ESX41 &&
priv->host->productVersion != esxVI_ProductVersion_ESX4x && priv->host->productVersion != esxVI_ProductVersion_ESX4x &&
priv->host->productVersion != esxVI_ProductVersion_ESX50 && priv->host->productVersion != esxVI_ProductVersion_ESX50 &&
priv->host->productVersion != esxVI_ProductVersion_ESX51 &&
priv->host->productVersion != esxVI_ProductVersion_ESX5x) { priv->host->productVersion != esxVI_ProductVersion_ESX5x) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s is neither an ESX 3.5, 4.x nor 5.x host"), _("%s is neither an ESX 3.5, 4.x nor 5.x host"),
...@@ -847,6 +848,7 @@ esxConnectToVCenter(virConnectPtr conn, ...@@ -847,6 +848,7 @@ esxConnectToVCenter(virConnectPtr conn,
priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x && priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX51 &&
priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) { priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s is neither a vCenter 2.5, 4.x nor 5.x server"), _("%s is neither a vCenter 2.5, 4.x nor 5.x server"),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册