Revision bb877241 kamaki/clients/tests.py
| b/kamaki/clients/tests.py | ||
|---|---|---|
| 203 | 203 |
for net in nics: |
| 204 | 204 |
if net['id'] == netid: |
| 205 | 205 |
return True |
| 206 |
sys.stdout.write('\twait nic %d to connect to %s: %ss '%(netid, servid, wait))
|
|
| 206 |
sys.stdout.write('\twait nic %s to connect to %s: %ss '%(netid, servid, wait))
|
|
| 207 | 207 |
for i in range(wait*4): |
| 208 | 208 |
sys.stdout.write('\b%s'%c[i%4])
|
| 209 | 209 |
sys.stdout.flush() |
| ... | ... | |
| 337 | 337 |
self._test_connect_server() |
| 338 | 338 |
print('...ok')
|
| 339 | 339 |
|
| 340 |
sys.stdout.write(' test disconnect_server')
|
|
| 341 |
self._test_disconnect_server() |
|
| 342 |
print('...ok')
|
|
| 343 |
|
|
| 340 | 344 |
self.network2 = self._create_network(self.netname2) |
| 341 | 345 |
|
| 342 | 346 |
sys.stdout.write(' test list_server_nics')
|
| ... | ... | |
| 351 | 355 |
self._test_get_network_details() |
| 352 | 356 |
print('...ok')
|
| 353 | 357 |
|
| 358 |
sys.stdout.write(' test update_network_name')
|
|
| 359 |
self._test_update_network_name() |
|
| 360 |
print('...ok')
|
|
| 361 |
|
|
| 354 | 362 |
"""Don't have auth for these: |
| 355 | 363 |
sys.stdout.write(' test delete_image')
|
| 356 | 364 |
self._test_delete_image() |
| ... | ... | |
| 725 | 733 |
self.assertTrue(self._wait_for_nic(self.network1['id'], self.server1['id'])) |
| 726 | 734 |
|
| 727 | 735 |
@if_not_all |
| 736 |
def test_disconnect_server(self): |
|
| 737 |
"""Test disconnect_server""" |
|
| 738 |
self.test_connect_server() |
|
| 739 |
self._test_disconnect_server() |
|
| 740 |
|
|
| 741 |
def _test_disconnect_server(self): |
|
| 742 |
pass |
|
| 743 |
|
|
| 744 |
@if_not_all |
|
| 728 | 745 |
def test_list_server_nics(self): |
| 729 | 746 |
"""Test list_server_nics""" |
| 730 | 747 |
self.server1 = self._create_server(self.servname1, self.flavorid, self.img) |
| ... | ... | |
| 753 | 770 |
r = self.client.get_network_details(self.network1['id']) |
| 754 | 771 |
self.assert_dicts_are_deeply_equal(self.network1, r) |
| 755 | 772 |
|
| 773 |
@if_not_all |
|
| 774 |
def test_update_network_name(self): |
|
| 775 |
self.network2 = self._create_network(self.netname2) |
|
| 776 |
self._test_update_network_name() |
|
| 777 |
|
|
| 778 |
def _test_update_network_name(self): |
|
| 779 |
updated_name = self.netname2+'_upd' |
|
| 780 |
self.client.update_network_name(self.network2['id'], updated_name) |
|
| 781 |
wait = 3 |
|
| 782 |
c=['|','/','-','\\'] |
|
| 783 |
r = self.client.get_network_details(self.network2['id']) |
|
| 784 |
while wait < 50: |
|
| 785 |
if r['name'] == updated_name: |
|
| 786 |
break |
|
| 787 |
sys.stdout.write('\twait for %s renaming (%s->%s) %ss '%(self.network2['id'],
|
|
| 788 |
self.network2['name'], updated_name, wait)) |
|
| 789 |
for i in range(4*wait): |
|
| 790 |
sys.stdout.write('\b%s'%c[i%4])
|
|
| 791 |
sys.stdout.flush() |
|
| 792 |
time.sleep(0.25) |
|
| 793 |
print('')
|
|
| 794 |
wait += 3 |
|
| 795 |
r = self.client.get_network_details(self.network2['id']) |
|
| 796 |
self.assertEqual(r['name'], updated_name) |
|
| 797 |
|
|
| 756 | 798 |
""" Don't have auth to test this |
| 757 | 799 |
@if_not_all |
| 758 | 800 |
def test_delete_image(self): |
Also available in: Unified diff