From 7f4e6cd2d654c505821554daf720d10a9415fce8 Mon Sep 17 00:00:00 2001 From: Mingwei Zhang Date: Thu, 20 Apr 2023 11:55:37 -0700 Subject: [PATCH] update default endpoint and tests --- bgpkit/bgpkit_broker.py | 2 +- bgpkit/test_integration.py | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/bgpkit/bgpkit_broker.py b/bgpkit/bgpkit_broker.py index e7449d1..d54eebd 100644 --- a/bgpkit/bgpkit_broker.py +++ b/bgpkit/bgpkit_broker.py @@ -25,7 +25,7 @@ class BrokerItem: class Broker: - def __init__(self, api_url: str = "https://api.broker.bgpkit.com/v2", page_size: int = 100, verify=True): + def __init__(self, api_url: str = "https://api.bgpkit.com/broker", page_size: int = 100, verify=True): self.base_url = api_url.strip() self.page_size = int(page_size) self.verify = verify diff --git a/bgpkit/test_integration.py b/bgpkit/test_integration.py index 7e956fc..b10cd82 100644 --- a/bgpkit/test_integration.py +++ b/bgpkit/test_integration.py @@ -13,30 +13,25 @@ def test_parser(self): assert len(elems) == 4227 def test_broker(self): + # filter by only time broker = bgpkit.Broker() items = broker.query(ts_start="1643760000", ts_end="2022-02-02T00:20:00") - for item in items: - print(json.dumps(item.__dict__)) - print(len(items)) assert len(items) == 290 - # elems = bgpkit.Parser(items[0].url).parse_all() - # assert len(elems) == 222467 - - def test_broker_2(self): + # filter by both time and collector broker = bgpkit.Broker() items = broker.query(ts_start="1643760000", ts_end="2022-02-02T00:20:00", collector_id="rrc00") - for item in items: - print(json.dumps(item.__dict__)) - print(len(items)) + assert len(items) == 7 + + # specify API endpoint and filter by time string with timezones (+ and - zones) + broker = bgpkit.Broker("https://api.bgpkit.com/broker") + items = broker.query(ts_start="2022-02-02T00:00:00-00:00", ts_end="2022-02-02T00:20:00.123000+00:00", + collector_id="rrc00") assert len(items) == 7 def test_broker_no_verify(self): broker = bgpkit.Broker(verify=False) items = broker.query(ts_start="1643760000", ts_end="2022-02-02T00:20:00", collector_id="rrc00") - for item in items: - print(json.dumps(item.__dict__)) - print(len(items)) assert len(items) == 7 def test_roas(self):