Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / rspecs / elements / versions / slabv1Sliver.py

diff --git a/sfa/rspecs/elements/versions/slabv1Sliver.py b/sfa/rspecs/elements/versions/slabv1Sliver.py
index a4c9be4..370f55f 100644 (file)
--- a/sfa/rspecs/elements/versions/slabv1Sliver.py
+++ b/sfa/rspecs/elements/versions/slabv1Sliver.py
@@ -1,7 +1,8 @@
 from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
-#from sfa.rspecs.elements.versions.pgv2DiskImage import PGv2DiskImage
 
+#from sfa.rspecs.elements.versions.pgv2DiskImage import PGv2DiskImage
+import sys
 class Slabv1Sliver:
 
     @staticmethod
@@ -11,7 +12,8 @@ class Slabv1Sliver:
         if not isinstance(slivers, list):
             slivers = [slivers]
         for sliver in slivers: 
-            sliver_elem = xml.add_element('sliver_type')
+            #sliver_elem = xml.add_element('sliver_type')
+            sliver_elem = xml.add_element('sliver')
             if sliver.get('type'):
                 sliver_elem.set('name', sliver['type'])
             if sliver.get('client_id'):
@@ -34,16 +36,20 @@ class Slabv1Sliver:
                         attrib_elem.set(key, value)                
     @staticmethod
     def get_slivers(xml, filter={}):
-        xpath = './default:sliver_type | ./sliver_type'
+        xpath = './default:sliver | ./sliver'
+     
         sliver_elems = xml.xpath(xpath)
         slivers = []
-        for sliver_elem in sliver_elems:
+        for sliver_elem in sliver_elems: 
             sliver = Sliver(sliver_elem.attrib,sliver_elem)
+
             if 'component_id' in xml.attrib:     
                 sliver['component_id'] = xml.attrib['component_id']
             if 'name' in sliver_elem.attrib:
                 sliver['type'] = sliver_elem.attrib['name']
             #sliver['images'] = Slabv1DiskImage.get_images(sliver_elem)
+                
+            print>>sys.stderr, "\r\n \r\n SLABV1SLIVER.PY  \t\t\t  get_slivers sliver %s " %( sliver)
             slivers.append(sliver)
         return slivers