From e880cde732b6d5b6a2fd22b2245ba7f6ff4517f3 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Fri, 21 Sep 2018 10:14:03 +0200 Subject: 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 --- .../src/main/proto/measurements/HVMeasFields.proto | 14 ++--- .../proto/measurements/MeasDataCollection.proto | 66 ++++++++-------------- 2 files changed, 26 insertions(+), 54 deletions(-) (limited to 'hv-collector-domain/src/main/proto/measurements') 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 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 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 -- cgit 1.2.3-korg