openstack
/
python-muranoclient
Code Issues Proposed changes

Use HTTPClient in package_create manager method 

Instead of direct requests library call.

Change-Id: I43588d0407f9ec92109560e423e3d0407a2f5940
Closes-Bug: #1354129
This commit is contained in:
Andrew Pashkin 2015-03-24 16:02:13 +03:00
parent d7fbf4c8cb
commit 2e3eb5e4ac
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
muranoclient/v1/packages.py
View File

@ -16,13 +16,10 @@ import logging
import urllib import urllib
from oslo.serialization import jsonutils from oslo.serialization import jsonutils
import requests
import yaml import yaml
from muranoclient.common import base from muranoclient.common import base
from muranoclient.common import exceptions from muranoclient.common import exceptions
from muranoclient.common import http
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -57,17 +54,17 @@ class PackageManager(base.Manager):
response_key='categories', obj_class=Category) response_key='categories', obj_class=Category)
def create(self, data, files): def create(self, data, files):
data = {'data': jsonutils.dumps(data)} response = self.api.raw_request(
url = '{0}/v1/catalog/packages'.format(self.api.endpoint) 'POST',
headers = {'X-Auth-Token': self.api.auth_token} '/v1/catalog/packages',
response = requests.post(url, data=data, files=files, headers=headers, data={'__metadata__': jsonutils.dumps(data)},
verify=self.api.verify_cert) files=files
http.HTTPClient.log_http_response(response) )
if not response.ok: if not response.ok:
setattr(response, 'status', response.status_code) setattr(response, 'status', response.status_code)
raise exceptions.from_response(response) raise exceptions.from_response(response)
return self.resource_class(self, jsonutils.loads(response.content)) body = jsonutils.loads(response.text)
return self.resource_class(self, body)
def get(self, app_id): def get(self, app_id):
return self._get('/v1/catalog/packages/{0}'.format(app_id)) return self._get('/v1/catalog/packages/{0}'.format(app_id))