Revision 6add54fd
| b/kamaki/cli.py | ||
|---|---|---|
| 325 | 325 |
def main(self, server_id, network=None): |
| 326 | 326 |
reply = self.client.list_server_addresses(int(server_id), network) |
| 327 | 327 |
print_list(reply) |
| 328 |
#print_addresses(reply, margin) |
|
| 329 |
|
|
| 330 | 328 |
|
| 331 | 329 |
@command(api='compute') |
| 332 | 330 |
class server_meta(object): |
| b/kamaki/clients/cyclades.py | ||
|---|---|---|
| 85 | 85 |
r = self.get(path, success=200) |
| 86 | 86 |
return r.json['stats'] |
| 87 | 87 |
|
| 88 |
|
|
| 89 | 88 |
def list_networks(self, detail=False): |
| 90 | 89 |
path = path4url('networks', 'detail') if detail else path4url('networks')
|
| 91 | 90 |
print('ready to get network list with this req: '+path)
|
| ... | ... | |
| 118 | 117 |
self.post(path, json=req, success=202) |
| 119 | 118 |
|
| 120 | 119 |
def disconnect_server(self, server_id, network_id): |
| 120 |
matched_nets = [net for net in self.list_server_addresses(server_id) if net['network_id'] == network_id] |
|
| 121 | 121 |
path = path4url('networks', network_id, 'action')
|
| 122 |
req = {'remove': {'serverRef': server_id}}
|
|
| 123 |
self.post(path, json=req, success=202) |
|
| 122 |
for nic in matched_nets: |
|
| 123 |
req = {'remove': {'attachment': unicode(nic['id'])}}
|
|
| 124 |
self.post(path, json=req, success=202) |
|
| b/kamaki/utils.py | ||
|---|---|---|
| 33 | 33 |
|
| 34 | 34 |
def print_dict(d, exclude=(), ident= 0): |
| 35 | 35 |
margin = max(max(len(key) for key in d) + 1, ident) |
| 36 |
for key, val in sorted(d.items()):
|
|
| 36 |
for key, val in d.items():
|
|
| 37 | 37 |
if key in exclude: |
| 38 | 38 |
continue |
| 39 | 39 |
print_str = '%s:' % unicode(key) |
| 40 | 40 |
if isinstance(val, dict): |
| 41 | 41 |
print(print_str.rjust(margin)+' {')
|
| 42 |
print_dict(val, exclude = exclude, ident = margin + 8)
|
|
| 42 |
print_dict(val, exclude = exclude, ident = margin + 6)
|
|
| 43 | 43 |
print '}'.rjust(margin) |
| 44 | 44 |
elif isinstance(val, list): |
| 45 | 45 |
print(print_str.rjust(margin)+' [') |
| 46 |
print_list(val, exclude = exclude, ident = margin + 8)
|
|
| 46 |
print_list(val, exclude = exclude, ident = margin + 6)
|
|
| 47 | 47 |
print ']'.rjust(margin) |
| 48 | 48 |
else: |
| 49 |
print print_str.rjust(margin+4)+' '+unicode(val)
|
|
| 49 |
print print_str.rjust(margin)+' '+unicode(val) |
|
| 50 | 50 |
|
| 51 | 51 |
def print_list(l, exclude=(), ident = 0): |
| 52 | 52 |
margin = max(max(len(item) for item in l) + 1, ident) |
| 53 |
for item in sorted(l):
|
|
| 53 |
for item in l:
|
|
| 54 | 54 |
if item in exclude: |
| 55 | 55 |
continue |
| 56 | 56 |
if isinstance(item, dict): |
| 57 | 57 |
print('{'.rjust(margin))
|
| 58 |
print_dict(item, exclude = exclude, ident = margin + 8)
|
|
| 58 |
print_dict(item, exclude = exclude, ident = margin + 6)
|
|
| 59 | 59 |
print '}'.rjust(margin) |
| 60 | 60 |
elif isinstance(item, list): |
| 61 | 61 |
print '['.rjust(margin) |
| 62 |
print_list(item, exclude = exclude, ident = margin + 8)
|
|
| 62 |
print_list(item, exclude = exclude, ident = margin + 6)
|
|
| 63 | 63 |
print ']'.rjust(margin) |
| 64 | 64 |
else: |
| 65 |
print unicode(val).rjust(margin + 4)
|
|
| 65 |
print unicode(val).rjust(margin) |
|
| 66 | 66 |
|
| 67 | 67 |
def print_items(items, title=('id', 'name')):
|
| 68 | 68 |
for item in items: |
Also available in: Unified diff