From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 22 Sep 2009 17:45:29 +0000 (+0000)
Subject: Reorganized targets
X-Git-Tag: sfa-0.9-3~57
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=598b7e4814f424b6fc91b74dfb7e7803af39c0d9

Reorganized targets
---

diff --git a/sfatables/targets/MAX_LINK_BW.xml b/sfatables/targets/RESTRICT_PROP.xml
similarity index 86%
rename from sfatables/targets/MAX_LINK_BW.xml
rename to sfatables/targets/RESTRICT_PROP.xml
index 6c91019a..6112b890 100644
--- a/sfatables/targets/MAX_LINK_BW.xml
+++ b/sfatables/targets/RESTRICT_PROP.xml
@@ -1,12 +1,12 @@
-<target name="MAX_LINK_BANDWIDTH">
+<target name="RESTRICT_PROP">
     <!-- The context is empty, since this target does not require any input from SFA -->
+    <rule element="link">
     <context select=""/>
-    <rule>
         <argument>
             <name>max-link-bandwidth</name>
             <help>Maximum link bandwidth.</help>
             <operand>bps</operand>
         </argument>
-    </rule>
     <processor filename="max_link_banwidth.xsl"/>
+    </rule>
 </target>
diff --git a/sfatables/targets/RESTRICT_TO_NODES.xml b/sfatables/targets/RESTRICT_SLICE_DOMAIN.xml
similarity index 89%
rename from sfatables/targets/RESTRICT_TO_NODES.xml
rename to sfatables/targets/RESTRICT_SLICE_DOMAIN.xml
index c31b67e3..45f2a4ba 100644
--- a/sfatables/targets/RESTRICT_TO_NODES.xml
+++ b/sfatables/targets/RESTRICT_SLICE_DOMAIN.xml
@@ -1,7 +1,7 @@
-<target name="RESTRICT_TO_NODES">
+<target name="RESTRICT_SLICE_DOMAIN">
+    <rule element="node">
     <!-- The context is empty, since this target does not require any input from SFA -->
     <context select=""/>
-    <rule>
         <argument>
             <name>whitelist</name>
             <help>Prefix of nodes to whitelist for this match.</help>
@@ -12,6 +12,6 @@
             <help>Prefix of nodes to blacklist for this match.</help>
             <operand>PREFIX</operand>
         </argument>
-    </rule>
     <processor filename="restrict_to_nodes.xsl"/>
+    </rule>
 </target>
diff --git a/sfatables/targets/RESTRICT_TO_NODES.xml.orig b/sfatables/targets/RESTRICT_TO_NODES.xml.orig
deleted file mode 100644
index e69de29b..00000000
diff --git a/sfatables/targets/RESTRICT_TO_NODE_GROUP.xml.orig b/sfatables/targets/RESTRICT_TO_NODE_GROUP.xml.orig
deleted file mode 100644
index e69de29b..00000000