Add router certificate support to yamltest, rpkic, etc.

svn path=/branches/tk671/; revision=5680

2 files changed, 8 insertions, 10 deletions

diff --git a/rpkid/rpki/irdb/models.py b/rpkid/rpki/irdb/models.py
index 6772b542..e29e332e 100644
--- a/rpkid/rpki/irdb/models.py
+++ b/rpkid/rpki/irdb/models.py
@@ -596,12 +596,12 @@ class EECertificateRequest(ResourceSet):
     ee_asn = rpki.irdb.EECertificateRequestASN.objects.raw("""
         SELECT *
         FROM irdb_eecertificaterequestasn
-        WHERE eecertificaterequest_id = %s
+        WHERE ee_certificate_request_id = %s
         """, [self.id])
-    ee_net = rpki.irdb.EECertificateRequestNET.objects.raw("""
+    ee_net = rpki.irdb.EECertificateRequestNet.objects.raw("""
         SELECT *
         FROM irdb_eecertificaterequestnet
-        WHERE eecertificaterequest_id = %s
+        WHERE ee_certificate_request_id = %s
         """, [self.id])
     return ee_asn, ee_net
 
diff --git a/rpkid/rpki/irdb/zookeeper.py b/rpkid/rpki/irdb/zookeeper.py
index 9f7cd15e..339503fb 100644
--- a/rpkid/rpki/irdb/zookeeper.py
+++ b/rpkid/rpki/irdb/zookeeper.py
@@ -1642,7 +1642,7 @@ class Zookeeper(object):
 
       pkcs10 = rpki.x509.PKCS10(Base64 = req.text)
       router_id = long(req.get("router_id"))
-      asns = req.get("asn")
+      asns = rpki.resource_set.resource_set_as(req.get("asn"))
       if not valid_until:
         valid_until = req.get("valid_until")
 
@@ -1656,13 +1656,11 @@ class Zookeeper(object):
 
       pkcs10.check_valid_request_router()
 
-      gski = pkcs10.gSKI()
-
       ee_request = self.resource_ca.ee_certificate_requests.create(
-        pkcs10 = pkcs10, gski = gski, valid_until = valid_until, router_id = router_id)
+        pkcs10      = pkcs10,
+        gski        = pkcs10.gSKI(),
+        valid_until = valid_until,
+        router_id   = router_id)
 
       for range in asns:
         ee_request.asns.create(start_as = str(range.min), end_as = str(range.max))
-
-      self.log("Added Router certificate request g(SKI) %s router-id %d ASNs %s" % (
-        gski, router_id, asns))