re-add display flag

Author: DaanHoogland

engine/schema/src/main/java/com/cloud/storage/GuestOSVO.java

@@ -57,6 +57,9 @@ public class GuestOSVO implements GuestOS {
     @Column(name = "is_user_defined")
     private boolean isUserDefined;
 
+    @Column(name = "display", updatable = true, nullable = false)
+    protected boolean display = true;
+
     @Override
     public long getId() {
         return id;
@@ -120,4 +123,12 @@ public boolean getIsUserDefined() {
     public void setIsUserDefined(boolean isUserDefined) {
         this.isUserDefined = isUserDefined;
     }
+
+    public boolean isDisplay() {
+        return display;
+    }
+
+    public void setDisplay(boolean display) {
+        this.display = display;
+    }
 }

engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java

@@ -72,19 +72,17 @@ private void makeNormative(GuestOSVO guestOSVO, Set<GuestOSVO> setOfGuestOSes) {
         for (GuestOSVO oldGuestOs : setOfGuestOSes) {
             List<GuestOSHypervisorVO> mappings = guestOSHypervisorDao.listByGuestOsId(oldGuestOs.getId());
             copyMappings(guestOSVO, mappings);
-            // // find VMs
-            // // // for each VM
-            // // // // set the guest_os_id to the one to keep
-            // // find templates
-            // // // for each template
-            // // // // set the guest_os_id to the one to keep
-            // // mark as removed
-
+            makeHidden(oldGuestOs);
         }
         // set the lower id as not user defined, if that was not the premise anyway
 
     }
 
+    private void makeHidden(GuestOSVO guestOSVO) {
+        guestOSVO.setDisplay(false);
+        guestOSDao.update(guestOSVO.getId(),guestOSVO);
+    }
+
     private void copyMappings(GuestOSVO guestOSVO, List<GuestOSHypervisorVO> mappings) {
         for (GuestOSHypervisorVO mapping : mappings) {
             if (null == guestOSHypervisorDao.findByOsIdAndHypervisor(guestOSVO.getId(), mapping.getHypervisorType(), mapping.getHypervisorVersion())) {

engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql

@@ -1568,4 +1568,6 @@ UPDATE
 SET
   usage_type = 22
 WHERE
-  usage_type = 24 AND usage_display like '% io write';
+  usage_type = 24 AND usage_display like '% io write';
+
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os', 'display', 'tinyint(1) DEFAULT ''1'' COMMENT ''should this guest_os be shown to the end user'' ');

engine/schema/src/main/resources/META-INF/db/schema-41800to41810.sql

@@ -39,3 +39,4 @@ WHERE so.default_use = 1 AND so.vm_type IN ('domainrouter', 'secondarystoragevm'
 
 -- fix erronous commas in guest_os names
 UPDATE `cloud`.`guest_os_hypervisor` SET guest_os_name = 'rhel9_64Guest' WHERE guest_os_name = 'rhel9_64Guest,';
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.guest_os', 'display', 'tinyint(1) DEFAULT ''1'' COMMENT ''should this guest_os be shown to the end user'' ');

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -3636,7 +3636,6 @@ public GuestOSResponse createGuestOSResponse(GuestOS guestOS) {
         if (category != null) {
             response.setOsCategoryId(category.getUuid());
         }
-        // TODO: create details find utility and add the details to the response
 
         response.setObjectName("ostype");
         return response;

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -2796,21 +2796,15 @@ public GuestOS addGuestOs(final AddGuestOsCmd cmd) {
         guestOsVo.setDisplayName(displayName);
         guestOsVo.setName(name);
         guestOsVo.setIsUserDefined(true);
+        guestOsVo.setDisplay(cmd.getForDisplay() == null ? true : cmd.getForDisplay());
         final GuestOS guestOsPersisted = _guestOSDao.persist(guestOsVo);
 
-        Map<String, String> details = cmd.getDetails();
-        Boolean forDisplay = cmd.getForDisplay();
-        persistGuestOsDetails(forDisplay, details, guestOsPersisted.getId());
+        persistGuestOsDetails(cmd.getDetails(), guestOsPersisted.getId());
 
         return guestOsPersisted;
     }
 
-    private void persistGuestOsDetails(Boolean forDisplay, Map<String, String> details, long guestOsPersistedId) {
-        if (Boolean.FALSE.equals(forDisplay)) {
-            details.put("display", Boolean.FALSE.toString());
-        } else {
-            details.put("display", Boolean.TRUE.toString());
-        }
+    private void persistGuestOsDetails(Map<String, String> details, long guestOsPersistedId) {
         for (Object key : details.keySet()) {
             _guestOsDetailsDao.addDetail(guestOsPersistedId, (String)key, details.get(key), false);
         }
@@ -2839,10 +2833,7 @@ public GuestOS updateGuestOs(final UpdateGuestOsCmd cmd) {
             throw new InvalidParameterValueException("Unable to modify system defined guest OS");
         }
 
-
-        Map<String, String> details = cmd.getDetails();
-        Boolean forDisplay = cmd.getForDisplay();
-        persistGuestOsDetails(forDisplay, details, id);
+        persistGuestOsDetails(cmd.getDetails(), id);
 
         //Check if update is needed
         if (displayName.equals(guestOsHandle.getDisplayName())) {
@@ -2856,6 +2847,9 @@ public GuestOS updateGuestOs(final UpdateGuestOsCmd cmd) {
         }
         final GuestOSVO guestOs = _guestOSDao.createForUpdate(id);
         guestOs.setDisplayName(displayName);
+        if (cmd.getForDisplay() != null) {
+            guestOs.setDisplay(cmd.getForDisplay());
+        }
         if (_guestOSDao.update(id, guestOs)) {
             return _guestOSDao.findById(id);
         } else {