You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/26 15:43:05 UTC

[airavata] branch staging updated: Adding new app_catalog tables to migration script

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

machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/staging by this push:
     new f863514  Adding new app_catalog tables to migration script
f863514 is described below

commit f86351435b07eef8a74dd4ec0457b3379780f033
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jun 26 11:42:53 2019 -0400

    Adding new app_catalog tables to migration script
---
 .../next/DeltaScripts/appCatalog_schema_delta.sql  | 169 +++++++++++++++++++++
 1 file changed, 169 insertions(+)

diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
index 8600fbb..6a3ec04 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
@@ -20,6 +20,175 @@
 
 use app_catalog;
 
+-- new tables
+CREATE TABLE `BATCH_QUEUE_RESOURCE_POLICY` (
+  `RESOURCE_POLICY_ID` varchar(255) NOT NULL,
+  `COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
+  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
+  `MAX_ALLOWED_CORES` int(11) DEFAULT NULL,
+  `MAX_ALLOWED_NODES` int(11) DEFAULT NULL,
+  `MAX_ALLOWED_WALLTIME` int(11) DEFAULT NULL,
+  `QUEUE_NAME` varchar(255) NOT NULL,
+  PRIMARY KEY (`RESOURCE_POLICY_ID`),
+  KEY `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`),
+  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
+  CONSTRAINT `BATCH_QUEUE_RESOURCE_POLICY_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
+  CONSTRAINT `BATCH_QUEUE_RESOURCE_POLICY_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSER_CONNECTOR` (
+  `PARSER_CONNECTOR_ID` varchar(255) NOT NULL,
+  `PARENT_PARSER_ID` varchar(255) NOT NULL,
+  `CHILD_PARSER_ID` varchar(255) NOT NULL,
+  `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
+  PRIMARY KEY (`PARSER_CONNECTOR_ID`),
+  KEY `PARENT_PARSER_ID` (`PARENT_PARSER_ID`),
+  KEY `CHILD_PARSER_ID` (`CHILD_PARSER_ID`),
+  KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
+  CONSTRAINT `PARSER_CONNECTOR_ibfk_1` FOREIGN KEY (`PARENT_PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE,
+  CONSTRAINT `PARSER_CONNECTOR_ibfk_2` FOREIGN KEY (`CHILD_PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE,
+  CONSTRAINT `PARSER_CONNECTOR_ibfk_3` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSING_TEMPLATE_INPUT` (
+  `PARSING_TEMPLATE_INPUT_ID` varchar(255) NOT NULL,
+  `TARGET_PARSER_INPUT_ID` varchar(255) NOT NULL,
+  `APPLICATION_OUTPUT_NAME` varchar(255) DEFAULT NULL,
+  `VALUE` varchar(255) DEFAULT NULL,
+  `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
+  PRIMARY KEY (`PARSING_TEMPLATE_INPUT_ID`),
+  KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
+  KEY `TARGET_PARSER_INPUT_ID` (`TARGET_PARSER_INPUT_ID`),
+  CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_1` FOREIGN KEY (`TARGET_PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
+  CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_2` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSING_TEMPLATE` (
+  `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
+  `APP_INTERFACE_ID` varchar(255) NOT NULL,
+  `GATEWAY_ID` varchar(255) NOT NULL,
+  PRIMARY KEY (`PARSING_TEMPLATE_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSER_OUTPUT` (
+  `PARSER_OUTPUT_ID` varchar(255) NOT NULL,
+  `PARSER_OUTPUT_NAME` varchar(255) NOT NULL,
+  `PARSER_OUTPUT_REQUIRED` tinyint(1) NOT NULL,
+  `PARSER_ID` varchar(255) NOT NULL,
+  `OUTPUT_TYPE` varchar(255) NOT NULL,
+  PRIMARY KEY (`PARSER_OUTPUT_ID`),
+  KEY `PARSER_ID` (`PARSER_ID`),
+  CONSTRAINT `PARSER_OUTPUT_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSER_INPUT` (
+  `PARSER_INPUT_ID` varchar(255) NOT NULL,
+  `PARSER_INPUT_NAME` varchar(255) NOT NULL,
+  `PARSER_INPUT_REQUIRED` tinyint(1) NOT NULL,
+  `PARSER_ID` varchar(255) NOT NULL,
+  `INPUT_TYPE` varchar(255) NOT NULL,
+  PRIMARY KEY (`PARSER_INPUT_ID`),
+  KEY `PARSER_ID` (`PARSER_ID`),
+  CONSTRAINT `PARSER_INPUT_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `COMPUTE_RESOURCE_POLICY` (
+  `RESOURCE_POLICY_ID` varchar(255) NOT NULL,
+  `COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
+  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
+  PRIMARY KEY (`RESOURCE_POLICY_ID`),
+  KEY `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`),
+  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
+  CONSTRAINT `COMPUTE_RESOURCE_POLICY_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
+  CONSTRAINT `COMPUTE_RESOURCE_POLICY_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSER_CONNECTOR_INPUT` (
+  `PARSER_CONNECTOR_INPUT_ID` varchar(255) NOT NULL,
+  `PARSER_INPUT_ID` varchar(255) NOT NULL,
+  `PARSER_OUTPUT_ID` varchar(255) DEFAULT NULL,
+  `VALUE` varchar(255) DEFAULT NULL,
+  `PARSER_CONNECTOR_ID` varchar(255) NOT NULL,
+  PRIMARY KEY (`PARSER_CONNECTOR_INPUT_ID`),
+  KEY `PARSER_INPUT_ID` (`PARSER_INPUT_ID`),
+  KEY `PARSER_OUTPUT_ID` (`PARSER_OUTPUT_ID`),
+  KEY `PARSER_CONNECTOR_ID` (`PARSER_CONNECTOR_ID`),
+  CONSTRAINT `PARSER_CONNECTOR_INPUT_ibfk_1` FOREIGN KEY (`PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
+  CONSTRAINT `PARSER_CONNECTOR_INPUT_ibfk_2` FOREIGN KEY (`PARSER_OUTPUT_ID`) REFERENCES `PARSER_OUTPUT` (`PARSER_OUTPUT_ID`) ON DELETE CASCADE,
+  CONSTRAINT `PARSER_CONNECTOR_INPUT_ibfk_3` FOREIGN KEY (`PARSER_CONNECTOR_ID`) REFERENCES `PARSER_CONNECTOR` (`PARSER_CONNECTOR_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSER` (
+  `PARSER_ID` varchar(255) NOT NULL,
+  `IMAGE_NAME` varchar(255) NOT NULL,
+  `OUTPUT_DIR_PATH` varchar(255) NOT NULL,
+  `INPUT_DIR_PATH` varchar(255) NOT NULL,
+  `EXECUTION_COMMAND` varchar(255) NOT NULL,
+  `GATEWAY_ID` varchar(255) NOT NULL,
+  PRIMARY KEY (`PARSER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `GRP_SSH_ACC_PROV_CONFIG` (
+  `CONFIG_NAME` varchar(255) NOT NULL,
+  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
+  `RESOURCE_ID` varchar(255) NOT NULL,
+  `CONFIG_VALUE` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`CONFIG_NAME`,`GROUP_RESOURCE_PROFILE_ID`,`RESOURCE_ID`),
+  KEY `RESOURCE_ID` (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
+  CONSTRAINT `GRP_SSH_ACC_PROV_CONFIG_ibfk_1` 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 `GROUP_RESOURCE_PROFILE` (
+  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
+  `CREATION_TIME` bigint(20) NOT NULL,
+  `GATEWAY_ID` varchar(255) NOT NULL,
+  `GROUP_RESOURCE_PROFILE_NAME` varchar(255) DEFAULT NULL,
+  `UPDATE_TIME` bigint(20) NOT NULL,
+  `DEFAULT_CREDENTIAL_STORE_TOKEN` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`GROUP_RESOURCE_PROFILE_ID`),
+  UNIQUE KEY `GATEWAY_ID` (`GATEWAY_ID`,`GROUP_RESOURCE_PROFILE_NAME`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` (
+  `RESOURCE_ID` varchar(255) NOT NULL,
+  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
+  `ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
+  `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
+  `OVERRIDE_BY_AIRAVATA` smallint(6) DEFAULT NULL,
+  `PREFERED_BATCH_QUEUE` varchar(255) DEFAULT NULL,
+  `PREFERED_DATA_MOVE_PROTOCOL` varchar(255) DEFAULT NULL,
+  `PREFERED_JOB_SUB_PROTOCOL` varchar(255) DEFAULT NULL,
+  `QUALITY_OF_SERVICE` varchar(255) DEFAULT NULL,
+  `RESERVATION` varchar(255) DEFAULT NULL,
+  `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
+  `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
+  `SSH_ACCOUNT_PROVISIONER` varchar(255) DEFAULT NULL,
+  `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL,
+  `USAGE_REPORTING_GATEWAY_ID` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
+  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
+  CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
+  CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `GATEWAY_GROUPS` (
+  `GATEWAY_ID` varchar(255) NOT NULL,
+  `ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
+  `DEFAULT_GATEWAY_USERS_GROUP_ID` varchar(255) DEFAULT NULL,
+  `READ_ONLY_ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`GATEWAY_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` (
+  `RESOURCE_POLICY_ID` varchar(255) NOT NULL,
+  `QUEUE_NAME` varchar(255) NOT NULL,
+  PRIMARY KEY (`RESOURCE_POLICY_ID`,`QUEUE_NAME`),
+  CONSTRAINT `COMPUTE_RESOURCE_POLICY_QUEUES_ibfk_1` FOREIGN KEY (`RESOURCE_POLICY_ID`) REFERENCES `COMPUTE_RESOURCE_POLICY` (`RESOURCE_POLICY_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
 -- AIRAVATA-2768
 alter table APPLICATION_INPUT modify METADATA VARCHAR(4096);