Quick fix to UsageAutomation._get_usage_template_download_location(): Before, the URL sent contained the path '/usage/files/usage/products/' instead of '/usage/files/'.

Author: JaviCerveraIngram

connect/resource/base.py

@@ -74,8 +74,8 @@ def _fix_request_kwargs(self, prev_kwargs, path, **kwargs):
         """ Set correct kwargs for requests """
         fixed_kwargs = prev_kwargs.copy()
         fixed_kwargs.update(kwargs)
-        if 'get_url' not in fixed_kwargs:
-            fixed_kwargs['get_url'] = self.get_url(path)
+        if 'url' not in fixed_kwargs:
+            fixed_kwargs['url'] = self.get_url(path)
         if 'headers' not in fixed_kwargs:
             fixed_kwargs['headers'] = self.headers
         return fixed_kwargs

connect/resource/usage_automation.py

@@ -153,7 +153,8 @@ def submit_usage(self, usage_file, usage_records):
     def _get_usage_template_download_location(self, product_id):
         # type: (str) -> str
         try:
-            response = self.api.get(path='/usage/products/' + product_id + '/template/')
+            response = self.api.get(url='{}/usage/products/{}/template/'
+                                    .format(self.config.api_url, product_id))
             response_dict = json.loads(response)
             return response_dict['template_link']
         except (requests.exceptions.RequestException, KeyError, TypeError, ValueError):

tests/test_usage.py

@@ -10,7 +10,7 @@
 from datetime import date, timedelta
 
 import pytest
-from mock import patch, MagicMock
+from mock import patch, MagicMock, call
 
 from connect.models import usage
 from connect.models.exception import FileRetrievalError
@@ -47,12 +47,20 @@ def test_process():
     resource.process()
 
 
-@patch('requests.get', MagicMock(side_effect=[
-    Response(ok=True, content='{"template_link": "..."}', status_code=200),
-    Response(ok=True, content='template_contents', status_code=200)]))
-def test_get_usage_template_ok():
+@patch('requests.get')
+def test_get_usage_template_ok(get_mock):
+    get_mock.side_effect = [
+        Response(ok=True, content='{"template_link": "..."}', status_code=200),
+        Response(ok=True, content='template_contents', status_code=200)]
     resource = UsageAutomation()
     assert resource.get_usage_template(Product(id='PRD-638-321-603')) == 'template_contents'
+    get_mock.assert_has_calls([
+        call(
+            url='http://localhost:8080/api/public/v1//usage/products/PRD-638-321-603/template/',
+            headers={'Content-Type': 'application/json', 'Authorization': 'ApiKey XXXX:YYYYY'},
+            params=None),
+        call('...')
+    ])
 
 
 @patch('requests.get', MagicMock(return_value=Response(