From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 27 Oct 2009 03:05:08 +0000 (+0000)
Subject: Modified a processor to conform to the XML schema of match parameters.
X-Git-Tag: sfa-0.9-6~101
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=02ad775013d04ed357b4af502757134ebf888365

Modified a processor to conform to the XML schema of match parameters.
---

diff --git a/sfatables/processors/hrn.xsl b/sfatables/processors/hrn.xsl
index 426c5fd9..47a8b621 100644
--- a/sfatables/processors/hrn.xsl
+++ b/sfatables/processors/hrn.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:variable name="context-hrn" select="//request-context//hrn"/>
+    <xsl:variable name="context-hrn" select="//request-context/sfa/user/hrn"/>
 
     <!-- Magic sauce -->
 
@@ -9,9 +9,10 @@
             <xsl:apply-templates select="@* | node()"/>
     </xsl:template>
 
-    <xsl:template match="//request-context//user">
+    <xsl:template match="//match-context/argument[name='user-hrn']">
+                    <xsl:value-of select="hrn"/>
                     <xsl:choose>
-                    <xsl:when test="starts-with($context-hrn, hrn)">
+                    <xsl:when test="starts-with($context-hrn, value)">
                         <result verdict="True"/> <!--Match -->
                     </xsl:when>
                     <xsl:otherwise>
diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index ef3ccc42..69dd6655 100644
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -86,7 +86,7 @@ class SFATablesRules:
 
 def main():
     incoming = SFATablesRules('INCOMING')
-    incoming.set_context({'sfa':{'user':{'hrn':'plc.princeton.sapanb'}}})
+    incoming.set_context({'sfa':{'user':{'hrn':'ple.princeton.sapanb'}}})
 
     outgoing = SFATablesRules('OUTGOING')
     print "%d rules loaded for INCOMING chain"%len(incoming.sorted_rule_list)
diff --git a/sfatables/test.rspec b/sfatables/test.rspec
new file mode 100644
index 00000000..a7173e86
--- /dev/null
+++ b/sfatables/test.rspec
@@ -0,0 +1,13 @@
+<!-- run "runtime.py sfarspec" to apply current rule set to this file -->
+
+<RSpec>
+     <request>
+        <nodespec>
+            <node name="plc.princeton.planetlab-01"/>
+            <node name="plc.princeton.planetlab-02"/>
+            <node name="plc.princeton.planetlab-03"/>
+            <node name="plc.princeton.planetlab-04"/>
+            <node name="plc.tp.planetlab3"/>
+        </nodespec>
+    </request>
+</RSpec>
diff --git a/sfatables/test.sfarspec b/sfatables/test.sfarspec
index a7173e86..b84bec4c 100644
--- a/sfatables/test.sfarspec
+++ b/sfatables/test.sfarspec
@@ -1,6 +1,8 @@
 <!-- run "runtime.py sfarspec" to apply current rule set to this file -->
 
 <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>
      <request>
         <nodespec>
             <node name="plc.princeton.planetlab-01"/>
diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 9e06bbfc..ea73a4f1 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -85,8 +85,10 @@ class XMLRule:
         #       else rspec
         
         if (self.match(rspec)):
+            print "Matched!"
             return (True,self.wrap_up(self.target(rspec)))
         else:
+            print "Not Matched!"
             return (False,self.wrap_up(rspec))