Added new filter to guest os mapping

Author: harikrishna-patnala

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java

@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.guest;
 
+import org.apache.commons.collections.MapUtils;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
@@ -57,7 +58,7 @@ public class AddGuestOsCmd extends BaseAsyncCreateCmd {
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = false, description = "Optional name for Guest OS")
     private String osName;
 
-    @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = true, description = "Map of (key/value pairs)")
+    @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = false, description = "Map of (key/value pairs)")
     private Map details;
 
 
@@ -79,7 +80,7 @@ public String getOsName() {
 
     public Map getDetails() {
         Map<String, String> detailsMap = new HashMap<String, String>();
-        if (!details.isEmpty()) {
+        if (!MapUtils.isEmpty(details)) {
             Collection<?> servicesCollection = details.values();
             Iterator<?> iter = servicesCollection.iterator();
             while (iter.hasNext()) {

api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java

@@ -51,6 +51,9 @@ public class ListGuestOsMappingCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.OS_DISPLAY_NAME, type = CommandType.STRING, required = false, description = "list Guest OS mapping by OS display name")
     private String osDisplayName;
 
+    @Parameter(name = ApiConstants.OS_NAME_FOR_HYPERVISOR, type = CommandType.STRING, required = false, description = "list Guest OS mapping by OS mapping name with hypervisor")
+    private String osNameForHypervisor;
+
     @Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, required = false, description = "list Guest OS mapping by hypervisor")
     private String hypervisor;
 
@@ -73,6 +76,10 @@ public String getOsDisplayName() {
         return osDisplayName;
     }
 
+    public String getOsNameForHypervisor() {
+        return osNameForHypervisor;
+    }
+
     public String getHypervisor() {
         return hypervisor;
     }

api/src/main/java/org/apache/cloudstack/api/response/GuestOSResponse.java

@@ -39,9 +39,9 @@ public class GuestOSResponse extends BaseResponse {
     @Param(description = "the name of the OS category")
     private String osCategoryName;
 
-    @SerializedName(ApiConstants.OS_NAME)
+    @SerializedName(ApiConstants.NAME)
     @Param(description = "the name of the OS type")
-    private String osName;
+    private String name;
 
     @SerializedName(ApiConstants.IS_USER_DEFINED)
     @Param(description = "is the guest OS user defined")
@@ -71,12 +71,12 @@ public void setOsCategoryName(String osCategoryName) {
         this.osCategoryName = osCategoryName;
     }
 
-    public String getOsName() {
-        return osName;
+    public String getName() {
+        return name;
     }
 
-    public void setOsName(String osName) {
-        this.osName = osName;
+    public void setName(String name) {
+        this.name = name;
     }
 
     public String getIsUserDefined() {

engine/schema/src/main/java/com/cloud/storage/dao/GuestOSDao.java

@@ -19,9 +19,12 @@
 import com.cloud.storage.GuestOSVO;
 import com.cloud.utils.db.GenericDao;
 
+import java.util.List;
+
 public interface GuestOSDao extends GenericDao<GuestOSVO, Long> {
 
     GuestOSVO listByDisplayName(String displayName);
 
+    List<GuestOSVO> listLikeDisplayName(String displayName);
     GuestOSVO findByCategoryIdAndDisplayNameOrderByCreatedDesc(long categoryId, String displayName);
 }

engine/schema/src/main/java/com/cloud/storage/dao/GuestOSDaoImpl.java

@@ -33,12 +33,19 @@ public class GuestOSDaoImpl extends GenericDaoBase<GuestOSVO, Long> implements G
 
     protected final SearchBuilder<GuestOSVO> Search;
 
+    protected final SearchBuilder<GuestOSVO> displayNameSearch;
+
     public GuestOSDaoImpl() {
         Search = createSearchBuilder();
         Search.and("category_id", Search.entity().getCategoryId(), SearchCriteria.Op.EQ);
         Search.and("display_name", Search.entity().getDisplayName(), SearchCriteria.Op.EQ);
         Search.and("is_user_defined", Search.entity().getIsUserDefined(), SearchCriteria.Op.EQ);
         Search.done();
+
+        displayNameSearch = createSearchBuilder();
+        displayNameSearch.and("display_name", displayNameSearch.entity().getDisplayName(), SearchCriteria.Op.LIKE);
+        displayNameSearch.done();
+
     }
 
     @Override
@@ -48,6 +55,13 @@ public GuestOSVO listByDisplayName(String displayName) {
         return findOneBy(sc);
     }
 
+    @Override
+    public List<GuestOSVO> listLikeDisplayName(String displayName) {
+        SearchCriteria<GuestOSVO> sc = displayNameSearch.create();
+        sc.setParameters("display_name", "%" + displayName + "%");
+        return listBy(sc);
+    }
+
     @Override
     public GuestOSVO findByCategoryIdAndDisplayNameOrderByCreatedDesc(long categoryId, String displayName) {
         SearchCriteria<GuestOSVO> sc = Search.create();

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

@@ -3583,7 +3583,7 @@ public Site2SiteVpnConnectionResponse createSite2SiteVpnConnectionResponse(Site2
     @Override
     public GuestOSResponse createGuestOSResponse(GuestOS guestOS) {
         GuestOSResponse response = new GuestOSResponse();
-        response.setOsName(guestOS.getDisplayName());
+        response.setName(guestOS.getDisplayName());
         response.setId(guestOS.getUuid());
         response.setIsUserDefined(String.valueOf(guestOS.getIsUserDefined()));
         GuestOSCategoryVO category = ApiDBUtils.findGuestOsCategoryById(guestOS.getCategoryId());

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

@@ -2610,6 +2610,7 @@ public Pair<List<? extends GuestOSHypervisor>, Integer> listGuestOSMappingByCrit
         final Long id = cmd.getId();
         final Long osTypeId = cmd.getOsTypeId();
         final String osDisplayName = cmd.getOsDisplayName();
+        final String osNameForHypervisor = cmd.getOsNameForHypervisor();
         final String hypervisor = cmd.getHypervisor();
         final String hypervisorVersion = cmd.getHypervisorVersion();
 
@@ -2628,8 +2629,8 @@ public Pair<List<? extends GuestOSHypervisor>, Integer> listGuestOSMappingByCrit
             sc.addAnd("guestOsId", SearchCriteria.Op.EQ, osTypeId);
         }
 
-        if (osDisplayName != null) {
-            sc.addAnd("guestOsName", SearchCriteria.Op.LIKE, "%" + osDisplayName + "%");
+        if (osNameForHypervisor != null) {
+            sc.addAnd("guestOsName", SearchCriteria.Op.LIKE, "%" + osNameForHypervisor + "%");
         }
 
         if (hypervisor != null) {
@@ -2640,6 +2641,12 @@ public Pair<List<? extends GuestOSHypervisor>, Integer> listGuestOSMappingByCrit
             sc.addAnd("hypervisorVersion", SearchCriteria.Op.EQ, hypervisorVersion);
         }
 
+        if (osDisplayName != null) {
+            List<GuestOSVO> guestOSVOS = _guestOSDao.listLikeDisplayName(osDisplayName);
+            List<Long> guestOSids = guestOSVOS.stream().map(mo -> mo.getId()).collect(Collectors.toList());
+            sc.addAnd("guestOsId", SearchCriteria.Op.IN, guestOSids.toArray());
+        }
+
         final Pair<List<GuestOSHypervisorVO>, Integer> result = _guestOSHypervisorDao.searchAndCount(sc, searchFilter);
         return new Pair<List<? extends GuestOSHypervisor>, Integer>(result.first(), result.second());
     }

ui/src/config/section/config.js

@@ -88,23 +88,29 @@ export default {
       title: 'label.guest.os',
       docHelp: 'adminguide/service_offerings.html#compute-and-disk-service-offerings',
       icon: 'database-outlined',
-      permission: ['listOsTypes'],
-      columns: ['osname', 'oscategoryname', 'isuserdefined'],
-      details: ['osname', 'oscategoryname', 'isuserdefined'],
+      permission: ['listOsTypes', 'listOsCategories'],
+      columns: ['name', 'oscategoryname', 'isuserdefined'],
+      details: ['name', 'oscategoryname', 'isuserdefined'],
       related: [{
         name: 'guestoshypervisormapping',
         title: 'label.guest.os.hypervisor.mappings',
         param: 'ostypeid'
       }],
-      searchFilters: ['osname'],
+      searchFilters: ['name'],
       actions: [
         {
           api: 'addGuestOs',
           icon: 'plus-outlined',
           label: 'label.add.guest.os',
           listView: true,
           dataView: false,
-          args: ['osdisplayname', 'oscategoryid']
+          args: ['osdisplayname', 'oscategoryid'],
+          mapping: {
+            oscategoryid: {
+              api: 'listOsCategories',
+              params: (record) => { return { oscategoryid: record.id } }
+            }
+          }
         },
         {
           api: 'updateGuestOs',
@@ -121,7 +127,8 @@ export default {
           args: ['ostypeid', 'hypervisor', 'hypervisorversion', 'osnameforhypervisor', 'osmappingcheckenabled', 'forced'],
           mapping: {
             ostypeid: {
-              value: (record) => { return record.id }
+              api: 'listOsTypes',
+              params: (record) => { return { ostypeid: record.id } }
             }
           }
         },
@@ -145,7 +152,7 @@ export default {
       columns: ['hypervisor', 'hypervisorversion', 'osdisplayname', 'osnameforhypervisor'],
       details: ['hypervisor', 'hypervisorversion', 'osdisplayname', 'osnameforhypervisor', 'isuserdefined'],
       filters: ['all', 'kvm', 'vmware', 'xenserver', 'lxc', 'ovm3'],
-      searchFilters: ['osdisplayname', 'hypervisor', 'hypervisorversion'],
+      searchFilters: ['osdisplayname', 'osnameforhypervisor', 'hypervisor', 'hypervisorversion'],
       actions: [
         {
           api: 'addGuestOsMapping',

ui/src/views/image/RegisterOrUploadIso.vue

@@ -111,11 +111,11 @@
             }"
             :loading="osTypeLoading"
             :placeholder="apiParams.ostypeid.description">
-            <a-select-option :value="opt.id" v-for="(opt, optIndex) in osTypes" :key="optIndex" :label="opt.name || opt.description">
+            <a-select-option :value="opt.id" v-for="(opt, optIndex) in osTypes" :key="optIndex" :label="opt.name">
               <span>
                 <resource-icon v-if="opt.icon" :image="opt.icon.base64image" size="1x" style="margin-right: 5px"/>
                 <global-outlined v-else style="margin-right: 5px" />
-                {{ opt.name || opt.description }}
+                {{ opt.name }}
               </span>
             </a-select-option>
           </a-select>

ui/src/views/image/RegisterOrUploadTemplate.vue

@@ -249,7 +249,7 @@
             :loading="osTypes.loading"
             :placeholder="apiParams.ostypeid.description">
             <a-select-option v-for="opt in osTypes.opts" :key="opt.id">
-              {{ opt.name || opt.description }}
+              {{ opt.name || opt.name }}
             </a-select-option>
           </a-select>
         </a-form-item>
@@ -564,7 +564,7 @@ export default {
         const listOsTypes = json.listostypesresponse.ostype
         this.osTypes.opts = listOsTypes
         this.defaultOsType = this.osTypes.opts[1].description
-        this.defaultOsId = this.osTypes.opts[1].id
+        this.defaultOsId = this.osTypes.opts[1].name
       }).finally(() => {
         this.osTypes.loading = false
       })