X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fplc-kml.py;h=5096a799c16bf50f19187596e0fe466b13a649cf;hb=refs%2Fheads%2Fpython2;hp=c8b7de938033347569e0faaae2469e1024f32241;hpb=27ae61d51ba27a22a2e9048b90fe158dd3fac592;p=myplc.git
diff --git a/bin/plc-kml.py b/bin/plc-kml.py
index c8b7de9..5096a79 100755
--- a/bin/plc-kml.py
+++ b/bin/plc-kml.py
@@ -17,6 +17,12 @@ default_foreign_icon = "sites/google-foreign.png"
default_local_builtin = "palette-4.png"
default_foreign_builtin = "palette-3.png"
+# cosmetic - peername cannot be easily changed on the PLC-PLE link...
+def render_public_name (peername):
+ if peername=='PlanetLab': return "PlanetLab Central"
+ elif peername == 'PlanetLabEurope': return "PlanetLab Europe"
+ else: return peername
+
class KmlMap:
def __init__ (self,outputname,options):
@@ -34,32 +40,19 @@ class KmlMap:
def write(self,string):
self.output.write(string.encode("UTF-8"))
- # mention local last
- @staticmethod
- def site_compare (s1,s2):
- p1 = p2 = 0
- if s1['peer_id']: p1=s1['peer_id']
- if s2['peer_id']: p2=s2['peer_id']
- return p2-p1
-
- def refresh (self):
- self.open()
- self.write_header()
- # cache peers
- peers = GetPeers({},['peer_id','peername'])
- all_sites = GetSites({'enabled':True,'is_public':True})
- all_sites.sort(KmlMap.site_compare)
- for site in all_sites:
- self.write_site(site,peers)
- self.write_footer()
- self.close()
-
# initial placement is for europe - dunno how to tune that yet
def write_header (self):
+ if not self.options.nodegroup:
+ local_peername=render_public_name(api.config.PLC_NAME)
+ title="%s sites"%local_peername
+ detailed="All the sites known to the %s testbed"%local_peername
+ else:
+ title="Nodegroup %s"%self.options.nodegroup
+ detailed="All sites involved in nodegroup %s"%self.options.nodegroup
self.write("""
- PlanetLab Sites
+ %(title)s
9.180821112577378
44.43275321178062
@@ -68,21 +61,78 @@ class KmlMap:
0
-7.767386340832667
- All the sites known to the PlanetLab testbed.
-""")
+ %(detailed)s.
+"""%locals())
def write_footer (self):
self.write("""
""")
- def peer_name (self,site, peers):
+ def peer_info (self,site, peers):
if not site['peer_id']:
- return "local"
+ return (render_public_name(api.config.PLC_NAME), "http://%s/"%api.config.PLC_API_HOST,)
for peer in peers:
if peer['peer_id'] == site['peer_id']:
- return peer['peername']
+ return (render_public_name(peer['peername']),peer['peer_url'].replace("PLCAPI/",""),)
+ return "Unknown peer_name"
+
+ # mention local last
+ @staticmethod
+ def site_compare (s1,s2):
+ p1 = p2 = 0
+ if s1['peer_id']: p1=s1['peer_id']
+ if s2['peer_id']: p2=s2['peer_id']
+ return p2-p1
+
+ ####################
+ def refresh (self):
+ if self.options.nodegroup:
+ self.refresh_nodegroup()
+ else:
+ self.refresh_all_sites()
+
+ def refresh_all_sites(self):
+ self.open()
+ self.write_header()
+ # cache peers
+ peers = GetPeers()
+ all_sites = GetSites({'enabled':True,'is_public':True})
+ all_sites.sort(KmlMap.site_compare)
+ for site in all_sites:
+ self.write_site(site,peers)
+ self.write_footer()
+ self.close()
+
+ def refresh_nodegroup(self):
+ try:
+ nodegroup=GetNodeGroups({'groupname':self.options.nodegroup})[0]
+ except:
+ print "No such nodegroup %s - ignored"%self.options.nodegroup
+ return
+ nodegroup_node_ids=nodegroup['node_ids']
+ if len(nodegroup_node_ids)==0:
+ print "Empty nodegroup %s - ignored"%self.options.nodegroup
+ return
+ # let's go
+ self.open()
+ self.write_header()
+ # cache peers
+ peers = GetPeers()
+ nodes=GetNodes(nodegroup_node_ids)
+ global_node_hash = dict ( [ (n['node_id'],n) for n in nodes ] )
+ site_ids = [ node['site_id'] for node in nodes]
+ # remove any duplicate
+ site_ids = list(set(site_ids))
+ sites = GetSites (site_ids)
+ # patch sites so that 'node_ids' only contains the nodes in the nodegroup
+ for site in sites:
+ site['node_ids'] = [ node_id for node_id in site['node_ids'] if node_id in nodegroup_node_ids ]
+ node_hash = dict ( [ (node_id, global_node_hash[node_id]) for node_id in site['node_ids'] ] )
+ self.write_site(site,peers,nodegroup_id=nodegroup['nodegroup_id'], node_hash=node_hash)
+ self.write_footer()
+ self.close()
- def write_site (self, site, peers):
+ def write_site (self, site, peers, nodegroup_id=False, node_hash={}):
# discard sites with missing lat or lon
if not site['latitude'] or not site['longitude']:
return
@@ -100,43 +150,9 @@ class KmlMap:
baseurl='http://%s'%api.config.PLC_WWW_HOST
peer_id=site['peer_id']
- # open description
- description='
'
- # Name and URL
- description += '- '
- description += ' Site page '%locals()
- if site['url']:
- site_url=site['url']
- description += ' -- %(site_url)s '%locals()
- description += '
'
- # NODES
- if nb_nodes:
- description += '- '
- description += '%(nb_nodes)d node(s)'%locals()
- description += ' (in Comon)'%locals()
- description += '
'
- else:
- description += '- No node
'
- #SLICES
- if nb_slices:
- description += '- %(nb_slices)d slice(s)
'%locals()
- else:
- description += '- No slice
'
- # PEER
- if peer_id:
- peername = self.peer_name(site,peers)
- description += '- '
- description += 'At peer %(peername)s'%locals()
- description += '
'
- # close description
- description +='
'
-
- if not self.options.labels:
- name=""
- description=""
-
# STYLE
- if self.options.use_google_icons:
+ # the size for google icons
+ if not self.options.use_custom_icons:
if not peer_id:
# local sites
iconfile=default_local_builtin
@@ -146,6 +162,7 @@ class KmlMap:
iconfile=default_foreign_builtin
xyspec="16003232"
iconurl="root://icons/%(iconfile)s"%locals()
+ # the size for our own brew of icons
else:
if not peer_id:
iconfile=self.options.local_icon
@@ -156,6 +173,98 @@ class KmlMap:
iconspec="%(iconurl)s%(xyspec)s"%locals()
+ # open description
+ # can't seem to get classes to get through to the google maps API
+ # so have to use hard-wired settings
+ description = ""
+ description += ""
+
+ if not self.options.labels:
+ name=""
+ description=""
+
# set the camera 50km high
template="""
@@ -184,15 +293,20 @@ def main () :
parser.add_option("-n","--no-label",action="store_false",dest="labels",
default=True,
help="outputs only geographic positions, no labels")
- parser.add_option("-c","--custom",action="store_false",dest="use_google_icons",
- default=True,
- help="use locally customized icons rather than the google-provided defaults")
+
+ parser.add_option("-g","--nodegroup",action='store',dest='nodegroup',default=None,
+ help="outputs a kml file for a given nodegroup only")
+
+ # default - for private depls. - is to use google-provided icons like palette-3
+ parser.add_option("-c","--custom",action="store_true",dest="use_custom_icons",
+ default=False,
+ help="use locally customized icons rather than the %s and %s defaults"%(default_local_builtin,default_foreign_builtin))
parser.add_option("-l","--local",action="store",dest="local_icon",
default=default_local_icon,
- help="set icon url to use for local sites marker -- default is %s"%default_local_icon)
+ help="set icon url to use for local sites marker -- requires -c -- default is %s"%default_local_icon)
parser.add_option("-f","--foreign",action="store",dest="foreign_icon",
default=default_foreign_icon,
- help="set icon url to use for foreign sites marker -- default is %s"%default_foreign_icon)
+ help="set icon url to use for foreign sites marker -- requires -c -- default is %s"%default_foreign_icon)
(options, args) = parser.parse_args()
if len(args) != 0: