Revision 06030a1b

b/kamaki/clients/test/cyclades.py
584 584
                '/networks/%s' % net_id)
585 585
            self.assert_dicts_are_equal(r, net_recv['network'])
586 586

  
587
    """
588
    def test_get_network_details(self):
589
        r = self.client.get_network_details(self.network1['id'])
590
        net1 = dict(self.network1)
591
        net1.pop('status')
592
        net1.pop('updated', None)
593
        net1.pop('attachments')
594
        r.pop('status')
595
        r.pop('updated', None)
596
        r.pop('attachments')
597
        self.assert_dicts_are_equal(net1, r)
598

  
599 587
    def test_update_network_name(self):
600
        updated_name = self.netname2 + '_upd'
601
        self.client.update_network_name(self.network2['id'], updated_name)
602

  
603
        def netwait(wait):
604
            r = self.client.get_network_details(self.network2['id'])
605
            if r['name'] == updated_name:
606
                return
607
            time.sleep(wait)
608
        self.do_with_progress_bar(
609
            netwait,
610
            'Network %s name is changing:' % self.network2['id'],
611
            self._waits[:5])
612

  
613
        r = self.client.get_network_details(self.network2['id'])
614
        self.assertEqual(r['name'], updated_name)
588
        net_id = net_recv['network']['id']
589
        new_name = '%s_new' % net_id
590
        self.FR.status_code = 204
591
        with patch.object(
592
                self.C,
593
                'perform_request',
594
                return_value=self.FR()) as perform_req:
595
            self.client.update_network_name(net_id, new_name)
596
            self.assertEqual(self.client.http_client.url, self.url)
597
            self.assertEqual(
598
                self.client.http_client.path,
599
                '/networks/%s' % net_id)
600
            (method, data, a_headers, a_params) = perform_req.call_args[0]
601
            self.assert_dicts_are_equal(
602
                dict(network=dict(name=new_name)),
603
                loads(data))
615 604

  
605
    """
616 606
    def test_delete_image(self):
617 607
        images = self.client.list_images()
618 608
        self.client.delete_image(images[2]['id'])

Also available in: Unified diff