Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --git a/.gitignore b/.gitignore
index eb92c3e..7936166 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ build/*
 TAGS
 *~
 /sfa/util/version.py
+*.version
+*.png
+*.svg
+*.out

diff --git a/sfa/client/Makefile b/sfa/client/Makefile
index 420543f..289d3ac 100644 (file)
--- a/sfa/client/Makefile
+++ b/sfa/client/Makefile
@@ -1,19 +1,22 @@
 # recompute the SFA graphs from different locations
 
+BUNDLES += http://planet-lab.eu:12346/@auto-ple-am
 BUNDLES += http://planet-lab.eu:12345/@auto-ple-reg 
 BUNDLES += http://planet-lab.eu:12347/@auto-ple-sa
 BUNDLES += http://planet-lab.org:12345/@auto-plc-reg 
 BUNDLES += http://planet-lab.org:12347/@auto-plc-sa
 BUNDLES += http://planet-lab.kr:12345/@auto-ppk-reg 
 BUNDLES += http://planet-lab.kr:12347/@auto-ppk-sa
-BUNDLES += http://www.planet-lab.jp:12345/@auto-plj-reg 
-BUNDLES += http://www.planet-lab.jp:12347/@auto-plj-sa
 BUNDLES += http://geni-myvini.umkc.gpeni.net:12345/@auto-gpeni-reg
 BUNDLES += http://geni-myvini.umkc.gpeni.net:12347/@auto-gpeni-sa
 BUNDLES += http://198.248.241.100:12345/@auto-glc-reg
 BUNDLES += http://198.248.241.100:12347/@auto-glc-sa
 BUNDLES += http://vini-veritas.net:12345/@auto-vini-reg
 BUNDLES += http://vini-veritas.net:12347/@auto-vini-sa
+BUNDLES += http://www.planet-lab.jp:12345/@auto-plj-reg 
+BUNDLES += http://www.planet-lab.jp:12347/@auto-plj-sa
+BUNDLES += http://www.emanicslab.org:12345/@auto-elc-reg 
+BUNDLES += http://www.emanicslab.org:12347/@auto-elc-sa
 
 # dont output svg yet
 #EXTENSIONS := png svg
@@ -48,6 +51,9 @@ clean-versions:
 # the actual targets
 $(foreach bundle,$(BUNDLES),$(eval $(call bundle_version_target,$(bundle))))
 
+clean:
+       rm -f auto-*.{out,version}
+       $(foreach extension,$(EXTENSIONS),rm -rf auto-*.$(extension);)
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)

diff --git a/sfa/client/sfascan.py b/sfa/client/sfascan.py
index 9f70c05..fc481d2 100755 (executable)
--- a/sfa/client/sfascan.py
+++ b/sfa/client/sfascan.py
@@ -34,7 +34,8 @@ class Interface:
         except:
             import traceback
             traceback.print_exc()
-            self.hostname="undefined"
+            self.hostname="unknown"
+            self.ip='0.0.0.0'
             self.port="???"
             self.probed=True
             self._version={}
@@ -42,6 +43,7 @@ class Interface:
     def url(self):
         return "http://%s:%s/"%(self.hostname,self.port)
 
+    # this is used as a key for creating graph nodes and to avoid duplicates
     def uid (self):
         return "%s:%s"%(self.ip,self.port)
 
@@ -63,24 +65,26 @@ class Interface:
             sfa_logger().info('issuing get version at %s'%url)
             server=xmlrpcprotocol.get_server(url, key_file, cert_file, options)
             self._version=server.GetVersion()
-            sfa_logger().info("get_version at %s returned %r"%(url,self._version))
         except:
-            sfa_logger().info("get_version at %s failed"%(url))
             self._version={}
         self.probed=True
         return self._version
 
-    abbrevs = {"registry": "REG", "slicemgr":"SM", "aggregate":"AM"}
+    # default is for when we can't determine the type of the service
+    # typically the server is down, or we can't authenticate, or it's too old code
     shapes = {"registry": "diamond", "slicemgr":"ellipse", "aggregate":"box", 'default':'plaintext'}
 
-    def get_name(self):
+    def get_label(self):
         version=self.get_version()
         if 'hrn' not in version: return self.url()
         hrn=version['hrn']
-        interface=version['interface']
-        abbrev=Interface.abbrevs.get(interface,"XXX")
-        result="%s %s"%(hrn,abbrev)
-        if 'code_tag' in version: result += " %s"%version['code_tag']
+        result=hrn
+        if 'code_tag' in version: 
+            result += " %s"%version['code_tag']
+        if 'testbed' in version:
+            # could not get so-called HTML-like labels to work
+            #"<TABLE><TR><TD>%s</TD></TR><TR><TD>%s</TD></TR></TABLE>"%(result,version['testbed'])
+            result += " (%s)"%version['testbed']
         return result
 
     def get_shape(self):
@@ -112,7 +116,6 @@ class SfaScan:
         # add entry points right away using the interface uid's as a key
         to_scan=interfaces
         for i in interfaces: 
-            sfa_logger().info("adding initial node %s"%i.uid())
             graph.add_node(i.uid())
             node2interface[graph.get_node(i.uid())]=i
         scanned=[]
@@ -145,8 +148,9 @@ class SfaScan:
             for node in graph.nodes():
                 interface=node2interface.get(node,None)
                 if interface:
-                    node.attr['label']=interface.get_name()
+                    node.attr['label']=interface.get_label()
                     node.attr['shape']=interface.get_shape()
+                    node.attr['href']=interface.url()
                 else:
                     sfa_logger().info("MISSED interface with node %s"%node)
     

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index 501f8cc..6546c69 100644 (file)
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -24,8 +24,11 @@ from sfa.util.version import version_core
 from sfa.util.sfatime import utcparse
 
 def GetVersion(api):
+    xrn=Xrn(api.hrn)
     return version_core({'interface':'aggregate',
-                         'testbed':'myplc'})
+                         'testbed':'myplc',
+                         'hrn':xrn.get_hrn(),
+                         })
 
 def __get_registry_objects(slice_xrn, creds, users):
     """

diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py
index 7b0a28c..227281a 100644 (file)
--- a/sfa/managers/aggregate_manager_vini.py
+++ b/sfa/managers/aggregate_manager_vini.py
@@ -4,7 +4,7 @@ import traceback
 import sys
 
 from types import StringTypes
-from sfa.util.xrn import urn_to_hrn
+from sfa.util.xrn import urn_to_hrn, Xrn
 from sfa.util.plxrn import hrn_to_pl_slicename
 from sfa.util.rspec import *
 from sfa.util.specdict import *
@@ -29,8 +29,11 @@ start_slice, stop_slice, renew_slice, reset_slice, get_slices, get_ticket, slice
 
 
 def GetVersion(api):
+    xrn=Xrn(api.hrn)
     return version_core({'interface':'aggregate',
-                         'testbed':'myplc.vini'})
+                         'testbed':'myplc.vini',
+                         'hrn':xrn.get_hrn(),
+                         })
 
 def delete_slice(api, xrn, creds):
     hrn, type = urn_to_hrn(xrn)