HV-VES Domain update

Change domain name. In this project this yields following changes:
* Comment change in VesEvent proto
* Updated measurements proto (kept as documentation only, ie. not used
    in the collector)
* Update name in test scenarios for unit and component scope

Change-Id: I719077b5fcb642c067d25b7aa174a2e629404689
Issue-ID: DCAEGEN2-847
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>

3 files changed, 124 insertions, 127 deletions

diff --git a/hv-collector-domain/src/main/proto/event/VesEvent.proto b/hv-collector-domain/src/main/proto/event/VesEvent.proto
index 0f9e5e1f..f7822425 100644
--- a/hv-collector-domain/src/main/proto/event/VesEvent.proto
+++ b/hv-collector-domain/src/main/proto/event/VesEvent.proto
@@ -20,25 +20,26 @@
 syntax = "proto3";
 package org.onap.ves;
 
-message VesEvent {
+message VesEvent                            // top-level message
+{
     CommonEventHeader commonEventHeader=1;  // required
 
     bytes eventFields=2;                    // required, payload
-    // this field contains a domain-specific GPB message
-    // the field being opaque (bytes), the decoding of the payload occurs in a separate step
-    // the name of the GPB message for domain XYZ is XYZFields
-    // e.g. for domain==HVMEAS, the GPB message is HVMEASFields
+        // this field contains a domain-specific GPB message
+        // the field being opaque (bytes), the decoding of the payload occurs in a separate step
+        // the name of the GPB message for domain XYZ is XYZFields
+        // e.g. for domain==PERF3GPP, the GPB message is Perf3GPPFields
 }
 
 // VES CommonEventHeader adapted to GPB (Google Protocol Buffers)
-// Aligned with VES 7.0.1 schema, and extending to hvMeas Domain.
+// Aligned with VES 7.0.1 schema, and extending to Performance Domain.
 
 message CommonEventHeader
 {
     string version = 1;                     // required, "version of the gpb common event header"
     string domain = 2;                      // required, "the eventing domain associated with the event", allowed values:
-    // FAULT, HEARTBEAT, MEASUREMENT, MOBILE_FLOW, OTHER, PNFREGISTRATION, SIP_SIGNALING,
-    // STATE_CHANGE, SYSLOG, THRESHOLD_CROSSING_ALERT, VOICE_QUALITY, HVMEAS
+                                            // FAULT, HEARTBEAT, MEASUREMENT, MOBILE_FLOW, OTHER, PNFREGISTRATION, SIP_SIGNALING,
+                                            // STATE_CHANGE, SYSLOG, THRESHOLD_CROSSING_ALERT, VOICE_QUALITY, PERF3GPP
 
     uint32 sequence = 3;                    // required, "ordering of events communicated by an event source instance or 0 if not needed"
 
diff --git a/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto b/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto
index 31f4dfb1..9c93bd16 100644
--- a/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto
+++ b/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto
@@ -1,82 +1,78 @@
-/*

- * ============LICENSE_START=======================================================

- * dcaegen2-collectors-veshv

- * ================================================================================

- * Copyright (C) 2018 NOKIA

- * ================================================================================

- * 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.

- * ============LICENSE_END=========================================================

- */

-syntax = "proto3";

-package org.onap.ves;

-

-// Definition for RTPM, structure aligned with 3GPP PM format optimized for RTPM delivery pre-standard TS 28.550 V2.0.0 (2018-09).

-// Some field details are taken from 3GPP TS 32.436 V15.0.0 (2018-06) ASN.1 file.

-// Note (2018-09): work is in progress for 3GPP TS 28.550. Changes will be made, if needed, to align with final version.

-// Differences/additions to 3GPP TS 28.550 are marked with "%%".

-

-message MeasDataCollection                  // top-level message

-{

-    // %% Combined messageFileHeader, measData (single instance), messageFileFooter (not needed: timestamp = collectionBeginTime + granularityPeriod).

-    string formatVersion = 1;

-    string senderName = 2;

-    string senderType = 3;

-    string vendorName = 4;

-    string collectionBeginTime = 5;         // in ASN.1 GeneralizedTime format (subset of ISO 8601 basic format)

-    uint32 granularityPeriod = 6;           // duration in seconds, %% moved from MeasInfo (single reporting period per event)

-    string measuredEntityUserName = 7;      // network function user definable name ("userLabel") defined for the measured entity in 3GPP TS 28.622

-    string measuredEntityDn = 8;            // DN as per 3GPP TS 32.300

-    string measuredEntitySoftwareVersion = 9;

-    repeated string measObjInstIdList = 10; // %%: optional, monitored object LDNs as per 3GPP TS 32.300 and 3GPP TS 32.432

-    repeated MeasInfo measInfo = 11;

-}

-

-message MeasInfo

-{

-    oneof MeasInfoId {                      // measurement group identifier

-                                            uint32 iMeasInfoId = 1;             // identifier as integer (%%: more compact)

-                                            string measInfoId = 2;              // identifier as string (more generic)

-    }

-

-    oneof MeasTypes {                       // measurement identifiers associated with the measurement results

-                                            IMeasTypes iMeasTypes = 3;          // identifiers as integers (%%: more compact)

-                                            SMeasTypes measTypes = 4;           // identifiers as strings (more generic)

-    }

-    // Needed only because GPB does not support repeated fields directly inside 'oneof'

-    message IMeasTypes { repeated uint32 iMeasType = 1; }

-    message SMeasTypes { repeated string measType = 1; }

-

-    string jobId = 5;

-    repeated MeasValue measValues = 6;      // performance measurements grouped by measurement object

-}

-

-message MeasValue

-{

-    oneof MeasObjInstId {                   // monitored object LDN as per 3GPP TS 32.300 and 3GPP TS 32.432

-                                            string measObjInstId = 1;           // LDN itself

-                                            uint32 measObjInstIdListIdx = 2;    // %%: index into measObjInstIdList

-    }

-    repeated MeasResult measResults = 3;

-    bool suspectFlag = 4;

-    map<string, string> measObjAddlFlds = 5; // %%: optional per-object data (name/value HashMap)

-}

-

-message MeasResult

-{

-    uint32 p = 1;                           // Index in the MeasTypes array, needed only if measResults has fewer elements than MeasTypes

-    oneof xValue {

-        sint64 iValue = 2;

-        double rValue = 3;

-        bool isNull = 4;

-    }

-}

+/*
+ * ============LICENSE_START=======================================================
+ * dcaegen2-collectors-veshv
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+syntax = "proto3";
+package org.onap.ves;
+
+// Definition for RTPM, structure aligned with 3GPP PM format optimized for RTPM delivery pre-standard TS 28.550 V2.0.0 (2018-09).
+// Some field details are taken from 3GPP TS 32.436 V15.0.0 (2018-06) ASN.1 file.
+// Note (2018-09): work is in progress for 3GPP TS 28.550. Changes will be made, if needed, to align with final version.
+// Differences/additions to 3GPP TS 28.550 are marked with "%%".
+
+message MeasDataCollection                  // top-level message 
+{
+    // %% Combined messageFileHeader, measData (single instance), messageFileFooter (not needed: timestamp = collectionBeginTime + granularityPeriod).
+    string formatVersion = 1;
+    uint32 granularityPeriod = 2;           // duration in seconds, %% moved from MeasInfo (single reporting period per event)
+    string measuredEntityUserName = 3;      // network function user definable name ("userLabel") defined for the measured entity in 3GPP TS 28.622
+    string measuredEntityDn = 4;            // DN as per 3GPP TS 32.300
+    string measuredEntitySoftwareVersion = 5;
+    repeated string measObjInstIdList = 6; // %%: optional, monitored object LDNs as per 3GPP TS 32.300 and 3GPP TS 32.432
+    repeated MeasInfo measInfo = 7; 
+}
+
+message MeasInfo
+{
+    oneof MeasInfoId {                      // measurement group identifier
+        uint32 iMeasInfoId = 1;             // identifier as integer (%%: more compact)
+        string measInfoId = 2;              // identifier as string (more generic)
+    }
+
+    oneof MeasTypes {                       // measurement identifiers associated with the measurement results
+        IMeasTypes iMeasTypes = 3;          // identifiers as integers (%%: more compact)
+        SMeasTypes measTypes = 4;           // identifiers as strings (more generic)
+    }
+    // Needed only because GPB does not support repeated fields directly inside 'oneof'
+    message IMeasTypes { repeated uint32 iMeasType = 1; }
+    message SMeasTypes { repeated string measType = 1; }
+
+    string jobId = 5;
+    repeated MeasValue measValues = 6;      // performance measurements grouped by measurement object
+}
+
+message MeasValue
+{
+    oneof MeasObjInstId {                   // monitored object LDN as per 3GPP TS 32.300 and 3GPP TS 32.432
+        string measObjInstId = 1;           // LDN itself
+        uint32 measObjInstIdListIdx = 2;    // %%: index into measObjInstIdList
+    }
+    repeated MeasResult measResults = 3;
+    bool suspectFlag = 4;
+    map<string, string> measObjAddlFlds = 5; // %%: optional per-object data (name/value HashMap)
+}
+
+message MeasResult
+{
+    uint32 p = 1;                           // Index in the MeasTypes array, needed only if measResults has fewer elements than MeasTypes
+    oneof xValue {
+        sint64 iValue = 2;
+        double rValue = 3;
+        bool isNull = 4;
+    }
+}
diff --git a/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto b/hv-collector-domain/src/main/proto/measurements/Perf3GPPFields.proto
index 94b40106..eac06ee0 100644
--- a/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto
+++ b/hv-collector-domain/src/main/proto/measurements/Perf3GPPFields.proto
@@ -1,37 +1,37 @@
-/*

- * ============LICENSE_START=======================================================

- * dcaegen2-collectors-veshv

- * ================================================================================

- * Copyright (C) 2018 NOKIA

- * ================================================================================

- * 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.

- * ============LICENSE_END=========================================================

- */

-syntax = "proto3";

-package org.onap.ves;

-import "MeasDataCollection.proto";          // for 3GPP PM format

-

-message HVMeasFields

-{

-    string hvMeasFieldsVersion = 1;

-    MeasDataCollection measDataCollection = 2;

-    // Based on 3GPP TS 28.550

-    // Informative: mapping between similar header fields (format may be different)

-    // 3GPP MeasHeader         ONAP/VES CommonEventHeader

-    // senderName              sourceName

-    // senderType              nfNamingCode + nfcNamingCode

-    // vendorName              nfVendorName

-    // collectionBeginTime     startEpochMicrosec

-    // timestamp               lastEpochMicrosec

-    map<string, string> eventAddlFlds = 3;     // optional per-event data (name/value HashMap)

-}

+/*
+ * ============LICENSE_START=======================================================
+ * dcaegen2-collectors-veshv
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+syntax = "proto3";
+package org.onap.ves;
+import "MeasDataCollection.proto";          // for 3GPP PM format
+
+message Perf3GPPFields
+{
+    string perf3GPPFieldsVersion = 1;
+    MeasDataCollection measDataCollection = 2;
+    // Based on 3GPP TS 28.550
+    // Logical mapping from 3GPP to ONAP header fields:
+    // 3GPP MeasFileHeader     ONAP/VES CommonEventHeader
+    // senderName              sourceName
+    // senderType              nfNamingCode + nfcNamingCode
+    // vendorName              nfVendorName
+    // collectionBeginTime     startEpochMicrosec
+    // timestamp               lastEpochMicrosec
+    map<string, string> eventAddlFlds = 3;     // optional per-event data (name/value HashMap)
+}