Remove end-of-transmission message from protocol

Also update protobuf files definitions to latest version.

Change-Id: I0cd5d2d8deec5c787e2d3948d3d905fa672f9fea
Issue-ID: DCAEGEN2-775
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>

3 files changed, 58 insertions, 85 deletions

diff --git a/hv-collector-domain/src/main/proto/event/VesEvent.proto b/hv-collector-domain/src/main/proto/event/VesEvent.proto
index 54a6d149..0f9e5e1f 100644
--- a/hv-collector-domain/src/main/proto/event/VesEvent.proto
+++ b/hv-collector-domain/src/main/proto/event/VesEvent.proto
@@ -21,54 +21,55 @@ syntax = "proto3";
 package org.onap.ves;
 
 message VesEvent {
-    CommonEventHeader commonEventHeader = 1; // required
+    CommonEventHeader commonEventHeader=1;  // required
 
-    oneof eventFields // required, payload
-    {
-        // each new high-volume domain can add an entry for its own GPB message
-        // the field can be opaque (bytes) to allow decoding the payload in a separate step
-        bytes hvMeasFields = 2; // for domain==HVMEAS, GPB message: HVMeasFields
-    }
+    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
 }
 
 // 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 hvMeas 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
+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
 
-    uint32 sequence = 3;              // required, "ordering of events communicated by an event source instance or 0 if not needed"
+    uint32 sequence = 3;                    // required, "ordering of events communicated by an event source instance or 0 if not needed"
 
-    enum Priority {
+    enum Priority
+    {
         PRIORITY_NOT_PROVIDED = 0;
         HIGH = 1;
         MEDIUM = 2;
         NORMAL = 3;
         LOW = 4;
     }
-    Priority priority = 4;            // required, "processing priority"
+    Priority priority = 4;                  // required, "processing priority"
 
-    string eventId = 5;               // required, "event key that is unique to the event source"
-    string eventName = 6;             // required, "unique event name"
-    string eventType = 7;             // "for example - guest05,  platform"
+    string eventId = 5;                     // required, "event key that is unique to the event source"
+    string eventName = 6;                   // required, "unique event name"
+    string eventType = 7;                   // "for example - guest05,  platform"
 
-    uint64 lastEpochMicrosec = 8;     // required, "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds"
-    uint64 startEpochMicrosec = 9;    // required, "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds"
+    uint64 lastEpochMicrosec = 8;           // required, "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds"
+    uint64 startEpochMicrosec = 9;          // required, "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds"
 
-    string nfNamingCode = 10;         // "4 character network function type, aligned with vnf naming standards"
-    string nfcNamingCode = 11;        // "3 character network function component type, aligned with vfc naming standards"
-    string nfVendorName = 12;         // " Vendor Name providing the nf "
+    string nfNamingCode = 10;               // "4 character network function type, aligned with vnf naming standards"
+    string nfcNamingCode = 11;              // "3 character network function component type, aligned with vfc naming standards"
+    string nfVendorName = 12;               // " Vendor Name providing the nf "
 
-    bytes reportingEntityId = 13;     // "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process"
-    string reportingEntityName = 14;  // required, "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName should match A&AI entry"
-    bytes sourceId = 15;              // "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process"
-    string sourceName = 16;           // required, "name of the entity experiencing the event issued use A&AI entry"
-    string timeZoneOffset = 17;       // "Offset to GMT to indicate local time zone for the device"
-    string vesEventListenerVersion = 18; // required, "Version of the VesEvent Listener"
+    bytes reportingEntityId = 13;           // "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process"
+    string reportingEntityName = 14;        // required, "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName should match A&AI entry"
+    bytes sourceId = 15;                    // "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process"
+    string sourceName = 16;                 // required, "name of the entity experiencing the event issued use A&AI entry"
+    string timeZoneOffset = 17;             // "Offset to GMT to indicate local time zone for the device"
+    string vesEventListenerVersion = 18;    // required, "Version of the VesEvent Listener"
 
-    reserved "InternalHeaderFields";  // "enrichment fields for internal VES Event Listener service use only, not supplied by event sources"
+    reserved "InternalHeaderFields";        // "enrichment fields for internal VES Event Listener service use only, not supplied by event sources"
     reserved 100;
 }
diff --git a/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto b/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto
index 9a8582d5..94b40106 100644
--- a/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto
+++ b/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto
@@ -24,20 +24,14 @@ import "MeasDataCollection.proto";          // for 3GPP PM format
 message HVMeasFields

 {

     string hvMeasFieldsVersion = 1;

-    measDataCollection.MeasDataCollection measDataCollection = 2;

-    // From 3GPP TS 28.550

+    MeasDataCollection measDataCollection = 2;

+    // Based on 3GPP TS 28.550

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

-    // 3GPP MeasStreamHeader   ONAP/VES CommonEventHeader

+    // 3GPP MeasHeader         ONAP/VES CommonEventHeader

     // senderName              sourceName

     // senderType              nfNamingCode + nfcNamingCode

     // vendorName              nfVendorName

     // collectionBeginTime     startEpochMicrosec

     // timestamp               lastEpochMicrosec

-    repeated HashMap eventAddlFlds = 3;     // optional per-event data

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

 }

-

-message HashMap

-{

-    string name = 1;

-    string value = 2;

-}
\ No newline at end of file
diff --git a/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto b/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto
index 472dcc43..31f4dfb1 100644
--- a/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto
+++ b/hv-collector-domain/src/main/proto/measurements/MeasDataCollection.proto
@@ -18,87 +18,65 @@
  * ============LICENSE_END=========================================================

  */

 syntax = "proto3";

-package measDataCollection;

+package org.onap.ves;

 

-// Definition for RTPM, structure aligned with 3GPP PM format optimized for RTPM delivery pre-standard TS 28.550 V1.2.2 (2018-08).

+// 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-08): work is in progress for 3GPP TS 28.550 to specify PM streaming format. Changes will be made, if needed, to align with final version.

+// 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 

+message MeasDataCollection                  // top-level message

 {

-    MeasHeader measHeader = 1;

-    repeated MeasData measData = 2;         // %%: use a single instance for RTPM

-    MeasFooter measFooter = 3;

-}

-

-message MeasHeader

-{

-    string streamFormatVersion = 1;

+    // %% 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 MeasData

-{

-    string measuredEntityId = 1;            // DN as per 3GPP TS 32.300

-    string measuredEntityUserName = 2;      // network function User Name

-    string measuredEntitySoftwareVersion = 3;

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

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

-    repeated MeasInfo measInfo = 6; 

-}

-

-

 message MeasInfo

 {

     oneof MeasInfoId {                      // measurement group identifier

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

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

+                                            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)

+                                            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 jobIdList = 5;

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

+    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

+                                            string measObjInstId = 1;           // LDN itself

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

     }

     repeated MeasResult measResults = 3;

     bool suspectFlag = 4;

-    repeated nameValue measObjAddlFlds = 5; // %%: optional per-object data

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

 }

 

 message MeasResult

 {

-    uint32 p = 1;                           // Optional index in the MeasTypes array

+    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;

     }

 }

-

-message MeasFooter

-{

-    string timestamp = 1;                   // in ASN.1 GeneralizedTime format, a better name would be "collectionEndTime"

-}

-

-message nameValue                           // %%: vendor-defined name-value pair

-{

-    string name = 1;

-    string value = 2;

-} 
\ No newline at end of file