Ansible Scripts to deploy/update the new Airavata Services

airavata-api/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/GwyResourceProfileRepository.java

@@ -63,6 +63,8 @@ public String updateGatewayResourceProfile(GatewayResourceProfile gatewayResourc
         String gatewayId = gatewayResourceProfile.getGatewayID();
         Mapper mapper = ObjectMapperSingleton.getInstance();
         GatewayProfileEntity gatewayProfileEntity = mapper.map(gatewayResourceProfile, GatewayProfileEntity.class);
+        // Explicitly set gatewayId since Dozer mapping does not handle gatewayID -> gatewayId conversion
+        gatewayProfileEntity.setGatewayId(gatewayId);
         if (get(gatewayId) != null) {
             gatewayProfileEntity.setUpdateTime(AiravataUtils.getCurrentTimestamp());
         } else {

airavata-api/src/main/resources/database_scripts/appcatalog-mysql.sql

@@ -592,26 +592,50 @@ CREATE TABLE GROUP_COMPUTE_RESOURCE_PREFERENCE
 (
         RESOURCE_ID VARCHAR(255) NOT NULL,
         GROUP_RESOURCE_PROFILE_ID varchar(255) NOT NULL,
+        RESOURCE_TYPE VARCHAR(255) NOT NULL,
         OVERRIDE_BY_AIRAVATA SMALLINT,
         PREFERED_JOB_SUB_PROTOCOL VARCHAR(255),
         PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
-        PREFERED_BATCH_QUEUE VARCHAR(255),
         SCRATCH_LOCATION VARCHAR(255),
-        ALLOCATION_PROJECT_NUMBER VARCHAR(255),
         LOGIN_USERNAME VARCHAR(255),
         RESOURCE_CS_TOKEN VARCHAR(255),
-        USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
-        QUALITY_OF_SERVICE VARCHAR(255),
-        RESERVATION VARCHAR (255),
-        RESERVATION_START_TIME timestamp,
-        RESERVATION_END_TIME timestamp,
-        SSH_ACCOUNT_PROVISIONER VARCHAR(255),
-        SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(1000),
         PRIMARY KEY(RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID),
         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
         FOREIGN KEY (GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_RESOURCE_PROFILE(GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
+CREATE TABLE SLURM_GROUP_COMPUTE_RESOURCE_PREFERENCE
+(
+        RESOURCE_ID VARCHAR(255) NOT NULL,
+        GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
+        PREFERED_BATCH_QUEUE VARCHAR(255) DEFAULT NULL,
+        ALLOCATION_PROJECT_NUMBER VARCHAR(255) DEFAULT NULL,
+        USAGE_REPORTING_GATEWAY_ID VARCHAR(255) DEFAULT NULL,
+        QUALITY_OF_SERVICE VARCHAR(255) DEFAULT NULL,
+        RESERVATION VARCHAR(255) DEFAULT NULL,
+        RESERVATION_START_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+        RESERVATION_END_TIME TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
+        SSH_ACCOUNT_PROVISIONER VARCHAR(255) DEFAULT NULL,
+        SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO TEXT DEFAULT NULL,
+        PRIMARY KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID),
+        CONSTRAINT FK_SLURM_PREF_TO_BASE FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+                REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+                ON DELETE CASCADE
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE AWS_GROUP_COMPUTE_RESOURCE_PREFERENCE
+(
+        RESOURCE_ID VARCHAR(255) NOT NULL,
+        GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
+        AWS_REGION VARCHAR(255) NOT NULL,
+        PREFERRED_AMI_ID VARCHAR(255) NOT NULL,
+        PREFERRED_INSTANCE_TYPE VARCHAR(255) NOT NULL,
+        PRIMARY KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID),
+        CONSTRAINT FK_AWS_PREF_TO_BASE FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+                REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+                ON DELETE CASCADE
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
 CREATE TABLE COMPUTE_RESOURCE_RESERVATION -- ComputeResourceReservationEntity
     (RESERVATION_ID VARCHAR(255) NOT NULL, END_TIME TIMESTAMP NOT NULL, RESERVATION_NAME VARCHAR(255) NOT NULL, START_TIME TIMESTAMP NOT NULL, RESOURCE_ID VARCHAR(255) NOT NULL, GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL, PRIMARY KEY (RESERVATION_ID)
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;