X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfascan.py;h=6a7e79ab0a7f77678b183844d8c66efc42ee94a2;hb=d40b9aa4b75edb62273b2d0705945342468d69d6;hp=60a8d71eb7c7e9ee2fbe5b214cde2878cc14334b;hpb=c94a8a8bf6bc09be064eac2c3dcab5b51d5c0394;p=sfa.git diff --git a/sfa/client/sfascan.py b/sfa/client/sfascan.py index 60a8d71e..6a7e79ab 100755 --- a/sfa/client/sfascan.py +++ b/sfa/client/sfascan.py @@ -13,7 +13,7 @@ from optparse import OptionParser from sfa.client.sfi import Sfi from sfa.util.sfalogging import logger, DEBUG -import sfa.client.xmlrpcprotocol as xmlrpcprotocol +import sfa.client.sfaprotocol as sfaprotocol def url_hostname_port (url): if url.find("://")<0: @@ -50,9 +50,9 @@ class VersionCache: self.url2version=pickle.load(infile) infile.close() except: - logger.info("Cannot load version cache, restarting from scratch") + logger.debug("Cannot load version cache, restarting from scratch") self.url2version = {} - logger.debug("loaded version cache with %d entries"%(len(self.url2version))) + logger.debug("loaded version cache with %d entries %s"%(len(self.url2version),self.url2version.keys())) def save (self): try: @@ -63,25 +63,35 @@ class VersionCache: logger.log_exc ("Cannot save version cache into %s"%self.filename) def clean (self): try: - os.unlink(self.filename) - logger.info("Cleaned up version cache %s"%self.filename) + retcod=os.unlink(self.filename) + logger.info("Cleaned up version cache %s, retcod=%d"%(self.filename,retcod)) except: - logger.log_exc ("Could not unlink version cache %s"%self.filename) + logger.info ("Could not unlink version cache %s"%self.filename) def show (self): entries=len(self.url2version) print "version cache from file %s has %d entries"%(self.filename,entries) - for (url,tuple) in self.url2version.iteritems(): + key_values=self.url2version.items() + def old_first (kv1,kv2): return int(kv1[1][0]-kv2[1][0]) + key_values.sort(old_first) + for key_value in key_values: + (url,tuple) = key_value (timestamp,version) = tuple how_old = time.time()-timestamp if how_old<=self.expires: - print url,"(%d seconds ago)"%how_old,"-> keys=",version.keys() + print url,"-- %d seconds ago"%how_old else: - print url,"(%d seconds ago)"%how_old,"too old" + 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 url.strip("/") + def set (self,url,version): + url=self.normalize(url) self.url2version[url]=( time.time(), version) def get (self,url): + url=self.normalize(url) try: (timestamp,version)=self.url2version[url] how_old = time.time()-timestamp @@ -121,8 +131,9 @@ class Interface: if self.probed: return self._version ### otherwise let's look in the cache file + logger.debug("searching in version cache %s"%self.url()) cached_version = VersionCache().get(self.url()) - if cached_version: + if cached_version is not None: logger.info("Retrieved version info from cache") return cached_version ### otherwise let's do the hard work @@ -140,17 +151,20 @@ class Interface: url=self.url() logger.info('issuing GetVersion at %s'%url) # setting timeout here seems to get the call to fail - even though the response time is fast - #server=xmlrpcprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose, timeout=options.timeout) - server=xmlrpcprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose) + #server=sfaprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose, timeout=options.timeout) + server=sfaprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose) self._version=server.GetVersion() except: logger.log_exc("failed to get version") self._version={} + # so that next run from this process will find out self.probed=True + # store in version cache so next processes will remember for an hour cache=VersionCache() cache.set(self.url(),self._version) cache.save() - logger.info("Saved version for url=%s in version cache"%self.url()) + logger.debug("Saved version for url=%s in version cache"%self.url()) + # that's our result return self._version @staticmethod @@ -231,19 +245,18 @@ class SfaScan: while to_scan: for interface in to_scan: # performing xmlrpc call + logger.info("retrieving/fetching version at interface %s"%interface.url()) version=interface.get_version() - if self.verbose: - logger.info("GetVersion at interface %s"%interface.url()) - if not version: - logger.info("") - else: - for (k,v) in version.iteritems(): - if not isinstance(v,dict): - logger.info("\r\t%s:%s"%(k,v)) - else: - logger.info(k) - for (k1,v1) in v.iteritems(): - logger.info("\r\t\t%s:%s"%(k1,v1)) + if not version: + logger.info("") + else: + for (k,v) in version.iteritems(): + if not isinstance(v,dict): + logger.debug("\r\t%s:%s"%(k,v)) + else: + 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: @@ -284,18 +297,24 @@ def main(): help="instead of top-to-bottom") parser.add_option("-v", "--verbose", action="count", dest="verbose", default=0, help="verbose - can be repeated for more verbosity") - parser.add_option("-c", "--clear-cache",action='store_true', - dest='clear_cache',default=False, - help='clear/trash version cache and exit') + parser.add_option("-c", "--clean-cache",action='store_true', + dest='clean_cache',default=False, + help='clean/trash version cache and exit') parser.add_option("-s","--show-cache",action='store_true', dest='show_cache',default=False, help='show/display version cache') (options,args)=parser.parse_args() + logger.enable_console() + # apply current verbosity to logger + logger.setLevelFromOptVerbose(options.verbose) + # figure if we need to be verbose for these local classes that only have a bool flag + bool_verbose=logger.getBoolVerboseFromOpt(options.verbose) + if options.show_cache: VersionCache().show() sys.exit(0) - if options.clear_cache: + if options.clean_cache: VersionCache().clean() sys.exit(0) if not args: @@ -304,11 +323,6 @@ def main(): if not options.outfiles: options.outfiles=default_outfiles - logger.enable_console() - # apply current verbosity to logger - logger.setLevelFromOptVerbose(options.verbose) - # figure if we need to be verbose for these local classes that only have a bool flag - bool_verbose=logger.getBoolVerboseFromOpt(options.verbose) scanner=SfaScan(left_to_right=options.left_to_right, verbose=bool_verbose) entries = [ Interface(entry) for entry in args ] g=scanner.graph(entries)