Update storage service to use PREMIS 3

This commit updates the storage service to use PREMIS 3 in pointer file generation. Various components have been touched upon including initial ingest, replication, and then reingest. The commit history is summarized as follows: * Update metsrw. * Use PREMIS 3 in pointer METS file. * Consolidate pointer file generation logic. * Timezone aware timestamp added to pointer file generation. * Various code-review and test follow-up changes.
artefactual · Jun 12, 2019 · cf231e4 · cf231e4
1 parent 5fb80c5
commit cf231e4
Show file tree

Hide file tree

Showing 12 changed files with 508 additions and 574 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -14,7 +14,7 @@ gunicorn==19.9.0
 jsonfield==2.0.1
 logutils==0.3.4.1
 lxml==3.7.3
-metsrw==0.3.1
+metsrw==0.3.8
 ndg-httpsclient==0.4.2
 python-gnupg==0.4.0
 python-keystoneclient==3.10.0

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -40,7 +40,7 @@ keystoneauth1==3.14.0     # via python-keystoneclient
 logutils==0.3.4.1
 git+https://github.com/seatme/django-longer-username.git@seatme#egg=longerusername
 lxml==3.7.3
-metsrw==0.3.1
+metsrw==0.3.8
 monotonic==1.5            # via oslo.utils
 msgpack==0.6.1            # via oslo.serialization
 mysqlclient==1.4.2.post1  # via agentarchives

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -45,7 +45,7 @@ logutils==0.3.4.1
 git+https://github.com/seatme/django-longer-username.git@seatme#egg=longerusername
 lxml==3.7.3
 markupsafe==1.1.1         # via jinja2
-metsrw==0.3.1
+metsrw==0.3.8
 monotonic==1.5
 msgpack==0.6.1
 mysqlclient==1.4.2.post1

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -41,7 +41,7 @@ keystoneauth1==3.14.0
 logutils==0.3.4.1
 git+https://github.com/seatme/django-longer-username.git@seatme#egg=longerusername
 lxml==3.7.3
-metsrw==0.3.1
+metsrw==0.3.8
 monotonic==1.5
 msgpack==0.6.1
 mysqlclient==1.4.2.post1

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -52,7 +52,7 @@ keystoneauth1==3.14.0
 logutils==0.3.4.1
 git+https://github.com/seatme/django-longer-username.git@seatme#egg=longerusername
 lxml==3.7.3
-metsrw==0.3.1
+metsrw==0.3.8
 mock==3.0.5               # via pytest-mock, vcrpy
 monotonic==1.5
 more-itertools==5.0.0     # via pytest

diff --git a/storage_service/common/management/commands/import_aip.py b/storage_service/common/management/commands/import_aip.py
@@ -63,7 +63,7 @@
 from django.utils.six.moves import input
 
 from administration.models import Settings
-from common import utils
+from common import premis, utils
 from locations import models
 
 
@@ -360,7 +360,7 @@ def compress(aip_model_inst, compression_algorithm):
     """Use the Package model's compress_package method to compress the AIP
     being imported, update the Package model's ``size`` attribute, retrieve
     PREMIS agents and event for the compression (using the package model's
-    ``get_premis_aip_compression_event`` method) and return a 3-tuple:
+    ``create_premis_aip_compression_event`` method) and return a 3-tuple:
     (aip_model_inst, compression_event, compression_agents).
     """
     if not compression_algorithm:
@@ -379,8 +379,8 @@ def compress(aip_model_inst, compression_algorithm):
     aip_model_inst.current_path = new_current_path
     shutil.rmtree(compressed_aip_parent_path)
     aip_model_inst.size = utils.recalculate_size(new_full_path)
-    compression_agents = utils.get_ss_premis_agents()
-    compression_event = aip_model_inst.get_premis_aip_compression_event(
+    compression_agents = [premis.SS_AGENT]
+    compression_event = premis.create_premis_aip_compression_event(
         details["event_detail"],
         details["event_outcome_detail_note"],
         agents=compression_agents,