Revert "Cmr 8128 umm c 1.17.0 (#1536)"

CMR-8128, CMR-8194, CMR-8195, and CMR-8197 should all be taken out of the UAT deployement on Wednesday. These are all part of the same Pull Request. #1536 with the commit number: 16744bd This reverts commit 16744bd.
nasa · Apr 25, 2022 · 77dce5e · 77dce5e
1 parent 89302df
commit 77dce5e
Show file tree

Hide file tree

Showing 29 changed files with 62 additions and 5,140 deletions.
diff --git a/common-app-lib/src/cmr/common_app/config.clj b/common-app-lib/src/cmr/common_app/config.clj
@@ -8,7 +8,7 @@
 (defconfig collection-umm-version
   "Defines the latest collection umm version accepted by ingest - it's the latest official version.
    This environment variable needs to be manually set when newer UMM version becomes official"
-  {:default "1.17.0"})
+  {:default "1.16.7"})
 
 (defconfig launchpad-token-enforced
   "Flag for whether or not launchpad token is enforced."

diff --git a/indexer-app/src/cmr/indexer/data/concepts/spatial.clj b/indexer-app/src/cmr/indexer/data/concepts/spatial.clj
@@ -7,7 +7,6 @@
    [cmr.spatial.polygon :as poly]
    [cmr.spatial.ring-relations :as rr]
    [cmr.spatial.serialize :as srl]
-   [cmr.umm-spec.migration.version.collection :as version-collection]
    [cmr.umm-spec.spatial-conversion :as sc]
    [cmr.umm.umm-spatial :as umm-s])
   ;; Must be required for derived calculations
@@ -121,8 +120,8 @@
   "Converts the orbit parameters of the given collection to the elastic documents"
   [collection]
   (when-let [orbit-params (get-in collection [:SpatialExtent :OrbitParameters])]
-    {:swath-width (version-collection/get-swath-width collection) 
-     :period (:OrbitPeriod orbit-params)
+    {:swath-width (:SwathWidth orbit-params)
+     :period (:Period orbit-params)
      :inclination-angle (:InclinationAngle orbit-params)
      :number-of-orbits (:NumberOfOrbits orbit-params)
      :start-circular-latitude (:StartCircularLatitude orbit-params)}))

diff --git a/ingest-app/resources/CMR-7557/test_data.json b/ingest-app/resources/CMR-7557/test_data.json
@@ -45,12 +45,9 @@
     "SpatialCoverageType" : "HORIZONTAL",
     "OrbitParameters" : {
       "SwathWidth" : 1450.0,
-      "SwathWidthUnit" : "Kilometer",
-      "OrbitPeriod" : 100.0,
-      "OrbitPeriodUnit" : "Decimal Minute",
+      "Period" : 100.0,
       "NumberOfOrbits" : 1,
-      "InclinationAngle" : 98.19,
-      "InclinationAngleUnit" : "Degree"
+      "InclinationAngle" : 98.19
     },
     "HorizontalSpatialDomain" : {
       "Geometry" : {
@@ -284,10 +281,5 @@
       "Format" : "NETCDF",
       "FormatType" : "Native"
     } ]
-  },
-  "MetadataSpecification": {
-    "URL": "https://cdn.earthdata.nasa.gov/umm/collection/v1.17.0",
-    "Name": "UMM-C",
-    "Version": "1.17.0"
   }
 }
diff --git a/system-int-test/src/cmr/system_int_test/data2/umm_spec_collection.clj b/system-int-test/src/cmr/system_int_test/data2/umm_spec_collection.clj
@@ -9,8 +9,7 @@
     [cmr.umm-spec.additional-attribute :as aa]
     [cmr.umm-spec.models.umm-collection-models :as umm-c]
     [cmr.umm-spec.models.umm-common-models :as umm-cmn]
-    [cmr.umm-spec.util :as u]
-    [cmr.umm-spec.versioning :as umm-spec-versioning]))
+    [cmr.umm-spec.util :as u]))
 
 (defn archive-and-distrution-information
   "Returns an ArchiveAndDistributionInformation based on given attributes"
@@ -189,12 +188,7 @@
    :EntryTitle "The entry title V5"
    :DataDates [(umm-cmn/map->DateType {:Date (t/date-time 2012)
                                        :Type "CREATE"})]
-   :Abstract "A very abstract collection"
-   :MetadataSpecification (umm-c/map->MetadataSpecificationType
-                             {:URL (str "https://cdn.earthdata.nasa.gov/umm/collection/v"
-                                        umm-spec-versioning/current-collection-version),
-                              :Name "UMM-C"
-                              :Version umm-spec-versioning/current-collection-version})})
+   :Abstract "A very abstract collection"})
 
 (def umm-c-missing-properties-dif
   "This is the minimal valid UMM-C."
@@ -211,12 +205,7 @@
    :EntryTitle "The entry title V5"
    :DataDates [(umm-cmn/map->DateType {:Date (t/date-time 2012)
                                        :Type "CREATE"})]
-   :Abstract "A very abstract collection"
-   :MetadataSpecification (umm-c/map->MetadataSpecificationType
-                             {:URL (str "https://cdn.earthdata.nasa.gov/umm/collection/v"
-                                        umm-spec-versioning/current-collection-version),
-                              :Name "UMM-C"
-                              :Version umm-spec-versioning/current-collection-version})})
+   :Abstract "A very abstract collection"})
 
 (def umm-c-missing-properties-dif10
   "This is the minimal valid UMM-C."
@@ -237,12 +226,7 @@
    :DataDates [(umm-cmn/map->DateType {:Date (t/date-time 2012)
                                        :Type "CREATE"})]
    :Abstract "A very abstract collection"
-   :TemporalExtents [(umm-cmn/map->TemporalExtentType {:SingleDateTimes [(t/date-time 2012)]})]
-   :MetadataSpecification (umm-c/map->MetadataSpecificationType
-                             {:URL (str "https://cdn.earthdata.nasa.gov/umm/collection/v"
-                                        umm-spec-versioning/current-collection-version),
-                              :Name "UMM-C"
-                              :Version umm-spec-versioning/current-collection-version})})
+   :TemporalExtents [(umm-cmn/map->TemporalExtentType {:SingleDateTimes [(t/date-time 2012)]})]})
 
 (def minimal-umm-c
   "This is the minimal valid UMM-C."
@@ -266,12 +250,7 @@
                                        :Type "CREATE"})]
    :Abstract "A very abstract collection"
    :TemporalExtents [(umm-cmn/map->TemporalExtentType {:SingleDateTimes [(t/date-time 2012)]})]
-   :DOI {:DOI "10.5678/TestDOI"}
-   :MetadataSpecification (umm-c/map->MetadataSpecificationType
-                             {:URL (str "https://cdn.earthdata.nasa.gov/umm/collection/v"
-                                        umm-spec-versioning/current-collection-version),
-                              :Name "UMM-C"
-                              :Version umm-spec-versioning/current-collection-version})})
+   :DOI {:DOI "10.5678/TestDOI"}})
 
 
 (defn collection-missing-properties

diff --git a/system-int-test/test/cmr/system_int_test/ingest/collection_umm_spec_validation_test.clj b/system-int-test/test/cmr/system_int_test/ingest/collection_umm_spec_validation_test.clj
@@ -14,7 +14,6 @@
     [cmr.system-int-test.utils.ingest-util :as ingest]
     [cmr.umm-spec.models.umm-collection-models :as umm-c]
     [cmr.umm-spec.models.umm-common-models :as umm-cmn]
-    [cmr.umm-spec.versioning :as umm-spec-versioning]
     [cmr.umm.umm-spatial :as umm-s]))
 
 ;; Used for testing invalid data date ranges.
@@ -54,12 +53,7 @@
                                        :Type "REVIEW"})]
    :Abstract "A very abstract collection"
    :TemporalExtents [(umm-cmn/map->TemporalExtentType {:SingleDateTimes [(time/date-time 2012)]})]
-   :DOI (umm-cmn/map->DoiType {:DOI "10.5678/TestDOI1"})
-   :MetadataSpecification (umm-c/map->MetadataSpecificationType
-                             {:URL (str "https://cdn.earthdata.nasa.gov/umm/collection/v"
-                                        umm-spec-versioning/current-collection-version),
-                              :Name "UMM-C"
-                              :Version umm-spec-versioning/current-collection-version})})
+   :DOI (umm-cmn/map->DoiType {:DOI "10.5678/TestDOI1"})})
 
 (defn collection-invalid-data-date-ranges
   "Returns a UmmCollection with invalid data date ranges"

diff --git a/system-int-test/test/cmr/system_int_test/ingest/collection_update_test.clj b/system-int-test/test/cmr/system_int_test/ingest/collection_update_test.clj
@@ -536,14 +536,10 @@
         gran2 (make-gran coll-cartesian-with-grans (p/point 10 22))
         ;; Orbit test collections
         orbit-params {:SwathWidth 1450
-                      :SwathWidthUnit "Kilometer"
-                      :OrbitPeriod 98.88
-                      :OrbitPeriodUnit "Decimal Minute" 
+                      :Period 98.88
                       :InclinationAngle 98.15
-                      :InclinationAngleUnit "Degree" 
                       :NumberOfOrbits 0.5
-                      :StartCircularLatitude -90
-                      :StartCircularLatitudeUnit "Degree"}
+                      :StartCircularLatitude -90}
         coll-orbit-no-grans (make-coll "coll-orbit-no-grans" {:gsr "ORBIT" :orbit orbit-params})
         coll-orbit-with-grans (make-coll "coll-orbit-with-grans" {:gsr "ORBIT" :orbit orbit-params})
         gran3 (make-gran coll-orbit-with-grans (dg/orbit -158.1 81.8 :desc  -81.8 :desc))