Revision 774cc124

b/kamaki/clients/test/cyclades.py
216 216
        vm_id = vm_recv['server']['id']
217 217
        metadata = dict(m1='v1', m2='v2', m3='v3')
218 218
        self.FR.json = dict(meta=vm_recv['server'])
219
        with patch.object(self.C, 'perform_request', return_value=self.FR()):
219
        with patch.object(
220
                self.C,
221
                'perform_request',
222
                return_value=self.FR()) as perform_req:
220 223
            self.assertRaises(
221 224
                ClientError,
222 225
                self.client.create_server_metadata,
223 226
                vm_id, 'key', 'value')
227
            self.FR.status_code = 201
224 228
            for k, v in metadata.items():
225
                self.FR.status_code = 201
226 229
                r = self.client.create_server_metadata(vm_id, k, v)
227 230
                self.assertEqual(self.client.http_client.url, self.url)
228 231
                self.assertEqual(
229 232
                    self.client.http_client.path,
230 233
                    '/servers/%s/meta/%s' % (vm_id, k))
234
                (method, data, a_headers, a_params) = perform_req.call_args[0]
235
                self.assertEqual(dict(meta={k: v}), loads(data))
231 236
                self.assert_dicts_are_equal(r, vm_recv['server'])
232 237

  
233
    """
234 238
    def test_get_server_metadata(self):
235
        self.client.create_server_metadata(
236
            self.server1['id'],
237
            'mymeta_0',
238
            'val_0')
239
        r = self.client.get_server_metadata(self.server1['id'], 'mymeta_0')
240
        self.assertEqual(r['mymeta_0'], 'val_0')
239
        vm_id = vm_recv['server']['id']
240
        metadata = dict(m1='v1', m2='v2', m3='v3')
241
        with patch.object(self.C, 'perform_request', return_value=self.FR()):
242
            self.FR.json = dict(metadata=dict(values=metadata))
243
            r = self.client.get_server_metadata(vm_id)
244
            self.assertEqual(self.client.http_client.url, self.url)
245
            self.assertEqual(
246
                self.client.http_client.path,
247
                '/servers/%s/meta' % vm_id)
248
            self.assert_dicts_are_equal(r, metadata)
249

  
250
            for k, v in metadata.items():
251
                self.FR.json = dict(meta={k: v})
252
                r = self.client.get_server_metadata(vm_id, k)
253
                self.assertEqual(self.client.http_client.url, self.url)
254
                self.assertEqual(
255
                    self.client.http_client.path,
256
                    '/servers/%s/meta/%s' % (vm_id, k))
257
                self.assert_dicts_are_equal(r, {k: v})
241 258

  
259
    """
242 260
    def test_update_server_metadata(self):
243 261
        r1 = self.client.create_server_metadata(
244 262
            self.server1['id'],

Also available in: Unified diff