From db8e5947b19bec6c9e83468469871e18b00463e1 Mon Sep 17 00:00:00 2001
From: BuzzTroll <bresnaha@mcs.anl.gov>
Date: Thu, 19 Aug 2010 20:39:13 -0500
Subject: [PATCH] cahing how fetcher is populated

---
 .../other/authz-callout-ACTIVE.xml                |  2 +-
 .../workspace-service/other/authz-callout-sql.xml |  2 +-
 .../workspace/sqlauthz/AuthzDecisionLogic.java    | 15 +++++++++------
 tests/ec2_submit_many.py                          |  3 +--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml b/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml
index 7d783c11..1e2278a8 100644
--- a/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml
+++ b/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml
@@ -39,7 +39,7 @@
         <property name="repoHost" value="$SSH{service.sshd.contact.string}" />
         <property name="repoScheme" value="scp" />
         <property name="passthroughSchemes" value="file,hdfs" />
-        <property name="urlParams" value="remoteexe=$COMMON{virga.fetch.path}" />        
+        <property name="virgaFetchPath" value="$COMMON{virga.fetch.path}" />
      </bean>
 
     <bean id="nimbus-rm.service.binding.RepoAdaptor"
diff --git a/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml b/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml
index f1d83ada..1e2278a8 100644
--- a/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml
+++ b/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml
@@ -39,7 +39,7 @@
         <property name="repoHost" value="$SSH{service.sshd.contact.string}" />
         <property name="repoScheme" value="scp" />
         <property name="passthroughSchemes" value="file,hdfs" />
-        <property name="urlParams" value="remoteexe=$COMMON{virga.fetch.path}" />
+        <property name="virgaFetchPath" value="$COMMON{virga.fetch.path}" />
      </bean>
 
     <bean id="nimbus-rm.service.binding.RepoAdaptor"
diff --git a/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java b/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
index 85f4e2c2..b13e871d 100644
--- a/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
+++ b/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
@@ -10,6 +10,7 @@
 import org.globus.workspace.service.binding.authorization.Decision;
 import org.globus.workspace.service.binding.vm.VirtualMachine;
 import org.globus.workspace.service.binding.vm.VirtualMachinePartition;
+import org.nimbustools.api.brain.NimbusHomePathResolver;
 import org.nimbustools.api.services.rm.AuthorizationException;
 import org.nimbustools.api.services.rm.ResourceRequestDeniedException;
 import org.nimbus.authz.AuthzDBAdapter;
@@ -38,12 +39,14 @@ public class AuthzDecisionLogic extends DecisionLogic
     private String                      repoDir = null;
     private boolean                     schemePassthrough;
     private String                      passthroughSchemes = null;
-    private Resource                    urlParams;
+    private Resource                    virgaFetchPathResouce;
 
     public  AuthzDecisionLogic(
         DataSource ds,
         String schemePassthroughStr)
     {
+        // String nh = System.getProperty(NimbusHomePathResolver.NIMBUS_HOME_ENV_NAME);
+       // might want to set default path some time
         this.authDB = new AuthzDBAdapter(ds);
         this.schemePassthrough =
                 schemePassthroughStr != null
@@ -128,7 +131,7 @@ protected String translateCumulus(
                 {
                     rc = scheme + "://" + this.getRepoHost() + "/" + dataKey;
                     String params =  "groupid=" + vm.getGroupTransferID() + ";groupcount=" + vm.getGroupCount();
-                    params = params + ";" + this.urlParams.toString();
+                    params = params + ";remoteexe=" + this.virgaFetchPathResouce.getFilename();
                     rc = rc + "?" + params;
                 }
             }
@@ -408,14 +411,14 @@ public String getRepoDir()
         return this.repoDir;
     }
 
-    public void setUrlParams(Resource up)
+    public void setVirgaFetchPath(Resource up)
     {
-        this.urlParams = up;
+        this.virgaFetchPathResouce = up;
     }
 
-    public Resource getUrlParams()
+    public Resource getVirgaFetchPath()
     {
-        return this.urlParams;
+        return this.virgaFetchPathResouce;
     }
 
     public void setPassthroughSchemes(String passthroughSchemes)
diff --git a/tests/ec2_submit_many.py b/tests/ec2_submit_many.py
index 73754ef8..f8b16b81 100755
--- a/tests/ec2_submit_many.py
+++ b/tests/ec2_submit_many.py
@@ -12,7 +12,6 @@
 import ConfigParser
 from ConfigParser import SafeConfigParser
 import time
-import pynimbusauthz
 import tempfile
 import traceback
 import filecmp
@@ -23,7 +22,6 @@
 from boto.s3.connection import OrdinaryCallingFormat
 from boto.s3.connection import VHostCallingFormat
 from boto.s3.connection import SubdomainCallingFormat
-from pynimbusauthz.cmd_opts import cbOpts
 from boto.s3.connection import S3Connection
 from boto.ec2.connection import EC2Connection
 
@@ -69,6 +67,7 @@ def main(argv=sys.argv[1:]):
 
         print "getting connection"
         ec2conn = EC2Connection(s3id, pw, host='locahost', port=8444, debug=2)
+        ec2conn.host = 'localhost'
         print "getting image"
         image = ec2conn.get_image(imagename)
         print "running"