X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSite.py;h=324861eb41e7742f5d6acf8cbf00573613e28763;hb=bdf6981919bef7a8c63e1228f29fadd4cb35a06b;hp=f52a28ed60faf07f540ef9dedcd329c08439c20e;hpb=868bbfe742f33640804d304223a7c58333e644dd;p=tests.git

diff --git a/system/TestSite.py b/system/TestSite.py
index f52a28e..324861e 100644
--- a/system/TestSite.py
+++ b/system/TestSite.py
@@ -1,3 +1,6 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import os.path
 import datetime
 import time
@@ -19,10 +22,10 @@ class TestSite:
 
     def create_site (self):
         print self.test_plc.auth_root()
-        self.test_plc.server.AddSite(self.test_plc.auth_root(),
-                                                    self.site_spec['site_fields'])
-        self.test_plc.server.AddSiteAddress(self.test_plc.auth_root(),self.name(),
-                                            self.site_spec['address_fields'])
+        self.test_plc.apiserver.AddSite(self.test_plc.auth_root(),
+                                        self.site_spec['site_fields'])
+        self.test_plc.apiserver.AddSiteAddress(self.test_plc.auth_root(),self.name(),
+                                               self.site_spec['address_fields'])
             
     def create_users (self):
         for user_spec in self.site_spec['users']:
@@ -32,7 +35,7 @@ class TestSite:
 
     def delete_site (self):
         print self.test_plc.auth_root()
-        self.test_plc.server.DeleteSite(self.test_plc.auth_root(),self.name())
+        self.test_plc.apiserver.DeleteSite(self.test_plc.auth_root(),self.name())
         return True
             
     def delete_users(self):
@@ -50,82 +53,9 @@ class TestSite:
         
     def locate_node (self,nodename):
         for node in self.site_spec['nodes']:
-            if node['node_fields']['hostname'] == nodename:
+            if node['name'] == nodename:
                 return node
         raise Exception,"Cannot locate node %s"%nodename
         
-    def start_nodes (self,options):
-        for node_spec in self.site_spec['nodes']:
-            TestNode(self.test_plc, self, node_spec).start_node(options)
-        return True
            
-    def delete_known_hosts(self):
-        utils.header("Messing with known_hosts (cleaning hostnames starting with 'test[0-9]')")
-        sed_command="sed -i -e '/^test[0-9]/d' /root/.ssh/known_hosts"
-        utils.system(sed_command)
-
-    # xxx should be attached to TestPlc
-    def check_slices(self):
-        
-        bool=True
-        bool1=True
-        secondes=15
-        self.delete_known_hosts()
-        start_time = datetime.datetime.now()
-        dead_time=start_time + datetime.timedelta(minutes=3)##adding 3minutes
-        for slice_spec in self.test_plc.plc_spec['slices']:
-            for hostname in slice_spec['nodenames']:
-                slicename=slice_spec['slice_fields']['name']
-                # locate the first avail. key
-                found=False
-                for username in slice_spec['usernames']:
-                    user_spec=self.locate_user(username)
-                    for keyname in user_spec['keynames']:
-                        key_spec=self.test_plc.locate_key(keyname)
-                        publickey=TestKey(self.test_plc,key_spec).publicpath()
-                        privatekey=TestKey(self.test_plc,key_spec).privatepath()
-                        if os.path.isfile(publickey) and os.path.isfile(privatekey):
-                            found=True
-                            break
-                if not found:
-                    raise Exception,"Cannot find a valid key for slice %s"%slicename
-
-                while(bool):
-                    utils.header('restarting nm on %s'%hostname)
-                    access=utils.system('ssh -i /etc/planetlab/root_ssh_key.rsa root@%s service nm restart'%hostname )
-                    if (access==0):
-                        utils.header('nm restarted on %s'%hostname)
-                        while(bool1):
-                            utils.header('trying to connect to %s@%s'%(slicename,hostname))
-                            ### should use saved keys instead of this hard-coded stuff
-                            Date=utils.system('ssh -i %s %s@%s date'%(privatekey,slicename,hostname))
-                            if (Date==0):
-                                break
-                            elif ( start_time  <= dead_time ) :
-                                start_time=datetime.datetime.now()+ datetime.timedelta(seconds=30)
-                                time.sleep(secondes)
-                            else:
-                                bool1=False
-                        if(bool1):
-                            utils.header('connected to %s@%s -->'%(slicename,hostname))
-                        else:
-                            utils.header('%s@%s : last chance - restarting nm on %s'%(slicename,hostname,hostname))
-                            access=utils.system('ssh -i /etc/planetlab/root_ssh_key.rsa  root@%s service nm restart'%hostname)
-                            if (access==0):
-                                utils.header('trying to connect (2) to %s@%s'%(slicename,hostname))
-                                Date=utils.system('ssh -i ~/.ssh/slices.rsa %s@%s date'%(slicename,hostname))
-                                if (Date==0):
-                                    utils.header('connected to %s@%s -->'%(slicename,hostname))
-                                else:
-                                    utils.header('giving up with to %s@%s -->'%(slicename,hostname))
-                                    return False
-                            else :
-                                utils.header('Last chance failed on %s@%s -->'%(slicename,hostname))
-                        break
-                    elif ( start_time  <= dead_time ) :
-                        start_time=datetime.datetime.now()+ datetime.timedelta(minutes=1)
-                        time.sleep(secondes)
-                    else:
-                        bool=False
-                            
-        return bool
+