Update samples

DataONEorg · Aug 10, 2020 · dfab267 · dfab267
1 parent 83a619c
commit dfab267
Show file tree

Hide file tree

Showing 72 changed files with 851 additions and 898 deletions.
diff --git a/lib_client/src/d1_client/tests/test_cnclient_2_0.py b/lib_client/src/d1_client/tests/test_cnclient_2_0.py
@@ -33,6 +33,7 @@
 import d1_test.d1_test_case
 import d1_test.instance_generator.sciobj
 import d1_test.mock_api.catch_all
+import requests
 
 
 @d1_test.d1_test_case.reproducible_random_decorator("TestCNClient20")

diff --git a/test_utilities/src/d1_test/test_docs/sample/test_cli_do_create_cn_v2.sample b/test_utilities/src/d1_test/test_docs/sample/test_cli_do_create_cn_v2.sample
@@ -16,7 +16,7 @@
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="42" replicationAllowed="true">
+  <replicationPolicy replicationAllowed="true" numberReplicas="42">
     <preferredMemberNode>preferred-mn-2</preferredMemberNode>
     <blockedMemberNode>blocked-mn-1</blockedMemberNode>
     <blockedMemberNode>blocked-mn-2</blockedMemberNode>

diff --git a/test_utilities/src/d1_test/test_docs/sample/test_cli_do_list.sample b/test_utilities/src/d1_test/test_docs/sample/test_cli_do_list.sample
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<ns1:objectList count="100" start="0" total="100" xmlns:ns1="http://ns.dataone.org/service/types/v1">
+<ns1:objectList xmlns:ns1="http://ns.dataone.org/service/types/v1" count="100" start="0" total="100">
   <objectInfo>
     <identifier>object#0000</identifier>
     <formatId>application/msword</formatId>

diff --git a/test_utilities/src/d1_test/test_docs/sample/test_cli_do_meta.sample b/test_utilities/src/d1_test/test_docs/sample/test_cli_do_meta.sample
@@ -19,7 +19,7 @@
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false">
+  <replicationPolicy replicationAllowed="false" numberReplicas="0">
     <preferredMemberNode>mn_hd</preferredMemberNode>
     <preferredMemberNode>mn_i</preferredMemberNode>
     <preferredMemberNode>mn_i</preferredMemberNode>

diff --git a/test_utilities/src/d1_test/test_docs/sample/test_cnclient_2_0_system_metadata_live.sample b/test_utilities/src/d1_test/test_docs/sample/test_cnclient_2_0_system_metadata_live.sample
@@ -24,7 +24,7 @@
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="3" replicationAllowed="true">
+  <replicationPolicy replicationAllowed="true" numberReplicas="3">
     <preferredMemberNode>node1</preferredMemberNode>
     <preferredMemberNode>node2</preferredMemberNode>
     <preferredMemberNode>node3</preferredMemberNode>
@@ -60,4 +60,4 @@
     <property name="property_name_3">property_value_3</property>
   </mediaType>
   <fileName>string</fileName>
-</ns1:systemMetadata>
+</ns1:systemMetadata>
diff --git a/test_utilities/src/d1_test/test_docs/sample/test_command_processor_search_mn_v1.sample b/test_utilities/src/d1_test/test_docs/sample/test_command_processor_search_mn_v1.sample
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<ns1:objectList count="100" start="0" total="100" xmlns:ns1="http://ns.dataone.org/service/types/v1">
+<ns1:objectList xmlns:ns1="http://ns.dataone.org/service/types/v1" count="100" start="0" total="100">
   <objectInfo>
     <identifier>object#0000</identifier>
     <formatId>application/msword</formatId>

diff --git a/test_utilities/src/d1_test/test_docs/sample/test_command_processor_search_mn_v2.sample b/test_utilities/src/d1_test/test_docs/sample/test_command_processor_search_mn_v2.sample
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<ns1:objectList count="100" start="0" total="100" xmlns:ns1="http://ns.dataone.org/service/types/v1">
+<ns1:objectList xmlns:ns1="http://ns.dataone.org/service/types/v1" count="100" start="0" total="100">
   <objectInfo>
     <identifier>object#0000</identifier>
     <formatId>application/msword</formatId>

diff --git a/test_utilities/src/d1_test/test_docs/sample/test_cors_get_bogus_endpoint_mn_v1.sample b/test_utilities/src/d1_test/test_docs/sample/test_cors_get_bogus_endpoint_mn_v1.sample
@@ -10,5 +10,5 @@
 > HTTP-Version: HTTP/1.1
 > HTTP/? 404 Not Found
 
-<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xsl" href="/templates/home.xsl"?><error detailCode="0"
-errorCode="404" name="NotFound" nodeId="urn:node:GMNUnitTestInstance"><description>Invalid API endpoint</description></error>
+<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xsl" href="/templates/home.xsl"?><error name="NotFound"
+errorCode="404" detailCode="0" nodeId="urn:node:GMNUnitTestInstance"><description>Invalid API endpoint</description></error>
diff --git a/test_utilities/src/d1_test/test_docs/sample/test_cors_get_bogus_endpoint_mn_v2.sample b/test_utilities/src/d1_test/test_docs/sample/test_cors_get_bogus_endpoint_mn_v2.sample
@@ -10,5 +10,5 @@
 > HTTP-Version: HTTP/1.1
 > HTTP/? 404 Not Found
 
-<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xsl" href="/templates/home.xsl"?><error detailCode="0"
-errorCode="404" name="NotFound" nodeId="urn:node:GMNUnitTestInstance"><description>Invalid API endpoint</description></error>
+<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xsl" href="/templates/home.xsl"?><error name="NotFound"
+errorCode="404" detailCode="0" nodeId="urn:node:GMNUnitTestInstance"><description>Invalid API endpoint</description></error>
diff --git a/test_utilities/src/d1_test/test_docs/sample/test_d1_exception_trigger_by_pid.sample b/test_utilities/src/d1_test/test_docs/sample/test_d1_exception_trigger_by_pid.sample
@@ -3,6 +3,6 @@
   {
     "Content-Type": "text/xml"
   },
-  "<?xml version=\"1.0\" encoding=\"utf-8\"?><error detailCode=\"0\" errorCode=\"413\"
-name=\"InsufficientResources\"><description></description></error>"
+  "<?xml version=\"1.0\" encoding=\"utf-8\"?><error name=\"InsufficientResources\" errorCode=\"413\"
+detailCode=\"0\"><description></description></error>"
 ]
diff --git a/...ties/src/d1_test/test_docs/sample/test_d1_exception_trigger_by_status_code_regular.sample b/...ties/src/d1_test/test_docs/sample/test_d1_exception_trigger_by_status_code_regular.sample
@@ -3,6 +3,6 @@
   {
     "Content-Type": "text/xml"
   },
-  "<?xml version=\"1.0\" encoding=\"utf-8\"?><error detailCode=\"0\" errorCode=\"413\"
-name=\"InsufficientResources\"><description></description></error>"
+  "<?xml version=\"1.0\" encoding=\"utf-8\"?><error name=\"InsufficientResources\" errorCode=\"413\"
+detailCode=\"0\"><description></description></error>"
 ]
diff --git a/test_utilities/src/d1_test/test_docs/sample/test_d1client_create_sysmeta.sample b/test_utilities/src/d1_test/test_docs/sample/test_d1client_create_sysmeta.sample
@@ -13,7 +13,7 @@
       <permission>read</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false"/>
+  <replicationPolicy replicationAllowed="false" numberReplicas="0"/>
   <archived>false</archived>
   <dateUploaded>1988-05-01T00:00:00Z</dateUploaded>
   <dateSysMetadataModified>1988-05-01T00:00:00Z</dateSysMetadataModified>

diff --git a/test_utilities/src/d1_test/test_docs/sample/test_exceptions_create_with_description.sample b/test_utilities/src/d1_test/test_docs/sample/test_exceptions_create_with_description.sample
@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
-<error detailCode="123.456.789" errorCode="500" name="ServiceFailure">
+<error name="ServiceFailure" errorCode="500" detailCode="123.456.789">
   <description>test description</description>
 </error>
diff --git a/test_utilities/src/d1_test/test_docs/sample/test_exceptions_create_with_detail_code.sample b/test_utilities/src/d1_test/test_docs/sample/test_exceptions_create_with_detail_code.sample
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<error detailCode="123" errorCode="500" name="ServiceFailure"/>
+<error name="ServiceFailure" errorCode="500" detailCode="123"/>
diff --git a/...ilities/src/d1_test/test_docs/sample/test_exceptions_create_with_trace_information.sample b/...ilities/src/d1_test/test_docs/sample/test_exceptions_create_with_trace_information.sample
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<error detailCode="123.456.789" errorCode="500" name="ServiceFailure">
+<error name="ServiceFailure" errorCode="500" detailCode="123.456.789">
   <description>test description</description>
   <traceInformation>test traceInformation</traceInformation>
 </error>
diff --git a/...ies/src/d1_test/test_docs/sample/test_get_capabilities_mock_get_capabilities_mn_v1.sample b/...ies/src/d1_test/test_docs/sample/test_get_capabilities_mock_get_capabilities_mn_v1.sample
@@ -1,15 +1,15 @@
 <?xml version="1.0" ?>
-<ns1:node replicate="false" state="up" synchronize="true" type="cn" xmlns:ns1="http://ns.dataone.org/service/types/v1">
+<ns1:node replicate="false" synchronize="true" type="cn" state="up" xmlns:ns1="http://ns.dataone.org/service/types/v1">
   <identifier>urn:node:NODEID</identifier>
   <name>Name of Node</name>
   <description>Description of node.</description>
   <baseURL>http://www.any.org/ventos/verrantque</baseURL>
   <services>
-    <service available="true" name="MNCore" version="v1"/>
-    <service available="true" name="MNRead" version="v1"/>
-    <service available="false" name="MNAuthorization" version="v1"/>
-    <service available="false" name="MNStorage" version="v1"/>
-    <service available="false" name="MNReplication" version="v1">
+    <service name="MNCore" version="v1" available="true"/>
+    <service name="MNRead" version="v1" available="true"/>
+    <service name="MNAuthorization" version="v1" available="false"/>
+    <service name="MNStorage" version="v1" available="false"/>
+    <service name="MNReplication" version="v1" available="false">
       <restriction methodName="string">
         <subject>string</subject>
       </restriction>
@@ -29,7 +29,7 @@
     <allowedObjectFormat>http://www.isotc211.org/2005/gmd</allowedObjectFormat>
     <allowedObjectFormat>eml://ecoinformatics.org/eml-2.1.1</allowedObjectFormat>
   </nodeReplicationPolicy>
-  <ping lastSuccess="2002-06-24T15:46:32Z" success="false"/>
+  <ping success="false" lastSuccess="2002-06-24T15:46:32Z"/>
   <subject>subjectStringA</subject>
   <subject>subjectStringB</subject>
   <contactSubject>contactSubjectA</contactSubject>

diff --git a/...ies/src/d1_test/test_docs/sample/test_get_capabilities_mock_get_capabilities_mn_v2.sample b/...ies/src/d1_test/test_docs/sample/test_get_capabilities_mock_get_capabilities_mn_v2.sample
@@ -1,20 +1,20 @@
 <?xml version="1.0" ?>
-<ns1:node replicate="false" state="up" synchronize="true" type="cn" xmlns:ns1="http://ns.dataone.org/service/types/v2.0">
+<ns1:node replicate="false" synchronize="true" type="cn" state="up" xmlns:ns1="http://ns.dataone.org/service/types/v2.0">
   <identifier>urn:node:NODEID</identifier>
   <name>Name of Node</name>
   <description>Description of node.</description>
   <baseURL>http://www.any.org/ventos/verrantque</baseURL>
   <services>
-    <service available="true" name="MNCore" version="v1"/>
-    <service available="true" name="MNRead" version="v1"/>
-    <service available="true" name="MNAuthorization" version="v1"/>
-    <service available="true" name="MNStorage" version="v1"/>
-    <service available="true" name="MNReplication" version="v1"/>
-    <service available="true" name="MNCore" version="v2"/>
-    <service available="true" name="MNRead" version="v2"/>
-    <service available="true" name="MNAuthorization" version="v2"/>
-    <service available="true" name="MNStorage" version="v2"/>
-    <service available="true" name="MNReplication" version="v2">
+    <service name="MNCore" version="v1" available="true"/>
+    <service name="MNRead" version="v1" available="true"/>
+    <service name="MNAuthorization" version="v1" available="true"/>
+    <service name="MNStorage" version="v1" available="true"/>
+    <service name="MNReplication" version="v1" available="true"/>
+    <service name="MNCore" version="v2" available="true"/>
+    <service name="MNRead" version="v2" available="true"/>
+    <service name="MNAuthorization" version="v2" available="true"/>
+    <service name="MNStorage" version="v2" available="true"/>
+    <service name="MNReplication" version="v2" available="true">
       <restriction methodName="string">
         <subject>string</subject>
       </restriction>
@@ -34,7 +34,7 @@
     <allowedObjectFormat>http://www.isotc211.org/2005/gmd</allowedObjectFormat>
     <allowedObjectFormat>eml://ecoinformatics.org/eml-2.1.1</allowedObjectFormat>
   </nodeReplicationPolicy>
-  <ping lastSuccess="2002-06-24T15:46:32Z" success="false"/>
+  <ping success="false" lastSuccess="2002-06-24T15:46:32Z"/>
   <subject>subjectStringA</subject>
   <subject>subjectStringB</subject>
   <contactSubject>contactSubjectA</contactSubject>

diff --git a/...utilities/src/d1_test/test_docs/sample/test_get_log_records_new_create_event_mn_v1.sample b/...utilities/src/d1_test/test_docs/sample/test_get_log_records_new_create_event_mn_v1.sample
@@ -32,7 +32,7 @@ sysmeta: <?xml version="1.0" ?>
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false">
+  <replicationPolicy replicationAllowed="false" numberReplicas="0">
     <blockedMemberNode>mn_b</blockedMemberNode>
     <blockedMemberNode>mn_o</blockedMemberNode>
   </replicationPolicy>

diff --git a/...utilities/src/d1_test/test_docs/sample/test_get_log_records_new_create_event_mn_v2.sample b/...utilities/src/d1_test/test_docs/sample/test_get_log_records_new_create_event_mn_v2.sample
@@ -32,7 +32,7 @@ sysmeta: <?xml version="1.0" ?>
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false">
+  <replicationPolicy replicationAllowed="false" numberReplicas="0">
     <blockedMemberNode>mn_b</blockedMemberNode>
     <blockedMemberNode>mn_o</blockedMemberNode>
   </replicationPolicy>

diff --git a/...c/d1_test/test_docs/sample/test_get_system_metadata_mock_get_system_metadata_mn_v1.sample b/...c/d1_test/test_docs/sample/test_get_system_metadata_mock_get_system_metadata_mn_v1.sample
@@ -31,7 +31,7 @@
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false">
+  <replicationPolicy replicationAllowed="false" numberReplicas="0">
     <preferredMemberNode>mn_fw</preferredMemberNode>
     <preferredMemberNode>mn_g</preferredMemberNode>
     <preferredMemberNode>mn_r</preferredMemberNode>

diff --git a/...c/d1_test/test_docs/sample/test_get_system_metadata_mock_get_system_metadata_mn_v2.sample b/...c/d1_test/test_docs/sample/test_get_system_metadata_mock_get_system_metadata_mn_v2.sample
@@ -31,7 +31,7 @@
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false">
+  <replicationPolicy replicationAllowed="false" numberReplicas="0">
     <preferredMemberNode>mn_fw</preferredMemberNode>
     <preferredMemberNode>mn_g</preferredMemberNode>
     <preferredMemberNode>mn_r</preferredMemberNode>

diff --git a/...lities/src/d1_test/test_docs/sample/test_iter_sysmeta_multi_from_19800805_to_unset.sample b/...lities/src/d1_test/test_docs/sample/test_iter_sysmeta_multi_from_19800805_to_unset.sample
@@ -17,7 +17,7 @@
       <permission>read</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="7" replicationAllowed="true">
+  <replicationPolicy replicationAllowed="true" numberReplicas="7">
     <preferredMemberNode>mn_se</preferredMemberNode>
   </replicationPolicy>
   <archived>false</archived>
@@ -48,7 +48,7 @@
       <permission>write</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="6" replicationAllowed="true">
+  <replicationPolicy replicationAllowed="true" numberReplicas="6">
     <preferredMemberNode>mn_b</preferredMemberNode>
     <preferredMemberNode>mn_q</preferredMemberNode>
     <preferredMemberNode>mn_q</preferredMemberNode>

diff --git a/...ies/src/d1_test/test_docs/sample/test_iter_sysmeta_multi_from_19900720_to_20100820.sample b/...ies/src/d1_test/test_docs/sample/test_iter_sysmeta_multi_from_19900720_to_20100820.sample
@@ -28,7 +28,7 @@
       <permission>changePermission</permission>
     </allow>
   </accessPolicy>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false">
+  <replicationPolicy replicationAllowed="false" numberReplicas="0">
     <preferredMemberNode>mn_f</preferredMemberNode>
     <preferredMemberNode>mn_iu</preferredMemberNode>
     <blockedMemberNode>mn_s</blockedMemberNode>
@@ -84,7 +84,7 @@
   <checksum algorithm="SHA-1">83c44b509ad842b77d48cb3e58c84c89a40991e5</checksum>
   <submitter>subj_wa</submitter>
   <rightsHolder>subj_fw</rightsHolder>
-  <replicationPolicy numberReplicas="0" replicationAllowed="false">
+  <replicationPolicy replicationAllowed="false" numberReplicas="0">
     <preferredMemberNode>mn_b</preferredMemberNode>
     <preferredMemberNode>mn_ys</preferredMemberNode>
     <blockedMemberNode>mn_ba</blockedMemberNode>