More bug fixes...

[sfa.git] / sfatables / test.sfarspec

diff --git a/sfatables/test.sfarspec b/sfatables/test.sfarspec
index 0b8942f..ca39017 100644 (file)
--- a/sfatables/test.sfarspec
+++ b/sfatables/test.sfarspec
@@ -1,25 +1,10 @@
 <!-- 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>
-
-    <rule-context>
-            <argument>
-                <name>hrn</name>
-                <value>plc</value>
-            </argument>
-            <argument>
-                <name>whitelist</name>
-                <value>plc.princeton</value>
-            </argument>
-            <argument>
-                <name>blacklist</name>
-                <value>plc.tp</value>
-            </argument>
-    </rule-context>
-    <request>
+<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>
+     <request>
         <nodespec>
             <node name="plc.princeton.planetlab-01"/>
             <node name="plc.princeton.planetlab-02"/>
@@ -28,4 +13,4 @@
             <node name="plc.tp.planetlab3"/>
         </nodespec>
     </request>
-</rspec>
+</RSpec>