airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject git commit: adding default type to parallalism
Date Mon, 07 Jul 2014 15:03:59 GMT
Repository: airavata
Updated Branches:
  refs/heads/master b2c2204c0 -> beb7471df


adding default type to parallalism


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/beb7471d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/beb7471d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/beb7471d

Branch: refs/heads/master
Commit: beb7471df9a0f2766a8a524cd6248ec925419174
Parents: b2c2204
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Mon Jul 7 11:03:56 2014 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Mon Jul 7 11:03:56 2014 -0400

----------------------------------------------------------------------
 .../airavata/api/airavataAPIConstants.java      |   2 +-
 .../resources/lib/airavataAPI_constants.cpp     |   2 +-
 .../lib/applicationDeploymentModel_types.h      |   2 +
 .../main/resources/lib/Airavata/API/Types.php   |   2 +-
 .../Model/AppCatalog/AppDeployment/Types.php    |   2 +-
 .../ApplicationDeploymentDescription.java       |   5 +-
 .../ApplicationInterfaceDescription.java        |   2 +-
 .../applicationDeploymentModel.thrift           |   2 +-
 .../data/impl/ApplicationDeploymentImpl.java    |  11 +-
 .../data/util/AppCatalogThriftConversion.java   |   4 +-
 .../src/main/resources/META-INF/persistence.xml |  20 +--
 .../src/main/resources/appcatalog-mysql.sql     | 146 ++++++++++++++-----
 12 files changed, 145 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
index a15cb7a..0594e00 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
@@ -64,6 +64,6 @@ import org.slf4j.LoggerFactory;
    *              in a change to major/minor version numbers.
    * 
    */
-  public static final String AIRAVATA_API_VERSION = "0.12.0";
+  public static final String AIRAVATA_API_VERSION = "0.13.0";
 
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
index 4f61277..250929b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavataAPI_constants.cpp
@@ -11,7 +11,7 @@ namespace airavata { namespace api {
 const airavataAPIConstants g_airavataAPI_constants;
 
 airavataAPIConstants::airavataAPIConstants() {
-  AIRAVATA_API_VERSION = "0.12.0";
+  AIRAVATA_API_VERSION = "0.13.0";
 
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
index 4c850dc..dec8238 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationDeploymentModel_types.h
@@ -166,6 +166,8 @@ class ApplicationDeploymentDescription {
   static const uint8_t binary_fingerprint[16]; // = {0x19,0xA9,0x84,0x1A,0x9F,0x46,0x27,0xA2,0xC1,0x0F,0x4A,0x28,0xE2,0xCF,0x0E,0x17};
 
   ApplicationDeploymentDescription() : isEmpty(false), appDeploymentId("DO_NOT_SET_AT_CLIENTS"),
appModuleId(), computeHostId(), executablePath(), parallelism((ApplicationParallelismType::type)0),
appDeploymentDescription() {
+    parallelism = (ApplicationParallelismType::type)0;
+
   }
 
   virtual ~ApplicationDeploymentDescription() throw() {}

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
index 5590a42..e99ad0b 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
@@ -17,6 +17,6 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
 use Thrift\Exception\TApplicationException;
 
 
-$GLOBALS['airavataAPI_CONSTANTS']['AIRAVATA_API_VERSION'] = "0.12.0";
+$GLOBALS['airavataAPI_CONSTANTS']['AIRAVATA_API_VERSION'] = "0.13.0";
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
index eab55bb..9137266 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -282,7 +282,7 @@ class ApplicationDeploymentDescription {
   public $appModuleId = null;
   public $computeHostId = null;
   public $executablePath = null;
-  public $parallelism = null;
+  public $parallelism =   0;
   public $appDeploymentDescription = null;
   public $moduleLoadCmds = null;
   public $libPrependPaths = null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
index b2f17bf..b6882ef 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -241,6 +241,8 @@ import org.slf4j.LoggerFactory;
 
     this.appDeploymentId = "DO_NOT_SET_AT_CLIENTS";
 
+    this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL;
+
   }
 
   public ApplicationDeploymentDescription(
@@ -325,7 +327,8 @@ import org.slf4j.LoggerFactory;
     this.appModuleId = null;
     this.computeHostId = null;
     this.executablePath = null;
-    this.parallelism = null;
+    this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL;
+
     this.appDeploymentDescription = null;
     this.moduleLoadCmds = null;
     this.libPrependPaths = null;

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
index cfff23d..0fecb98 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  * appDeploymentId:
  *   Corelated the interface to a particular application deployment
  * 
- * 
+ * FIXME: add a description
  */
 @SuppressWarnings("all") public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription,
ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription");

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
index ae4c20f..fa7ed01 100644
--- a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
@@ -120,7 +120,7 @@ struct ApplicationDeploymentDescription {
     3: required string appModuleId,
     4: required string computeHostId,
     5: required string executablePath,
-    6: required ApplicationParallelismType parallelism,
+    6: required ApplicationParallelismType parallelism = ApplicationParallelismType.SERIAL
,
 	7: optional string appDeploymentDescription,
 	8: optional list<string> moduleLoadCmds,
 	9: optional list<SetEnvPaths> libPrependPaths,

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
index a31f0d3..04c1a0e 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java
@@ -27,6 +27,7 @@ import org.apache.aiaravata.application.catalog.data.resources.*;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogThriftConversion;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogUtils;
 import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
+import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
 import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +61,11 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment
{
             deploymentResource.setHostResource((ComputeResourceResource)computeHostResource.get(deploymentDescription.getComputeHostId()));
             deploymentResource.setAppDes(deploymentDescription.getAppDeploymentDescription());
             deploymentResource.setExecutablePath(deploymentDescription.getExecutablePath());
-            deploymentResource.setParallelism(deploymentDescription.getParallelism().toString());
+            ApplicationParallelismType parallelism = deploymentDescription.getParallelism();
+            if (parallelism != null){
+                deploymentResource.setParallelism(parallelism.toString());
+            }
+
             //TODO
 //            deploymentResource.setEnvModuleLoadCMD(deploymentDescription.getModuleLoadCmd());
             deploymentResource.save();
@@ -129,7 +134,9 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment
{
             existingDep.setHostResource((ComputeResourceResource)computeHostResource.get(updatedDeployment.getComputeHostId()));
             existingDep.setAppDes(updatedDeployment.getAppDeploymentDescription());
             existingDep.setExecutablePath(updatedDeployment.getExecutablePath());
-            existingDep.setParallelism(updatedDeployment.getParallelism().toString());
+            if (updatedDeployment.getParallelism() != null){
+                deploymentResource.setParallelism(updatedDeployment.getParallelism().toString());
+            }
             //TODO
             
 //            existingDep.setEnvModuleLoadCMD(updatedDeployment.getModuleLoadCmd());

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index d15293e..d20e955 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -581,7 +581,9 @@ public class AppCatalogThriftConversion {
         description.setAppModuleId(resource.getAppModuleId());
         description.setComputeHostId(resource.getHostId());
         description.setExecutablePath(resource.getExecutablePath());
-        description.setParallelism(ApplicationParallelismType.valueOf(resource.getParallelism()));
+        if (resource.getParallelism() != null){
+            description.setParallelism(ApplicationParallelismType.valueOf(resource.getParallelism()));
+        }
         description.setAppDeploymentDescription(resource.getAppDes());
         //TODO ModuleLoadCmds is a list now. need to create a table for this and the jpa
layer
 //        description.setModuleLoadCmds(resource.getEnvModuleLoadCMD());

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
index 66925f1..3d6e299 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
@@ -23,7 +23,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
     <persistence-unit name="appcatalog_data">
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-	<class>org.apache.aiaravata.application.catalog.data.model.ComputeResource</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.ComputeResource</class>
         <class>org.apache.aiaravata.application.catalog.data.model.DataMovementProtocol</class>
         <class>org.apache.aiaravata.application.catalog.data.model.GlobusJobSubmission</class>
         <class>org.apache.aiaravata.application.catalog.data.model.GlobusGKEndpoint</class>
@@ -34,10 +34,10 @@
         <class>org.apache.aiaravata.application.catalog.data.model.HostAlias</class>
         <class>org.apache.aiaravata.application.catalog.data.model.HostIPAddress</class>
         <class>org.apache.aiaravata.application.catalog.data.model.JobSubmissionProtocol</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.ScpDataMovement</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.GridftpDataMovement</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.GridftpEndpoint</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.SshJobSubmission</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.ScpDataMovement</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.GridftpDataMovement</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.GridftpEndpoint</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.SshJobSubmission</class>
         <class>org.apache.aiaravata.application.catalog.data.model.ApplicationModule</class>
         <class>org.apache.aiaravata.application.catalog.data.model.ApplicationDeployment</class>
         <class>org.apache.aiaravata.application.catalog.data.model.LibraryPrepandPath</class>
@@ -52,11 +52,11 @@
         <class>org.apache.aiaravata.application.catalog.data.model.BatchQueue</class>
         <class>org.apache.aiaravata.application.catalog.data.model.ComputeResourceFileSystem</class>
         <class>org.apache.aiaravata.application.catalog.data.model.JobSubmissionInterface</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.DataMovementInterface</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.ResourceJobManager</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.JobManagerCommand</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.LocalSubmission</class>
-	<class>org.apache.aiaravata.application.catalog.data.model.LocalDataMovement</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.DataMovementInterface</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.ResourceJobManager</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.JobManagerCommand</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.LocalSubmission</class>
+        <class>org.apache.aiaravata.application.catalog.data.model.LocalDataMovement</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
     </persistence-unit>
 </persistence>

http://git-wip-us.apache.org/repos/asf/airavata/blob/beb7471d/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
index dcc8dc9..e4e6483 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
@@ -18,14 +18,12 @@
  * under the License.
  *
  */
-
 CREATE TABLE COMPUTE_RESOURCE
 (
-         RESOURCE_ID VARCHAR(255),
-         HOST_NAME VARCHAR(255),
-         DESCRIPTION VARCHAR(255),
-         PREFERRED_JOB_SUBMISSION_PROTOCOL VARCHAR(255),
-         PRIMARY KEY(RESOURCE_ID)
+	RESOURCE_ID VARCHAR (255) NOT NULL,
+	HOST_NAME VARCHAR (255) NOT NULL,
+	RESOURCE_DESCRIPTION VARCHAR (255),
+	PRIMARY KEY (RESOURCE_ID)
 );
 
 CREATE TABLE HOST_ALIAS
@@ -37,12 +35,12 @@ CREATE TABLE HOST_ALIAS
 );
 
 CREATE TABLE HOST_IPADDRESS
-  (
-           RESOURCE_ID VARCHAR(255),
-           IP_ADDRESS VARCHAR(255),
-           PRIMARY KEY(RESOURCE_ID,IP_ADDRESS),
-           FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-  );
+(
+         RESOURCE_ID VARCHAR(255),
+         IP_ADDRESS VARCHAR(255),
+         PRIMARY KEY(RESOURCE_ID,IP_ADDRESS),
+         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
+);
 
 CREATE TABLE GSISSH_SUBMISSION
 (
@@ -94,35 +92,49 @@ CREATE TABLE GLOBUS_GK_ENDPOINT
          FOREIGN KEY (SUBMISSION_ID) REFERENCES GLOBUS_SUBMISSION(SUBMISSION_ID) ON DELETE
CASCADE
 );
 
-CREATE TABLE SSH_SUBMISSION
+CREATE TABLE RESOURCE_JOB_MANAGER
 (
-         SUBMISSION_ID VARCHAR(255),
-         RESOURCE_JOB_MANAGER VARCHAR(255),
-         SSH_PORT INTEGER,
-         PRIMARY KEY(SUBMISSION_ID)
+	RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
+	PUSH_MONITORING_ENDPOINT VARCHAR (255),
+	JOB_MANAGER_BIN_PATH VARCHAR (255),
+	RESOURCE_JOB_MANAGER_TYPE VARCHAR (255) NOT NULL,
+	PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
 );
 
-CREATE TABLE SCP_DATAMOVEMENT
+CREATE TABLE SSH_JOB_SUBMISSION
 (
-         DATA_MOVE_ID VARCHAR(255),
-         SECURITY_PROTOCOL VARCHAR(255),
-         SSH_PORT INTEGER,
-         PRIMARY KEY(DATA_MOVE_ID)
+	RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
+	JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
+	ALTERNATIVE_SSH_HOSTNAME VARCHAR (255),
+	SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
+	SSH_PORT INTEGER,
+	PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
+	FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
 );
 
-CREATE TABLE GRID_FTP_DATAMOVEMENT
+CREATE TABLE SCP_DATA_MOVEMENT
 (
-         DATA_MOVE_ID VARCHAR(255),
-         SECURITY_PROTOCOL VARCHAR(255),
-         PRIMARY KEY(DATA_MOVE_ID)
+	QUEUE_DESCRIPTION VARCHAR (255),
+	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
+	SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
+	ALTERNATIVE_SCP_HOSTNAME VARCHAR (255),
+	SSH_PORT INTEGER,
+	PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
 );
 
-CREATE TABLE GRIDFTP_DM_ENDPOINT
+CREATE TABLE GRIDFTP_DATA_MOVEMENT
 (
-         DATA_MOVE_ID VARCHAR(255),
-         ENDPOINT VARCHAR(255),
-         PRIMARY KEY(DATA_MOVE_ID, ENDPOINT),
-         FOREIGN KEY (DATA_MOVE_ID) REFERENCES GRID_FTP_DATAMOVEMENT(DATA_MOVE_ID) ON DELETE
CASCADE
+	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
+	SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
+	PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
+);
+
+CREATE TABLE GRIDFTP_ENDPOINT
+(
+	ENDPOINT VARCHAR (255) NOT NULL,
+	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
+	PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID,ENDPOINT),
+	FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID)
ON DELETE CASCADE
 );
 
 CREATE TABLE JOB_SUBMISSION_PROTOCOL
@@ -156,11 +168,11 @@ CREATE TABLE APPLICATION_DEPLOYMENT
 (
          DEPLOYMENT_ID VARCHAR(255),
          APP_MODULE_ID VARCHAR(255),
-         COMPUTE_HOST_ID VARCHAR(255),
+         COMPUTE_HOSTID VARCHAR(255),
          EXECUTABLE_PATH VARCHAR(255),
+	     PARALLELISM VARCHAR(255),
          APPLICATION_DESC VARCHAR(255),
          ENV_MODULE_LOAD_CMD VARCHAR(255),
-         MODULE_LOAD_STRING VARCHAR(255),
          PRIMARY KEY(DEPLOYMENT_ID),
          FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE
CASCADE,
          FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
@@ -229,7 +241,6 @@ CREATE TABLE APPLICATION_OUTPUT
          OUTPUT_KEY VARCHAR(255),
          OUTPUT_VALUE VARCHAR(255),
          DATA_TYPE VARCHAR(255),
-         METADATA VARCHAR(255),
          PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
          FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE
CASCADE
 );
@@ -246,7 +257,7 @@ CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
 (
         GATEWAY_ID VARCHAR(255),
         RESOURCE_ID VARCHAR(255),
-        OVERRIDE_BY_AIRAVATA SMALLINT(255),
+        OVERRIDE_BY_AIRAVATA SMALLINT,
         PREFERED_JOB_SUB_PROTOCOL VARCHAR(255),
         PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
         PREFERED_BATCH_QUEUE VARCHAR(255),
@@ -257,3 +268,68 @@ CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
         FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
 );
 
+CREATE TABLE BATCH_QUEUE
+(
+	COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
+	MAX_RUNTIME INTEGER,
+	MAX_JOB_IN_QUEUE INTEGER,
+	QUEUE_DESCRIPTION VARCHAR(255),
+	QUEUE_NAME VARCHAR(255) NOT NULL,
+	MAX_PROCESSORS INTEGER,
+	MAX_NODES INTEGER,
+	PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME),
+	FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM
+(
+	COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
+	PATH VARCHAR (255),
+	FILE_SYSTEM VARCHAR (255) NOT NULL,
+	PRIMARY KEY (COMPUTE_RESOURCE_ID,FILE_SYSTEM),
+	FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE JOB_SUBMISSION_INTERFACE
+(
+	JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
+	COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
+	JOB_SUBMISSION_PROTOCOL VARCHAR (255) NOT NULL,
+	PRIORITY_ORDER INTEGER,
+	PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID),
+	FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
+);
+ 
+CREATE TABLE DATA_MOVEMENT_INTERFACE
+(
+	COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
+	DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
+	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
+	PRIORITY_ORDER INTEGER,
+	PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
+	FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE JOB_MANAGER_COMMAND
+(
+	RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
+	COMMAND_TYPE VARCHAR (255) NOT NULL,
+	COMMAND VARCHAR (255),
+	PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
+	FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
ON DELETE CASCADE
+);
+
+CREATE TABLE LOCAL_SUBMISSION
+(
+	RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
+	JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
+	PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
+	FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
+);
+
+CREATE TABLE LOCAL_DATA_MOVEMENT
+(
+	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
+	PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
+);
+


Mime
View raw message