X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Faggregates%2Fvini%2Futils.py;h=ea36aaddeac4f7589af9e8a69f6e2555c9ac91d0;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=94e64bf79c6d8d8b65838cc6ebc3910ba93cd84c;hpb=cbfcd01963fd69149937551f9d225ec825554384;p=sfa.git

diff --git a/sfa/rspecs/aggregates/vini/utils.py b/sfa/rspecs/aggregates/vini/utils.py
index 94e64bf7..ea36aadd 100644
--- a/sfa/rspecs/aggregates/vini/utils.py
+++ b/sfa/rspecs/aggregates/vini/utils.py
@@ -1,67 +1,68 @@
 import re
 import socket
+from sfa.util.faults import *
 from sfa.rspecs.aggregates.vini.topology import *
 
 default_topo_xml = """
             <LinkSpec>
                 <endpoint>i2atla1</endpoint>
                 <endpoint>i2chic1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2atla1</endpoint>
                 <endpoint>i2hous1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2atla1</endpoint>
                 <endpoint>i2wash1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2chic1</endpoint>
                 <endpoint>i2kans1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2chic1</endpoint>
                 <endpoint>i2wash1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2hous1</endpoint>
                 <endpoint>i2kans1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2hous1</endpoint>
                 <endpoint>i2losa1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2kans1</endpoint>
                 <endpoint>i2salt1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2losa1</endpoint>
                 <endpoint>i2salt1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2losa1</endpoint>
                 <endpoint>i2seat1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2newy1</endpoint>
                 <endpoint>i2wash1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>
             <LinkSpec>
                 <endpoint>i2salt1</endpoint>
                 <endpoint>i2seat1</endpoint>
-                <bw>1Mbit</bw>
+                <kbps>1000</kbps>
             </LinkSpec>"""
       
 # Taken from bwlimit.py
@@ -218,6 +219,7 @@ class Site:
         self.name = site['abbreviated_name'].replace(" ", "_")
         self.tag = site['login_base']
         self.public = site['is_public']
+        self.enabled = site['enabled']
         self.links = set()
 
     def get_sitenodes(self, nodes):
@@ -469,7 +471,17 @@ class Topology:
             tags.append(self.tags[t])
         return tags
     
-    def nodeTopoFromRspec(self, rspec):
+    def lookupSiteLink(self, node1, node2):
+        site1 = self.sites[node1.site_id]
+        site2 = self.sites[node2.site_id]
+        for link in self.sitelinks:
+            if site1 == link.end1 and site2 == link.end2:
+                return link
+            if site2 == link.end1 and site1 == link.end2:
+                return link
+        return None
+    
+    def nodeTopoFromRSpec(self, rspec):
         if self.nodelinks:
             raise Error("virtual topology already present")
             
@@ -478,11 +490,11 @@ class Topology:
         for node in self.getNodes():
             nodedict[node.tag] = node
             
-        linkspecs = rspecdict['Rspec']['Request'][0]['NetSpec'][0]['LinkSpec']    
+        linkspecs = rspecdict['RSpec']['Request'][0]['NetSpec'][0]['LinkSpec']    
         for l in linkspecs:
             n1 = nodedict[l['endpoint'][0]]
             n2 = nodedict[l['endpoint'][1]]
-            bps = get_tc_rate(l['bw'][0])
+            bps = int(l['kbps'][0]) * 1000
             self.nodelinks.append(Link(n1, n2, bps))
  
     def nodeTopoFromSliceTags(self, slice):
@@ -523,14 +535,37 @@ class Topology:
                     tag.delete()
                 tag.write(self.api)
                 
+    """
+    Check the requested topology against the available topology and capacity
+    """
+    def verifyNodeTopo(self, hrn, topo, maxbw):
+        maxbps = get_tc_rate(maxbw)
+        for link in self.nodelinks:
+            if link.bps <= 0:
+                raise SfaInvalidArgument(bw, "BW")
+            if link.bps > maxbps:
+                raise PermissionError(" %s requested %s but max BW is %s" % 
+                                      (hrn, format_tc_rate(link.bps), maxbw))
+                
+            n1 = link.end1
+            n2 = link.end2
+            sitelink = self.lookupSiteLink(n1, n2)
+            if not sitelink:
+                raise PermissionError("%s: nodes %s and %s not adjacent" % (hrn, n1.tag, n2.tag))
+            if sitelink.bps < link.bps:
+                raise PermissionError("%s: insufficient capacity between %s and %s" % (hrn, n1.tag, n2.tag))
+                
+    """
+    Produce XML directly from the topology specification.
+    """
     def toxml(self, hrn = None):
         xml = """<?xml version="1.0"?>
-<Rspec xmlns="http://www.planet-lab.org/sfa/rspec/" name="vini">
+<RSpec name="vini">
     <Capacity>
         <NetSpec name="physical_topology">"""
 
         for site in self.getSites():
-            if not site.public:
+            if not (site.public and site.enabled and site.node_ids):
                 continue
             
             xml += """
@@ -543,8 +578,8 @@ class Topology:
                 xml += """
                 <NodeSpec name="%s">
                     <hostname>%s</hostname>
-                    <bw>%s</bw>
-                </NodeSpec>""" % (node.tag, node.hostname, format_tc_rate(node.bps))
+                    <kbps>%s</kbps>
+                </NodeSpec>""" % (node.tag, node.hostname, int(node.bps/1000))
             xml += """
             </SiteSpec>"""
             
@@ -553,8 +588,8 @@ class Topology:
             <SiteLinkSpec>
                 <endpoint>%s</endpoint>
                 <endpoint>%s</endpoint> 
-                <bw>%s</bw>
-            </SiteLinkSpec>""" % (link.end1.name, link.end2.name, format_tc_rate(link.bps))
+                <kbps>%s</kbps>
+            </SiteLinkSpec>""" % (link.end1.name, link.end2.name, int(link.bps/1000))
             
         
         if hrn:
@@ -573,15 +608,15 @@ class Topology:
             <LinkSpec>
                 <endpoint>%s</endpoint>
                 <endpoint>%s</endpoint> 
-                <bw>%s</bw>
-            </LinkSpec>""" % (link.end1.tag, link.end2.tag, format_tc_rate(link.bps))
+                <kbps>%s</kbps>
+            </LinkSpec>""" % (link.end1.tag, link.end2.tag, int(link.bps/1000))
         else:
             xml += default_topo_xml
             
         xml += """
         </NetSpec>
     </Request>
-</Rspec>"""
+</RSpec>"""
 
         # Remove all leading whitespace and newlines
         lines = xml.split("\n")