Revision 740a5649

b/snf-cyclades-app/synnefo/tools/burnin.py
635 635
                            public_addrs[0]["values"])
636 636
        self.assertEqual(len(ipv4_addrs), 1)
637 637
        return ipv4_addrs[0]["addr"]
638

  
638
    
639 639

  
640 640
    def _connect_loginname(self, os):
641 641
        """Return the login name for connections based on the server OS"""
......
647 647
            return "root"
648 648

  
649 649

  
650
    def test_00001_submit_create_server_A(self):
650
    def test_00001a_submit_create_server_A(self):
651 651
        """Test submit create server request"""
652 652
        serverA = self.client.create_server(self.servername, self.flavorid,
653 653
                                           self.imageid, personality=None)
......
663 663
        self.password['A'] = serverA["adminPass"]
664 664

  
665 665

  
666
    def test_00001_serverA_becomes_active(self):
666
    def test_00001b_serverA_becomes_active(self):
667 667
        """Test server becomes ACTIVE"""
668 668

  
669 669
        fail_tmout = time.time()+self.action_timeout
......
682 682

  
683 683
        
684 684
    
685
    def test_00002_submit_create_server_B(self):
685
    def test_00002a_submit_create_server_B(self):
686 686
        """Test submit create server request"""
687 687
        serverB = self.client.create_server(self.servername, self.flavorid,
688 688
                                           self.imageid, personality=None)
......
698 698
        self.password['B'] = serverB["adminPass"]
699 699

  
700 700

  
701
        def test_00002_serverB_becomes_active(self):
701
    def test_00002b_serverB_becomes_active(self):
702 702
        """Test server becomes ACTIVE"""
703 703

  
704 704
        fail_tmout = time.time()+self.action_timeout
......
768 768
        if not loginname:
769 769
            loginname = self._connect_loginname(os)
770 770

  
771
        myPass = self.password['A']
772

  
773
        ssh = paramiko.SSHClient()
774
        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
775

  
771 776
        try:
772
            ssh = paramiko.SSHClient()
773
            ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
774
            ssh.connect(hostip, username = loginname, password = self.password['A'])
777
            log.info("My password " + myPass)
778
            ssh.connect(hostip, username = loginname, password = myPass)
779

  
775 780
        except socket.error:
776 781
            raise AssertionError
777 782

  
......
791 796
        
792 797
        if not loginname:
793 798
            loginname = self._connect_loginname(os)
799
        
800
        myPass = self.password['B']
801

  
794 802

  
795 803
        try:
796 804
            ssh = paramiko.SSHClient()
797 805
            ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
798
            ssh.connect(hostip, username = loginname, password = self.password['B'])
806
            log.info("My password " + myPass)
807
            ssh.connect(hostip, username = loginname, password = myPass)
808

  
799 809
        except socket.error:
800 810
            raise AssertionError
801 811

  
......
830 840
        stdin, stdout, stderr = ssh.exec_command(cmd)
831 841
        lines = stdout.readlines()
832 842

  
843
        exists = False
844

  
833 845
        for i in lines:
834 846
            if i=='True\n':
835 847
                exists = True

Also available in: Unified diff