CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

The xentools iso has been renamed from xs-tools to guest-tools starting from XenServer 7.0.
apache · Dec 20, 2017 · 249378c · 249378c
1 parent 044636c
commit 249378c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/...ervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java b/...ervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
@@ -111,6 +111,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
     protected String _guestNic;
     protected boolean _setupMultipath;
     protected String _instance;
+    private String _toolsIsoName;
 
     @Inject
     protected AlertManager _alertMgr;
@@ -393,6 +394,8 @@ protected void addSamePool(Connection conn, Map<CitrixResourceBase, Map<String,
     }
 
     protected CitrixResourceBase createServerResource(String prodBrand, String prodVersion, String prodVersionTextShort, String hotfix) {
+        determineToolsIsoName(prodBrand, prodVersion);
+
         // Xen Cloud Platform group of hypervisors
         if (prodBrand.equals("XCP") && (prodVersion.equals("1.0.0") || prodVersion.equals("1.1.0")
               || prodVersion.equals("5.6.100") || prodVersion.startsWith("1.4") || prodVersion.startsWith("1.6"))) {
@@ -439,7 +442,15 @@ else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0")) {
         throw new RuntimeException(msg);
     }
 
+    private void determineToolsIsoName(String prodBrand, String prodVersion) {
+        final String[] items = prodVersion.split("\\.");
 
+        if (prodBrand.equals("XenServer") && Integer.parseInt(items[0]) >= 7) {
+            _toolsIsoName = "guest-tools.iso";
+        } else {
+            _toolsIsoName = "xs-tools.iso";
+        }
+    }
 
     protected CitrixResourceBase createServerResource(long dcId, Long podId, Host.Record record, String hotfix) {
         String prodBrand = record.softwareVersion.get("product_brand");
@@ -529,13 +540,12 @@ public boolean processCommands(long agentId, long seq, Command[] commands) {
     }
 
     private void createXsToolsISO() {
-        String isoName = "xs-tools.iso";
-        VMTemplateVO tmplt = _tmpltDao.findByTemplateName(isoName);
+        VMTemplateVO tmplt = _tmpltDao.findByTemplateName(_toolsIsoName);
         Long id;
         if (tmplt == null) {
             id = _tmpltDao.getNextInSequence(Long.class, "id");
             VMTemplateVO template =
-                    VMTemplateVO.createPreHostIso(id, isoName, isoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, Account.ACCOUNT_ID_SYSTEM,
+                    VMTemplateVO.createPreHostIso(id, _toolsIsoName, _toolsIsoName, ImageFormat.ISO, true, true, TemplateType.PERHOST, null, null, true, 64, Account.ACCOUNT_ID_SYSTEM,
                             null, "xen-pv-drv-iso", false, 1, false, HypervisorType.XenServer);
             _tmpltDao.persist(template);
         } else {

diff --git a/...hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/...hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -2590,7 +2590,9 @@ public SR getISOSRbyVmName(final Connection conn, final String vmName) {
     public VDI getIsoVDIByURL(final Connection conn, final String vmName, final String isoURL) {
         SR isoSR = null;
         String mountpoint = null;
-        if (isoURL.startsWith("xs-tools")) {
+        // XenServer 7.0+ => guest-tools.iso
+        // XenServer [other] => xs-tools.iso
+        if (isoURL.startsWith("xs-tools") || isoURL.startsWith("guest-tools")) {
             try {
                 final Set<VDI> vdis = VDI.getByNameLabel(conn, isoURL);
                 if (vdis.isEmpty()) {
@@ -3880,7 +3882,9 @@ protected VDI mount(final Connection conn, final String vmName, final DiskTO vol
 
             // corer case, xenserver pv driver iso
             final String templateName = iso.getName();
-            if (templateName.startsWith("xs-tools")) {
+            // XenServer 7.0+ => guest-tools.iso
+            // XenServer [other] => xs-tools.iso
+            if (templateName.startsWith("xs-tools") || templateName.startsWith("guest-tools")) {
                 try {
                     final Set<VDI> vdis = VDI.getByNameLabel(conn, templateName);
                     if (vdis.isEmpty()) {

diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3342,7 +3342,7 @@ else if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYP
             SearchCriteria<TemplateJoinVO> zoneSc = _templateJoinDao.createSearchCriteria();
             zoneSc.addOr("dataCenterId", SearchCriteria.Op.EQ, zoneId);
             zoneSc.addOr("dataStoreScope", SearchCriteria.Op.EQ, ScopeType.REGION);
-            // handle the case where xs-tools.iso and vmware-tools.iso do not
+            // handle the case where xs-tools.iso, guest-tools.iso and vmware-tools.iso do not
             // have data_center information in template_view
             SearchCriteria<TemplateJoinVO> isoPerhostSc = _templateJoinDao.createSearchCriteria();
             isoPerhostSc.addAnd("format", SearchCriteria.Op.EQ, ImageFormat.ISO);

diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
@@ -278,7 +278,7 @@ public TemplateResponse newIsoResponse(TemplateJoinVO iso) {
         isoResponse.setCreated(iso.getCreatedOnStore());
         isoResponse.setDynamicallyScalable(iso.isDynamicallyScalable());
         if (iso.getTemplateType() == TemplateType.PERHOST) {
-            // for xs-tools.iso and vmware-tools.iso, we didn't download, but is ready to use.
+            // for xs-tools.iso, guest-tools.iso and vmware-tools.iso, we didn't download, but is ready to use.
             isoResponse.setReady(true);
         } else {
             isoResponse.setReady(iso.getState() == ObjectInDataStoreStateMachine.State.Ready);