Merge pull request #293 from UnifiedViews/feature/pipelineId

Implementing UnifiedViews/Plugin-DevEnv#5
UnifiedViews · Feb 19, 2015 · 27409a2 · 27409a2
2 parents f16a1d0 + c60ed95
commit 27409a2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/backend/src/main/java/cz/cuni/mff/xrg/odcs/backend/context/Context.java b/backend/src/main/java/cz/cuni/mff/xrg/odcs/backend/context/Context.java
@@ -312,7 +312,7 @@ public File getWorkingDir() {
     @Override
     public File getResultDir() {
         try {
-            final File dir =  resourceManager.getDPUStorageDir(contextInfo.getExecution(), dpuInstance);
+            final File dir = resourceManager.getDPUStorageDir(contextInfo.getExecution(), dpuInstance);
             dir.mkdirs();
             return dir;
         } catch (MissingResourceException ex) {
@@ -374,4 +374,19 @@ public Locale getLocale() {
     public void setLocale(Locale locale) {
         this.locale = locale;
     }
+
+    @Override
+    public Long getPipelineId() {
+        return this.contextInfo.getExecution().getPipeline().getId();
+    }
+
+    @Override
+    public Long getPipelineExecutionId() {
+        return this.contextInfo.getExecutionId();
+    }
+
+    @Override
+    public Long getDpuInstanceId() {
+        return dpuInstance.getId();
+    }
 }
diff --git a/module-test/src/main/java/cz/cuni/mff/xrg/odcs/dpu/test/context/TestContext.java b/module-test/src/main/java/cz/cuni/mff/xrg/odcs/dpu/test/context/TestContext.java
@@ -244,4 +244,19 @@ public String getDpuInstanceDirectory() {
     public Locale getLocale() {
         return new Locale("en", "US");
     }
+
+    @Override
+    public Long getPipelineId() {
+        return 7L;
+    }
+
+    @Override
+    public Long getPipelineExecutionId() {
+        return 15L;
+    }
+
+    @Override
+    public Long getDpuInstanceId() {
+        return 9L;
+    }
 }