Revision 24ff0a35 kamaki/clients/cyclades.py

b/kamaki/clients/cyclades.py
81 81
        try:
82 82
            return r['attachments']['values'][0]['firewallProfile']
83 83
        except KeyError:
84
            raise ClientError('No Firewall Profile', 520,
84
            raise ClientError(
85
                'No Firewall Profile', 520,
85 86
                details='Server %s is missing a firewall profile' % server_id)
86 87

  
87 88
    def set_firewall_profile(self, server_id, profile):
......
144 145
        r = self.networks_get(network_id=network_id)
145 146
        return r.json['network']['attachments']['values']
146 147

  
147
    def create_network(self,
148
        name, cidr=None, gateway=None, type=None, dhcp=None):
148
    def create_network(
149
            self, name,
150
            cidr=None, gateway=None, type=None, dhcp=None):
149 151
        """
150 152
        :param name: (str)
151 153

  
......
202 204
        except ClientError as err:
203 205
            if err.status == 421:
204 206
                err.details = [
205
                'Network may be still connected to at least one server']
207
                    'Network may be still connected to at least one server']
206 208
            raise err
207 209
        r.release()
208 210

  
......
224 226
        :param nic_id: (str)
225 227
        """
226 228
        server_nets = self.list_server_nics(server_id)
227
        nets = [(net['id'], net['network_id']) for net in server_nets\
228
            if nic_id == net['id']]
229 229
        num_of_disconnections = 0
230
        for (nic_id, network_id) in nets:
230
        for (nic_id, network_id) in [(
231
            net['id'],
232
            net['network_id']) for net in server_nets if nic_id == net['id']]:
231 233
            req = {'remove': {'attachment': unicode(nic_id)}}
232 234
            r = self.networks_post(network_id, 'action', json_data=req)
233 235
            r.release()
......
244 246
            r.release()
245 247

  
246 248
    def wait_server(
247
        self,
248
        server_id,
249
        current_status='BUILD',
250
        delay=0.5,
251
        max_wait=128,
252
        wait_cb=None):
249
            self,
250
            server_id,
251
            current_status='BUILD',
252
            delay=0.5,
253
            max_wait=128,
254
            wait_cb=None):
253 255
        """Wait for server while its status is current_status
254 256

  
255 257
        :param server_id: integer (str or int)

Also available in: Unified diff