Checkpoint

svn path=/scripts/biz-certs/Bob-CA.srl; revision=1407

3 files changed, 14 insertions, 36 deletions

diff --git a/scripts/biz-certs/Bob-CA.srl b/scripts/biz-certs/Bob-CA.srl
index 49512e5e..2d52136c 100644
--- a/scripts/biz-certs/Bob-CA.srl
+++ b/scripts/biz-certs/Bob-CA.srl
@@ -1 +1 @@
-90801F1ED1945558
+90801F1ED194555A
diff --git a/scripts/testdb.py b/scripts/testdb.py
index 7fee9b4e..4e98669f 100644
--- a/scripts/testdb.py
+++ b/scripts/testdb.py
@@ -88,6 +88,11 @@ class allocation_db(list):
   def __init__(self, yaml):
     self.root = allocation(yaml, self)
     assert self.root.is_root()
+    for a in self:
+      if a.sia_base is None:
+        a.sia_base = a.parent.sia_base + a.name + "/"
+      if a.base.valid_until is None:
+        a.base.valid_until = a.parent.base.valid_until
     self.root.closure()
     self.map = dict((a.name, a) for a in self)
     self.engines = [a for a in self if not a.is_leaf()]
@@ -120,7 +125,8 @@ class allocation(object):
       as = rpki.resource_set.resource_set_as(yaml.get("asn")),
       v4 = rpki.resource_set.resource_set_ipv4(yaml.get("ipv4")),
       v6 = rpki.resource_set.resource_set_ipv6(yaml.get("ipv6")),
-      valid_until = yaml["valid_until"])
+      valid_until = yaml.get("valid_until"))
+    self.sia_base = yaml.get("sia_base")
 
   def closure(self):
     """Compute the transitive resource closure for one resource attribute."""
@@ -144,13 +150,14 @@ class allocation(object):
   def apply_valid_until(self, stamp): self.base.valid_until = stamp
 
   def __str__(self):
-    s = self.name + " " + self.resources.valid_until.strftime("%Y-%m-%dT%H:%M:%SZ") + "\n"
+    s = self.name + "\n"
     if self.resources.as:       s += "  ASN: %s\n" % self.resources.as
     if self.resources.v4:       s += " IPv4: %s\n" % self.resources.v4
     if self.resources.v6:       s += " IPv6: %s\n" % self.resources.v6
     if self.kids:               s += " Kids: %s\n" % ", ".join(k.name for k in self.kids)
     if self.parent:             s += "   Up: %s\n" % self.parent.name
-    return s
+    if self.sia_base:           s += "  SIA: %s\n" % self.sia_base
+    return s + "Until: %s\n" % self.resources.valid_until.strftime("%Y-%m-%dT%H:%M:%SZ")
 
   def is_leaf(self): return not self.kids
   def is_root(self): return self.parent is None
diff --git a/scripts/testdb2.yaml b/scripts/testdb2.yaml
index 3540657a..57ff750a 100644
--- a/scripts/testdb2.yaml
+++ b/scripts/testdb2.yaml
@@ -1,102 +1,73 @@
 # $Id$
 
-name: Root
+name:           Root
+valid_until:    2008-07-14T12:30:00Z
+sia_base:       "rsync://wombat.invalid/"
 kids:
   - name: R0
     kids:
       - name: Alice
         ipv4: 192.0.2.1-192.0.2.33
         asn:  64533
-        valid_until: 2008-07-14T12:30:00Z
       - name: Bob
         ipv4: 192.0.2.44-192.0.2.100
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R1
     kids:
       - name: Carol
         ipv6: 2001:db8::44-2001:db8::100
-        valid_until: 2008-07-14T12:30:00Z
       - name: Dave
         ipv6: 2001:db8::10:0:44/128
         asn:  64544
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R2
     kids:
       - name: Elena
         ipv4: 10.0.0.0/24
         ipv6: 2001:db8::a00:0/120
-        valid_until: 2008-07-14T12:30:00Z
       - name: Frank
         ipv4: 10.3.0.0/24
         ipv6: 2001:db8::a03:0/120
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R3
     kids:
       - name: Ginny
         asn:  64534-64540
-        valid_until: 2008-07-14T12:30:00Z
       - name: Harry
         asn:  666-677
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R4
     kids:
       - name: Ilse
         ipv4: 10.3.0.0/16
-        valid_until: 2008-07-14T12:30:00Z
       - name: Jack
         ipv4: 10.2.0.0/16
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R5
     kids:
       - name: Kari
         asn:  222-233
-        valid_until: 2008-07-14T12:30:00Z
       - name: Leon
         asn:  244-255
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R6
     kids:
       - name: Mary
         ipv4: 10.77.0.0/16
-        valid_until: 2008-07-14T12:30:00Z
       - name: Neal
         ipv4: 10.66.0.0/16
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R7
     kids:
       - name: Olga
         ipv4: 10.88.0.0/16
-        valid_until: 2008-07-14T12:30:00Z
       - name: Piet
         ipv4: 10.99.0.0/16
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R8
     kids:
       - name: Qi
         asn:  111-122
-        valid_until: 2008-07-14T12:30:00Z
       - name: Rex
         asn:  333-344
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
   - name: R9
     kids:
       - name: Sandra
         asn:  555-566
-        valid_until: 2008-07-14T12:30:00Z
       - name: Thad
         asn:  577-588
-        valid_until: 2008-07-14T12:30:00Z
-    valid_until: 2008-07-14T12:30:00Z
-valid_until: 2008-07-14T12:30:00Z
 ---
 - name: Alice
   add_as: 33