D4
/
BGP-Ranking
mirror of https://github.com/D4-project/BGP-Ranking
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: Make rank_a_day easier to use.

pull/12/head
Raphaël Vinot 2019-04-09 11:05:14 +02:00
parent 019ef1c40a
commit fd84482410
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bgpranking/ranking.py
View File

@ -22,7 +22,7 @@ class Ranking():
self.logger = logging.getLogger(f'{self.__class__.__name__}') self.logger = logging.getLogger(f'{self.__class__.__name__}')
self.logger.setLevel(loglevel) self.logger.setLevel(loglevel)
def rank_a_day(self, day: str): def rank_a_day(self, day: str, config_files: dict):
asns_aggregation_key_v4 = f'{day}|asns|v4' asns_aggregation_key_v4 = f'{day}|asns|v4'
asns_aggregation_key_v6 = f'{day}|asns|v6' asns_aggregation_key_v6 = f'{day}|asns|v6'
to_delete = set([asns_aggregation_key_v4, asns_aggregation_key_v6]) to_delete = set([asns_aggregation_key_v4, asns_aggregation_key_v6])
@ -53,11 +53,11 @@ class Ranking():
prefix_rank = float(len(ips)) / py_prefix.num_addresses prefix_rank = float(len(ips)) / py_prefix.num_addresses
r_pipeline.zadd(f'{day}|{source}|{asn}|v{py_prefix.version}|prefixes', {prefix: prefix_rank}) r_pipeline.zadd(f'{day}|{source}|{asn}|v{py_prefix.version}|prefixes', {prefix: prefix_rank})
if py_prefix.version == 4: if py_prefix.version == 4:
asn_rank_v4 += len(ips) * self.config_files[source]['impact'] asn_rank_v4 += len(ips) * config_files[source]['impact']
r_pipeline.zincrby(prefixes_aggregation_key_v4, prefix_rank * self.config_files[source]['impact'], prefix) r_pipeline.zincrby(prefixes_aggregation_key_v4, prefix_rank * config_files[source]['impact'], prefix)
else: else:
asn_rank_v6 += len(ips) * self.config_files[source]['impact'] asn_rank_v6 += len(ips) * config_files[source]['impact']
r_pipeline.zincrby(prefixes_aggregation_key_v6, prefix_rank * self.config_files[source]['impact'], prefix) r_pipeline.zincrby(prefixes_aggregation_key_v6, prefix_rank * config_files[source]['impact'], prefix)
v4info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v4', date=day) v4info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v4', date=day)
v6info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v6', date=day) v6info = self.ipasn.asn_meta(asn=asn, source='caida', address_family='v6', date=day)
ipasnhistory_date_v4 = list(v4info['response'].keys())[0] ipasnhistory_date_v4 = list(v4info['response'].keys())[0]
@ -80,7 +80,7 @@ class Ranking():
r_pipeline.execute() r_pipeline.execute()
def compute(self): def compute(self):
self.config_files = load_config_files(self.config_dir) config_files = load_config_files(self.config_dir)
ready, message = sanity_check_ipasn(self.ipasn) ready, message = sanity_check_ipasn(self.ipasn)
if not ready: if not ready:
# Try again later. # Try again later.
@ -95,7 +95,7 @@ class Ranking():
today12am = now.replace(hour=12, minute=0, second=0, microsecond=0) today12am = now.replace(hour=12, minute=0, second=0, microsecond=0)
if now < today12am: if now < today12am:
# Compute yesterday and today's ranking (useful when we have lists generated only once a day) # Compute yesterday and today's ranking (useful when we have lists generated only once a day)
self.rank_a_day((today - timedelta(days=1)).isoformat()) self.rank_a_day((today - timedelta(days=1)).isoformat(), config_files)
self.rank_a_day(today.isoformat()) self.rank_a_day(today.isoformat(), config_files)
unset_running(self.__class__.__name__) unset_running(self.__class__.__name__)
self.logger.info('Ranking done.') self.logger.info('Ranking done.')