Revision e6ec9ea6
| b/kamaki/clients/test/cyclades.py | ||
|---|---|---|
| 92 | 92 |
dict(name="Ubuntu 12.10", id="3a24fef9-1a8c-47d1-8f11-e07bd5e544fd"), |
| 93 | 93 |
dict(name="Debian Base", id="40ace203-6254-4e17-a5cb-518d55418a7d"), |
| 94 | 94 |
dict(name="ubuntu_bundled", id="5336e265-5c7c-4127-95cb-2bf832a79903")])) |
| 95 |
net_send = dict(network=dict(dhcp=False, name='someNet')) |
|
| 96 |
net_recv = dict(network=dict( |
|
| 97 |
status="PENDING", |
|
| 98 |
updated="2013-03-05T15:04:51.758780+00:00", |
|
| 99 |
name="someNet", |
|
| 100 |
created="2013-03-05T15:04:51.758728+00:00", |
|
| 101 |
cidr6=None, |
|
| 102 |
id="2130", |
|
| 103 |
gateway6=None, |
|
| 104 |
public=False, |
|
| 105 |
dhcp=False, |
|
| 106 |
cidr="192.168.1.0/24", |
|
| 107 |
type="MAC_FILTERED", |
|
| 108 |
gateway=None, |
|
| 109 |
attachments=dict(values=[dict(name='att1'), dict(name='att2')]))) |
|
| 95 | 110 |
|
| 96 | 111 |
|
| 97 | 112 |
class Cyclades(TestCase): |
| ... | ... | |
| 458 | 473 |
'/servers/%s/stats' % vm_id) |
| 459 | 474 |
self.assert_dicts_are_equal(stats, r) |
| 460 | 475 |
|
| 461 |
""" |
|
| 462 | 476 |
def test_create_network(self): |
| 463 |
print('\twith no params')
|
|
| 464 |
self.network1 = self._create_network(self.netname1) |
|
| 465 |
self._wait_for_network(self.network1['id'], 'ACTIVE') |
|
| 466 |
n1id = self.network1['id'] |
|
| 467 |
self.network1 = self.client.get_network_details(n1id) |
|
| 468 |
nets = self.client.list_networks(self.network1['id']) |
|
| 469 |
chosen = [net for net in nets if net['id'] == n1id][0] |
|
| 470 |
chosen.pop('updated')
|
|
| 471 |
net1 = dict(self.network1) |
|
| 472 |
net1.pop('updated')
|
|
| 473 |
self.assert_dicts_are_equal(chosen, net1) |
|
| 474 |
for param, val in dict( |
|
| 475 |
cidr='192.168.0.0/24', |
|
| 476 |
gateway='192.168.0.1', |
|
| 477 |
type='MAC_FILTERED', |
|
| 478 |
dhcp=True).items(): |
|
| 479 |
print('\tdelete %s to avoid max net limit' % n1id)
|
|
| 480 |
self._delete_network(n1id) |
|
| 481 |
kwargs = {param: val}
|
|
| 482 |
print('\twith %s=%s' % (param, val))
|
|
| 483 |
self.network1 = self._create_network(self.netname1, **kwargs) |
|
| 484 |
n1id = self.network1['id'] |
|
| 485 |
self._wait_for_network(n1id, 'ACTIVE') |
|
| 486 |
self.network1 = self.client.get_network_details(n1id) |
|
| 487 |
self.assertEqual(self.network1[param], val) |
|
| 477 |
net_name = net_send['network']['name'] |
|
| 478 |
# net_id = net_recv['network']['id'] |
|
| 479 |
self.FR.json = net_recv |
|
| 480 |
self.FR.status_code = 202 |
|
| 481 |
with patch.object( |
|
| 482 |
self.C, |
|
| 483 |
'perform_request', |
|
| 484 |
return_value=self.FR()) as perform_req: |
|
| 485 |
full_args = dict( |
|
| 486 |
cidr='192.168.0.0/24', |
|
| 487 |
gateway='192.168.0.1', |
|
| 488 |
type='MAC_FILTERED', |
|
| 489 |
dhcp=True) |
|
| 490 |
test_args = dict(full_args) |
|
| 491 |
test_args.update(dict(empty=None, full=None)) |
|
| 492 |
for arg, val in test_args.items(): |
|
| 493 |
kwargs = {} if arg == 'empty' else full_args if (
|
|
| 494 |
arg == 'full') else {arg: val}
|
|
| 495 |
r = self.client.create_network(net_name, **kwargs) |
|
| 496 |
self.assertEqual(self.client.http_client.url, self.url) |
|
| 497 |
self.assertEqual( |
|
| 498 |
self.client.http_client.path, |
|
| 499 |
'/networks') |
|
| 500 |
self.assert_dicts_are_equal(r, net_recv['network']) |
|
| 501 |
data = perform_req.call_args[0][1] |
|
| 502 |
expected = dict(network=dict(net_send['network'])) |
|
| 503 |
expected['network'].update(kwargs) |
|
| 504 |
self.assert_dicts_are_equal(loads(data), expected) |
|
| 488 | 505 |
|
| 506 |
""" |
|
| 489 | 507 |
def test_connect_server(self): |
| 490 | 508 |
self.client.connect_server(self.server1['id'], self.network1['id']) |
| 491 | 509 |
self.assertTrue(self._wait_for_nic( |
Also available in: Unified diff