rename json_payload to payload; update backends; test cases (#113)

Signed-off-by: SreeV <[email protected]>

Author: sreev

marquez_client/client_wo.py

@@ -46,7 +46,7 @@ def create_namespace(self, namespace_name, owner_name, description=None):
         return self._backend.put(
             self._path('/namespaces/{0}', namespace_name),
             headers=_HEADERS,
-            json_payload=payload
+            payload=payload
         )
 
     # Source API
@@ -67,7 +67,7 @@ def create_source(self, source_name, source_type, connection_url,
         return self._backend.put(
             self._path('/sources/{0}', source_name),
             headers=_HEADERS,
-            json_payload=payload)
+            payload=payload)
 
     # Datasets API
     def create_dataset(self, namespace_name, dataset_name, dataset_type,
@@ -109,7 +109,7 @@ def create_dataset(self, namespace_name, dataset_name, dataset_type,
             self._path('/namespaces/{0}/datasets/{1}', namespace_name,
                        dataset_name),
             headers=_HEADERS,
-            json_payload=payload
+            payload=payload
         )
 
     # Job API
@@ -138,7 +138,7 @@ def create_job(self, namespace_name, job_name, job_type,
         return self._backend.put(
             self._path('/namespaces/{0}/jobs/{1}', namespace_name, job_name),
             headers=_HEADERS,
-            json_payload=payload
+            payload=payload
         )
 
     def create_job_run(self, namespace_name, job_name, run_id,
@@ -165,7 +165,7 @@ def create_job_run(self, namespace_name, job_name, run_id,
             self._path('/namespaces/{0}/jobs/{1}/runs',
                        namespace_name, job_name),
             headers=_HEADERS,
-            json_payload=payload)
+            payload=payload)
 
         if mark_as_running:
             response = self.mark_job_run_as_started(
@@ -192,7 +192,7 @@ def __mark_job_run_as(self, run_id, action, action_at=None):
             self._path('/jobs/runs/{0}/{1}?at={2}', run_id, action,
                        action_at if action_at else Utils.utc_now()),
             headers=_HEADERS,
-            json_payload={}
+            payload={}
         )
 
     # Common

marquez_client/file_backend.py

@@ -29,31 +29,31 @@ def _mkdir_if_not_exists(file):
         os.makedirs(path, exist_ok=True)
         return file
 
-    def put(self, path, headers, json_payload):
+    def put(self, path, headers, payload):
         log.debug("_put()")
 
         put_details = {}
 
         put_details['method'] = 'PUT'
         put_details['path'] = path
         put_details['headers'] = headers
-        put_details['payload'] = json_payload
+        put_details['payload'] = payload
 
         put_json = json.dumps(put_details)
         log.info(put_json)
 
         self._sync_file(put_json)
 
-    def post(self, path, headers, json_payload=None):
+    def post(self, path, headers, payload=None):
         log.debug("_post()")
 
         post_details = {}
 
         post_details['method'] = 'POST'
         post_details['path'] = path
         post_details['headers'] = headers
-        if json_payload:
-            post_details['payload'] = json_payload
+        if payload:
+            post_details['payload'] = payload
 
         post_json = json.dumps(post_details)
         log.info(post_json)

marquez_client/http_backend.py

@@ -25,20 +25,20 @@ def __init__(self, url, timeout):
         self._timeout = timeout
         self._url = url
 
-    def put(self, path, headers, json):
+    def put(self, path, headers, payload):
         log.debug("_put()")
 
         response = requests.put(
-            url=f'{self._url}{path}', headers=headers, json=json,
+            url=f'{self._url}{path}', headers=headers, json=payload,
             timeout=self._timeout)
 
         return self._response(response, as_json=True)
 
-    def post(self, path, headers, json=None):
+    def post(self, path, headers, payload=None):
         log.debug("_post()")
 
         response = requests.post(
-            url=f'{self._url}{path}', headers=headers, json=json,
+            url=f'{self._url}{path}', headers=headers, json=payload,
             timeout=self._timeout)
 
         return self._response(response, as_json=True)

marquez_client/log_backend.py

@@ -22,29 +22,29 @@ class LogBackend(Backend):
     def __init__(self):
         log.debug("LogBackend.init")
 
-    def put(self, path, headers, json_payload):
+    def put(self, path, headers, payload):
         log.debug("_put()")
 
         put_details = {}
 
         put_details['method'] = 'PUT'
         put_details['path'] = path
         put_details['headers'] = headers
-        put_details['payload'] = json_payload
+        put_details['payload'] = payload
 
         log_details = json.dumps(put_details)
         log.info(log_details)
 
-    def post(self, path, headers, json_payload=None):
+    def post(self, path, headers, payload=None):
         log.debug("_post()")
 
         post_details = {}
 
         post_details['method'] = 'POST'
         post_details['path'] = path
         post_details['headers'] = headers
-        if json_payload:
-            post_details['payload'] = json_payload
+        if payload:
+            post_details['payload'] = payload
 
         log_details = json.dumps(post_details)
         log.info(log_details)