Revision 677979bc kamaki/clients/networking/test.py
| 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', data=dumps(json_data), **kwargs)
|
|
| 79 |
self._assert(post, '/networks', json=dumps(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, data=dumps(json_data), **kwargs)
|
|
| 91 |
put, '/networks/%s' % netid, json=dumps(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', data=dumps(json_data), **kwargs)
|
|
| 119 |
self._assert(post, '/subnets', json=dumps(json_data), **kwargs)
|
|
| 120 | 120 |
|
| 121 | 121 |
@patch('kamaki.clients.Client.put', return_value='ret val')
|
| 122 | 122 |
def test_subnets_put(self, put): |
| ... | ... | |
| 174 | 174 |
self.assertEqual(self.client.ports_post(**callargs), 'ret val') |
| 175 | 175 |
self._assert( |
| 176 | 176 |
post, '/ports', set_param, |
| 177 |
params=params, data=None, **kwargs)
|
|
| 177 |
params=params, json=None, **kwargs)
|
|
| 178 | 178 |
|
| 179 | 179 |
json_data = dict(id='some id', other_param='other val') |
| 180 | 180 |
callargs['json_data'] = json_data |
| 181 | 181 |
self.assertEqual(self.client.ports_post(**callargs), 'ret val') |
| 182 | 182 |
self._assert( |
| 183 | 183 |
post, '/ports', set_param, params, |
| 184 |
data=dumps(json_data), **kwargs)
|
|
| 184 |
json=dumps(json_data), **kwargs)
|
|
| 185 | 185 |
|
| 186 | 186 |
@patch('kamaki.clients.Client.set_param')
|
| 187 | 187 |
@patch('kamaki.clients.Client.put', return_value='ret val')
|
| ... | ... | |
| 213 | 213 |
self.client.ports_put(port_id, **callargs), 'ret val') |
| 214 | 214 |
self._assert( |
| 215 | 215 |
put, '/ports/%s' % port_id, set_param, |
| 216 |
params=params, data=None, **kwargs)
|
|
| 216 |
params=params, json=None, **kwargs)
|
|
| 217 | 217 |
|
| 218 | 218 |
json_data = dict(id='some id', other_param='other val') |
| 219 | 219 |
callargs['json_data'] = json_data |
| ... | ... | |
| 221 | 221 |
self.client.ports_put(port_id, **callargs), 'ret val') |
| 222 | 222 |
self._assert( |
| 223 | 223 |
put, '/ports/%s' % port_id, set_param, params, |
| 224 |
data=dumps(json_data), **kwargs)
|
|
| 224 |
json=dumps(json_data), **kwargs)
|
|
| 225 | 225 |
|
| 226 | 226 |
|
| 227 | 227 |
class FakeObject(object): |
Also available in: Unified diff