Skip to content

Commit fe506d9

Browse files
CloudStack-QAAbhinandan Prateek
CloudStack-QA
authored and
Abhinandan Prateek
committed
CLOUDSTACK-2642: [XenServer] Add support for XenServer 6.2.0
Currently XcpServerDiscoverer.java is only allowing till XenServer 6.1.0. Added code to support XenServer 6.2.0. Also, added support to allow the RC build of XenSever 6.2.0. Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com> Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
1 parent a30f9fa commit fe506d9

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

‎plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,10 @@ else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2"))
447447
return new XenServer602Resource();
448448
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.0"))
449449
return new XenServer610Resource();
450+
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.83"))
451+
return new XenServer610Resource();
452+
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0"))
453+
return new XenServer610Resource();
450454
else if (prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
451455
String prodVersionTextShort = record.softwareVersion.get("product_version_text_short").trim();
452456
if ("5.6 SP2".equals(prodVersionTextShort)) {
@@ -458,7 +462,7 @@ else if (prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
458462
return new XcpOssResource();
459463
}
460464

461-
String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0 but this one is " + prodBrand + " " + prodVersion;
465+
String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0, 6.1.83, 6.2.0 but this one is " + prodBrand + " " + prodVersion;
462466
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
463467
s_logger.debug(msg);
464468
throw new RuntimeException(msg);
@@ -598,6 +602,10 @@ public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalanc
598602
resource = XenServer602Resource.class.getName();
599603
} else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.0")) {
600604
resource = XenServer610Resource.class.getName();
605+
} else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.83")) {
606+
resource = XenServer610Resource.class.getName();
607+
} else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0")) {
608+
resource = XenServer610Resource.class.getName();
601609
} else if (prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
602610
String prodVersionTextShort = details.get("product_version_text_short").trim();
603611
if ("5.6 SP2".equals(prodVersionTextShort)) {
@@ -610,7 +618,7 @@ public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalanc
610618
}
611619

612620
if( resource == null ){
613-
String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0 but this one is " + prodBrand + " " + prodVersion;
621+
String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0, 6.1.83, 6.2.0 but this one is " + prodBrand + " " + prodVersion;
614622
s_logger.debug(msg);
615623
throw new RuntimeException(msg);
616624
}

0 commit comments

Comments
 (0)