Automate injection of 3GPP yaml files

- removing references to 3GPP directories
  because this step is now automated
- adding Dockerfile supporting the build process

Many thanks to Micha!

Issue-ID: OAM-324
Change-Id: I1d9f8be141f9e14f411ea1c939bf2528a1f7c168
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/solution/smo/oam/ves-collector/Dockerfile b/solution/smo/oam/ves-collector/Dockerfile
new file mode 100644 (file)
index 0000000..3a7a4d6
--- /dev/null
+++ b/solution/smo/oam/ves-collector/Dockerfile
@@ -0,0 +1,25 @@
+################################################################################
+# Copyright 2023 highstreet technologies GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG BASEIMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.8.0
+FROM ubuntu:22.04 AS stage-0
+RUN apt update && apt install -y python3 git
+COPY install.py /
+COPY externalRepo.json /
+COPY externalRepo /opt/app/VESCollector/etc/externalRepo
+RUN python3 install.py -c /externalRepo.json -d /opt/app/VESCollector/etc/externalRepo
+
+FROM ${BASEIMAGE}
+COPY --from=stage-0 --chown=vescollector:vescollector /opt/app/VESCollector/etc/externalRepo /opt/app/VESCollector/etc/externalRepo
\ No newline at end of file

diff --git a/solution/smo/oam/ves-collector/externalRepo/schema-map.json b/solution/smo/oam/ves-collector/externalRepo/schema-map.json
index 6335270..7f3cdeb 100644 (file)
--- a/solution/smo/oam/ves-collector/externalRepo/schema-map.json
+++ b/solution/smo/oam/ves-collector/externalRepo/schema-map.json
@@ -1,40 +1,4 @@
 [
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FaultMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FaultMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_HeartbeatNtf.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_HeartbeatNtf.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FileDataReportingMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FileDataReportingMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_PerfMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_PerfMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_ProvMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_ProvMnS.yaml"
-  },
   {
     "publicURL": "https://gerrit.o-ran-sc.org/r/gitweb?p=scp/oam/modeling.git;a=blob_plain;f=data-model/oas3/experimental/o-ran-sc-du-hello-world-pm-streaming-oas3.yaml",
     "localURL": "o-ran-sc/experimental/o-ran-sc-du-hello-world-pm-streaming-oas3.yaml"
@@ -42,35 +6,5 @@
   {
     "publicURL": "https://gerrit.o-ran-sc.org/r/gitweb?p=scp/oam/modeling.git;a=blob_plain;f=data-model/yang/working/o-ran-sc/template/yes-o1-notify-pnf-registration.yang",
     "localURL": "o-ran-sc/experimental/yes-o1-notify-pnf-registration.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FileDataReportingMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FileDataReportingMnS.yaml"
-  },
-
-
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_FaultMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_FaultMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_HeartbeatNtf.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_HeartbeatNtf.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_FileDataReportingMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_FileDataReportingMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_PerfMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_PerfMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_ProvMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_ProvMnS.yaml"
-  },
-  {
-    "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_FileDataReportingMnS.yaml",
-    "localURL": "3gpp/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28532_FileDataReportingMnS.yaml"
   }
 ]
\ No newline at end of file