From 538de454d777f6aa3f25177f20255297e337cfb5 Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Wed, 9 Oct 2013 15:20:15 +0200 Subject: [PATCH] back to epoch date format in leases --- sfa/rspecs/elements/versions/nitosv1Lease.py | 10 ++++++---- sfa/rspecs/elements/versions/pgv2Lease.py | 5 +++-- sfa/rspecs/elements/versions/sfav1Lease.py | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sfa/rspecs/elements/versions/nitosv1Lease.py b/sfa/rspecs/elements/versions/nitosv1Lease.py index 0e507b17..99e815a5 100644 --- a/sfa/rspecs/elements/versions/nitosv1Lease.py +++ b/sfa/rspecs/elements/versions/nitosv1Lease.py @@ -54,7 +54,7 @@ class NITOSv1Lease: lease_elems = [] for lease in grouped_leases: - lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time'])) + #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 +67,7 @@ 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'])) + #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, ['component_id']) @@ -88,7 +88,8 @@ 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'] = 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'] lease['type'] = 'node' @@ -98,7 +99,8 @@ 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'] = datetime_to_epoch(utcparse(lease_elem.attrib['start_time'])) + channel['start_time'] = lease_elem.attrib['start_time'] channel['duration'] = lease_elem.attrib['duration'] channel['component_id'] = channel_elem.attrib['component_id'] channel['type'] = 'channel' diff --git a/sfa/rspecs/elements/versions/pgv2Lease.py b/sfa/rspecs/elements/versions/pgv2Lease.py index 89892759..68c44f0c 100644 --- a/sfa/rspecs/elements/versions/pgv2Lease.py +++ b/sfa/rspecs/elements/versions/pgv2Lease.py @@ -39,7 +39,7 @@ class PGv2Lease: lease_elems = [] for lease in grouped_leases: - lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time'])) + #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) @@ -66,7 +66,8 @@ 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'] = 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 c68b3edc..039d2d13 100644 --- a/sfa/rspecs/elements/versions/sfav1Lease.py +++ b/sfa/rspecs/elements/versions/sfav1Lease.py @@ -52,7 +52,7 @@ class SFAv1Lease: lease_elems = [] for lease in grouped_leases: - lease[0]['start_time'] = datetime_to_string(utcparse(lease[0]['start_time'])) + #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) @@ -86,7 +86,8 @@ 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'] = 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) -- 2.43.0