+from __future__ import print_function
+
import sys, os.path
import pickle
import time
try:
import pygraphviz
except:
- print 'Warning, could not import pygraphviz, test mode only'
+ print('Warning, could not import pygraphviz, test mode only')
from optparse import OptionParser
+from sfa.client.return_value import ReturnValue
from sfa.client.sfi import Sfi
from sfa.util.sfalogging import logger, DEBUG
from sfa.client.sfaserverproxy import SfaServerProxy
### assuming everything is sequential, as simple as it gets
### { url -> (timestamp,version)}
class VersionCache:
+ # default expiration period is 1h
def __init__ (self, filename=None, expires=60*60):
# default is to store cache in the same dir as argv[0]
if filename is None:
def load (self):
try:
- infile=file(self.filename,'r')
+ infile=open(self.filename,'r')
self.url2version=pickle.load(infile)
infile.close()
except:
def save (self):
try:
- outfile=file(self.filename,'w')
+ outfile=open(self.filename,'w')
pickle.dump(self.url2version,outfile)
outfile.close()
except:
def show (self):
entries=len(self.url2version)
- print "version cache from file %s has %d entries"%(self.filename,entries)
+ print("version cache from file %s has %d entries"%(self.filename,entries))
key_values=self.url2version.items()
def old_first (kv1,kv2): return int(kv1[1][0]-kv2[1][0])
key_values.sort(old_first)
(timestamp,version) = tuple
how_old = time.time()-timestamp
if how_old<=self.expires:
- print url,"-- %d seconds ago"%how_old
+ print(url,"-- %d seconds ago"%how_old)
else:
- print "OUTDATED",url,"(%d seconds ago, expires=%d)"%(how_old,self.expires)
+ print("OUTDATED",url,"(%d seconds ago, expires=%d)"%(how_old,self.expires))
# turns out we might have trailing slashes or not
def normalize (self, url):
return None
###
+# non-existing hostnames happen...
+# for better perfs we cache the result of gethostbyname too
class Interface:
- def __init__ (self,url,verbose=False):
+ def __init__ (self,url,mentioned_in=None,verbose=False):
self._url=url
self.verbose=verbose
+ cache=VersionCache()
+ key="interface:%s"%url
try:
(self._url,self.hostname,self.port)=url_hostname_port(url)
- self.ip=socket.gethostbyname(self.hostname)
- self.probed=False
+ # look for ip in the cache
+ tuple=cache.get(key)
+ if tuple:
+ (self.hostname, self.ip, self.port) = tuple
+ else:
+ self.ip=socket.gethostbyname(self.hostname)
except:
+ msg="can't resolve hostname %s\n\tfound in url %s"%(self.hostname,self._url)
+ if mentioned_in:
+ msg += "\n\t(mentioned at %s)"%mentioned_in
+ logger.warning (msg)
self.hostname="unknown"
self.ip='0.0.0.0'
self.port="???"
+
+ cache.set(key, (self.hostname, self.ip, self.port,) )
+ cache.save()
+ self.probed=False
+
+ # mark unknown interfaces as probed to avoid unnecessary attempts
+ if self.hostname=='unknown':
# don't really try it
self.probed=True
self._version={}
+
def url(self):
return self._url
# setting timeout here seems to get the call to fail - even though the response time is fast
#server=SfaServerProxy(url, key_file, cert_file, verbose=self.verbose, timeout=options.timeout)
server=SfaServerProxy(url, key_file, cert_file, verbose=self.verbose)
- self._version=server.GetVersion()
+ self._version=ReturnValue.get_value(server.GetVersion())
except:
logger.log_exc("failed to get version")
self._version={}
try: shape=Interface.shapes[version['interface']]
except: shape=Interface.shapes['default']
layout['shape']=shape
- ### fill color to outline wrongly configured bodies
- if 'geni_api' not in version and 'sfa' not in version:
+ ### fill color to outline wrongly configured or unreachable bodies
+ # as of sfa-2.0 registry doesn't have 'sfa' not 'geni_api', but have peers
+ # slicemgr and aggregate have 'geni_api' and 'sfa'
+ if 'geni_api' not in version and 'peers' not in version:
layout['style']='filled'
layout['fillcolor']='gray'
return layout
logger.debug(k)
for (k1,v1) in v.iteritems():
logger.debug("\r\t\t%s:%s"%(k1,v1))
- # 'geni_api' is expected if the call succeeded at all
- # 'peers' is needed as well as AMs typically don't have peers
- if 'geni_api' in version and 'peers' in version:
- # proceed with neighbours
+ # proceed with neighbours
+ if 'peers' in version:
for (next_name,next_url) in version['peers'].iteritems():
- next_interface=Interface(next_url)
+ next_interface=Interface(next_url,mentioned_in=interface.url())
# locate or create node in graph
try:
# if found, we're good with this one
if not options.outfiles:
options.outfiles=SfaScan.default_outfiles
scanner=Scanner(left_to_right=options.left_to_right, verbose=bool_verbose)
- entries = [ Interface(entry) for entry in args ]
+ entries = [ Interface(entry,mentioned_in="command line") for entry in args ]
try:
g=scanner.graph(entries)
logger.info("creating layout")
# test mode when pygraphviz is not available
except:
entry=entries[0]
- print "GetVersion at %s returned %s"%(entry.url(),entry.get_version())
+ print("GetVersion at %s returned %s"%(entry.url(),entry.get_version()))
git://git.onelab.eu / sfa.git / blobdiff