From: Git User <support@planet-lab.org>
Date: Thu, 14 Nov 2013 12:46:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/geni-v2' into geni-v2
X-Git-Tag: geni-v2-broken-and-discontinued~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f3bc4f2d4fd97df55921baa2b14e697e0325c49d;hp=58a480022cec9e3ff8a7674d3d58afe5f0c8c2b9;p=sfa.git

Merge remote-tracking branch 'origin/geni-v2' 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)
+