Revision 56f5c6fc
| b/kamaki/clients/networking/rest_api.py | ||
|---|---|---|
| 44 | 44 |
return self.get(path4url('networks'), **kwargs)
|
| 45 | 45 |
|
| 46 | 46 |
def networks_post(self, json_data, **kwargs): |
| 47 |
return self.post(path4url('networks'), json=dumps(json_data), **kwargs)
|
|
| 47 |
return self.post(path4url('networks'), json=json_data, **kwargs)
|
|
| 48 | 48 |
|
| 49 | 49 |
def networks_put(self, network_id, json_data, **kwargs): |
| 50 | 50 |
return self.put( |
| 51 |
path4url('networks', network_id), json=dumps(json_data), **kwargs)
|
|
| 51 |
path4url('networks', network_id), json=json_data, **kwargs)
|
|
| 52 | 52 |
|
| 53 | 53 |
def networks_delete(self, network_id, **kwargs): |
| 54 | 54 |
return self.delete(path4url('networks', network_id), **kwargs)
|
| ... | ... | |
| 59 | 59 |
return self.get(path4url('subnets'), **kwargs)
|
| 60 | 60 |
|
| 61 | 61 |
def subnets_post(self, json_data, **kwargs): |
| 62 |
return self.post(path4url('subnets'), json=dumps(json_data), **kwargs)
|
|
| 62 |
return self.post(path4url('subnets'), json=json_data, **kwargs)
|
|
| 63 | 63 |
|
| 64 | 64 |
def subnets_put(self, subnet_id, **kwargs): |
| 65 | 65 |
return self.put(path4url('subnets', subnet_id), **kwargs)
|
| ... | ... | |
| 81 | 81 |
self.set_param('mac_address', mac_address, iff=mac_address)
|
| 82 | 82 |
self.set_param('fixed_ips', fixed_ips, iff=fixed_ips)
|
| 83 | 83 |
self.set_param('security_groups', security_groups, iff=security_groups)
|
| 84 |
data = dumps(json_data) if json_data else None |
|
| 85 |
return self.post(path4url('ports'), json=data, **kwargs)
|
|
| 84 |
return self.post(path4url('ports'), json=json_data, **kwargs)
|
|
| 86 | 85 |
|
| 87 | 86 |
def ports_put( |
| 88 | 87 |
self, port_id, |
| ... | ... | |
| 93 | 92 |
self.set_param('mac_address', mac_address, iff=mac_address)
|
| 94 | 93 |
self.set_param('fixed_ips', fixed_ips, iff=fixed_ips)
|
| 95 | 94 |
self.set_param('security_groups', security_groups, iff=security_groups)
|
| 96 |
data = dumps(json_data) if json_data else None |
|
| 97 |
return self.put(path4url('ports', port_id), json=data, **kwargs)
|
|
| 95 |
return self.put(path4url('ports', port_id), json=json_data, **kwargs)
|
|
| 98 | 96 |
|
| 99 | 97 |
def ports_delete(self, port_id, **kwargs): |
| 100 | 98 |
return self.delete(path4url('ports', port_id), **kwargs)
|
| b/kamaki/clients/networking/test.py | ||
|---|---|---|
| 76 | 76 |
dict(json_data=dict(k2='v2'), k3='v3')): |
| 77 | 77 |
self.assertEqual(self.client.networks_post(**kwargs), 'ret val') |
| 78 | 78 |
json_data = kwargs.pop('json_data')
|
| 79 |
self._assert(post, '/networks', json=dumps(json_data), **kwargs)
|
|
| 79 |
self._assert(post, '/networks', json=json_data, **kwargs)
|
|
| 80 | 80 |
|
| 81 | 81 |
@patch('kamaki.clients.Client.put', return_value='ret val')
|
| 82 | 82 |
def test_networks_put(self, put): |
| ... | ... | |
| 88 | 88 |
self.client.networks_put(netid, **kwargs), 'ret val') |
| 89 | 89 |
json_data = kwargs.pop('json_data')
|
| 90 | 90 |
self._assert( |
| 91 |
put, '/networks/%s' % netid, json=dumps(json_data), **kwargs)
|
|
| 91 |
put, '/networks/%s' % netid, json=json_data, **kwargs)
|
|
| 92 | 92 |
|
| 93 | 93 |
@patch('kamaki.clients.Client.delete', return_value='ret val')
|
| 94 | 94 |
def test_networks_delete(self, delete): |
| ... | ... | |
| 116 | 116 |
json_data = dict(subnets='some data') |
| 117 | 117 |
self.assertEqual(self.client.subnets_post( |
| 118 | 118 |
json_data=json_data, **kwargs), 'ret val') |
| 119 |
self._assert(post, '/subnets', json=dumps(json_data), **kwargs)
|
|
| 119 |
self._assert(post, '/subnets', json=json_data, **kwargs)
|
|
| 120 | 120 |
|
| 121 | 121 |
@patch('kamaki.clients.Client.put', return_value='ret val')
|
| 122 | 122 |
def test_subnets_put(self, put): |
| ... | ... | |
| 173 | 173 |
|
| 174 | 174 |
self.assertEqual(self.client.ports_post(**callargs), 'ret val') |
| 175 | 175 |
self._assert( |
| 176 |
post, '/ports', set_param, |
|
| 177 |
params=params, json=None, **kwargs) |
|
| 176 |
post, '/ports', set_param, params=params, json=None, **kwargs) |
|
| 178 | 177 |
|
| 179 | 178 |
json_data = dict(id='some id', other_param='other val') |
| 180 | 179 |
callargs['json_data'] = json_data |
| 181 | 180 |
self.assertEqual(self.client.ports_post(**callargs), 'ret val') |
| 182 | 181 |
self._assert( |
| 183 | 182 |
post, '/ports', set_param, params, |
| 184 |
json=dumps(json_data), **kwargs)
|
|
| 183 |
json=json_data, **kwargs)
|
|
| 185 | 184 |
|
| 186 | 185 |
@patch('kamaki.clients.Client.set_param')
|
| 187 | 186 |
@patch('kamaki.clients.Client.put', return_value='ret val')
|
| ... | ... | |
| 221 | 220 |
self.client.ports_put(port_id, **callargs), 'ret val') |
| 222 | 221 |
self._assert( |
| 223 | 222 |
put, '/ports/%s' % port_id, set_param, params, |
| 224 |
json=dumps(json_data), **kwargs)
|
|
| 223 |
json=json_data, **kwargs)
|
|
| 225 | 224 |
|
| 226 | 225 |
|
| 227 | 226 |
class FakeObject(object): |
Also available in: Unified diff