Updates for quarantine removal

artefactual-labs · Dec 20, 2019 · dadb7f8 · dadb7f8
1 parent e169fbe
commit dadb7f8
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 114 deletions.
diff --git a/amuser/am_browser_ability.py b/amuser/am_browser_ability.py
@@ -424,12 +424,6 @@ def ensure_default_processing_config_in_default_state(self):
                 })
             });
         """
-        self.set_processing_config_decision(
-            decision_label="Send transfer to quarantine", choice_value="No"
-        )
-        self.set_processing_config_decision(
-            decision_label="Remove from quarantine after (days)", choice_value="28"
-        )
         self.set_processing_config_decision(
             decision_label="Generate transfer structure report", choice_value="No"
         )

diff --git a/amuser/constants.py b/amuser/constants.py
@@ -118,7 +118,6 @@ def varvn(varname, vn):
     "Create SIP(s)": ("Create SIP from Transfer",),
     "Create thumbnails directory": ("Normalize",),
     "Create transfer metadata XML": ("Complete transfer",),
-    "Designate to process as a standard transfer": ("Quarantine",),
     "Determine if transfer contains packages": ("Extract packages",),
     "Determine which files to identify": ("Identify file format",),
     "Do you want to perform file format identification?": (
@@ -127,7 +126,6 @@ def varvn(varname, vn):
     ),
     "Document empty directories?": ("Generate AIP METS",),
     "Examine contents?": ("Examine contents",),
-    "Find type to process as": ("Quarantine",),
     "Generate METS.xml document": ("Generate METS.xml document", "Generate AIP METS"),
     "Generate transfer structure report": ("Generate transfer structure report",),
     "Grant normalization options for no pre-existing DIP": ("Normalize",),
@@ -170,7 +168,6 @@ def varvn(varname, vn):
     ),
     "Move to select file ID tool": ("Identify file format", "Normalize"),
     "Move to the store AIP approval directory": ("Store AIP",),
-    "Move to workFlowDecisions-quarantineSIP directory": ("Quarantine",),
     "Normalization report": ("Normalize",),
     "Normalize": ("Normalize",),
     "Normalize for preservation": ("Normalize",),
@@ -194,7 +191,6 @@ def varvn(varname, vn):
     "Remove empty manual normalization directories": ("Process metadata directory",),
     "Remove files without linking information (failed normalization"
     " artifacts etc.)": ("Process submission documentation", "Normalize"),
-    "Remove from quarantine": ("Quarantine",),
     "Remove hidden files and directories": ("Verify transfer compliance",),
     "Remove the processing directory": ("Store AIP",),
     "Remove unneeded files": ("Verify transfer compliance",),
@@ -251,7 +247,6 @@ def varvn(varname, vn):
         "Verify transfer compliance",
     ),
     "Verify transfer compliance": ("Verify transfer compliance",),
-    "Workflow decision - send transfer to quarantine": ("Quarantine",),
 }
 
 # The following JavaScript run in the browser console will create an object
@@ -285,11 +280,9 @@ def varvn(varname, vn):
     "Assign UUIDs to directories": "id_bd899573-694e-4d33-8c9b-df0af802437d",
     "Document empty directories": "id_d0dfa5fc-e3c2-4638-9eda-f96eea1070e0",
     "Bind PIDs": "id_a2ba5278-459a-4638-92d9-38eb1588717d",
-    "Send transfer to quarantine": "id_755b4177-c587-41a7-8c52-015277568302",
     "Perform policy checks on access derivatives": "id_8ce07e94-6130-4987-96f0-2399ad45c5c2",
     "Perform policy checks on preservation derivatives": "id_153c5f41-3cfb-47ba-9150-2dd44ebc27df",
     "Perform policy checks on originals": "id_70fc7040-d4fb-4d19-a0e6-792387ca1006",
-    "Remove from quarantine after (days)": "id_19adb668-b19a-4fcb-8938-f49d7485eaf3",
     "Generate transfer structure report": "id_56eebd45-5600-4768-a8c2-ec0114555a3d",
     "Perform file format identification (Transfer)": "id_f09847c2-ee51-429a-9478-a860477f6b8d",
     "Extract packages": "id_dec97e3c-5598-4b99-b26e-f87a435a6b7f",

diff --git a/etc/processingMCPs/processingMCP-acc.xml b/etc/processingMCPs/processingMCP-acc.xml
@@ -50,11 +50,6 @@
       <appliesTo>cb8e5706-e73f-472f-ad9b-d1236af8095f</appliesTo>
       <goToChain>fb7a326e-1e50-4b48-91b9-4917ff8d0ae8</goToChain>
     </preconfiguredChoice>
-    <!-- Send transfer to quarantine -->
-    <preconfiguredChoice>
-      <appliesTo>755b4177-c587-41a7-8c52-015277568302</appliesTo>
-      <goToChain>d4404ab1-dc7f-4e9e-b1f8-aa861e766b8e</goToChain>
-    </preconfiguredChoice>
     <!-- Select compression algorithm -->
     <preconfiguredChoice>
       <appliesTo>01d64f58-8295-4b7b-9cab-8f1b153a504f</appliesTo>
@@ -90,11 +85,5 @@
       <appliesTo>b320ce81-9982-408a-9502-097d0daa48fa</appliesTo>
       <goToChain>/api/v2/location/e129d776-aef6-4c46-82c1-8531e166e195/</goToChain>
     </preconfiguredChoice>
-    <!-- Remove from quarantine after (days) -->
-    <preconfiguredChoice>
-      <appliesTo>19adb668-b19a-4fcb-8938-f49d7485eaf3</appliesTo>
-      <goToChain>333643b7-122a-4019-8bef-996443f3ecc5</goToChain>
-      <delay unitCtime="yes">2419200.0</delay>
-    </preconfiguredChoice>
   </preconfiguredChoices>
 </processingMCP>
diff --git a/etc/processingMCPs/processingMCP-no-normalize-no-store-aip.xml b/etc/processingMCPs/processingMCP-no-normalize-no-store-aip.xml
@@ -50,11 +50,6 @@
       <appliesTo>cb8e5706-e73f-472f-ad9b-d1236af8095f</appliesTo>
       <goToChain>89cb80dd-0636-464f-930d-57b61e3928b2</goToChain>
     </preconfiguredChoice>
-    <!-- Send transfer to quarantine -->
-    <preconfiguredChoice>
-      <appliesTo>755b4177-c587-41a7-8c52-015277568302</appliesTo>
-      <goToChain>d4404ab1-dc7f-4e9e-b1f8-aa861e766b8e</goToChain>
-    </preconfiguredChoice>
     <!-- Select compression algorithm -->
     <preconfiguredChoice>
       <appliesTo>01d64f58-8295-4b7b-9cab-8f1b153a504f</appliesTo>
@@ -80,11 +75,5 @@
       <appliesTo>de909a42-c5b5-46e1-9985-c031b50e9d30</appliesTo>
       <goToChain>1e0df175-d56d-450d-8bee-7df1dc7ae815</goToChain>
     </preconfiguredChoice>
-    <!-- Remove from quarantine after (days) -->
-    <preconfiguredChoice>
-      <appliesTo>19adb668-b19a-4fcb-8938-f49d7485eaf3</appliesTo>
-      <goToChain>333643b7-122a-4019-8bef-996443f3ecc5</goToChain>
-      <delay unitCtime="yes">2419200.0</delay>
-    </preconfiguredChoice>
   </preconfiguredChoices>
 </processingMCP>
diff --git a/etc/processingMCPs/processingMCP-no-normalize.xml b/etc/processingMCPs/processingMCP-no-normalize.xml
@@ -50,11 +50,6 @@
       <appliesTo>cb8e5706-e73f-472f-ad9b-d1236af8095f</appliesTo>
       <goToChain>89cb80dd-0636-464f-930d-57b61e3928b2</goToChain>
     </preconfiguredChoice>
-    <!-- Send transfer to quarantine -->
-    <preconfiguredChoice>
-      <appliesTo>755b4177-c587-41a7-8c52-015277568302</appliesTo>
-      <goToChain>d4404ab1-dc7f-4e9e-b1f8-aa861e766b8e</goToChain>
-    </preconfiguredChoice>
     <!-- Select compression algorithm -->
     <preconfiguredChoice>
       <appliesTo>01d64f58-8295-4b7b-9cab-8f1b153a504f</appliesTo>
@@ -90,11 +85,5 @@
       <appliesTo>b320ce81-9982-408a-9502-097d0daa48fa</appliesTo>
       <goToChain>/api/v2/location/e129d776-aef6-4c46-82c1-8531e166e195/</goToChain>
     </preconfiguredChoice>
-    <!-- Remove from quarantine after (days) -->
-    <preconfiguredChoice>
-      <appliesTo>19adb668-b19a-4fcb-8938-f49d7485eaf3</appliesTo>
-      <goToChain>333643b7-122a-4019-8bef-996443f3ecc5</goToChain>
-      <delay unitCtime="yes">2419200.0</delay>
-    </preconfiguredChoice>
   </preconfiguredChoices>
 </processingMCP>
diff --git a/etc/processingMCPs/processingMCP-normalize-acc-no-store-aip.xml b/etc/processingMCPs/processingMCP-normalize-acc-no-store-aip.xml
@@ -50,11 +50,6 @@
       <appliesTo>cb8e5706-e73f-472f-ad9b-d1236af8095f</appliesTo>
       <goToChain>fb7a326e-1e50-4b48-91b9-4917ff8d0ae8</goToChain>
     </preconfiguredChoice>
-    <!-- Send transfer to quarantine -->
-    <preconfiguredChoice>
-      <appliesTo>755b4177-c587-41a7-8c52-015277568302</appliesTo>
-      <goToChain>d4404ab1-dc7f-4e9e-b1f8-aa861e766b8e</goToChain>
-    </preconfiguredChoice>
     <!-- Select compression algorithm -->
     <preconfiguredChoice>
       <appliesTo>01d64f58-8295-4b7b-9cab-8f1b153a504f</appliesTo>
@@ -80,11 +75,5 @@
       <appliesTo>de909a42-c5b5-46e1-9985-c031b50e9d30</appliesTo>
       <goToChain>1e0df175-d56d-450d-8bee-7df1dc7ae815</goToChain>
     </preconfiguredChoice>
-    <!-- Remove from quarantine after (days) -->
-    <preconfiguredChoice>
-      <appliesTo>19adb668-b19a-4fcb-8938-f49d7485eaf3</appliesTo>
-      <goToChain>333643b7-122a-4019-8bef-996443f3ecc5</goToChain>
-      <delay unitCtime="yes">2419200.0</delay>
-    </preconfiguredChoice>
   </preconfiguredChoices>
 </processingMCP>
diff --git a/etc/processingMCPs/processingMCP-normalize-pres-no-store-aip.xml b/etc/processingMCPs/processingMCP-normalize-pres-no-store-aip.xml
@@ -50,11 +50,6 @@
       <appliesTo>cb8e5706-e73f-472f-ad9b-d1236af8095f</appliesTo>
       <goToChain>612e3609-ce9a-4df6-a9a3-63d634d2d934</goToChain>
     </preconfiguredChoice>
-    <!-- Send transfer to quarantine -->
-    <preconfiguredChoice>
-      <appliesTo>755b4177-c587-41a7-8c52-015277568302</appliesTo>
-      <goToChain>d4404ab1-dc7f-4e9e-b1f8-aa861e766b8e</goToChain>
-    </preconfiguredChoice>
     <!-- Select compression algorithm -->
     <preconfiguredChoice>
       <appliesTo>01d64f58-8295-4b7b-9cab-8f1b153a504f</appliesTo>
@@ -80,11 +75,5 @@
       <appliesTo>de909a42-c5b5-46e1-9985-c031b50e9d30</appliesTo>
       <goToChain>1e0df175-d56d-450d-8bee-7df1dc7ae815</goToChain>
     </preconfiguredChoice>
-    <!-- Remove from quarantine after (days) -->
-    <preconfiguredChoice>
-      <appliesTo>19adb668-b19a-4fcb-8938-f49d7485eaf3</appliesTo>
-      <goToChain>333643b7-122a-4019-8bef-996443f3ecc5</goToChain>
-      <delay unitCtime="yes">2419200.0</delay>
-    </preconfiguredChoice>
   </preconfiguredChoices>
 </processingMCP>
diff --git a/etc/processingMCPs/processingMCP-pres-acc.xml b/etc/processingMCPs/processingMCP-pres-acc.xml
@@ -50,11 +50,6 @@
       <appliesTo>cb8e5706-e73f-472f-ad9b-d1236af8095f</appliesTo>
       <goToChain>b93cecd4-71f2-4e28-bc39-d32fd62c5a94</goToChain>
     </preconfiguredChoice>
-    <!-- Send transfer to quarantine -->
-    <preconfiguredChoice>
-      <appliesTo>755b4177-c587-41a7-8c52-015277568302</appliesTo>
-      <goToChain>d4404ab1-dc7f-4e9e-b1f8-aa861e766b8e</goToChain>
-    </preconfiguredChoice>
     <!-- Select compression algorithm -->
     <preconfiguredChoice>
       <appliesTo>01d64f58-8295-4b7b-9cab-8f1b153a504f</appliesTo>
@@ -90,11 +85,5 @@
       <appliesTo>b320ce81-9982-408a-9502-097d0daa48fa</appliesTo>
       <goToChain>/api/v2/location/e129d776-aef6-4c46-82c1-8531e166e195/</goToChain>
     </preconfiguredChoice>
-    <!-- Remove from quarantine after (days) -->
-    <preconfiguredChoice>
-      <appliesTo>19adb668-b19a-4fcb-8938-f49d7485eaf3</appliesTo>
-      <goToChain>333643b7-122a-4019-8bef-996443f3ecc5</goToChain>
-      <delay unitCtime="yes">2419200.0</delay>
-    </preconfiguredChoice>
   </preconfiguredChoices>
 </processingMCP>
diff --git a/etc/processingMCPs/processingMCP-pres.xml b/etc/processingMCPs/processingMCP-pres.xml
@@ -50,11 +50,6 @@
       <appliesTo>cb8e5706-e73f-472f-ad9b-d1236af8095f</appliesTo>
       <goToChain>612e3609-ce9a-4df6-a9a3-63d634d2d934</goToChain>
     </preconfiguredChoice>
-    <!-- Send transfer to quarantine -->
-    <preconfiguredChoice>
-      <appliesTo>755b4177-c587-41a7-8c52-015277568302</appliesTo>
-      <goToChain>d4404ab1-dc7f-4e9e-b1f8-aa861e766b8e</goToChain>
-    </preconfiguredChoice>
     <!-- Select compression algorithm -->
     <preconfiguredChoice>
       <appliesTo>01d64f58-8295-4b7b-9cab-8f1b153a504f</appliesTo>
@@ -90,11 +85,5 @@
       <appliesTo>b320ce81-9982-408a-9502-097d0daa48fa</appliesTo>
       <goToChain>/api/v2/location/e129d776-aef6-4c46-82c1-8531e166e195/</goToChain>
     </preconfiguredChoice>
-    <!-- Remove from quarantine after (days) -->
-    <preconfiguredChoice>
-      <appliesTo>19adb668-b19a-4fcb-8938-f49d7485eaf3</appliesTo>
-      <goToChain>333643b7-122a-4019-8bef-996443f3ecc5</goToChain>
-      <delay unitCtime="yes">2419200.0</delay>
-    </preconfiguredChoice>
   </preconfiguredChoices>
 </processingMCP>
diff --git a/features/core/premis-events.feature b/features/core/premis-events.feature
@@ -82,31 +82,8 @@ Feature: PREMIS events are recorded correctly
     And the user waits for the "Store AIP (review)" decision point to appear during ingest
     Then in the METS file there are/is 6 PREMIS event(s) of type registration with properties {"eventOutcomeInformation/eventOutcomeDetail/eventOutcomeDetailNote": [["equals", "accession#1234-567"]]}
 
-  @quarantine
-  Scenario: Isla wants to confirm that quarantine PREMIS events are created when files are put under quarantine
-    Given that the user has ensured that the default processing config is in its default state
-    And the processing config decision "Select file format identification command (Transfer)" is set to "Identify using Fido"
-    And the processing config decision "Assign UUIDs to directories" is set to "No"
-    And the processing config decision "Perform policy checks on originals" is set to "No"
-    And the processing config decision "Create SIP(s)" is set to "Create single SIP and continue processing"
-    And the processing config decision "Select file format identification command (Ingest)" is set to "Identify using Fido"
-    And the processing config decision "Normalize" is set to "Do not normalize"
-    And the processing config decision "Approve normalization" is set to "Yes"
-    And the processing config decision "Perform policy checks on preservation derivatives" is set to "No"
-    And the processing config decision "Perform policy checks on access derivatives" is set to "No"
-    And the processing config decision "Bind PIDs" is set to "No"
-    And the processing config decision "Document empty directories" is set to "No"
-    And the processing config decision "Select file format identification command (Submission documentation & metadata)" is set to "Identify using Fido"
-    And the processing config decision "Send transfer to quarantine" is set to "None"
-    When a transfer is initiated on directory ~/archivematica-sampledata/SampleTransfers/BagTransfer
-    And the user waits for the "Workflow decision - send transfer to quarantine" decision point to appear and chooses "Quarantine" during transfer
-    And the user waits for the "Remove from quarantine" decision point to appear and chooses "Unquarantine" during transfer
-    And the user waits for the "Store AIP (review)" decision point to appear during ingest
-    Then in the METS file there are/is 6 PREMIS event(s) of type quarantine
-    And in the METS file there are/is 6 PREMIS event(s) of type unquarantine
-
   @format-identification
-  Scenario: Isla wants to confirm that quarantine PREMIS events are created when files are put under quarantine
+  Scenario: Isla wants to confirm that format identification PREMIS events are created when a package is ingested
     Given that the user has ensured that the default processing config is in its default state
     And the processing config decision "Select file format identification command (Transfer)" is set to "Identify using Siegfried"
     And the processing config decision "Assign UUIDs to directories" is set to "No"