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:
e59bff2
)
fix bug in geni_fields_to_pl_fields
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 16 Jun 2009 17:20:11 +0000
(17:20 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 16 Jun 2009 17:20:11 +0000
(17:20 +0000)
geni/util/api.py
patch
|
blob
|
history
diff --git
a/geni/util/api.py
b/geni/util/api.py
index
177e2e1
..
08e1134
100644
(file)
--- 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 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
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:
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_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())
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()
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", [])
if (type == "slice"):
auth_table = self.auth.get_auth_table(self.auth.get_authority(record.get_name()))
person_ids = record.get("person_ids", [])