[Swift-commit] r3310 - SwiftApps/adem-osg

[noreply at svn.ci.uchicago.edu]

Author: aespinosa
Date: 2010-05-03 14:56:28 -0500 (Mon, 03 May 2010)
New Revision: 3310

Modified:
   SwiftApps/adem-osg/adem-test.rb
   SwiftApps/adem-osg/adem.rb
Log:
Renamed ress functions for namespace consistency

Modified: SwiftApps/adem-osg/adem-test.rb
===================================================================
--- SwiftApps/adem-osg/adem-test.rb	2010-05-03 19:56:25 UTC (rev 3309)
+++ SwiftApps/adem-osg/adem-test.rb	2010-05-03 19:56:28 UTC (rev 3310)
@@ -30,9 +30,9 @@
     end
   end
 
-  def test_query_ress
+  def test_ress_query
     conf = @conf
-    ress = query_ress(conf).split "\n\n"
+    ress = ress_query(conf).split "\n\n"
     assumption = true
     class_ads = [
       "GlueSiteUniqueID", "GlueCEInfoHostName", "GlueCEInfoJobManager",
@@ -99,9 +99,9 @@
     assert_equal "ff-grid.unl.edu:2119/jobmanager-fork", site_fork("ff-grid.unl.edu:2119/jobmanager-pbs")
   end
 
-  def test_parse_classads
+  def test_ress_parse
     site_list = YAML.load @site_list
-    assert_equal site_list, parse_classads(@ress.split("\n\n"))
+    assert_equal site_list, ress_parse(@ress.split("\n\n"))
   end
 
   def test_app

Modified: SwiftApps/adem-osg/adem.rb
===================================================================
--- SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:25 UTC (rev 3309)
+++ SwiftApps/adem-osg/adem.rb	2010-05-03 19:56:28 UTC (rev 3310)
@@ -31,13 +31,13 @@
   conf
 end
 
-def query_ress(conf)
+def ress_query(conf)
   `condor_status -pool #{conf[:ress_server]} -const \
     'stringListIMember(\"VO:#{conf[:virtual_organization]}\", \  
     GlueCEAccessControlBaseRule)' -long`
 end
 
-def parse_classads(ress)
+def ress_parse(ress)
   class_ads = [
     "GlueSiteUniqueID", "GlueCEInfoHostName", "GlueCEInfoJobManager",
     "GlueCEInfoGatekeeperPort", "GlueSEAccessProtocolEndpoint",
@@ -99,7 +99,7 @@
   begin
     YAML.load File.open sites_file
   rescue Errno::ENOENT
-    result = parse_classads query_ress(conf).split("\n\n")
+    result = ress_parse ress_query(conf).split("\n\n")
     raise SiteError.new(result)
   end
 end