Revision 0e8a5f03 kamaki/clients/test/cyclades.py

b/kamaki/clients/test/cyclades.py
475 475

  
476 476
    def test_create_network(self):
477 477
        net_name = net_send['network']['name']
478
        #  net_id = net_recv['network']['id']
479 478
        self.FR.json = net_recv
480 479
        self.FR.status_code = 202
481 480
        with patch.object(
......
503 502
                expected['network'].update(kwargs)
504 503
                self.assert_dicts_are_equal(loads(data), expected)
505 504

  
506
    """
507 505
    def test_connect_server(self):
508
        self.client.connect_server(self.server1['id'], self.network1['id'])
509
        self.assertTrue(self._wait_for_nic(
510
            self.network1['id'],
511
            self.server1['id']))
506
        vm_id = vm_recv['server']['id']
507
        net_id = net_recv['network']['id']
508
        self.FR.status_code = 202
509
        with patch.object(
510
            self.C,
511
            'perform_request',
512
            return_value=self.FR()) as perform_req:
513
            self.client.connect_server(vm_id, net_id)
514
            self.assertEqual(self.client.http_client.url, self.url)
515
            self.assertEqual(
516
                self.client.http_client.path,
517
                '/networks/%s/action' % net_id)
518
            self.assertEqual(
519
                perform_req.call_args[0],
520
                ('post', '{"add": {"serverRef": %s}}' % vm_id, {}, {}))
512 521

  
522
    """
513 523
    def test_disconnect_server(self):
514 524
        self.client.disconnect_server(self.server1['id'], self.network1['id'])
515 525
        self.assertTrue(self._wait_for_nic(

Also available in: Unified diff