git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c2d7f6e
)
Added creation time for slices,nodes and users
author
Sandrine Avakian
<sandrine.avakian@inria.fr>
Wed, 16 Nov 2011 14:44:49 +0000
(15:44 +0100)
committer
Sandrine Avakian
<sandrine.avakian@inria.fr>
Wed, 16 Nov 2011 14:44:49 +0000
(15:44 +0100)
sfa/senslab/slab-import.py
patch
|
blob
|
history
diff --git
a/sfa/senslab/slab-import.py
b/sfa/senslab/slab-import.py
index
e41e2ca
..
ff1cba6
100644
(file)
--- a/
sfa/senslab/slab-import.py
+++ b/
sfa/senslab/slab-import.py
@@
-6,6
+6,8
@@
#
###########################################################################
import sys
#
###########################################################################
import sys
+import datetime
+import time
from sfa.senslab.OARrestapi import OARapi
from sfa.senslab.LDAPapi import LDAPapi
from sfa.senslab.slabdriver import SlabDriver
from sfa.senslab.OARrestapi import OARapi
from sfa.senslab.LDAPapi import LDAPapi
from sfa.senslab.slabdriver import SlabDriver
@@
-66,6
+68,8
@@
def import_node(hrn, node):
node_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
node_record = SfaRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id'])
node_record['authority'] = get_authority(node_record['hrn'])
node_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
node_record = SfaRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id'])
node_record['authority'] = get_authority(node_record['hrn'])
+ extime = datetime.datetime.utcnow()
+ node_record['date_created'] = int(time.mktime(extime.timetuple()))
existing_records = table.find({'hrn': hrn, 'type': 'node', 'pointer': node['node_id']})
if not existing_records:
print>>sys.stderr, " \r\n \t slab-import : node record %s inserted" %(node_record['hrn'])
existing_records = table.find({'hrn': hrn, 'type': 'node', 'pointer': node['node_id']})
if not existing_records:
print>>sys.stderr, " \r\n \t slab-import : node record %s inserted" %(node_record['hrn'])
@@
-78,6
+82,8
@@
def import_node(hrn, node):
# person is already a sfa record
def import_person(person):
existing_records = table.find({'hrn': person['hrn'], 'type': 'user'})
# person is already a sfa record
def import_person(person):
existing_records = table.find({'hrn': person['hrn'], 'type': 'user'})
+ extime = datetime.datetime.utcnow()
+ person['date_created'] = int(time.mktime(extime.timetuple()))
if not existing_records:
print>>sys.stderr, " \r\n \t slab-import : person record %s inserted" %(person['hrn'])
table.insert(person)
if not existing_records:
print>>sys.stderr, " \r\n \t slab-import : person record %s inserted" %(person['hrn'])
table.insert(person)
@@
-94,6
+100,10
@@
def import_slice(person):
gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
slice_record= SfaRecord(hrn=hrn, gid=gid, type="slice", pointer=-1)
slice_record['authority'] = get_authority(slice_record['hrn'])
gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey)
slice_record= SfaRecord(hrn=hrn, gid=gid, type="slice", pointer=-1)
slice_record['authority'] = get_authority(slice_record['hrn'])
+
+ extime = datetime.datetime.utcnow()
+ slice_record['date_created'] = int(time.mktime(extime.timetuple()))
+
print>>sys.stderr, " \r\n \t slab-import : slice record %s " %(slice_record['hrn'])
existing_records = table.find({'hrn': slice_record['hrn'], 'type': 'slice'})
if not existing_records:
print>>sys.stderr, " \r\n \t slab-import : slice record %s " %(slice_record['hrn'])
existing_records = table.find({'hrn': slice_record['hrn'], 'type': 'slice'})
if not existing_records: