This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 2786582  Add new registers in guest_os (#4699)
2786582 is described below

commit 278658283e539db8157aae9405132478283f6e5d
Author: Daniel Augusto Veronezi Salvador 
<[email protected]>
AuthorDate: Thu Aug 12 11:32:09 2021 -0300

    Add new registers in guest_os (#4699)
    
    * Add new registers in guest_os
    
    * Create a procedure to insert guest_os and guest_os_hypervisor data
    
    * Remove ';' as the last char of the procedure
    
    * Set the right category_id on guest_os
    
    Ubuntu 20.04 LTS - Ubuntu - Linux
    Ubuntu 21.04 - Ubuntu - Linux
    pfSense 2.4 - FreeBSD - Unix
    OpenBSD 6.7 - Unix
    OpenBSD 6.8 - Unix
    AlmaLinux 8.3 - CentOS
    
    * Fix SQL line's last character
    
    * Add from with dummy table
    
    Co-authored-by: Daniel Augusto Veronezi Salvador <[email protected]>
---
 .../resources/META-INF/db/schema-41510to41600.sql  | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git 
a/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql 
b/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql
index da1fd20..e53bdc5 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql
@@ -696,3 +696,44 @@ CREATE VIEW `cloud`.`host_view` AS
         `cloud`.`user` ON `user`.`uuid` = `last_annotation_view`.`user_uuid`
     GROUP BY
         `host`.`id`;
+
+-- PR#4699 Drop the procedure `ADD_GUEST_OS_AND_HYPERVISOR_MAPPING` if it 
already exist.
+DROP PROCEDURE IF EXISTS `cloud`.`ADD_GUEST_OS_AND_HYPERVISOR_MAPPING`;
+
+-- PR#4699 Create the procedure `ADD_GUEST_OS_AND_HYPERVISOR_MAPPING` to add 
guest_os and guest_os_hypervisor mapping.
+CREATE PROCEDURE `cloud`.`ADD_GUEST_OS_AND_HYPERVISOR_MAPPING` (
+    IN guest_os_category_id bigint(20) unsigned,
+    IN guest_os_display_name VARCHAR(255),
+    IN guest_os_hypervisor_hypervisor_type VARCHAR(32),
+    IN guest_os_hypervisor_hypervisor_version VARCHAR(32),
+    IN guest_os_hypervisor_guest_os_name VARCHAR(255)
+)
+BEGIN  
+       INSERT  INTO cloud.guest_os (uuid, category_id, display_name, created) 
+       SELECT  UUID(), guest_os_category_id, guest_os_display_name, now()
+       FROM    DUAL
+       WHERE   not exists( SELECT  1 
+                           FROM    cloud.guest_os
+                           WHERE   cloud.guest_os.category_id = 
guest_os_category_id
+                           AND     cloud.guest_os.display_name = 
guest_os_display_name)        
+                                               
+;      INSERT  INTO cloud.guest_os_hypervisor (uuid, hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created) 
+       SELECT  UUID(), guest_os_hypervisor_hypervisor_type, 
guest_os_hypervisor_hypervisor_version, guest_os_hypervisor_guest_os_name, 
guest_os.id, now()
+       FROM    cloud.guest_os
+       WHERE   guest_os.category_id = guest_os_category_id
+       AND     guest_os.display_name = guest_os_display_name
+       AND     NOT EXISTS (SELECT  1 
+                           FROM    cloud.guest_os_hypervisor as hypervisor
+                           WHERE   hypervisor_type = 
guest_os_hypervisor_hypervisor_type                       
+                           AND     hypervisor_version = 
guest_os_hypervisor_hypervisor_version
+                           AND     hypervisor.guest_os_id = guest_os.id
+                           AND     hypervisor.guest_os_name = 
guest_os_hypervisor_guest_os_name)    
+;END;
+
+-- PR#4699 Call procedure `ADD_GUEST_OS_AND_HYPERVISOR_MAPPING` to add new 
data to guest_os and guest_os_hypervisor.
+CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (10, 'Ubuntu 20.04 LTS', 'KVM', 
'default', 'Ubuntu 20.04 LTS');
+CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (10, 'Ubuntu 21.04', 'KVM', 
'default', 'Ubuntu 21.04');
+CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (9, 'pfSense 2.4', 'KVM', 'default', 
'pfSense 2.4');
+CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (9, 'OpenBSD 6.7', 'KVM', 'default', 
'OpenBSD 6.7');
+CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (9, 'OpenBSD 6.8', 'KVM', 'default', 
'OpenBSD 6.8');
+CALL ADD_GUEST_OS_AND_HYPERVISOR_MAPPING (1, 'AlmaLinux 8.3', 'KVM', 
'default', 'AlmaLinux 8.3');

Reply via email to