Revision 7749f75a 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']
156
        return r.json['meta' if key else 'metadata']
157 157

  
158 158
    def create_server_metadata(self, server_id, key, val):
159 159
        """
......
254 254
        """
255 255
        command = path4url('metadata', key)
256 256
        r = self.images_get(image_id, command)
257
        return r.json['meta']
257
        return r.json['meta' if key else 'metadata']
258 258

  
259 259
    def create_image_metadata(self, image_id, key, val):
260 260
        """

Also available in: Unified diff