from sfa.util.sfalogging import logger
from sfa.util.xml import XpathFilter
from sfa.util.xrn import Xrn
+from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
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
from sfa.rspecs.elements.versions.pgv2Services import PGv2Services
from sfa.rspecs.elements.lease import Lease
-from sfa.planetlab.plxrn import xrn_to_hostname
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]
lease_elems = []
for lease in grouped_leases:
- #lease_fields = ['lease_id', 'component_id', 'slice_id', 'start_time', 'duration']
+ #lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time']))
+
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:
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')
for node_elem in node_elems:
lease = Lease(lease_elem.attrib, lease_elem)
lease['slice_id'] = lease_elem.attrib['slice_id']
- lease['start_time'] = lease_elem.attrib['start_time']
+ #lease['start_time'] = datetime_to_epoch(utcparse(lease_elem.attrib['start_time']))
+ 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