summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md4
-rw-r--r--etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml (renamed from etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/PerDataFileReportMnS.yaml)0
-rw-r--r--etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml (renamed from etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml)0
-rw-r--r--etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml (renamed from etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/heartbeatNtf.yaml)0
-rw-r--r--etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml (renamed from etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/provMnS.yaml)0
-rw-r--r--etc/externalRepo/schema-map.json16
-rw-r--r--pom.xml2
-rw-r--r--src/test/resources/stndDefined/faultMnS.yaml (renamed from src/test/resources/stndDefined/OpenAPI_faultMnS.yaml)0
-rw-r--r--src/test/resources/stndDefined/schema-map.json4
-rw-r--r--src/test/resources/ves_stdnDefined_empty_namespace_invalid.json2
-rw-r--r--src/test/resources/ves_stdnDefined_invalid.json2
-rw-r--r--src/test/resources/ves_stdnDefined_missing_local_schema_reference.json2
-rw-r--r--src/test/resources/ves_stdnDefined_missing_namespace_invalid.json2
-rw-r--r--src/test/resources/ves_stdnDefined_valid.json2
-rw-r--r--src/test/resources/ves_stdnDefined_valid_unknown_topic.json2
-rw-r--r--src/test/resources/ves_stdnDefined_with_empty_stndDefined_fields_data.json2
-rw-r--r--src/test/resources/ves_stdnDefined_wrong_internal_file_reference.json2
-rw-r--r--version.properties2
18 files changed, 23 insertions, 21 deletions
diff --git a/Changelog.md b/Changelog.md
index f9821d2d..9d6192b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -33,4 +33,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [DCAEGEN2-2426](https://jira.onap.org/browse/DCAEGEN2-2426) - Fix bug throwing exception when first event is collected
## [1.7.6] - 18/09/2020
- [DCAEGEN-2374](https://jira.onap.org/browse/DCAEGEN2-2374) - Fix an error reported by DMaapEventPublisher test when pk is not available.
- - [DCAEGEN2-2453](https://jira.onap.org/browse/DCAEGEN2-2453) - Fix VES problem with subsequent fetching from CBS. \ No newline at end of file
+ - [DCAEGEN2-2453](https://jira.onap.org/browse/DCAEGEN2-2453) - Fix VES problem with subsequent fetching from CBS.
+## [1.7.7] - 29/09/2020
+ - [DCAEGEN2-2462](https://jira.onap.org/browse/DCAEGEN2-2462) - Adapt schema-map.json and test files to updated 3GPP repos \ No newline at end of file
diff --git a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/PerDataFileReportMnS.yaml b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml
index dfacc14f..dfacc14f 100644
--- a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/PerDataFileReportMnS.yaml
+++ b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml
diff --git a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml
index 499123b9..499123b9 100644
--- a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml
+++ b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml
diff --git a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/heartbeatNtf.yaml b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml
index afde5066..afde5066 100644
--- a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/heartbeatNtf.yaml
+++ b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml
diff --git a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/provMnS.yaml b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml
index b2f84a4d..b2f84a4d 100644
--- a/etc/externalRepo/3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/provMnS.yaml
+++ b/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml
diff --git a/etc/externalRepo/schema-map.json b/etc/externalRepo/schema-map.json
index bd6e4fda..a70c597b 100644
--- a/etc/externalRepo/schema-map.json
+++ b/etc/externalRepo/schema-map.json
@@ -1,18 +1,18 @@
[
{
- "publicURL": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml",
- "localURL": "3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml"
+ "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/data-models/tree/SA88-Rel16/OpenAPI/heartbeatNtf.yaml",
- "localURL": "3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/heartbeatNtf.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/data-models/tree/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml",
- "localURL": "3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/PerDataFileReportMnS.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/data-models/tree/SA88-Rel16/OpenAPI/provMnS.yaml",
- "localURL": "3gpp/rep/sa5/data-models/blob/REL-16/OpenAPI/provMnS.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"
}
] \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4e332fee..9e11a338 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.onap.dcaegen2.collectors.ves</groupId>
<artifactId>VESCollector</artifactId>
- <version>1.7.6-SNAPSHOT</version>
+ <version>1.7.7-SNAPSHOT</version>
<name>dcaegen2-collectors-ves</name>
<description>VESCollector</description>
<properties>
diff --git a/src/test/resources/stndDefined/OpenAPI_faultMnS.yaml b/src/test/resources/stndDefined/faultMnS.yaml
index 499123b9..499123b9 100644
--- a/src/test/resources/stndDefined/OpenAPI_faultMnS.yaml
+++ b/src/test/resources/stndDefined/faultMnS.yaml
diff --git a/src/test/resources/stndDefined/schema-map.json b/src/test/resources/stndDefined/schema-map.json
index 15dd5926..eccd914a 100644
--- a/src/test/resources/stndDefined/schema-map.json
+++ b/src/test/resources/stndDefined/schema-map.json
@@ -1,6 +1,6 @@
[
{
- "publicURL": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml",
- "localURL": "OpenAPI_faultMnS.yaml"
+ "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml",
+ "localURL": "faultMnS.yaml"
}
] \ No newline at end of file
diff --git a/src/test/resources/ves_stdnDefined_empty_namespace_invalid.json b/src/test/resources/ves_stdnDefined_empty_namespace_invalid.json
index 44bfd873..44123c9f 100644
--- a/src/test/resources/ves_stdnDefined_empty_namespace_invalid.json
+++ b/src/test/resources/ves_stdnDefined_empty_namespace_invalid.json
@@ -15,7 +15,7 @@
"vesEventListenerVersion": "7.2"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
"data": {
"href": 1,
"uri": "1",
diff --git a/src/test/resources/ves_stdnDefined_invalid.json b/src/test/resources/ves_stdnDefined_invalid.json
index 00cc97a4..69703cf2 100644
--- a/src/test/resources/ves_stdnDefined_invalid.json
+++ b/src/test/resources/ves_stdnDefined_invalid.json
@@ -15,7 +15,7 @@
"priority": "High"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
"data": {
"href": 1,
"uri": "1",
diff --git a/src/test/resources/ves_stdnDefined_missing_local_schema_reference.json b/src/test/resources/ves_stdnDefined_missing_local_schema_reference.json
index 96ba0f84..6c60b48a 100644
--- a/src/test/resources/ves_stdnDefined_missing_local_schema_reference.json
+++ b/src/test/resources/ves_stdnDefined_missing_local_schema_reference.json
@@ -15,7 +15,7 @@
"priority": "High"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml",
"data": {
"href": 1,
"uri": "1",
diff --git a/src/test/resources/ves_stdnDefined_missing_namespace_invalid.json b/src/test/resources/ves_stdnDefined_missing_namespace_invalid.json
index 40dda13d..909ac5e6 100644
--- a/src/test/resources/ves_stdnDefined_missing_namespace_invalid.json
+++ b/src/test/resources/ves_stdnDefined_missing_namespace_invalid.json
@@ -14,7 +14,7 @@
"vesEventListenerVersion": "7.2"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
"data": {
"href": 1,
"uri": "1",
diff --git a/src/test/resources/ves_stdnDefined_valid.json b/src/test/resources/ves_stdnDefined_valid.json
index b999ea3b..f31b9c7e 100644
--- a/src/test/resources/ves_stdnDefined_valid.json
+++ b/src/test/resources/ves_stdnDefined_valid.json
@@ -15,7 +15,7 @@
"priority": "High"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
"data": {
"href": 1,
"uri": "1",
diff --git a/src/test/resources/ves_stdnDefined_valid_unknown_topic.json b/src/test/resources/ves_stdnDefined_valid_unknown_topic.json
index 579480ec..f1408b56 100644
--- a/src/test/resources/ves_stdnDefined_valid_unknown_topic.json
+++ b/src/test/resources/ves_stdnDefined_valid_unknown_topic.json
@@ -15,7 +15,7 @@
"vesEventListenerVersion": "7.2"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
"data": {
"href": 1,
"uri": "1",
diff --git a/src/test/resources/ves_stdnDefined_with_empty_stndDefined_fields_data.json b/src/test/resources/ves_stdnDefined_with_empty_stndDefined_fields_data.json
index 7d897a67..d9a3315d 100644
--- a/src/test/resources/ves_stdnDefined_with_empty_stndDefined_fields_data.json
+++ b/src/test/resources/ves_stdnDefined_with_empty_stndDefined_fields_data.json
@@ -15,7 +15,7 @@
"priority": "High"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
"data": {
},
"stndDefinedFieldsVersion": "1.0"
diff --git a/src/test/resources/ves_stdnDefined_wrong_internal_file_reference.json b/src/test/resources/ves_stdnDefined_wrong_internal_file_reference.json
index a5649d23..f43c0b44 100644
--- a/src/test/resources/ves_stdnDefined_wrong_internal_file_reference.json
+++ b/src/test/resources/ves_stdnDefined_wrong_internal_file_reference.json
@@ -15,7 +15,7 @@
"priority": "High"
},
"stndDefinedFields": {
- "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/tree/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/dummyRef",
+ "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml#components/schemas/dummyRef",
"data": {
"href": 1,
"uri": "1",
diff --git a/version.properties b/version.properties
index d5f0dca3..976c443f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=1
minor=7
-patch=6
+patch=7
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT