You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2016/02/08 17:49:03 UTC
[21/50] [abbrv] airavata git commit: Added application name and
applicatoin id to NodeModel struct
Added application name and applicatoin id to NodeModel struct
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/09be4d92
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/09be4d92
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/09be4d92
Branch: refs/heads/master
Commit: 09be4d92b579830e8f14d96b11c53b3acd8ae928
Parents: 97f4ba9
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Feb 1 12:48:04 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Feb 1 12:48:04 2016 -0500
----------------------------------------------------------------------
.../workflow/core/dag/nodes/NodeState.java | 44 --------------------
.../workflow-models/workflow_data_model.thrift | 6 ++-
2 files changed, 4 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/09be4d92/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/NodeState.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/NodeState.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/NodeState.java
deleted file mode 100644
index df2c87a..0000000
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/NodeState.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.workflow.core.dag.nodes;
-
-public enum NodeState {
- WAITING(0), // waiting on inputs
- READY(1), // all inputs are available and ready to execute
- QUEUED(2), //
- PRE_PROCESSING(3), //
- EXECUTING(4), // task has been submitted , not yet finish
- EXECUTED(5), // task executed
- POST_PROCESSING(6), //
- FAILED(7),
- COMPLETE(8); // all works done
-
- private int level;
-
- NodeState(int level) {
- this.level = level;
- }
-
- public int getLevel() {
- return level;
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/09be4d92/thrift-interface-descriptions/data-models/workflow-models/workflow_data_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/workflow-models/workflow_data_model.thrift b/thrift-interface-descriptions/data-models/workflow-models/workflow_data_model.thrift
index 7b7922a..62ed885 100644
--- a/thrift-interface-descriptions/data-models/workflow-models/workflow_data_model.thrift
+++ b/thrift-interface-descriptions/data-models/workflow-models/workflow_data_model.thrift
@@ -92,6 +92,8 @@ struct PortModel {
struct NodeModel {
1: required string nodeId= airavata_commons.DEFAULT_ID,
2: optional string name,
- 3: optional ComponentStatus status,
- 4: optional string description
+ 3: optional string applicationId,
+ 4: optional string applicationName,
+ 5: optional ComponentStatus status,
+ 6: optional string description
}