Revision e711efe2

b/kamaki/clients/compute.py
135 135

  
136 136
        :param hard: perform a hard reboot if true, soft reboot otherwise
137 137
        """
138
        type = 'HARD' if hard else 'SOFT'
139
        req = {'reboot': {'type': type}}
138
        boot_type = 'HARD' if hard else 'SOFT'
139
        req = {'reboot': {'type': boot_type}}
140 140
        r = self.servers_post(server_id, 'action', json_data=req)
141 141
        r.release()
142 142

  
b/kamaki/clients/test/cyclades.py
195 195
                dict(server=dict(name=new_name)),
196 196
                loads(data))
197 197

  
198
    """
199 198
    def test_reboot_server(self):
200
        print('')
201
        self._wait_for_status(self.server1['id'], 'REBOOT')
202
        self._wait_for_status(self.server2['id'], 'REBOOT')
199
        vm_id = vm_recv['server']['id']
200
        self.FR.status_code = 202
201
        with patch.object(
202
                self.C,
203
                'perform_request',
204
                return_value=self.FR()) as perform_req:
205
            self.client.reboot_server(vm_id)
206
            self.assertEqual(self.client.http_client.url, self.url)
207
            self.assertEqual(
208
                self.client.http_client.path,
209
                '/servers/%s/action' % vm_id)
210
            (method, data, a_headers, a_params) = perform_req.call_args[0]
211
            self.assert_dicts_are_equal(
212
                dict(reboot=dict(type='SOFT')),
213
                loads(data))
203 214

  
215
    """
204 216
    def test_create_server_metadata(self):
205 217
        r1 = self.client.create_server_metadata(
206 218
            self.server1['id'],

Also available in: Unified diff