X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fpg_rspec_converter.py;h=0fff41eb86fdf786a8709a8d0b24c48f19219244;hb=31cc4fa991896f000abb106916662923f37bc3a6;hp=aa6854668121cbac3dd9f58b2160ea393909f7f8;hpb=84e623db2fcda26e9f941f17ca83506fad7317da;p=sfa.git

diff --git a/sfa/rspecs/pg_rspec_converter.py b/sfa/rspecs/pg_rspec_converter.py
index aa685466..0fff41eb 100755
--- a/sfa/rspecs/pg_rspec_converter.py
+++ b/sfa/rspecs/pg_rspec_converter.py
@@ -1,10 +1,14 @@
-#!/usr/bin/python 
+#!/usr/bin/env python2
+from __future__ import print_function
+
 from lxml import etree
-from StringIO import StringIO
-from sfa.util.xrn import *
-from sfa.rspecs.pg_rspec import PGRSpec 
+from sfa.util.xrn import Xrn, urn_to_hrn
+from sfa.rspecs.rspec import RSpec
+from sfa.rspecs.version_manager import VersionManager
+
+from sfa.util.py23 import StringIO
 
-xslt='''<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+xslt = '''<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="xml" indent="no"/>
 
 <xsl:template match="/|comment()|processing-instruction()">
@@ -27,42 +31,70 @@ xslt='''<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Tran
 </xsl:stylesheet>
 '''
 
-xslt_doc=etree.parse(StringIO(xslt))
-transform=etree.XSLT(xslt_doc)
+xslt_doc = etree.parse(StringIO(xslt))
+transform = etree.XSLT(xslt_doc)
+
 
 class PGRSpecConverter:
 
     @staticmethod
-    def to_sfa_node(site, node, i=0):
-        urn = node.get('component_uuid')
-        hrn, _ = urn_to_hrn(urn)
-        hostname = Xrn.urn_split(urn)[-1]
-        node_tag = etree.SubElement(site, "node")
-        hostname_tag = etree.SubElement(node_tag, "hostname").text = hostname
-        urn_tag = etree.SubElement(node_tag, "urn").text = urn
-        for child in node.getchildren():
-            node_tag.append(transform(child).getroot())      
+    def to_sfa_rspec(rspec, content_type=None):
+        if not isinstance(rspec, RSpec):
+            pg_rspec = RSpec(rspec)
+        else:
+            pg_rspec = rspec
 
-    @staticmethod
-    def to_sfa_network(pg_rspec, xml): 
-        network_urn = pg_rspec.get_network()
-        network,  _ = urn_to_hrn(network_urn)
-        nodes = pg_rspec.get_node_elements()
-        network_tag = etree.SubElement(xml, "network")
-        network_tag.set("name", network)
-        network_tag.set("id", network)
-        i = 0
-        for node in nodes:
-           PGRSpecConverter.to_sfa_node(network_tag, node, i)
-        
-    @staticmethod
-    def to_sfa_rspec(rspec):
-        pg_rspec = PGRSpec(rspec=rspec)
-        header = '<?xml version="1.0"?>\n'
-        xml = etree.Element("RSpec", type="SFA") 
-        PGRSpecConverter.to_sfa_network(pg_rspec, xml) 
-        return header + etree.tostring(xml, pretty_print=True)
+        version_manager = VersionManager()
+        sfa_version = version_manager._get_version('sfa', '1')
+        sfa_rspec = RSpec(version=sfa_version)
+
+        #nodes = pg_rspec.version.get_nodes()
+        # sfa_rspec.version.add_nodes(nodes())
+        # sfa_rspec.version.add_links(pg_rspec.version.get_links())
+        # return sfa_rspec.toxml()
+
+        # get network
+        networks = pg_rspec.version.get_networks()
+        network_hrn = networks[0]["name"]
+        network_element = sfa_rspec.xml.add_element(
+            'network', name=network_hrn, id=network_hrn)
+
+        # get nodes
+        pg_nodes_elements = pg_rspec.version.get_nodes()
+        nodes_with_slivers = pg_rspec.version.get_nodes_with_slivers()
+        i = 1
+        for pg_node in pg_nodes_elements:
+            attribs = dict(pg_node.items())
+            attribs['id'] = 'n' + str(i)
+
+            node_element = network_element.add_element('node')
+            for attrib in attribs:
+                if type(attribs[attrib]) == str:
+                    node_element.set(attrib, attribs[attrib])
+            urn = pg_node["component_id"]
+            if urn:
+                if type(urn) == list:
+                    # legacy code, not sure if urn is ever a list...
+                    urn = urn[0]
+                hostname = Xrn.urn_split(urn)[-1]
+                hostname_element = node_element.add_element('hostname')
+                hostname_element.set_text(hostname)
+                if hostname in nodes_with_slivers:
+                    node_element.add_element('sliver')
+
+            for hardware_type in pg_node["hardware_types"]:
+                if "name" in hardware_type:
+                    node_element.add_element(
+                        "hardware_type", name=hardware_type["name"])
+
+            # just copy over remaining child elements
+            # for child in pg_node_element.getchildren():
+            #    node_element.append(transform(child).getroot())
+            i = i + 1
+
+        return sfa_rspec.toxml()
 
 if __name__ == '__main__':
-   rspec = 'protogeni.rspec' 
-   print PGRSpecConverter.to_sfa_rspec(rspec)  
+    import sys
+    if len(sys.argv) > 1:
+        print(PGRSpecConverter.to_sfa_rspec(sys.argv[1]))