X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Faggregates%2Fvini%2Futils.py;h=c3118877757e535eb22f7b72dbf707b5dd93b1af;hb=73b163a7ea35209e0675a7c7cef367946928a96f;hp=57a010fddde7b8155676ebb46a1fdc81cf6a0987;hpb=c2c3a2a188ec988abbf64b0f701fea56a5bf213d;p=sfa.git

diff --git a/sfa/rspecs/aggregates/vini/utils.py b/sfa/rspecs/aggregates/vini/utils.py
index 57a010fd..c3118877 100644
--- a/sfa/rspecs/aggregates/vini/utils.py
+++ b/sfa/rspecs/aggregates/vini/utils.py
@@ -1,7 +1,70 @@
 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>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2atla1</endpoint>
+                <endpoint>i2hous1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2atla1</endpoint>
+                <endpoint>i2wash1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2chic1</endpoint>
+                <endpoint>i2kans1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2chic1</endpoint>
+                <endpoint>i2wash1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2hous1</endpoint>
+                <endpoint>i2kans1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2hous1</endpoint>
+                <endpoint>i2losa1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2kans1</endpoint>
+                <endpoint>i2salt1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2losa1</endpoint>
+                <endpoint>i2salt1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2losa1</endpoint>
+                <endpoint>i2seat1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2newy1</endpoint>
+                <endpoint>i2wash1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>
+            <LinkSpec>
+                <endpoint>i2salt1</endpoint>
+                <endpoint>i2seat1</endpoint>
+                <bw>1Mbit</bw>
+            </LinkSpec>"""
+      
 # Taken from bwlimit.py
 #
 # See tc_util.c and http://physics.nist.gov/cuu/Units/binary.html. Be
@@ -153,9 +216,10 @@ class Site:
     def __init__(self, site):
         self.id = site['site_id']
         self.node_ids = site['node_ids']
-        self.name = site['abbreviated_name']
+        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):
@@ -407,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")
             
@@ -416,7 +490,7 @@ 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]]
@@ -460,6 +534,96 @@ class Topology:
                 if tag.tagname == 'topo_rspec' and not tag.updated:
                     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 GeniInvalidArgument(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">
+    <Capacity>
+        <NetSpec name="physical_topology">"""
+
+        for site in self.getSites():
+            if not (site.public and site.enabled):
+                continue
+            
+            xml += """
+            <SiteSpec name="%s"> """ % site.name
+
+            for node in site.get_sitenodes(self.nodes):
+                if not node.tag:
+                    continue
+                
+                xml += """
+                <NodeSpec name="%s">
+                    <hostname>%s</hostname>
+                    <bw>%s</bw>
+                </NodeSpec>""" % (node.tag, node.hostname, format_tc_rate(node.bps))
+            xml += """
+            </SiteSpec>"""
+            
+        for link in self.sitelinks:
+            xml += """
+            <SiteLinkSpec>
+                <endpoint>%s</endpoint>
+                <endpoint>%s</endpoint> 
+                <bw>%s</bw>
+            </SiteLinkSpec>""" % (link.end1.name, link.end2.name, format_tc_rate(link.bps))
+            
+        
+        if hrn:
+            name = hrn
+        else:
+            name = 'default_topology'
+        xml += """
+        </NetSpec>
+    </Capacity>
+    <Request>
+        <NetSpec name="%s">""" % name
+        
+        if hrn:
+            for link in self.nodelinks:
+                xml += """
+            <LinkSpec>
+                <endpoint>%s</endpoint>
+                <endpoint>%s</endpoint> 
+                <bw>%s</bw>
+            </LinkSpec>""" % (link.end1.tag, link.end2.tag, format_tc_rate(link.bps))
+        else:
+            xml += default_topo_xml
+            
+        xml += """
+        </NetSpec>
+    </Request>
+</RSpec>"""
+
+        # Remove all leading whitespace and newlines
+        lines = xml.split("\n")
+        noblanks = ""
+        for line in lines:
+            noblanks += line.strip()
+        return noblanks
 
 
 """