Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ABA3018DEA for ; Thu, 9 Jul 2015 20:55:58 +0000 (UTC) Received: (qmail 70492 invoked by uid 500); 9 Jul 2015 20:55:58 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 70449 invoked by uid 500); 9 Jul 2015 20:55:58 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 70438 invoked by uid 99); 9 Jul 2015 20:55:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2015 20:55:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74197E6843; Thu, 9 Jul 2015 20:55:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Message-Id: <62ff4f00c1524a5cb1b07f852497615b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: fixing attribute not set issues in ComputeResource Date: Thu, 9 Jul 2015 20:55:58 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 644ff09ff -> 618b70804 fixing attribute not set issues in ComputeResource Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/618b7080 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/618b7080 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/618b7080 Branch: refs/heads/airavata-0.15-release-branch Commit: 618b7080418d4d3c19d495af7fe9be12fc3661a2 Parents: 644ff09 Author: Supun Nakandala Authored: Fri Jul 10 02:25:31 2015 +0530 Committer: Supun Nakandala Committed: Fri Jul 10 02:25:31 2015 +0530 ---------------------------------------------------------------------- .../data/resources/ComputeResourceResource.java | 1 + .../data/util/AppCatalogThriftConversion.java | 1 + .../src/test/resources/appcatalog-derby.sql | 22 +++++--------------- 3 files changed, 7 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/618b7080/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java index 07e00cb..5c3b441 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java @@ -296,6 +296,7 @@ public class ComputeResourceResource extends AbstractResource { computeResource.setResourceId(getResourceId()); computeResource.setHostName(getHostName()); computeResource.setMaxMemoryPerNode(getMaxMemoryPerNode()); + computeResource.setEnabled(isEnabled()); if (existingComputeResource == null) { em.persist(computeResource); } else { http://git-wip-us.apache.org/repos/asf/airavata/blob/618b7080/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 6fd7c68..f5f3956 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 @@ -60,6 +60,7 @@ public class AppCatalogThriftConversion { description.setHostName(resource.getHostName()); description.setResourceDescription(resource.getResourceDescription()); description.setMaxMemoryPerNode(resource.getMaxMemoryPerNode()); + description.setEnabled(resource.isEnabled()); HostAliasResource aliasResource = new HostAliasResource(); List resources = aliasResource.get(AbstractResource.HostAliasConstants.RESOURCE_ID, resource.getResourceId()); if (resources != null && !resources.isEmpty()){ http://git-wip-us.apache.org/repos/asf/airavata/blob/618b7080/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql index 8171968..8a36a69 100644 --- a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql +++ b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql @@ -27,6 +27,7 @@ CREATE TABLE COMPUTE_RESOURCE CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', MAX_MEMORY_NODE INTEGER, + ENABLED SMALLINT, PRIMARY KEY (RESOURCE_ID) ); @@ -126,18 +127,6 @@ CREATE TABLE SSH_JOB_SUBMISSION FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ); -CREATE TABLE EMAIL_MONITOR_PROPERTY -( - JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL, - HOST VARCHAR(255), - EMAIL_ADDRESS VARCHAR(255), - PASSWORD VARCHAR(255), - FOLDER_NAME VARCHAR(255), - EMAIL_PROTOCOL VARCHAR(255), - PRIMARY KEY(JOB_SUBMISSION_INTERFACE_ID), - FOREIGN KEY (JOB_SUBMISSION_INTERFACE_ID) REFERENCES SSH_JOB_SUBMISSION(JOB_SUBMISSION_INTERFACE_ID) -); - CREATE TABLE SCP_DATA_MOVEMENT ( QUEUE_DESCRIPTION VARCHAR (255), @@ -382,7 +371,7 @@ CREATE TABLE JOB_SUBMISSION_INTERFACE 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, @@ -457,6 +446,8 @@ CREATE TABLE WORKFLOW_OUTPUT FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE ); + + CREATE TABLE CONFIGURATION ( CONFIG_KEY VARCHAR(255), @@ -464,7 +455,4 @@ CREATE TABLE CONFIGURATION PRIMARY KEY(CONFIG_KEY, CONFIG_VAL) ); -INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15'); - - - +INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15'); \ No newline at end of file