| 171 |
171 |
else:
|
| 172 |
172 |
print('\tnot deleted yet ...')
|
| 173 |
173 |
deleted_servers[server['name']] = retries + 1
|
|
174 |
for netid in self.networks.keys():
|
|
175 |
self.client.delete_network(netid)
|
| 174 |
176 |
|
| 175 |
177 |
def _create_server(self, servername, flavorid, imageid, personality=None):
|
| 176 |
178 |
server = self.client.create_server(servername, flavorid, imageid, personality)
|
| ... | ... | |
| 180 |
182 |
def _delete_server(self, servid):
|
| 181 |
183 |
self.client.delete_server(servid)
|
| 182 |
184 |
|
|
185 |
def _create_network(self, netname, **kwargs):
|
|
186 |
net = self.client.create_network(netname, **kwargs)
|
|
187 |
self.networks[net['id']] = net
|
|
188 |
return net
|
|
189 |
|
|
190 |
def _delete_network(self, netid)
|
|
191 |
self.client.delete_network(netid)
|
|
192 |
|
| 183 |
193 |
def if_not_all(foo):
|
| 184 |
194 |
global TEST_ALL
|
| 185 |
195 |
if TEST_ALL:
|
| ... | ... | |
| 290 |
300 |
self._test_set_firewall_profile()
|
| 291 |
301 |
print('...ok')
|
| 292 |
302 |
|
|
303 |
sys.stdout.write(' test connect_server')
|
|
304 |
self._test_connect_server()
|
|
305 |
print('...ok')
|
|
306 |
|
|
307 |
sys.stdout.write(' test list_server_nics')
|
|
308 |
self._test_list_server_nics()
|
|
309 |
print('...ok')
|
|
310 |
|
| 293 |
311 |
"""Don't have auth for these:
|
| 294 |
312 |
sys.stdout.write(' test delete_image')
|
| 295 |
313 |
self._test_delete_image()
|
| ... | ... | |
| 604 |
622 |
print('\b ')
|
| 605 |
623 |
fprofile = self.client.get_firewall_profile(self.server1['id'])
|
| 606 |
624 |
|
|
625 |
#untested tests from here:
|
|
626 |
@if_not_all
|
|
627 |
def test_connect_server(self):
|
|
628 |
self.server1 = self._create_server(self.servname1, self.flavorid, self.img)
|
|
629 |
self._test_connect_server()
|
|
630 |
|
|
631 |
def _test_connect_server(self):
|
|
632 |
newnet = self._create_network('mynet')
|
|
633 |
self.client.connect_server(self.server1['id'], newnet['id'])
|
|
634 |
s1nics = self.list_server_nics(self.server1['id'])
|
|
635 |
self.assertTrue(newnet['id'] in s1nics['id'])
|
|
636 |
|
| 607 |
637 |
@if_not_all
|
| 608 |
638 |
def test_list_server_nics(self):
|
| 609 |
639 |
"""Test list_server_nics"""
|
| 610 |
640 |
self.server1 = self._create_server(self.servname1, self.flavorid, self.img)
|
| 611 |
|
newnet = self.client.create_network('mynet')
|
| 612 |
|
self.client.connect_server(self.server1['id'], newnet['id'])
|
| 613 |
641 |
self._test_list_server_nics()
|
| 614 |
|
self.client.delete_network(newnet['id'])
|
| 615 |
642 |
|
| 616 |
643 |
def _test_list_server_nics(self):
|
| 617 |
644 |
r = self.client.list_server_nics(self.server1['id'])
|
| 618 |
|
print('NOT READY YET')
|
|
645 |
len0 = len(r)
|
|
646 |
self.assertTrue(len0>0)
|
|
647 |
self.assertTrue('public' in [net['id'] for net in r])
|
|
648 |
|
|
649 |
newnet = self._create_network('mynet_list_nics')
|
|
650 |
self.client.connect_server(self.server1['id'], newnet['id'])
|
|
651 |
r = self.client.list_server_nics(self.server1['id'])
|
|
652 |
self.assertTrue(len(r)>len0)
|
| 619 |
653 |
|
| 620 |
654 |
|
| 621 |
655 |
""" Don't have auth to test this
|