From: Andy Bavier <acb@cs.princeton.edu>
Date: Tue, 12 Jun 2012 20:31:59 +0000 (-0400)
Subject: Add request context for GENI rspecs
X-Git-Tag: sfa-2.1-12~59
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e8d18d70468b223f3e0f46fa7941e062f0477aa8

Add request context for GENI rspecs
---

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index e22967c7..b7c3444d 100644
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -56,8 +56,8 @@ class SFATablesRules:
                 
     def add_request_context_to_rspec(self, doc):
         p = doc.xpathNewContext()
-        context = p.xpathEval("//RSpec")
-        if (not context):
+        context = p.xpathEval("//*")
+        if not context or context[0].name not in ['RSpec', 'rspec']:
             raise Exception('Request is not an rspec')
         else:
             # Add the request context
diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 46f36018..ff3b3ef0 100644
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -61,8 +61,8 @@ class XMLRule:
 
     def add_rule_context_to_rspec(self, doc):
         p = doc.xpathNewContext()
-        context = p.xpathEval("//RSpec")
-        if (not context):
+        context = p.xpathEval("//*")
+        if not context or context[0].name not in ['RSpec', 'rspec']:
             raise Exception('Request is not an rspec')
         else:
             # Add the request context