From e2ee08699ea26b1717b14be64b04b563abaf4ec0 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 10 Jul 2009 16:07:32 +0000 Subject: Include address resources needed for ROAs in each nodes requested resources, so that the YAML file doesn't need to specify the same resources twice in such cases. svn path=/rpkid/testbed.py; revision=2602 --- rpkid/testbed.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'rpkid/testbed.py') diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 2ab8357b..c150b821 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -462,6 +462,11 @@ class allocation(object): if "regen_margin" in yaml: self.regen_margin = rpki.sundial.timedelta.parse(yaml["regen_margin"]).convert_to_seconds() self.roa_requests = [roa_request.parse(y) for y in yaml.get("roa_request", yaml.get("route_origin", ()))] + for r in self.roa_requests: + if r.v4: + self.base.v4 = self.base.v4.union(r.v4.to_resource_set()) + if r.v6: + self.base.v6 = self.base.v6.union(r.v6.to_resource_set()) self.hosted_by = yaml.get("hosted_by") self.extra_conf = yaml.get("extra_conf", []) self.hosts = [] -- cgit v1.2.3