From: Andy Bavier <acb@cs.princeton.edu>
Date: Fri, 6 Nov 2009 15:01:09 +0000 (+0000)
Subject: Cap kbps values rather than discard LinkSpecs
X-Git-Tag: sfa-0.9-6~48
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=f3c157d7da5ef6adc4ce1bf81cd732ba309d9647

Cap kbps values rather than discard LinkSpecs
---

diff --git a/sfatables/processors/max_link_kbps.xsl b/sfatables/processors/max_link_kbps.xsl
index 575e92e8..71d0abe5 100644
--- a/sfatables/processors/max_link_kbps.xsl
+++ b/sfatables/processors/max_link_kbps.xsl
@@ -1,28 +1,39 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <!-- Magic sauce copied from a manual. This fragment basically copies everything except for
-    stuff that explicitly matches with the templates defined below. In the case of such a match,
-    the matched node is treated differently.-->
-    <xsl:template match="@* | node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
-    <!-- End of magic sauce -->
+  <!-- Magic sauce copied from a manual. This fragment basically
+    copies everything except for stuff that explicitly matches with
+    the templates defined below. In the case of such a match, the
+    matched node is treated differently.-->
+  <xsl:template match="@* | node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()"/>
+    </xsl:copy>
+  </xsl:template>
+  <!-- End of magic sauce -->
 
-    <!-- Read in the value of the argument. See 'example_vini_rspec.xml' for an example of such an argument -->
-    <xsl:variable name="max-link-kbps" select="//RSpec//target-context/argument[name='max-link-kbps']/value"/>
+  <!-- Read in the value of the argument. -->
+  <xsl:variable name="max-link-kbps" select="//RSpec//target-context/argument[name='max-link-kbps']/value"/>
 
-    <!-- Drop Linkspecs for which bw > max-link-bandwidth -->
-    <xsl:template match="LinkSpec">
-            <xsl:choose>
-                <xsl:when test="not (kbps &gt; $max-link-kbps)">
-                    <xsl:copy-of select="."/>
-                </xsl:when>
-                <xsl:otherwise/>
-            </xsl:choose> 
-    </xsl:template>
-
-    <xsl:template match="sfatables-input"/>
+  <!-- Modify LinkSpecs for which kbps > max-link-kbps -->
+  <xsl:template match="LinkSpec/kbps">
+    <xsl:choose>
+      <xsl:when test=". &gt; $max-link-kbps">
+	<kbps><xsl:value-of select="$max-link-kbps"/></kbps>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:copy-of select="."/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+      
+  <!-- Fill in missing kbps values --> 
+  <xsl:template match="LinkSpec[not(kbps)]">
+    <LinkSpec>
+      <xsl:copy-of select="*"/>
+      <kbps><xsl:value-of select="$max-link-kbps"/></kbps>
+    </LinkSpec>
+  </xsl:template>
+  
+  <xsl:template match="sfatables-input"/>
 </xsl:stylesheet>
 
diff --git a/sfatables/vini.rspec b/sfatables/vini.rspec
index 8922170f..99f89e5b 100644
--- a/sfatables/vini.rspec
+++ b/sfatables/vini.rspec
@@ -8,5 +8,9 @@
       <endpoint>i2chic1</endpoint>
       <kbps>1001</kbps>
     </LinkSpec>
+    <LinkSpec name="baz">
+      <endpoint>i2hous1</endpoint>
+      <endpoint>i2newy1</endpoint>
+    </LinkSpec>
   </Request>
 </RSpec>