Revision bcef3ac9 kamaki/clients/cyclades/test.py
| b/kamaki/clients/cyclades/test.py | ||
|---|---|---|
| 52 | 52 |
suspended=False, |
| 53 | 53 |
progress=0, |
| 54 | 54 |
id=31173, |
| 55 |
metadata=dict(values=dict(os="debian", users="root"))))
|
|
| 56 |
vm_list = dict(servers=dict(values=[
|
|
| 55 |
metadata=dict(os="debian", users="root")))
|
|
| 56 |
vm_list = dict(servers=[ |
|
| 57 | 57 |
dict(name='n1', id=1), |
| 58 |
dict(name='n2', id=2)]))
|
|
| 58 |
dict(name='n2', id=2)]) |
|
| 59 | 59 |
net_send = dict(network=dict(dhcp=False, name='someNet')) |
| 60 | 60 |
net_recv = dict(network=dict( |
| 61 | 61 |
status="PENDING", |
| ... | ... | |
| 70 | 70 |
cidr="192.168.1.0/24", |
| 71 | 71 |
type="MAC_FILTERED", |
| 72 | 72 |
gateway=None, |
| 73 |
attachments=dict(values=[dict(name='att1'), dict(name='att2')])))
|
|
| 74 |
net_list = dict(networks=dict(values=[
|
|
| 73 |
attachments=[dict(name='att1'), dict(name='att2')]))
|
|
| 74 |
net_list = dict(networks=[ |
|
| 75 | 75 |
dict(id=1, name='n1'), |
| 76 | 76 |
dict(id=2, name='n2'), |
| 77 |
dict(id=3, name='n3')]))
|
|
| 78 |
firewalls = dict(attachments=dict(values=[
|
|
| 79 |
dict(firewallProfile='50m3_pr0f1L3', otherStuff='57uff')]))
|
|
| 77 |
dict(id=3, name='n3')]) |
|
| 78 |
firewalls = dict(attachments=[ |
|
| 79 |
dict(firewallProfile='50m3_pr0f1L3', otherStuff='57uff')]) |
|
| 80 | 80 |
|
| 81 | 81 |
|
| 82 | 82 |
class FR(object): |
| ... | ... | |
| 233 | 233 |
self.assertEqual(SG.mock_calls[-1], call( |
| 234 | 234 |
command='detail' if detail else '', |
| 235 | 235 |
changes_since=since)) |
| 236 |
expected = vm_list['servers']['values']
|
|
| 236 |
expected = vm_list['servers'] |
|
| 237 | 237 |
for i, vm in enumerate(r): |
| 238 | 238 |
self.assert_dicts_are_equal(vm, expected[i]) |
| 239 | 239 |
self.assertEqual(i + 1, len(expected)) |
| ... | ... | |
| 267 | 267 |
|
| 268 | 268 |
def test_get_firewall_profile(self): |
| 269 | 269 |
vm_id = vm_recv['server']['id'] |
| 270 |
v = firewalls['attachments']['values'][0]['firewallProfile']
|
|
| 270 |
v = firewalls['attachments'][0]['firewallProfile'] |
|
| 271 | 271 |
with patch.object( |
| 272 | 272 |
cyclades.CycladesClient, 'get_server_details', |
| 273 | 273 |
return_value=firewalls) as GSD: |
| ... | ... | |
| 285 | 285 |
@patch('%s.servers_post' % cyclades_pkg, return_value=FR())
|
| 286 | 286 |
def test_set_firewall_profile(self, SP): |
| 287 | 287 |
vm_id = vm_recv['server']['id'] |
| 288 |
v = firewalls['attachments']['values'][0]['firewallProfile']
|
|
| 288 |
v = firewalls['attachments'][0]['firewallProfile'] |
|
| 289 | 289 |
self.client.set_firewall_profile(vm_id, v) |
| 290 | 290 |
SP.assert_called_once_with( |
| 291 | 291 |
vm_id, 'action', |
| ... | ... | |
| 354 | 354 |
@patch('%s.servers_get' % cyclades_pkg, return_value=FR())
|
| 355 | 355 |
def test_list_server_nics(self, SG): |
| 356 | 356 |
vm_id = vm_recv['server']['id'] |
| 357 |
nics = dict(addresses=dict(values=[dict(id='nic1'), dict(id='nic2')]))
|
|
| 357 |
nics = dict(addresses=[dict(id='nic1'), dict(id='nic2')])
|
|
| 358 | 358 |
FR.json = nics |
| 359 | 359 |
r = self.client.list_server_nics(vm_id) |
| 360 | 360 |
SG.assert_called_once_with(vm_id, 'ips') |
| 361 |
expected = nics['addresses']['values']
|
|
| 361 |
expected = nics['addresses'] |
|
| 362 | 362 |
for i in range(len(r)): |
| 363 | 363 |
self.assert_dicts_are_equal(r[i], expected[i]) |
| 364 | 364 |
self.assertEqual(i + 1, len(r)) |
| ... | ... | |
| 366 | 366 |
@patch('%s.networks_get' % cyclades_pkg, return_value=FR())
|
| 367 | 367 |
def test_list_networks(self, NG): |
| 368 | 368 |
FR.json = net_list |
| 369 |
expected = net_list['networks']['values']
|
|
| 369 |
expected = net_list['networks'] |
|
| 370 | 370 |
for detail in ('', 'detail'):
|
| 371 | 371 |
r = self.client.list_networks(detail=True if detail else False) |
| 372 | 372 |
self.assertEqual(NG.mock_calls[-1], call(command=detail)) |
| ... | ... | |
| 380 | 380 |
FR.json = net_recv |
| 381 | 381 |
r = self.client.list_network_nics(net_id) |
| 382 | 382 |
NG.assert_called_once_with(network_id=net_id) |
| 383 |
expected = net_recv['network']['attachments']['values']
|
|
| 383 |
expected = net_recv['network']['attachments'] |
|
| 384 | 384 |
for i in range(len(r)): |
| 385 | 385 |
self.assert_dicts_are_equal(r[i], expected[i]) |
| 386 | 386 |
|
Also available in: Unified diff