From: Mohamed Larabi Date: Fri, 31 May 2013 13:17:59 +0000 (+0200) Subject: Move back to express lease start_time to in epoch X-Git-Tag: sfa-2.1-26~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3027a719fc93d6f217e5eb1d5fe112fcc2b061d3;p=sfa.git Move back to express lease start_time to in epoch --- diff --git a/sfa/rspecs/elements/versions/nitosv1Lease.py b/sfa/rspecs/elements/versions/nitosv1Lease.py index 158f0ba1..4e1dcdc3 100644 --- a/sfa/rspecs/elements/versions/nitosv1Lease.py +++ b/sfa/rspecs/elements/versions/nitosv1Lease.py @@ -1,7 +1,6 @@ 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 @@ -54,7 +53,6 @@ class NITOSv1Lease: lease_elems = [] for lease in grouped_leases: - 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) @@ -67,7 +65,6 @@ class NITOSv1Lease: # add reserved channels of this lease #channels = [{'channel_id': 1}, {'channel_id': 2}] for channel in channels: - channel['start_time'] = datetime_to_string(utcparse(channel['start_time'])) if channel['slice_id'] == lease[0]['slice_id'] and channel['start_time'] == lease[0]['start_time'] and channel['duration'] == lease[0]['duration']: lease_elem.add_instance('channel', channel, ['channel_num']) @@ -88,7 +85,7 @@ class NITOSv1Lease: for node_elem in node_elems: lease = Lease(lease_elem.attrib, lease_elem) lease['slice_id'] = lease_elem.attrib['slice_id'] - 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'] leases.append(lease) @@ -97,7 +94,7 @@ class NITOSv1Lease: for channel_elem in channel_elems: channel = Channel(channel_elem.attrib, channel_elem) channel['slice_id'] = lease_elem.attrib['slice_id'] - channel['start_time'] = datetime_to_epoch(utcparse(lease_elem.attrib['start_time'])) + channel['start_time'] = lease_elem.attrib['start_time'] channel['duration'] = lease_elem.attrib['duration'] channel['channel_num'] = channel_elem.attrib['channel_num'] channels.append(channel) diff --git a/sfa/rspecs/elements/versions/pgv2Lease.py b/sfa/rspecs/elements/versions/pgv2Lease.py index 952aec2a..7d439e94 100644 --- a/sfa/rspecs/elements/versions/pgv2Lease.py +++ b/sfa/rspecs/elements/versions/pgv2Lease.py @@ -1,6 +1,5 @@ from sfa.util.xrn import Xrn from sfa.util.xml import XpathFilter -from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch from sfa.rspecs.elements.node import Node from sfa.rspecs.elements.sliver import Sliver @@ -40,7 +39,6 @@ class PGv2Lease: lease_elems = [] for lease in grouped_leases: - lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time'])) lease_fields = ['slice_id', 'start_time', 'duration'] lease_elem = xml.add_instance('lease', lease[0], lease_fields) @@ -67,7 +65,7 @@ class PGv2Lease: for node_elem in node_elems: lease = Lease(lease_elem.attrib, lease_elem) lease['slice_id'] = lease_elem.attrib['slice_id'] - 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'] leases.append(lease) diff --git a/sfa/rspecs/elements/versions/sfav1Lease.py b/sfa/rspecs/elements/versions/sfav1Lease.py index 7effc833..fa735cd3 100644 --- a/sfa/rspecs/elements/versions/sfav1Lease.py +++ b/sfa/rspecs/elements/versions/sfav1Lease.py @@ -1,7 +1,6 @@ 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 @@ -53,7 +52,6 @@ class SFAv1Lease: lease_elems = [] for lease in grouped_leases: - 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) @@ -87,7 +85,7 @@ class SFAv1Lease: for node_elem in node_elems: lease = Lease(lease_elem.attrib, lease_elem) lease['slice_id'] = lease_elem.attrib['slice_id'] - 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'] leases.append(lease) diff --git a/sfa/rspecs/elements/versions/slabv1Lease.py b/sfa/rspecs/elements/versions/slabv1Lease.py index 2991a490..d176d3a2 100644 --- a/sfa/rspecs/elements/versions/slabv1Lease.py +++ b/sfa/rspecs/elements/versions/slabv1Lease.py @@ -1,8 +1,6 @@ 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.versions.sfav1PLTag import SFAv1PLTag #from sfa.rspecs.elements.versions.pgv2Services import PGv2Services @@ -26,7 +24,6 @@ class Slabv1Lease: lease_elems = [] for lease in leases: - lease['start_time'] = datetime_to_string(utcparse(lease['start_time'])) lease_fields = ['lease_id', 'component_id', 'slice_id', 'start_time', 'duration'] lease_elem = network_elem.add_instance('lease', lease, lease_fields) @@ -48,7 +45,7 @@ class Slabv1Lease: for node_elem in node_elems: lease = Lease(lease_elem.attrib, lease_elem) lease['slice_id'] = lease_elem.attrib['slice_id'] - 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'] leases.append(lease)