added redeemticket

diff --git a/component/component.py b/component/component.py
index c584a85..45da6e5 100644 (file)
--- a/component/component.py
+++ b/component/component.py
@@ -10,8 +10,12 @@ from excep import *
 from trustedroot import *
 from misc import *
 from record import *
+from geniticket import *
 
 import accounts
+import database
+import sm
+import database
 
 
 class ComponentManager(GeniServer):
@@ -24,6 +28,11 @@ class ComponentManager(GeniServer):
         self.server.register_function(self.start_slice)
         self.server.register_function(self.reset_slice)
         self.server.register_function(self.delete_slice)
+        self.server.register_function(self.list_slices)
+        self.server.register_function(self.redeem_ticket)
+        self.server.register_function(self.reboot)
+
+    # Slice Interface
 
     def stop_slice(self, cred_str):
         self.decode_authentication(cred_str, "stopslice")
@@ -41,9 +50,16 @@ class ComponentManager(GeniServer):
         self.decode_authentication(cred_str, "resetslice")
         slicename = hrn_to_pl_slicename(self.object_gid.get_hrn())
         print "resetslice:", slicename
+
+        # find the existing record for the slice
+        try:
+            rec = database.db[slicename]
+        except KeyError:
+            raise SliverDoesNotExist(slicename)
+
         accounts.get(slicename).stop()
         accounts.get(slicename).ensure_destroyed()
-        accounts.get(slicename).ensure_created()
+        accounts.get(slicename).ensure_created(rec)
 
     def delete_slice(self, cred_str):
         self.decode_authentication(cred_str, "deleteslice")
@@ -51,6 +67,76 @@ class ComponentManager(GeniServer):
         print "deleteslice:", slicename
         accounts.get(slicename).ensure_destroyed()
 
+    # this is similar to geniserver.decode_authentication
+    def decode_ticket(self, ticket_string):
+        self.client_ticket = Ticket(string = ticket_string)
+        self.client_gid = self.client_ticket.get_gid_caller()
+        self.object_gid = self.client_ticket.get_gid_object()
+
+        # make sure the client_gid is not blank
+        if not self.client_gid:
+            raise MissingCallerGID(self.client_ticket.get_subject())
+
+        # make sure the client_gid matches the certificate that the client is using
+        peer_cert = self.server.peer_cert
+        if not peer_cert.is_pubkey(self.client_gid.get_pubkey()):
+            raise ConnectionKeyGIDMismatch(self.client_gid.get_subject())
+
+        if self.trusted_cert_list:
+            self.client_ticket.verify_chain(self.trusted_cert_list)
+            if self.client_gid:
+                self.client_gid.verify_chain(self.trusted_cert_list)
+            if self.object_gid:
+                self.object_gid.verify_chain(self.trusted_cert_list)
+
+    def geni_ticket_to_plc_rec(self, ticket):
+        ticket_attrs = ticket.get_attributes()
+        ticket_rspec = ticket.get_rspec()
+        rec = {}
+
+        rec["name"] = ticket_attrs.get("name")
+        rec["keys"] = '\n'.join(ticket_attrs.get("keys",[]))
+        rec["initscript"] = ticket_attrs.get("initscript", "")
+        rec["vref"] = ticket_attrs.get("vref", "default")
+        rec["timestamp"] = ticket_attrs.get("timestamp")    # should there be a default timestamp?
+
+        rspec = {}
+        rec['rspec'] = rspec
+        for resname, default_amt in sm.DEFAULT_ALLOCATION.iteritems():
+            try:
+                t = type(default_amt)
+                amt = t.__new__(t, ticket_attrs[resname])
+            except (KeyError, ValueError):
+                amt = default_amt
+            rspec[resname] = amt
+
+        return rec
+
+    def redeem_ticket(self, ticket_str):
+        self.decode_ticket(ticket_str)
+        ticket = self.client_ticket
+
+        print "ticket received for", self.object_gid.get_hrn()
+
+        rec = self.geni_ticket_to_plc_rec(ticket)
+
+        print "record", rec
+
+        database.db.deliver_record(rec)
+
+    # Slice Information
+
+    def list_slices(self, cred_str):
+        self.decode_authentication(cred_str, "listslices")
+        slice_names = database.db.keys()
+        return slice_names
+
+    # Management Interface
+
+    def reboot(self, cred_str):
+        self.decode_authentication(cred_str, "reboot")
+        system("/sbin/reboot")
+
 
 if __name__ == "__main__":
     global TrustedRoots
@@ -71,6 +157,10 @@ if __name__ == "__main__":
 
     TrustedRoots = TrustedRootList()
 
+    # XXX: does this conflict with the nodemanager's database? I don't think
+    # so because there are locks, but double check...
+    database.start()
+
     s = ComponentManager("", 12345, key_file, cert_file)
     s.trusted_cert_list = TrustedRoots.get_list()
     s.run()

diff --git a/component/copynode.sh b/component/copynode.sh
index 572a2e0..0a5108e 100755 (executable)
--- a/component/copynode.sh
+++ b/component/copynode.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo connecting to node: $1
-export FILES="component.py ../util/cert.py ../util/credential.py ../util/excep.py ../util/geniserver.py ../util/gid.py ../util/misc.py ../util/record.py ../util/rights.py ../util/report.py ../util/trustedroot.py ../registry/trusted_roots install"
+export FILES="component.py ../util/cert.py ../util/credential.py ../util/excep.py ../util/geniserver.py ../util/geniticket.py ../util/gid.py ../util/misc.py ../util/record.py ../util/rights.py ../util/report.py ../util/trustedroot.py ../registry/trusted_roots install"
 echo $FILES
 scp -i root_ssh_key.rsa -r $FILES root@$1:/usr/share/NodeManager