Revision 362130c3

b/snf-tools/synnefo_tools/burnin/server_tests.py
120 120
        """Test server becomes ACTIVE"""
121 121
        self._insist_on_server_transition(self.server, ["BUILD"], "ACTIVE")
122 122

  
123
    def test_006_attach_second_network(self):
124
        """Attach a second public IP to our server"""
125
        floating_ip = self._create_floating_ip()
126
        self._create_port(floating_ip['floating_network_id'],
127
                          device_id=self.server['id'],
128
                          floating_ip=floating_ip)
129

  
130
    def test_007_get_server_oob_console(self):
123
    def test_006_get_server_oob_console(self):
131 124
        """Test getting OOB server console over VNC
132 125

  
133 126
        Implementation of RFB protocol follows
......
165 158
        self.assertEquals(list(result), ['\x00', '\x00', '\x00', '\x00'])
166 159
        sock.close()
167 160

  
168
    def test_008_server_has_ipv4(self):
161
    def test_007_server_has_ipv4(self):
169 162
        """Test active server has a valid IPv4 address"""
170 163
        server = self.clients.cyclades.get_server_details(self.server['id'])
171 164
        # Update the server attribute
......
173 166

  
174 167
        self.ipv4 = self._get_ips(server, version=4)
175 168

  
176
    def test_009_server_has_ipv6(self):
169
    def test_008_server_has_ipv6(self):
177 170
        """Test active server has a valid IPv6 address"""
178 171
        self._skip_if(not self.use_ipv6, "--no-ipv6 flag enabled")
179 172

  
180 173
        self.ipv6 = self._get_ips(self.server, version=6)
181 174

  
182
    def test_010_server_ping_ipv4(self):
175
    def test_009_server_ping_ipv4(self):
183 176
        """Test server responds to ping on IPv4 address"""
184
        self._insist_on_ping(self.ipv4[0], version=4)
185
        self._insist_on_ping(self.ipv4[1], version=4)
177
        for ipv4 in self.ipv4:
178
            self._insist_on_ping(ipv4, version=4)
186 179

  
187
    def test_011_server_ping_ipv6(self):
180
    def test_010_server_ping_ipv6(self):
188 181
        """Test server responds to ping on IPv6 address"""
189 182
        self._skip_if(not self.use_ipv6, "--no-ipv6 flag enabled")
190 183
        self._insist_on_ping(self.ipv6[0], version=6)
191 184

  
185
    def test_011_attach_second_network(self):
186
        """Attach a second public IP to our server"""
187
        floating_ip = self._create_floating_ip()
188
        self._create_port(floating_ip['floating_network_id'],
189
                          device_id=self.server['id'],
190
                          floating_ip=floating_ip)
191

  
192
        # Update server attributes
193
        server = self.clients.cyclades.get_server_details(self.server['id'])
194
        self.server = server
195
        self.ipv4 = self._get_ips(server, version=4)
196
        self.assertEqual(len(self.ipv4), 2)
197

  
198
        # Test new IPv4
199
        self.test_009_server_ping_ipv4()
200

  
192 201
    def test_012_submit_shutdown(self):
193 202
        """Test submit request to shutdown server"""
194 203
        self.clients.cyclades.shutdown_server(self.server['id'])
......
207 216

  
208 217
    def test_016_server_ping_ipv4(self):
209 218
        """Test server OS is actually up and running again"""
210
        self.test_010_server_ping_ipv4()
219
        self.test_009_server_ping_ipv4()
211 220

  
212 221
    def test_017_ssh_to_server_ipv4(self):
213 222
        """Test SSH to server public IPv4 works, verify hostname"""

Also available in: Unified diff