modifications realted to special account

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index cc844e4..377c4a4 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -325,61 +325,61 @@ class TestPlc:
                         self.display_key_spec (key)
             elif passno == 1:
                 if key not in ['sites','initscripts','slices','keys']:
-                    print '*   ',key,':',val
+                    print '+   ',key,':',val
 
     def display_site_spec (self,site):
-        print '* ======== site',site['site_fields']['name']
+        print '+ ======== site',site['site_fields']['name']
         for (k,v) in site.iteritems():
             if k=='nodes':
                 if v: 
-                    print '*       ','nodes : ',
+                    print '+       ','nodes : ',
                     for node in v:  
                         print node['node_fields']['hostname'],'',
                     print ''
             elif k=='users':
                 if v: 
-                    print '*       users : ',
+                    print '+       users : ',
                     for user in v:  
                         print user['name'],'',
                     print ''
             elif k == 'site_fields':
-                print '*       login_base',':',v['login_base']
+                print '+       login_base',':',v['login_base']
             elif k == 'address_fields':
                 pass
             else:
-                print '*       ',k,
+                print '+       ',k,
                 PrettyPrinter(indent=8,depth=2).pprint(v)
         
     def display_initscript_spec (self,initscript):
-        print '* ======== initscript',initscript['initscript_fields']['name']
+        print '+ ======== initscript',initscript['initscript_fields']['name']
 
     def display_key_spec (self,key):
-        print '* ======== key',key['name']
+        print '+ ======== key',key['name']
 
     def display_slice_spec (self,slice):
-        print '* ======== slice',slice['slice_fields']['name']
+        print '+ ======== slice',slice['slice_fields']['name']
         for (k,v) in slice.iteritems():
             if k=='nodenames':
                 if v: 
-                    print '*       nodes : ',
+                    print '+       nodes : ',
                     for nodename in v:  
                         print nodename,'',
                     print ''
             elif k=='usernames':
                 if v: 
-                    print '*       users : ',
+                    print '+       users : ',
                     for username in v:  
                         print username,'',
                     print ''
             elif k=='slice_fields':
-                print '*       fields',':',
+                print '+       fields',':',
                 print 'max_nodes=',v['max_nodes'],
                 print ''
             else:
-                print '*       ',k,v
+                print '+       ',k,v
 
     def display_node_spec (self,node):
-        print "*           node",node['name'],"host_box=",node['host_box'],
+        print "+           node",node['name'],"host_box=",node['host_box'],
         print "hostname=",node['node_fields']['hostname'],
         print "ip=",node['interface_fields']['ip']
     
@@ -391,18 +391,18 @@ class TestPlc:
 
     @staticmethod
     def display_mapping_plc (plc_spec):
-        print '* MyPLC',plc_spec['name']
-        print '*\tvserver address = root@%s:/vservers/%s'%(plc_spec['hostname'],plc_spec['vservername'])
-        print '*\tIP = %s/%s'%(plc_spec['PLC_API_HOST'],plc_spec['vserverip'])
+        print '+ MyPLC',plc_spec['name']
+        print '+\tvserver address = root@%s:/vservers/%s'%(plc_spec['hostname'],plc_spec['vservername'])
+        print '+\tIP = %s/%s'%(plc_spec['PLC_API_HOST'],plc_spec['vserverip'])
         for site_spec in plc_spec['sites']:
             for node_spec in site_spec['nodes']:
                 TestPlc.display_mapping_node(node_spec)
 
     @staticmethod
     def display_mapping_node (node_spec):
-        print '*   NODE %s'%(node_spec['name'])
-        print '*\tqemu box %s'%node_spec['host_box']
-        print '*\thostname=%s'%node_spec['node_fields']['hostname']
+        print '+   NODE %s'%(node_spec['name'])
+        print '+\tqemu box %s'%node_spec['host_box']
+        print '+\thostname=%s'%node_spec['node_fields']['hostname']
 
     def local_pre (self):
         "run site-dependant pre-test script as defined in LocalTestResources"
@@ -540,11 +540,6 @@ class TestPlc:
             os.mkdir(dir)
         vservername=self.vservername
         overall=True
-        prefix = 'root_ssh_key'
-        for ext in [ 'pub', 'rsa' ] :
-            src="/vservers/%(vservername)s/etc/planetlab/%(prefix)s.%(ext)s"%locals()
-            dst="keys/%(vservername)s.%(ext)s"%locals()
-            if self.test_ssh.fetch(src,dst) != 0: overall=False
         prefix = 'debug_ssh_key'
         for ext in [ 'pub', 'rsa' ] :
             src="/vservers/%(vservername)s/etc/planetlab/%(prefix)s.%(ext)s"%locals()
@@ -745,7 +740,7 @@ class TestPlc:
             local_key = "keys/%(vservername)s-debug.rsa"%locals()
         else: 
             message="boot"
-            local_key = "keys/%(vservername)s.rsa"%locals()
+           local_key = "keys/key1.rsa"
         tocheck = self.all_hostnames()
         utils.header("checking ssh access (expected in %s mode) to nodes %r"%(message,tocheck))
         utils.header("max timeout is %d minutes, silent for %d minutes (period is %s)"%\
@@ -952,7 +947,8 @@ class TestPlc:
         return \
             self.run_in_guest("yum -y install sfa")==0 and \
             self.run_in_guest("yum -y install sfa-client")==0 and \
-            self.run_in_guest("yum -y install sfa-plc")==0
+            self.run_in_guest("yum -y install sfa-plc")==0 and \
+            self.run_in_guest("yum -y install sfa-sfatables")==0
     ###
     def configure_sfa(self):
         "run sfa-config-tty"
@@ -1173,9 +1169,9 @@ class TestPlc:
             test_site = TestSite (self,site_spec)
             for node_spec in site_spec['nodes']:
                 test_node=TestNode(self,test_site,node_spec)
-                test_ssh = TestSsh (test_node.name(),key="/etc/planetlab/root_ssh_key.rsa")
-                to_plc = self.actual_command_in_guest ( test_ssh.actual_command("tar -C /var/log -cf - ."))
-                command = to_plc + "| tar -C logs/node.var-log.%s -xf -"%test_node.name()
+                test_ssh = TestSsh (test_node.name(),key="keys/key1.rsa")
+                command = test_ssh.actual_command("tar -C /var/log -cf - .")
+                command = command + "| tar -C logs/node.var-log.%s -xf -"%test_node.name()
                 utils.system("mkdir -p logs/node.var-log.%s"%test_node.name())
                 utils.system(command)