Add size parameter to upload

Fixes: theforeman#659
evgeni · Dec 12, 2019 · 6308c52 · 6308c52
1 parent 1f4f681
commit 6308c52
Show file tree

Hide file tree

Showing 7 changed files with 678 additions and 471 deletions.
diff --git a/plugins/modules/katello_upload.py b/plugins/modules/katello_upload.py
@@ -179,15 +179,18 @@ def main():
 
     if not content_unit:
         if not module.check_mode:
-            content_upload = module.resource_action('content_uploads', 'create', repository_scope)
+            size = os.stat(entity_dict['src']).st_size
+            content_upload_payload = {'size': size}
+            content_upload_payload.update(repository_scope)
+            content_upload = module.resource_action('content_uploads', 'create', content_upload_payload)
             content_upload_scope = {'id': content_upload['upload_id']}
             content_upload_scope.update(repository_scope)
 
             offset = 0
 
             with open(entity_dict['src'], 'rb') as contentfile:
                 for chunk in iter(lambda: contentfile.read(CONTENT_CHUNK_SIZE), b""):
-                    data = {'content': chunk, 'offset': offset}
+                    data = {'content': chunk, 'offset': offset, 'size': len(chunk)}
                     module.resource_action('content_uploads', 'update', params=content_upload_scope, data=data)
 
                     offset += len(chunk)

diff --git a/tests/test_playbooks/fixtures/upload-0.yml b/tests/test_playbooks/fixtures/upload-0.yml
diff --git a/tests/test_playbooks/fixtures/upload-1.yml b/tests/test_playbooks/fixtures/upload-1.yml
diff --git a/tests/test_playbooks/fixtures/upload-2.yml b/tests/test_playbooks/fixtures/upload-2.yml
diff --git a/tests/test_playbooks/fixtures/upload-3.yml b/tests/test_playbooks/fixtures/upload-3.yml
diff --git a/tests/test_playbooks/fixtures/upload-4.yml b/tests/test_playbooks/fixtures/upload-4.yml
diff --git a/tests/test_playbooks/fixtures/upload-5.yml b/tests/test_playbooks/fixtures/upload-5.yml