Revision bcef3ac9 kamaki/clients/compute/__init__.py
| b/kamaki/clients/compute/__init__.py | ||
|---|---|---|
| 153 | 153 |
""" |
| 154 | 154 |
command = path4url('metadata', key)
|
| 155 | 155 |
r = self.servers_get(server_id, command) |
| 156 |
return r.json['meta'] if key else r.json['metadata']
|
|
| 156 |
return r.json['metadata'] |
|
| 157 | 157 |
|
| 158 | 158 |
def create_server_metadata(self, server_id, key, val): |
| 159 | 159 |
""" |
| ... | ... | |
| 165 | 165 |
|
| 166 | 166 |
:returns: dict of updated key:val metadata |
| 167 | 167 |
""" |
| 168 |
req = {'meta': {key: val}}
|
|
| 168 |
req = {'metadata': {key: val}}
|
|
| 169 | 169 |
r = self.servers_put( |
| 170 | 170 |
server_id, |
| 171 | 171 |
'metadata/' + key, |
| 172 | 172 |
json_data=req, |
| 173 | 173 |
success=201) |
| 174 |
return r.json['meta'] |
|
| 174 |
return r.json['metadata']
|
|
| 175 | 175 |
|
| 176 | 176 |
def update_server_metadata(self, server_id, **metadata): |
| 177 | 177 |
""" |
| ... | ... | |
| 202 | 202 |
""" |
| 203 | 203 |
:param detail: (bool) detailed flavor info if set, short if not |
| 204 | 204 |
|
| 205 |
:returns: (dict) flavor info
|
|
| 205 |
:returns: (list) flavor info
|
|
| 206 | 206 |
""" |
| 207 | 207 |
r = self.flavors_get(command='detail' if detail else '') |
| 208 | 208 |
return r.json['flavors'] |
| ... | ... | |
| 258 | 258 |
""" |
| 259 | 259 |
command = path4url('metadata', key)
|
| 260 | 260 |
r = self.images_get(image_id, command) |
| 261 |
return r.json['meta'] if key else r.json['metadata']
|
|
| 261 |
return r.json['metadata'] |
|
| 262 | 262 |
|
| 263 | 263 |
def create_image_metadata(self, image_id, key, val): |
| 264 | 264 |
""" |
| ... | ... | |
| 270 | 270 |
|
| 271 | 271 |
:returns: (dict) updated metadata |
| 272 | 272 |
""" |
| 273 |
req = {'meta': {key: val}}
|
|
| 273 |
req = {'metadata': {key: val}}
|
|
| 274 | 274 |
r = self.images_put(image_id, 'metadata/' + key, json_data=req) |
| 275 |
return r.json['meta'] |
|
| 275 |
return r.json['metadata']
|
|
| 276 | 276 |
|
| 277 | 277 |
def update_image_metadata(self, image_id, **metadata): |
| 278 | 278 |
""" |
Also available in: Unified diff