Checkpoint

svn path=/scripts/rpki/left_right.py; revision=964

3 files changed, 15 insertions, 13 deletions

diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index 55705328..8f602137 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -65,7 +65,7 @@ class extension_preference_elt(base_elt, rpki.sql.sql_persistant):
   attributes = ("name",)
 
   sql_select_cmd = """SELECT pref_name, pref_value FROM self_pref WHERE self_id = %(self_id)s"""
-  sql_insert_cmd = """INSERT self_pref (self_id, pref_name, pref_value) VALUES (%(self_id)s, %(name)s, %(value)s"""
+  sql_insert_cmd = """INSERT self_pref (self_id, pref_name, pref_value) VALUES (%(self_id)s, %(name)s, %(value)s)"""
   sql_update_cmd = """UPDATE self_pref SET pref_value = %(value)s WHERE self_id = %(self_id)s AND pref_name = %(name)s"""
   sql_delete_cmd = """DELETE FROM self_pref WHERE self_id = %(self_id)s AND pref_name = %(name)s"""
 
@@ -105,7 +105,7 @@ class bsc_elt(data_elt, rpki.sql.sql_persistant):
 
   sql_id_name = "bsc_id"
   sql_select_cmd = """SELECT bsc_id, pub_key, priv_key_id FROM bsc WHERE self_id = %(self_id)s"""
-  sql_insert_cmd = """INSERT bsc (self_id, pub_key, priv_key_id) VALUES (%(self_id)s, %(pub_key)s, %(priv_key_id)s"""
+  sql_insert_cmd = """INSERT bsc (self_id, pub_key, priv_key_id) VALUES (%(self_id)s, %(pub_key)s, %(priv_key_id)s)"""
   sql_update_cmd = """UPDATE bsc SET self_id = %(self_id)s, pub_key = %(pub_key)s, priv_key_id = %(priv_key_id)s WHERE bsc_id = %(bsc_id)s"""
   sql_delete_cmd = """DELETE FROM bsc WHERE bsc_id = %(bsc_id)s"""
 
@@ -418,7 +418,7 @@ class self_elt(data_elt, rpki.sql.sql_persistant):
 
   sql_id_name = "self_id"
   sql_select_cmd = """SELECT self_id, use_hsm FROM self WHERE self_id = %(self_id)s"""
-  sql_insert_cmd = """INSERT self (use_hsm) VALUES (%(use_hsm)s"""
+  sql_insert_cmd = """INSERT self (use_hsm) VALUES (%(use_hsm)s)"""
   sql_update_cmd = """UPDATE self SET use_hsm = %(use_hsm)s WHERE self_id = %(self_id)s"""
   sql_delete_cmd = """DELETE FROM self WHERE self_id = %(self_id)s"""
   sql_children = (("prefs",         extension_preference_elt),
@@ -429,6 +429,7 @@ class self_elt(data_elt, rpki.sql.sql_persistant):
                   ("route_origins", route_origin_elt))
 
   self_id = None
+  use_hsm = False
 
   def __init__(self):
     for k,v in self.sql_children:
diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py
index ad44b9e8..3bee2ff8 100644
--- a/scripts/rpki/sql.py
+++ b/scripts/rpki/sql.py
@@ -111,7 +111,7 @@ class sql_persistant(object):
       self.in_sql = True
       self.sql_decode(sql_parent, *row)
       if self.sql_id_name is not None:
-        cache_add(self, self.__class__, getattr(self, self.sql_id_name))
+        self.cache_add()
       self_dict = self.sql_encode()
       self.sql_fetch_hook(db, cur)
       result.append(self)
@@ -128,7 +128,7 @@ class sql_persistant(object):
       cur.execute(self.sql_insert_cmd, self.sql_encode())
       if self.sql_id_name is not None:
         setattr(self, self.sql_id_name, cur.lastrowid)
-        cache_add(self, self.__class__, getattr(self, self.sql_id_name))
+        self.cache_add()
       self.sql_insert_hook(db, cur)
     elif self.sql_dirty:
       cur.execute(self.sql_update_cmd, self.sql_encode())
diff --git a/scripts/rpkid.py b/scripts/rpkid.py
index 5864980d..9398575b 100755
--- a/scripts/rpkid.py
+++ b/scripts/rpkid.py
@@ -22,22 +22,24 @@ def left_right_handler(query, path):
     if rpki.left_right.self_elt.sql_cache_find(q_pdu.self_id) is None:
       rpki.left_right.self_elt.sql_fetch(db, cur, { "self_id" : q_pdu.self_id })
 
-  def make_reply():
-    r_pdu = q_pdu.__class__()
+  def make_reply(r_pdu = q_pdu.__class__()):
     r_pdu.action = q_pdu.action
     r_pdu.type = "reply"
+    return r_pdu
 
-  def destroy_handler():
-    make_reply()
+  def destroy_handler(q_pdu):
+    r_pdu = make_reply()
     r_pdu.self_id = q_pdu.self_id
     setattr(r_pdu, q_pdu.sql_id_name, getattr(q_pdu, q_pdu.sql_id_name))
     q_pdu.sql_delete()    
+    r_msg.append(r_pdu)
 
-  def create_handler():
-    make_reply()
+  def create_handler(q_pdu):
+    r_pdu = make_reply()
     q_pdu.sql_store(db, cur)
     r_pdu.self_id = q_pdu.self_id
     setattr(r_pdu, q_pdu.sql_id_name, getattr(q_pdu, q_pdu.sql_id_name))
+    r_msg.append(r_pdu)
 
   def get_handler():
     raise NotImplementedError
@@ -61,8 +63,7 @@ def left_right_handler(query, path):
         "set"     : set_handler,
         "get"     : get_handler,
         "list"    : list_handler,
-        "destroy" : destroy_handler }[q_pdu.action]()
-      r_msg.append(r_pdu)
+        "destroy" : destroy_handler }[q_pdu.action](q_pdu)
     r_elt = r_msg.toXML()
     lr_rng.assertValid(r_elt)
     return 200, encode(r_elt, cms_key, cms_certs)