diff options
| author | Rob Austein <sra@hactrn.net> | 2007-10-01 22:56:39 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-10-01 22:56:39 +0000 |
| commit | a6748e3876136dc252061a09e16c828eb45c1842 (patch) | |
| tree | 20b4646a2caa982e9c69894d8d5c5c178e06ddf2 /scripts/rpki/left_right.py | |
| parent | 20f735ac7884111b47bd8ba974ed3e8fd1242e89 (diff) | |
Make rpki.resource_set.resource_set.from_sql() into a class method.
Rework IRDB code.
svn path=/docs/rpki-db-schema.pdf; revision=1068
Diffstat (limited to 'scripts/rpki/left_right.py')
| -rw-r--r-- | scripts/rpki/left_right.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 069835a3..fd6a17ce 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -417,10 +417,12 @@ class route_origin_elt(data_elt): roa = None def sql_fetch_hook(self, db, cur): - self.ipv4 = rpki.resource_set.resource_set_ipv4() - self.ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM route_origin_range WHERE route_origin_id = %s AND start_ip NOT LIKE '%:%'", self.route_origin_id) - self.ipv6 = rpki.resource_set.resource_set_ipv6() - self.ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM route_origin_range WHERE route_origin_id = %s AND start_ip LIKE '%:%'", self.route_origin_id) + self.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(cur, + "SELECT start_ip, end_ip FROM route_origin_range WHERE route_origin_id = %s AND start_ip NOT LIKE '%:%'", + self.route_origin_id) + self.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(cur, + "SELECT start_ip, end_ip FROM route_origin_range WHERE route_origin_id = %s AND start_ip LIKE '%:%'", + self.route_origin_id) cur.execute("SELECT roa, ca_detail_id FROM roa WHERE route_origin_id = %s", self.route_origin_id) roas = cur.fetchall() if len(roas) == 1: |