(no commit message)

diff --git a/sfatables/TO_CLEANUP b/sfatables/TO_CLEANUP
index 1b98c00..bb7db58 100644 (file)
--- a/sfatables/TO_CLEANUP
+++ b/sfatables/TO_CLEANUP
@@ -1,2 +1,3 @@
 1# Load sfatables rules only once, not on every request.
 2# Set request context based on the context requested by the match/target.
 1# Load sfatables rules only once, not on every request.
 2# Set request context based on the context requested by the match/target.

+3# Remember the element type at run time

diff --git a/sfatables/test.rspec b/sfatables/test.rspec
index a7173e8..387594b 100644 (file)
--- a/sfatables/test.rspec
+++ b/sfatables/test.rspec
@@ -2,7 +2,7 @@
 
 <RSpec>
      <request>
 
 <RSpec>
      <request>

-        <nodespec>
+        <nodespec name="foobar">

             <node name="plc.princeton.planetlab-01"/>
             <node name="plc.princeton.planetlab-02"/>
             <node name="plc.princeton.planetlab-03"/>
             <node name="plc.princeton.planetlab-01"/>
             <node name="plc.princeton.planetlab-02"/>
             <node name="plc.princeton.planetlab-03"/>

diff --git a/sfatables/test.sfarspec b/sfatables/test.sfarspec
index ca39017..a634adf 100644 (file)
--- a/sfatables/test.sfarspec
+++ b/sfatables/test.sfarspec
@@ -3,7 +3,7 @@
 <RSpec>
      <request-context><sfa><user><hrn>plc.princeton.sapanb</hrn></user></sfa></request-context>
      <match-context><argument><name>user-hrn</name><value>plc.princeton.sapanb</value></argument></match-context>
 <RSpec>
      <request-context><sfa><user><hrn>plc.princeton.sapanb</hrn></user></sfa></request-context>
      <match-context><argument><name>user-hrn</name><value>plc.princeton.sapanb</value></argument></match-context>

-     <target-context><argument><name>blacklist</name><value>plc.tp</value></argument></target-context>
+     <target-context><argument><name>blacklist</name><value>plc.princeton</value></argument></target-context>

      <request>
         <nodespec>
             <node name="plc.princeton.planetlab-01"/>
      <request>
         <nodespec>
             <node name="plc.princeton.planetlab-01"/>

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 9e06bbf..52bea31 100644 (file)
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -84,6 +84,7 @@ class XMLRule:
         #       then target(target_args, rspec)
         #       else rspec
         
         #       then target(target_args, rspec)
         #       else rspec
         

+        import pdb

         if (self.match(rspec)):
             return (True,self.wrap_up(self.target(rspec)))
         else:
         if (self.match(rspec)):
             return (True,self.wrap_up(self.target(rspec)))
         else: