git://git.onelab.eu
/
myplc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8e830a6
)
updated to work with current plcapi
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 25 Feb 2011 16:51:23 +0000
(11:51 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 25 Feb 2011 16:51:23 +0000
(11:51 -0500)
support-scripts/gen-sites-xml.py
patch
|
blob
|
history
diff --git
a/support-scripts/gen-sites-xml.py
b/support-scripts/gen-sites-xml.py
index
bfbcd6f
..
5da0f72
100755
(executable)
--- a/
support-scripts/gen-sites-xml.py
+++ b/
support-scripts/gen-sites-xml.py
@@
-76,10
+76,10
@@
plc = Shell(globals())
#
begin()
#
begin()
-GetNodes(None, ['node_id', 'model', 'boot_state', 'hostname', 'version', 'ssh_rsa_key', '
nodenetwork
_ids', 'slice_ids_whitelist'])
-Get
NodeNetworks({'is_primary': True}, ['nodenetwork
_id', 'node_id', 'ip', 'mac', 'bwlimit'])
+GetNodes(None, ['node_id', 'model', 'boot_state', 'hostname', 'version', 'ssh_rsa_key', '
interface
_ids', 'slice_ids_whitelist'])
+Get
Interfaces({'is_primary': True}, ['interface
_id', 'node_id', 'ip', 'mac', 'bwlimit'])
GetSites(None, ['name', 'latitude', 'longitude', 'url', 'site_id', 'login_base', 'abbreviated_name', 'node_ids'])
GetSites(None, ['name', 'latitude', 'longitude', 'url', 'site_id', 'login_base', 'abbreviated_name', 'node_ids'])
-GetNodeGroups(['Alpha', 'Beta', 'Rollout', 'Production'], ['name', 'node_ids'])
+GetNodeGroups(['Alpha', 'Beta', 'Rollout', 'Production'], ['
group
name', 'node_ids'])
(nodes, nodenetworks, sites, groups) = commit()
# remove whitelisted nodes
(nodes, nodenetworks, sites, groups) = commit()
# remove whitelisted nodes
@@
-94,7
+94,7
@@
for nodenetwork in nodenetworks:
for key, value in nodenetwork.iteritems():
node[key] = value
for key, value in nodenetwork.iteritems():
node[key] = value
-group_node_ids = dict([(group['name'], group['node_ids']) for group in groups])
+group_node_ids = dict([(group['
group
name'], group['node_ids']) for group in groups])
class PrettyXMLGenerator(XMLGenerator):
"""
class PrettyXMLGenerator(XMLGenerator):
"""