From 7b4e5e94ce9533fb9bcb53a764eeb63e7a0bef00 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Wed, 13 Feb 2019 11:09:38 +0100 Subject: Use protobuf definitions from SDK Change-Id: I22163f3239769070e1e04c8d0e8f0da179069632 Issue-ID: DCAEGEN2-1218 Signed-off-by: Filip Krzywka --- pom.xml | 41 ++---------- sources/hv-collector-domain/pom.xml | 40 ++---------- .../src/main/proto/event/VesEvent.proto | 75 ---------------------- .../src/main/proto/measurements/README.md | 1 - 4 files changed, 12 insertions(+), 145 deletions(-) delete mode 100644 sources/hv-collector-domain/src/main/proto/event/VesEvent.proto delete mode 100644 sources/hv-collector-domain/src/main/proto/measurements/README.md diff --git a/pom.xml b/pom.xml index 3c24c968..780147c4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ dcaegen2-collectors-veshv ~ ================================================================================ - ~ Copyright (C) 2018 NOKIA + ~ Copyright (C) 2018-2019 NOKIA ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -56,13 +56,10 @@ 1.7 0.8.2 1.0.0-RC11 - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT 3.6.1 - 3.6.0.1 - ${project.build.directory}/generated-sources/proto/main/java/ - 1.2.0-RC1 @@ -151,30 +148,6 @@ - - com.github.os72 - protoc-jar-maven-plugin - ${protoc-jar-maven-plugin.version} - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper-maven-plugin.version} - - - add-source - generate-sources - - add-source - - - - ${protobuf-generated-files.directory} - - - - - org.apache.maven.plugins maven-compiler-plugin @@ -548,11 +521,6 @@ ${os.detected.classifier} --> - - com.google.protobuf - protobuf-java - ${protobuf.version} - com.google.protobuf protobuf-java-util @@ -601,6 +569,11 @@ hvvesclient-producer-api ${sdk.version} + + org.onap.dcaegen2.services.sdk + hvvesclient-protobuf + ${sdk.version} + diff --git a/sources/hv-collector-domain/pom.xml b/sources/hv-collector-domain/pom.xml index f60cb604..4e01be3f 100644 --- a/sources/hv-collector-domain/pom.xml +++ b/sources/hv-collector-domain/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ dcaegen2-collectors-veshv ~ ================================================================================ - ~ Copyright (C) 2018 NOKIA + ~ Copyright (C) 2018-2019 NOKIA ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -58,39 +58,14 @@ maven-surefire-plugin org.apache.maven.plugins - - org.codehaus.mojo - build-helper-maven-plugin - - - com.github.os72 - protoc-jar-maven-plugin - - - generate-sources - - run - - - com.google.protobuf:protoc:${protobuf.version} - - ${project.basedir}/src/main/proto/event - - - - java - none - ${protobuf-generated-files.directory} - - - - - - + + org.onap.dcaegen2.services.sdk + hvvesclient-protobuf + org.jetbrains.kotlin kotlin-stdlib-jdk8 @@ -99,10 +74,6 @@ io.projectreactor.netty reactor-netty - - com.google.protobuf - protobuf-java - io.arrow-kt arrow-core @@ -127,5 +98,4 @@ - diff --git a/sources/hv-collector-domain/src/main/proto/event/VesEvent.proto b/sources/hv-collector-domain/src/main/proto/event/VesEvent.proto deleted file mode 100644 index 6d4c2307..00000000 --- a/sources/hv-collector-domain/src/main/proto/event/VesEvent.proto +++ /dev/null @@ -1,75 +0,0 @@ -/* - * ============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; - -message VesEvent // top-level message, currently the maximum event size supported by the HV-VES Collector is 1 MiB -{ - 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==perf3gpp, the GPB message is Perf3gppFields -} - -// VES CommonEventHeader adapted to GPB (Google Protocol Buffers) - -message CommonEventHeader -{ - string version = 1; // required, "version of the gpb common event header", current value "1.0" - string domain = 2; // required, "the eventing domain associated with the event", allowed values: - // fault, heartbeat, measurement, mobileFlow, other, pnfRegistration, sipSignaling, - // stateChange, syslog, thresholdCrossingAlert, voiceQuality, perf3gpp - - uint32 sequence = 3; // required, "ordering of events communicated by an event source instance or 0 if not needed" - - enum Priority - { - PRIORITY_NOT_PROVIDED = 0; - HIGH = 1; - MEDIUM = 2; - NORMAL = 3; - LOW = 4; - } - 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" - - 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 " - - 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", current value "7.2" - - reserved "InternalHeaderFields"; // "enrichment fields for internal VES Event Listener service use only, not supplied by event sources" - reserved 100; -} diff --git a/sources/hv-collector-domain/src/main/proto/measurements/README.md b/sources/hv-collector-domain/src/main/proto/measurements/README.md deleted file mode 100644 index eb69eb4a..00000000 --- a/sources/hv-collector-domain/src/main/proto/measurements/README.md +++ /dev/null @@ -1 +0,0 @@ -Measurements data (data placed in VesEvent.eventFields) description should be available in [RTD documentation](https://onap.readthedocs.io/en/latest/submodules/dcaegen2.git/docs/sections/apis/ves-hv.html). \ No newline at end of file -- cgit 1.2.3-korg