Merge branch 'master' of https://github.com/apache/cloudstack into cks_debian

Author: Pearl Dsilva

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -386,6 +386,7 @@ public class ApiConstants {
     public static final String VIRTUAL_MACHINE_NAME = "virtualmachinename";
     public static final String VIRTUAL_MACHINE_ID_IP = "vmidipmap";
     public static final String VIRTUAL_MACHINE_COUNT = "virtualmachinecount";
+    public static final String VIRTUAL_MACHINES = "virtualmachines";
     public static final String USAGE_ID = "usageid";
     public static final String USAGE_TYPE = "usagetype";
     public static final String INCLUDE_TAGS = "includetags";

api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java

@@ -21,6 +21,7 @@
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
+import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.user.UserCmd;
@@ -35,6 +36,13 @@ public class UpdateTemplateCmd extends BaseUpdateTemplateOrIsoCmd implements Use
     public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmd.class.getName());
     private static final String s_name = "updatetemplateresponse";
 
+    /////////////////////////////////////////////////////
+    //////////////// API parameters /////////////////////
+    /////////////////////////////////////////////////////
+
+    @Parameter(name = "templatetype", type = CommandType.STRING, description = "the type of the template")
+    private String templateType;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -44,6 +52,10 @@ public Boolean getBootable() {
         return null;
     }
 
+    public String getTemplateType() {
+        return templateType;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

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

@@ -219,6 +219,10 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
     @Param(description = "true if template requires HVM enabled, false otherwise")
     private Boolean requiresHvm;
 
+    @SerializedName(ApiConstants.URL)
+    @Param(description = "the URL which the template/iso is registered from")
+    private String url;
+
     public TemplateResponse() {
         tags = new LinkedHashSet<>();
     }
@@ -450,4 +454,8 @@ public void addDeployAsIsDetail(String key, String value) {
         }
         this.deployAsIsDetails.put(key,value);
     }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }

debian/cloudstack-agent.install

@@ -24,5 +24,6 @@
 /usr/bin/cloudstack-setup-agent
 /usr/bin/cloudstack-ssh
 /usr/bin/cloudstack-agent-upgrade
+/usr/bin/cloudstack-guest-tool
 /usr/share/cloudstack-agent/lib/*
 /usr/share/cloudstack-agent/plugins

engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql

@@ -75,7 +75,8 @@ ALTER TABLE `cloud`.`project_invitations`
     ADD CONSTRAINT `uc_project_invitations__project_id_account_id_user_id` UNIQUE (`project_id`, `account_id`,`user_id`);
 
 -- Alter project_invitation_view to incorporate user_id as a field
-ALTER VIEW `cloud`.`project_invitation_view` AS
+DROP VIEW IF EXISTS `cloud`.`project_invitation_view`;
+CREATE VIEW `cloud`.`project_invitation_view` AS
     select
         project_invitations.id,
         project_invitations.uuid,
@@ -107,7 +108,8 @@ ALTER VIEW `cloud`.`project_invitation_view` AS
         `cloud`.`user` ON project_invitations.user_id = user.id;
 
 -- Alter project_account_view to incorporate user id
-ALTER VIEW `cloud`.`project_account_view` AS
+DROP VIEW IF EXISTS `cloud`.`project_account_view`;
+CREATE VIEW `cloud`.`project_account_view` AS
     select
         project_account.id,
         account.id account_id,
@@ -140,7 +142,9 @@ ALTER VIEW `cloud`.`project_account_view` AS
             left join
         `cloud`.`user` ON (project_account.user_id = user.id);
 
-ALTER VIEW `cloud`.`project_view` AS
+-- Alter project_view to incorporate user id
+DROP VIEW IF EXISTS `cloud`.`project_view`;
+CREATE VIEW `cloud`.`project_view` AS
     select
         projects.id,
         projects.uuid,
@@ -558,7 +562,8 @@ CREATE TABLE `cloud`.`user_vm_deploy_as_is_details` (
 
 ALTER TABLE `cloud`.`image_store` ADD COLUMN `readonly` boolean DEFAULT false COMMENT 'defines status of image store';
 
-ALTER VIEW `cloud`.`image_store_view` AS
+DROP VIEW IF EXISTS `cloud`.`image_store_view`;
+CREATE VIEW `cloud`.`image_store_view` AS
     select
         image_store.id,
         image_store.uuid,
@@ -826,6 +831,9 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_vers
 INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'VMware', '6.7.2', 'vmwarePhoton64Guest', 329, now(), 0);
 INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'VMware', '6.7.3', 'vmwarePhoton64Guest', 329, now(), 0);
 
+-- Fix OS category for Guest OS 'Other PV Virtio-SCSI (64-bit)'
+UPDATE `cloud`.`guest_os` SET category_id = 7 WHERE id = 275 AND display_name = 'Other PV Virtio-SCSI (64-bit)';
+
 ALTER TABLE `cloud`.`user_vm` ADD COLUMN `user_vm_type` varchar(255) DEFAULT "UserVM" COMMENT 'Defines the type of UserVM';
 
 UPDATE `cloud`.`vm_template` set deploy_as_is = 1 where id = 8;