From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 16 Jun 2009 17:20:11 +0000 (+0000)
Subject: fix bug in geni_fields_to_pl_fields
X-Git-Tag: sfa-0.9-0@14641~266
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a8bfc962698cdbfce8ad3d269e96504d5e138f05;p=sfa.git

fix bug in geni_fields_to_pl_fields
---

diff --git a/geni/util/api.py b/geni/util/api.py
index 177e2e18..08e1134e 100644
--- a/geni/util/api.py
+++ b/geni/util/api.py
@@ -248,10 +248,9 @@ class GeniAPI:
         if type == "slice":
             if not "instantiation" in pl_record:
                 pl_record["instantiation"] = "delegated"  # "plc-instantiated"
-            if not "name" in pl_record:
-                pl_record["name"] = hrn_to_pl_slicename(hrn)
             if not "max_nodes" in pl_record:
                 pl_record["max_nodes"] = 10
+            pl_record["name"] = hrn_to_pl_slicename(hrn)
 
         elif type == "node":
             if not "hostname" in pl_record:
@@ -357,7 +356,6 @@ class GeniAPI:
             user_records = auth_table.find("user", person_id, "pointer")
             for user_record in user_records:
                 self.fill_record_info(user_record)
-
                 user_roles = user_record.get("roles")
                 if (role=="*") or (role in user_roles):
                     record_list.append(user_record.get_name())
@@ -366,7 +364,6 @@ class GeniAPI:
     def fill_record_geni_info(self, record):
         geni_info = {}
         type = record.get_type()
-
         if (type == "slice"):
             auth_table = self.auth.get_auth_table(self.auth.get_authority(record.get_name()))
             person_ids = record.get("person_ids", [])