From 6029bd2c3dcac714a98e38c9a98f6fac6009e6cd Mon Sep 17 00:00:00 2001 From: Jonathan Lundy Date: Sat, 27 Jun 2020 08:35:41 -0600 Subject: [PATCH] make init do index --- utils/registry/dn42/rpsl/rspldom.py | 2 ++ utils/registry/rpsl_init/__init__.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/utils/registry/dn42/rpsl/rspldom.py b/utils/registry/dn42/rpsl/rspldom.py index 3312ea431..8af635cc5 100644 --- a/utils/registry/dn42/rpsl/rspldom.py +++ b/utils/registry/dn42/rpsl/rspldom.py @@ -82,6 +82,8 @@ class RPSL: related.add(key) for i in related: + if i in keys: + continue yield self.load_file(self._files[i]) def load_file(self, fn: str) -> FileDOM: diff --git a/utils/registry/rpsl_init/__init__.py b/utils/registry/rpsl_init/__init__.py index 74ae51500..70e61f733 100644 --- a/utils/registry/rpsl_init/__init__.py +++ b/utils/registry/rpsl_init/__init__.py @@ -19,6 +19,7 @@ import argparse from typing import List, Dict, Generator, Tuple, Set, TypeVar from dn42.rpsl import Config, FileDOM, SchemaDOM +import rpsl_index Group = TypeVar("Group", set, tuple) @@ -62,6 +63,8 @@ def run(args: List[str], env: Dict[str, str]) -> int: print(rpsl, file=f) print(f"Created: {rpsl.config_file}", file=sys.stderr) + rpsl_index.run(args, env) + return 0