diff --git a/freezerclient/tests/unit/v1/test_client_actions.py b/freezerclient/tests/unit/v1/test_client_actions.py index 8700c50..d83be9d 100644 --- a/freezerclient/tests/unit/v1/test_client_actions.py +++ b/freezerclient/tests/unit/v1/test_client_actions.py @@ -34,7 +34,8 @@ class TestActionManager(unittest.TestCase): @patch('freezerclient.v1.managers.actions.requests') def test_create(self, mock_requests): self.assertEqual('http://testendpoint:9999/v1/actions/', self.action_manager.endpoint) - self.assertEqual({'X-Auth-Token': 'testtoken'}, self.action_manager.headers) + self.assertEqual({'X-Auth-Token': 'testtoken', 'Content-Type': 'application/json'}, + self.action_manager.headers) @patch('freezerclient.v1.managers.actions.requests') def test_create_ok(self, mock_requests): diff --git a/freezerclient/tests/unit/v1/test_client_backups.py b/freezerclient/tests/unit/v1/test_client_backups.py index bca769f..32a2f5a 100644 --- a/freezerclient/tests/unit/v1/test_client_backups.py +++ b/freezerclient/tests/unit/v1/test_client_backups.py @@ -32,7 +32,8 @@ class TestBackupManager(unittest.TestCase): @patch('freezerclient.v1.managers.backups.requests') def test_create(self, mock_requests): self.assertEqual('http://testendpoint:9999/v1/backups/', self.b.endpoint) - self.assertEqual({'X-Auth-Token': 'testtoken'}, self.b.headers) + self.assertEqual({'X-Auth-Token': 'testtoken', 'Content-Type': 'application/json'}, + self.b.headers) @patch('freezerclient.v1.managers.backups.requests') def test_create_ok(self, mock_requests): @@ -114,7 +115,7 @@ class TestBackupManager(unittest.TestCase): 'http://testendpoint:9999/v1/backups/', params={'limit': 5, 'offset': 5}, data='{"time_before": 1428529956}', - headers={'X-Auth-Token': 'testtoken'}, + headers={'X-Auth-Token': 'testtoken', 'Content-Type': 'application/json'}, verify=True) self.assertEqual(backup_list, retval) diff --git a/freezerclient/tests/unit/v1/test_client_clients.py b/freezerclient/tests/unit/v1/test_client_clients.py index 99f33d1..3a48e39 100644 --- a/freezerclient/tests/unit/v1/test_client_clients.py +++ b/freezerclient/tests/unit/v1/test_client_clients.py @@ -31,7 +31,8 @@ class TestClientManager(unittest.TestCase): @patch('freezerclient.v1.managers.clients.requests') def test_create(self, mock_requests): self.assertEqual('http://testendpoint:9999/v1/clients/', self.r.endpoint) - self.assertEqual({'X-Auth-Token': 'testtoken'}, self.r.headers) + self.assertEqual({'X-Auth-Token': 'testtoken', 'Content-Type': 'application/json'}, + self.r.headers) @patch('freezerclient.v1.managers.clients.requests') def test_create_ok(self, mock_requests): diff --git a/freezerclient/tests/unit/v1/test_client_jobs.py b/freezerclient/tests/unit/v1/test_client_jobs.py index 4338ca4..a902157 100644 --- a/freezerclient/tests/unit/v1/test_client_jobs.py +++ b/freezerclient/tests/unit/v1/test_client_jobs.py @@ -28,14 +28,15 @@ class TestJobManager(unittest.TestCase): self.mock_response = Mock() self.mock_client.endpoint = 'http://testendpoint:9999' self.mock_client.auth_token = 'testtoken' - self.headers = {'X-Auth-Token': 'testtoken'} + self.headers = {'X-Auth-Token': 'testtoken', 'Content-Type': 'application/json'} self.mock_client.client_id = 'test_client_id_78900987' self.job_manager = jobs.JobManager(self.mock_client) @patch('freezerclient.v1.managers.jobs.requests') def test_create(self, mock_requests): self.assertEqual('http://testendpoint:9999/v1/jobs/', self.job_manager.endpoint) - self.assertEqual({'X-Auth-Token': 'testtoken'}, self.job_manager.headers) + self.assertEqual({'X-Auth-Token': 'testtoken', 'Content-Type': 'application/json'}, + self.job_manager.headers) @patch('freezerclient.v1.managers.jobs.requests') def test_create_ok(self, mock_requests): diff --git a/freezerclient/tests/unit/v1/test_client_sessions.py b/freezerclient/tests/unit/v1/test_client_sessions.py index ab09a95..296135c 100644 --- a/freezerclient/tests/unit/v1/test_client_sessions.py +++ b/freezerclient/tests/unit/v1/test_client_sessions.py @@ -31,7 +31,7 @@ class TestSessionManager(unittest.TestCase): self.mock_client.client_id = 'test_client_id_78900987' self.session_manager = sessions.SessionManager(self.mock_client) self.endpoint = 'http://testendpoint:9999/v1/sessions/' - self.headers = {'X-Auth-Token': 'testtoken'} + self.headers = {'X-Auth-Token': 'testtoken', 'Content-Type': 'application/json'} @patch('freezerclient.v1.managers.sessions.requests') def test_create(self, mock_requests): diff --git a/freezerclient/utils.py b/freezerclient/utils.py index aab4e42..5e9a2a8 100644 --- a/freezerclient/utils.py +++ b/freezerclient/utils.py @@ -117,3 +117,15 @@ def doc_from_json_file(path_to_file): except Exception as err: logging.error(err) raise Exception('Unable to load conf file. {0}'.format(err)) + + +def create_headers_for_request(token): + """Create a header dict to be passed to the api. + + :param token: token string coming from the api + :return: a dict containing all the headers for a request + """ + return { + 'X-Auth-Token': token, + 'Content-Type': 'application/json' + } diff --git a/freezerclient/v1/managers/actions.py b/freezerclient/v1/managers/actions.py index 1704d2e..6cc9fbb 100644 --- a/freezerclient/v1/managers/actions.py +++ b/freezerclient/v1/managers/actions.py @@ -16,6 +16,7 @@ import json import requests from freezerclient import exceptions +from freezerclient.utils import create_headers_for_request class ActionManager(object): @@ -27,7 +28,7 @@ class ActionManager(object): @property def headers(self): - return {'X-Auth-Token': self.client.auth_token} + return create_headers_for_request(self.client.auth_token) def create(self, doc, action_id=''): action_id = action_id or doc.get('action_id', '') diff --git a/freezerclient/v1/managers/backups.py b/freezerclient/v1/managers/backups.py index bc598bf..b880fbf 100644 --- a/freezerclient/v1/managers/backups.py +++ b/freezerclient/v1/managers/backups.py @@ -16,6 +16,7 @@ import json import requests from freezerclient import exceptions +from freezerclient.utils import create_headers_for_request class BackupsManager(object): @@ -27,7 +28,7 @@ class BackupsManager(object): @property def headers(self): - return {'X-Auth-Token': self.client.auth_token} + return create_headers_for_request(self.client.auth_token) def create(self, backup_metadata): r = requests.post(self.endpoint, diff --git a/freezerclient/v1/managers/clients.py b/freezerclient/v1/managers/clients.py index c79d28a..5431dd3 100644 --- a/freezerclient/v1/managers/clients.py +++ b/freezerclient/v1/managers/clients.py @@ -16,6 +16,7 @@ import json import requests from freezerclient import exceptions +from freezerclient.utils import create_headers_for_request class ClientManager(object): @@ -27,7 +28,7 @@ class ClientManager(object): @property def headers(self): - return {'X-Auth-Token': self.client.auth_token} + return create_headers_for_request(self.client.auth_token) def create(self, client_info): r = requests.post(self.endpoint, diff --git a/freezerclient/v1/managers/jobs.py b/freezerclient/v1/managers/jobs.py index 98a490f..bd05a49 100644 --- a/freezerclient/v1/managers/jobs.py +++ b/freezerclient/v1/managers/jobs.py @@ -16,6 +16,7 @@ import json import requests from freezerclient import exceptions +from freezerclient.utils import create_headers_for_request class JobManager(object): @@ -27,7 +28,7 @@ class JobManager(object): @property def headers(self): - return {'X-Auth-Token': self.client.auth_token} + return create_headers_for_request(self.client.auth_token) def create(self, doc, job_id=''): job_id = job_id or doc.get('job_id', '') diff --git a/freezerclient/v1/managers/sessions.py b/freezerclient/v1/managers/sessions.py index 4645d9e..20de76b 100644 --- a/freezerclient/v1/managers/sessions.py +++ b/freezerclient/v1/managers/sessions.py @@ -16,6 +16,7 @@ import json import requests from freezerclient import exceptions +from freezerclient.utils import create_headers_for_request class SessionManager(object): @@ -27,7 +28,7 @@ class SessionManager(object): @property def headers(self): - return {'X-Auth-Token': self.client.auth_token} + return create_headers_for_request(self.client.auth_token) def create(self, doc, session_id=''): session_id = session_id or doc.get('session_id', '')