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

fix: More logical use of the keys

pull/12/head
Raphaël Vinot 2018-04-12 18:29:44 +02:00
parent 6b18e9921c
commit 917c1beebc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpranking/querying.py
View File

@ -50,7 +50,7 @@ class Querying():
'''Aggregated ranking of all the prefixes anounced by the given ASN, weighted by source.''' '''Aggregated ranking of all the prefixes anounced by the given ASN, weighted by source.'''
d = self.__normalize_date(date) d = self.__normalize_date(date)
if source: if source:
key = f'{d}|{source}|{asn}|rank{ipversion}|prefixes' key = f'{d}|{source}|{asn}|{ipversion}|prefixes'
else: else:
key = f'{d}|{asn}|{ipversion}' key = f'{d}|{asn}|{ipversion}'
return self.ranking.zrevrange(key, start=0, end=-1, withscores=True) return self.ranking.zrevrange(key, start=0, end=-1, withscores=True)
@ -59,7 +59,7 @@ class Querying():
'''Get the rank of a single ASN, weighted by source.''' '''Get the rank of a single ASN, weighted by source.'''
d = self.__normalize_date(date) d = self.__normalize_date(date)
if source: if source:
key = f'{d}|{source}|{asn}|rank{ipversion}' key = f'{d}|{source}|{asn}|{ipversion}'
else: else:
key = f'{d}|asns|{ipversion}' key = f'{d}|asns|{ipversion}'
return self.ranking.zscore(key, asn) return self.ranking.zscore(key, asn)

6
bgpranking/ranking.py
View File

@ -55,7 +55,7 @@ class Ranking():
for ip_ts in self.storage.smembers(f'{today}|{source}|{asn}|{prefix}')]) for ip_ts in self.storage.smembers(f'{today}|{source}|{asn}|{prefix}')])
py_prefix = ip_network(prefix) py_prefix = ip_network(prefix)
prefix_rank = float(len(ips)) / py_prefix.num_addresses prefix_rank = float(len(ips)) / py_prefix.num_addresses
r_pipeline.zadd(f'{today}|{source}|{asn}|rankv{py_prefix.version}|prefixes', prefix_rank, prefix) r_pipeline.zadd(f'{today}|{source}|{asn}|v{py_prefix.version}|prefixes', prefix_rank, prefix)
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) * self.config_files[source]['impact']
r_pipeline.zincrby(prefixes_aggregation_key_v4, prefix, prefix_rank * self.config_files[source]['impact']) r_pipeline.zincrby(prefixes_aggregation_key_v4, prefix, prefix_rank * self.config_files[source]['impact'])
@ -66,13 +66,13 @@ class Ranking():
if v4count: if v4count:
asn_rank_v4 /= float(v4count) asn_rank_v4 /= float(v4count)
if asn_rank_v4: if asn_rank_v4:
r_pipeline.set(f'{today}|{source}|{asn}|rankv4', asn_rank_v4) r_pipeline.set(f'{today}|{source}|{asn}|v4', asn_rank_v4)
r_pipeline.zincrby(asns_aggregation_key_v4, asn, asn_rank_v4) r_pipeline.zincrby(asns_aggregation_key_v4, asn, asn_rank_v4)
r_pipeline.zadd(source_aggregation_key_v4, asn_rank_v4, asn) r_pipeline.zadd(source_aggregation_key_v4, asn_rank_v4, asn)
if v6count: if v6count:
asn_rank_v6 /= float(v6count) asn_rank_v6 /= float(v6count)
if asn_rank_v6: if asn_rank_v6:
r_pipeline.set(f'{today}|{source}|{asn}|rankv6', asn_rank_v6) r_pipeline.set(f'{today}|{source}|{asn}|v6', asn_rank_v6)
r_pipeline.zincrby(asns_aggregation_key_v6, asn, asn_rank_v6) r_pipeline.zincrby(asns_aggregation_key_v6, asn, asn_rank_v6)
r_pipeline.zadd(source_aggregation_key_v6, asn_rank_v4, asn) r_pipeline.zadd(source_aggregation_key_v6, asn_rank_v4, asn)
self.ranking.delete(*to_delete) self.ranking.delete(*to_delete)