[gavia-ms-commit] r1285 - branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise

[commit at globus.org]

Author: andre
Date: 2009-07-30 11:57:24 -0500 (Thu, 30 Jul 2009)
New Revision: 1285

Added:
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in
Modified:
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl
Log:
checkpoint commit to testing branch

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in	2009-07-30 15:33:21 UTC (rev 1284)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in	2009-07-30 16:57:24 UTC (rev 1285)
@@ -54,11 +54,8 @@
 
 ##  What machine is your central manager?
 CONDOR_HOST	= $(FULL_HOSTNAME)
-#NEGOTIATOR_HOST = ggate01.triumf.ca
 NEGOTIATOR_HOST = $(CONDOR_HOST)
-#COLLECTOR_HOST  = ggate01.triumf.ca
-#COLLECTOR_HOST  = lcgce02.triumf.ca
-CONDOR_IDS       = @globusUID at .@globusGID@
+CONDOR_IDS       = @GLOBUS_UID at .@GLOBUS_GID@
 
 GRID_MONITOR        = $(SBIN)/grid_monitor.sh
 ENABLE_GRID_MONITOR = TRUE
@@ -73,7 +70,7 @@
 ##  Pathnames:
 ##--------------------------------------------------------------------
 ##  Where have you installed the bin, sbin and lib condor directories?   
-RELEASE_DIR = /opt/condor-6.6.1
+RELEASE_DIR = @CONDOR_LOCATION@
 
 ##  Where is the local condor directory for each host?  
 LOCAL_DIR		= $(RELEASE_DIR)/var

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in	2009-07-30 15:33:21 UTC (rev 1284)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in	2009-07-30 16:57:24 UTC (rev 1285)
@@ -12,7 +12,19 @@
 GRID_MAPFILE="/etc/grid-security/grid-mapfile"
 AC_SUBST(GRID_MAPFILE)
 
+# Get the current user ID and group ID
+# (Here we are assuming that this script will be run as the globus user.)
+GLOBUS_UID=`id -u`
+GLOBUS_GID=`id -g`
+AC_SUBST(GLOBUS_UID)
+AC_SUBST(GLOBUS_GID)
 
+# Extract the path of the gavia-resource-advertise given as argument.
+AC_ARG_WITH(gavia-resource-advertise-path,
+   [ --gavia-resource-advertise-path gavia-resource-advertise-path],
+   [GAVIA_RESOURCE_ADVERTISE_PATH=$withval],
+   [GAVIA_RESOURCE_ADVERTISE_PATH=''])
+AC_SUBST(GAVIA_RESOURCE_ADVERTISE_PATH)
 
 # check for Condor
 
@@ -197,5 +209,7 @@
 AC_SUBST(RESOURCE_NAME)
 
 AC_OUTPUT(
-  $GLOBUS_LOCATION/libexec/gavia-resource-advertise:gavia-resource-advertise.in
+  gavia-resource-advertise
+  condor_condig:condor_config.in
+  rp-provider-config.xml
 )

Added: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in	                        (rev 0)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in	2009-07-30 16:57:24 UTC (rev 1285)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns1:ResourcePropertyProviderConfigArray xsi:type="ns1:ResourcePropertyProviderConfigArray" xmlns:ns1="http://mds.globus.org/rpprovider/2005/08" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <ns1:configArray xsi:type="ns1:resourcePropertyProviderConfig">
+   <ns1:resourcePropertyName xsi:type="xsd:QName" xmlns:mds="http://gavia/resourceInfoProvider" xmlns:xsd="http://www.w3.org/2001/XMLSchema">mds:GaviaResourceRP</ns1:resourcePropertyName>
+   <ns1:resourcePropertyImpl xsi:type="xsd:string" xmlns:xsd="http://www.w3.org/2001/XMLSchema">org.globus.mds.usefulrp.rpprovider.SingleValueResourcePropertyProvider</ns1:resourcePropertyImpl>
+   <ns1:resourcePropertyElementProducers xsi:type="ns1:resourcePropertyElementProducerConfig">
+   <ns1:className xsi:type="xsd:string" xmlns:xsd="http://www.w3.org/2001/XMLSchema">org.globus.mds.usefulrp.rpprovider.producers.ExternalProcessElementProducer</ns1:className>
+   <ns1:arguments xsi:type="xsd:string" xmlns:xsd="http://www.w3.org/2001/XMLSchema">@GAVIA_RESOURCE_ADVERTISE_EXEC@</ns1:arguments>
+   <ns1:period xsi:type="xsd:int" xmlns:xsd="http://www.w3.org/2001/XMLSchema">60</ns1:period>
+   </ns1:resourcePropertyElementProducers>
+ </ns1:configArray>
+
+</ns1:ResourcePropertyProviderConfigArray>
+

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl	2009-07-30 15:33:21 UTC (rev 1284)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl	2009-07-30 16:57:24 UTC (rev 1285)
@@ -46,6 +46,7 @@
     $c_opts .= " --with-condor-arch=$condor_arch";
 }
 
+$c_opts .= " --gavia-resource-advertise-path=$pgm_file"
 print `./find-gavia-resource-advertise-tools $c_opts --cache-file=/dev/null`;
 
 if($? != 0)