Revision 4443152f kamaki/clients/compute/test.py

b/kamaki/clients/compute/test.py
314 314
    def test_create_server_metadata(self, SP):
315 315
        vm_id = vm_recv['server']['id']
316 316
        metadata = dict(m1='v1', m2='v2', m3='v3')
317
        FR.json = dict(metadata=vm_recv['server'])
317
        FR.json = dict(meta=vm_recv['server'])
318 318
        for k, v in metadata.items():
319 319
            r = self.client.create_server_metadata(vm_id, k, v)
320 320
            self.assert_dicts_are_equal(r, vm_recv['server'])
321 321
            self.assertEqual(SP.mock_calls[-1], call(
322 322
                vm_id, 'metadata/%s' % k,
323
                json_data=dict(metadata={k: v}), success=201))
323
                json_data=dict(meta={k: v}), success=201))
324 324

  
325 325
    @patch('%s.servers_get' % compute_pkg, return_value=FR())
326 326
    def test_get_server_metadata(self, SG):
......
328 328
        metadata = dict(m1='v1', m2='v2', m3='v3')
329 329
        FR.json = dict(metadata=metadata)
330 330
        r = self.client.get_server_metadata(vm_id)
331
        FR.json = dict(meta=metadata)
331 332
        SG.assert_called_once_with(vm_id, '/metadata')
332 333
        self.assert_dicts_are_equal(r, metadata)
333 334

  
334 335
        for k, v in metadata.items():
335
            FR.json = dict(metadata={k: v})
336
            FR.json = dict(meta={k: v})
336 337
            r = self.client.get_server_metadata(vm_id, k)
337 338
            self.assert_dicts_are_equal(r, {k: v})
338 339
            self.assertEqual(
......
391 392
    @patch('%s.images_get' % compute_pkg, return_value=FR())
392 393
    def test_get_image_metadata(self, IG):
393 394
        for key in ('', '50m3k3y'):
394
            FR.json = dict(metadata=img_recv['image']) if (
395
            FR.json = dict(meta=img_recv['image']) if (
395 396
                key) else dict(metadata=img_recv['image'])
396 397
            r = self.client.get_image_metadata(img_ref, key)
397 398
            self.assertEqual(IG.mock_calls[-1], call(
......
413 414
    @patch('%s.images_put' % compute_pkg, return_value=FR())
414 415
    def test_create_image_metadata(self, IP):
415 416
        (key, val) = ('k1', 'v1')
416
        FR.json = dict(metadata=img_recv['image'])
417
        FR.json = dict(meta=img_recv['image'])
417 418
        r = self.client.create_image_metadata(img_ref, key, val)
418 419
        IP.assert_called_once_with(
419 420
            img_ref, 'metadata/%s' % key,
420
            json_data=dict(metadata={key: val}))
421
            json_data=dict(meta={key: val}))
421 422
        self.assert_dicts_are_equal(r, img_recv['image'])
422 423

  
423 424
    @patch('%s.images_post' % compute_pkg, return_value=FR())

Also available in: Unified diff