general fixes

Author: bernardodemarco

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42100to42200.java

@@ -16,7 +16,6 @@
 // under the License.
 package com.cloud.upgrade.dao;
 
-import com.cloud.utils.FileUtil;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 import java.io.InputStream;
@@ -27,7 +26,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.List;
 
 public class Upgrade42100to42200 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
     private static final Path NIMBLE_RESOURCE_TYPES_DIRECTORY = Paths.get("nimble", "resource-types");

engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql

@@ -26,6 +26,6 @@ CREATE TABLE IF NOT EXISTS `cloud`.`iac_resource_types` (
     `uuid` VARCHAR(40) UNIQUE,
     `name` VARCHAR(100) NOT NULL COMMENT 'Profile''s element name.',
     `category` VARCHAR(100) NOT NULL COMMENT 'Profile''s element category.',
-    `element_content` TEXT NOT NULL COMMENT 'Profile''s element content.',
+    `content` TEXT NOT NULL COMMENT 'Profile''s element content.',
     PRIMARY KEY (`id`)
 );

plugins/iac/nimble/src/main/java/org/apache/cloudstack/api/response/NimbleResponseBuilder.java

@@ -29,6 +29,7 @@ public IacResourceTypeResponse createIacResourceTypeResponse(IacResourceType iac
             response.setIacResourceTypeContent(iacResourceType.getContent());
         }
 
+        response.setObjectName("iacresourcetypes");
         return response;
     }
 }

plugins/iac/nimble/src/main/java/org/apache/cloudstack/persistence/iactemplatesprofile/IacResourceTypeDaoImpl.java

@@ -38,6 +38,7 @@ public IacResourceTypeDaoImpl() {
         listIacResourceTypesSearchBuilder = createSearchBuilder();
         listIacResourceTypesSearchBuilder.and(ID, listIacResourceTypesSearchBuilder.entity().getId(), SearchCriteria.Op.EQ);
         listIacResourceTypesSearchBuilder.and(NAME, listIacResourceTypesSearchBuilder.entity().getName(), SearchCriteria.Op.EQ);
+        listIacResourceTypesSearchBuilder.and(CATEGORY, listIacResourceTypesSearchBuilder.entity().getCategory(), SearchCriteria.Op.EQ);
         listIacResourceTypesSearchBuilder.and(NAME_LIKE_KEYWORD, listIacResourceTypesSearchBuilder.entity().getName(), SearchCriteria.Op.LIKE);
         listIacResourceTypesSearchBuilder.done();
     }