From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 13 Nov 2013 14:51:30 +0000 (-0500)
Subject: Merge branch 'geni-v2' of ssh://git.planet-lab.org/git/sfa into geni-v2
X-Git-Tag: geni-v2-broken-and-discontinued~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7af0ccd91f260b3dd9dba56169c17663891c5943;hp=b66385581e40464404bb642d69a737f9d27e414a;p=sfa.git

Merge branch 'geni-v2' of ssh://git.planet-lab.org/git/sfa into geni-v2
---

diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 16338095..929ab85a 100644
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -391,5 +391,14 @@ def augment_with_sfa_builtins (local_record):
         related_records = getattr(local_record,attribute,[])
         hrns = [ r.hrn for r in related_records ]
         setattr (local_record, field_name, hrns)
+
+    # include legacy 'slices' and 'keys' fields for backwards compatibility
+    reg_keys = getattr(local_record, 'reg-keys')
+    if reg_keys:
+        setattr(local_record, 'keys', reg_keys)
+    reg_slices = getattr(local_record, 'reg-slices')
+    if reg_slices:
+       setattr(local_record, 'slices', reg_slices)
+