seems to get rather than post metadata

Author: tcnichol

pyclowder/connectors.py

@@ -409,6 +409,8 @@ def _process_message(self, body):
         if not source_host.endswith('/'): source_host += '/'
         if not host.endswith('/'): host += '/'
         secret_key = body.get('secretKey', '')
+        if clowder_version >= 2.0:
+            secret_key = body.get('token', '')
         token = body.get('token', ' ')
         retry_count = 0 if 'retry_count' not in body else body['retry_count']
         resource = self._build_resource(body, host, secret_key)

pyclowder/files.py

@@ -211,14 +211,23 @@ def upload_metadata(connector, host, key, fileid, metadata):
     metadata -- the metadata to be uploaded
     """
 
-    connector.message_process({"type": "file", "id": fileid}, "Uploading file metadata.")
+    if clowder_version >= 2.0:
+        connector.message_process({"type": "file", "id": fileid}, "Uploading file metadata.")
 
-    headers = {'Content-Type': 'application/json'}
-    # TODO if version 2.0
+        headers = {'Content-Type': 'application/json',
+                   'Authorization':'Bearer ' + key}
+        print(metadata)
+        url = '%sapi/v2/files/%s/metadata' % (host, fileid)
+        result = connector.post(url, headers=headers, data=json.dumps(metadata),
+                                verify=connector.ssl_verify if connector else True)
+    else:
+        connector.message_process({"type": "file", "id": fileid}, "Uploading file metadata.")
 
-    url = '%sapi/files/%s/metadata.jsonld?key=%s' % (host, fileid, key)
-    result = connector.post(url, headers=headers, data=json.dumps(metadata),
-                            verify=connector.ssl_verify if connector else True)
+        headers = {'Content-Type': 'application/json'}
+
+        url = '%sapi/files/%s/metadata.jsonld?key=%s' % (host, fileid, key)
+        result = connector.post(url, headers=headers, data=json.dumps(metadata),
+                                verify=connector.ssl_verify if connector else True)
 
 
 # pylint: disable=too-many-arguments