mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-16 10:32:34 +01:00
add CentOS 6.0, CentOS 5.7, RHEL 5.7 support for XenServer 6.0.2
This commit is contained in:
anthony
parent
37e8d03f0a
commit
352f3d95ed
@ -22,13 +22,14 @@ import org.apache.log4j.Logger;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class CitrixHelper {
|
public class CitrixHelper {
|
||||||
private static final Logger s_logger = Logger.getLogger(CitrixHelper.class);
|
private static final Logger s_logger = Logger.getLogger(CitrixHelper.class);
|
||||||
private static final HashMap<String, String> _xcp100GuestOsMap = new HashMap<String, String>(70);
|
private static final HashMap<String, String> _xcp100GuestOsMap = new HashMap<String, String>(70);
|
||||||
private static final HashMap<String, String> _xenServerGuestOsMap = new HashMap<String, String>(70);
|
private static final HashMap<String, String> _xenServerGuestOsMap = new HashMap<String, String>(70);
|
||||||
private static final HashMap<String, String> _xenServer56FP1GuestOsMap = new HashMap<String, String>(70);
|
private static final HashMap<String, String> _xenServer56FP1GuestOsMap = new HashMap<String, String>(70);
|
||||||
private static final HashMap<String, String> _xenServer56FP2GuestOsMap = new HashMap<String, String>(70);
|
private static final HashMap<String, String> _xenServer56FP2GuestOsMap = new HashMap<String, String>(70);
|
||||||
private static final HashMap<String, String> _xenServer600GuestOsMap = new HashMap<String, String>(70);
|
private static final HashMap<String, String> _xenServer600GuestOsMap = new HashMap<String, String>(70);
|
||||||
private static final ArrayList<String> _guestOsList = new ArrayList<String>(70);
|
private static final HashMap<String, String> _xenServer602GuestOsMap = new HashMap<String, String>(70);
|
||||||
|
private static final ArrayList<String> _guestOsList = new ArrayList<String>(70);
|
||||||
|
|
||||||
|
|
||||||
static {
|
static {
|
||||||
@ -433,6 +434,122 @@ public class CitrixHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static {
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 4.5 (32-bit)", "CentOS 4.5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 4.6 (32-bit)", "CentOS 4.6 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 4.7 (32-bit)", "CentOS 4.7 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 4.8 (32-bit)", "CentOS 4.8 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.0 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.0 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.1 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.1 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.2 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.2 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.3 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.3 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.4 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.4 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.5 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.5 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.6 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.6 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.7 (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 5.7 (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 6.0 (32-bit)", "CentOS 6.0 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("CentOS 6.0 (64-bit)", "CentOS 6.0 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Debian GNU/Linux 5.0 (32-bit)", "Debian Lenny 5.0 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Debian GNU/Linux 6(32-bit)", "Debian Squeeze 6.0 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Debian GNU/Linux 6(64-bit)", "Debian Squeeze 6.0 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.0 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.0 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.1 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.1 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.2 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.2 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.3 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.3 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.4 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.4 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.5 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.5 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.6 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.6 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.7 (32-bit)", "Oracle Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 5.7 (64-bit)", "Oracle Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 6.0 (32-bit)", "Oracle Enterprise Linux 6.0 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Oracle Enterprise Linux 6.0 (64-bit)", "Oracle Enterprise Linux 6.0 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 4.5 (32-bit)", "Red Hat Enterprise Linux 4.5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 4.6 (32-bit)", "Red Hat Enterprise Linux 4.6 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 4.7 (32-bit)", "Red Hat Enterprise Linux 4.7 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 4.8 (32-bit)", "Red Hat Enterprise Linux 4.8 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.0 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.0 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.1 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.1 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.2 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.2 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.3 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.3 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.4 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.4 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.5 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.5 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.6 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.6 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.7 (32-bit)", "Red Hat Enterprise Linux 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 5.7 (64-bit)", "Red Hat Enterprise Linux 5 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 6.0 (32-bit)", "Red Hat Enterprise Linux 6.0 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Red Hat Enterprise Linux 6.0 (64-bit)", "Red Hat Enterprise Linux 6.0 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 9 SP4 (32-bit)", "SUSE Linux Enterprise Server 10 SP1 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (32-bit)", "SUSE Linux Enterprise Server 10 SP1 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP1 (64-bit)", "SUSE Linux Enterprise Server 10 SP1 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP2 (32-bit)", "SUSE Linux Enterprise Server 10 SP2 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP2 (64-bit)", "SUSE Linux Enterprise Server 10 SP2 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP3 (32-bit)", "SUSE Linux Enterprise Server 10 SP3 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP3 (64-bit)", "SUSE Linux Enterprise Server 10 SP3 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP4 (32-bit)", "SUSE Linux Enterprise Server 10 SP4 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 10 SP4 (64-bit)", "SUSE Linux Enterprise Server 10 SP4 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 11 (32-bit)", "SUSE Linux Enterprise Server 11 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 11 (64-bit)", "SUSE Linux Enterprise Server 11 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 11 SP1 (32-bit)", "SUSE Linux Enterprise Server 11 SP1 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("SUSE Linux Enterprise Server 11 SP1 (64-bit)", "SUSE Linux Enterprise Server 11 SP1 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows 7 (32-bit)", "Windows 7 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows 7 (64-bit)", "Windows 7 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows 8 (32-bit)", "Windows 8 (32-bit) (experimental)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows 8 (64-bit)", "Windows 7 (64-bit) (experimental)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 (32-bit)", "Windows Server 2003 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 (64-bit)", "Windows Server 2003 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 PAE (32-bit)", "Windows Server 2003 PAE (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 Enterprise Edition(32-bit)", "Windows Server 2003 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 Enterprise Edition(64-bit)", "Windows Server 2003 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 DataCenter Edition(32-bit)", "Windows Server 2003 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 DataCenter Edition(64-bit)", "Windows Server 2003 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 Standard Edition(32-bit)", "Windows Server 2003 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2003 Standard Edition(64-bit)", "Windows Server 2003 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2008 (32-bit)", "Windows Server 2008 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2008 (64-bit)", "Windows Server 2008 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 2008 R2 (64-bit)", "Windows Server 2008 R2 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Server 8 (64-bit)", "Windows Server 8 (64-bit) (experimental)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows Vista (32-bit)", "Windows Vista (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Ubuntu 10.04 (32-bit)", "Ubuntu Lucid Lynx 10.04 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Ubuntu 10.04 (64-bit)", "Ubuntu Lucid Lynx 10.04 (64-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Ubuntu 10.10 (32-bit)", "Ubuntu Maverick Meerkat 10.10 (32-bit) (experimental)");
|
||||||
|
_xenServer602GuestOsMap.put("Ubuntu 10.10 (64-bit)", "Ubuntu Maverick Meerkat 10.10 (64-bit) (experimental)");
|
||||||
|
_xenServer602GuestOsMap.put("Other Linux (32-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other Linux (64-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other (32-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other (64-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other CentOS (32-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other CentOS (64-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other Ubuntu (32-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other Ubuntu (64-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other SUSE Linux(32-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other SUSE Linux(64-bit)", "Other install media");
|
||||||
|
_xenServer602GuestOsMap.put("Other PV (32-bit)", "CentOS 5 (32-bit)");
|
||||||
|
_xenServer602GuestOsMap.put("Other PV (64-bit)", "CentOS 5 (64-bit)");
|
||||||
|
}
|
||||||
|
|
||||||
public static String getXcpGuestOsType(String stdType) {
|
public static String getXcpGuestOsType(String stdType) {
|
||||||
String guestOS = _xcp100GuestOsMap.get(stdType);
|
String guestOS = _xcp100GuestOsMap.get(stdType);
|
||||||
if (guestOS == null) {
|
if (guestOS == null) {
|
||||||
@ -500,4 +617,19 @@ public class CitrixHelper {
|
|||||||
}
|
}
|
||||||
return guestOS;
|
return guestOS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getXenServer602GuestOsType(String stdType, boolean bootFromCD) {
|
||||||
|
String guestOS = _xenServer602GuestOsMap.get(stdType);
|
||||||
|
if (guestOS == null) {
|
||||||
|
if (!bootFromCD) {
|
||||||
|
s_logger.debug("Can't find the guest os: " + stdType + " mapping into XenServer 6.0.2 guestOS type, start it as HVM guest");
|
||||||
|
guestOS = "Other install media";
|
||||||
|
} else {
|
||||||
|
String msg = "XenServer 6.0.2 DOES NOT support Guest OS type " + stdType;
|
||||||
|
s_logger.warn(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
return guestOS;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,55 @@
|
|||||||
|
// Copyright 2012 Citrix Systems, Inc. Licensed under the
|
||||||
|
// Apache License, Version 2.0 (the "License"); you may not use this
|
||||||
|
// file except in compliance with the License. Citrix Systems, Inc.
|
||||||
|
// reserves all rights not expressly granted by the License.
|
||||||
|
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
//
|
||||||
|
// Automatically generated by addcopyright.py at 04/03/2012
|
||||||
|
package com.cloud.hypervisor.xen.resource;
|
||||||
|
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.ejb.Local;
|
||||||
|
|
||||||
|
import org.apache.log4j.Logger;
|
||||||
|
|
||||||
|
import com.cloud.resource.ServerResource;
|
||||||
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
|
import com.cloud.utils.script.Script;
|
||||||
|
|
||||||
|
|
||||||
|
@Local(value=ServerResource.class)
|
||||||
|
public class XenServer602Resource extends XenServer56FP1Resource {
|
||||||
|
private static final Logger s_logger = Logger.getLogger(XenServer602Resource.class);
|
||||||
|
|
||||||
|
public XenServer602Resource() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getGuestOsType(String stdType, boolean bootFromCD) {
|
||||||
|
return CitrixHelper.getXenServer602GuestOsType(stdType, bootFromCD);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<File> getPatchFiles() {
|
||||||
|
List<File> files = new ArrayList<File>();
|
||||||
|
String patch = "scripts/vm/hypervisor/xenserver/xenserver60/patch";
|
||||||
|
String patchfilePath = Script.findScript("" , patch);
|
||||||
|
if ( patchfilePath == null ) {
|
||||||
|
throw new CloudRuntimeException("Unable to find patch file " + patch);
|
||||||
|
}
|
||||||
|
File file = new File(patchfilePath);
|
||||||
|
files.add(file);
|
||||||
|
return files;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -64,6 +64,7 @@ import com.cloud.hypervisor.xen.resource.XenServer56FP1Resource;
|
|||||||
import com.cloud.hypervisor.xen.resource.XenServer56Resource;
|
import com.cloud.hypervisor.xen.resource.XenServer56Resource;
|
||||||
import com.cloud.hypervisor.xen.resource.XenServer56SP2Resource;
|
import com.cloud.hypervisor.xen.resource.XenServer56SP2Resource;
|
||||||
import com.cloud.hypervisor.xen.resource.XenServer600Resource;
|
import com.cloud.hypervisor.xen.resource.XenServer600Resource;
|
||||||
|
import com.cloud.hypervisor.xen.resource.XenServer602Resource;
|
||||||
import com.cloud.hypervisor.xen.resource.XenServerConnectionPool;
|
import com.cloud.hypervisor.xen.resource.XenServerConnectionPool;
|
||||||
import com.cloud.resource.Discoverer;
|
import com.cloud.resource.Discoverer;
|
||||||
import com.cloud.resource.DiscovererBase;
|
import com.cloud.resource.DiscovererBase;
|
||||||
@ -408,9 +409,12 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
|
|||||||
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
|
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
|
||||||
return new XenServer56Resource();
|
return new XenServer56Resource();
|
||||||
|
|
||||||
if(prodBrand.equals("XenServer") && prodVersion.startsWith("6.0"))
|
if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.0"))
|
||||||
return new XenServer600Resource();
|
return new XenServer600Resource();
|
||||||
|
|
||||||
|
if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2"))
|
||||||
|
return new XenServer602Resource();
|
||||||
|
|
||||||
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
|
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
|
||||||
String prodVersionTextShort = record.softwareVersion.get("product_version_text_short").trim();
|
String prodVersionTextShort = record.softwareVersion.get("product_version_text_short").trim();
|
||||||
if("5.6 SP2".equals(prodVersionTextShort)) {
|
if("5.6 SP2".equals(prodVersionTextShort)) {
|
||||||
@ -552,8 +556,10 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
|
|||||||
resource = XcpServerResource.class.getName();
|
resource = XcpServerResource.class.getName();
|
||||||
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) {
|
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) {
|
||||||
resource = XenServer56Resource.class.getName();
|
resource = XenServer56Resource.class.getName();
|
||||||
} else if(prodBrand.equals("XenServer") && prodVersion.startsWith("6.0")) {
|
} else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.0")) {
|
||||||
resource = XenServer600Resource.class.getName();
|
resource = XenServer600Resource.class.getName();
|
||||||
|
} else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2")) {
|
||||||
|
resource = XenServer602Resource.class.getName();
|
||||||
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
|
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
|
||||||
String prodVersionTextShort = details.get("product_version_text_short").trim();
|
String prodVersionTextShort = details.get("product_version_text_short").trim();
|
||||||
if("5.6 SP2".equals(prodVersionTextShort)) {
|
if("5.6 SP2".equals(prodVersionTextShort)) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user