Merge Master in geni-v3 conflict resolution

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

diff --git a/sfa/rspecs/elements/versions/sfav1Lease.py b/sfa/rspecs/elements/versions/sfav1Lease.py
index 180673c..d463904 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Lease.py
+++ b/sfa/rspecs/elements/versions/sfav1Lease.py
@@ -3,7 +3,7 @@ from sfa.util.xml import XpathFilter
 from sfa.util.xrn import Xrn
 
 from sfa.rspecs.elements.element import Element
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import NodeElement
 from sfa.rspecs.elements.sliver import Sliver
 from sfa.rspecs.elements.location import Location
 from sfa.rspecs.elements.hardware_type import HardwareType
@@ -22,7 +22,7 @@ class SFAv1Lease:
 
     @staticmethod
     def add_leases(xml, leases):
-        logger.debug("SFAV1LEASE \t add_lease ")
+        
         network_elems = xml.xpath('//network')
         if len(network_elems) > 0:
             network_elem = network_elems[0]
@@ -56,7 +56,6 @@ class SFAv1Lease:
             lease_fields = ['slice_id', 'start_time', 'duration']
             lease_elem = network_elem.add_instance('lease', lease[0], lease_fields)
             lease_elems.append(lease_elem)
-            logger.debug("SFAV1LEASE \t add_lease lease %s" %(lease))
 
             # add nodes of this lease
             for node in lease:
@@ -75,13 +74,11 @@ class SFAv1Lease:
     def get_leases(xml, filter={}):
         xpath = '//lease%s | //default:lease%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter))
         lease_elems = xml.xpath(xpath)
-        logger.debug("SFAV1LEASE \t  get_leases lease_elems %s" %(lease_elems))
         return SFAv1Lease.get_lease_objs(lease_elems)
 
     @staticmethod
     def get_lease_objs(lease_elems):
         leases = []
-        logger.debug("SFAV1LEASE \t  get_lease_objs OHGET_LEAQSE_OBJS lease_elems %s "%(lease_elems))
         for lease_elem in lease_elems:
             #get nodes
             node_elems = lease_elem.xpath('./default:node | ./node')
@@ -91,7 +88,6 @@ class SFAv1Lease:
                  lease['start_time'] = lease_elem.attrib['start_time']
                  lease['duration'] = lease_elem.attrib['duration']
                  lease['component_id'] = node_elem.attrib['component_id']
-                 logger.debug("SFAV1LEASE \t  get_lease_objs lease %s" %(lease))
                  leases.append(lease)
 
         return leases