Skip to content

update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dingrui37 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e362c4
Merge pull request #1 from wsx25289/master
dingrui37 Jan 16, 2018
b2c1722
temp116
Jan 16, 2018
c1152ed
add gRPC code
Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/odl-telemetry-all/pom.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependencies>
<dependency>
<groupId>org.opendaylight.telemetry</groupId>
<artifactId>odl-telemetry-grpcserver</artifactId>
<artifactId>odl-telemetry-grpc</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
Expand Down
6 changes: 3 additions & 3 deletions features/odl-telemetry-grpcserver/pom.xml → features/odl-telemetry-grpc/pom.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</parent>

<groupId>org.opendaylight.telemetry</groupId>
<artifactId>odl-telemetry-grpcserver</artifactId>
<artifactId>odl-telemetry-grpc</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>feature</packaging>

Expand All @@ -32,12 +32,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>grpcserver-api</artifactId>
<artifactId>grpc-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>grpcserver-impl</artifactId>
<artifactId>grpc-impl</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
9 changes: 8 additions & 1 deletion grpcserver/api/pom.xml → grpc/api/pom.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
</parent>

<groupId>org.opendaylight.telemetry</groupId>
<artifactId>grpcserver-api</artifactId>
<artifactId>grpc-api</artifactId>
<version>0.1.0-SNAPSHOT</version>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: telemetry :: ${project.artifactId}</name>
<packaging>bundle</packaging>

<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>ietf-inet-types-2013-07-15</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
22 changes: 22 additions & 0 deletions grpc/api/src/main/yang/grpc.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
module grpc {
yang-version 1.1;
namespace "urn:opendaylight:params:xml:ns:yang:grpc";
prefix "grpc";

revision "2017-08-30" {
description "Initial revision of grpc model";
}

import ietf-inet-types {
prefix "inet";
revision-date 2013-07-15;
}

rpc start-grpc-server {
input {
leaf port {
type inet:port-number;
}
}
}
}
225 changes: 71 additions & 154 deletions grpcserver/impl/pom.xml → grpc/impl/pom.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,191 +19,108 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
</parent>

<groupId>org.opendaylight.telemetry</groupId>
<artifactId>grpcserver-impl</artifactId>
<artifactId>grpc-impl</artifactId>
<version>0.1.0-SNAPSHOT</version>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
<name>ODL :: telemetry :: ${project.artifactId}</name>
<packaging>bundle</packaging>

<properties>
<protobuf.java.version>3.2.0</protobuf.java.version>
<protobuf.java.util.version>3.2.0</protobuf.java.util.version>
<grpc.version>1.3.0</grpc.version>
<netty.version>4.1.8.Final</netty.version>
<gson.version>2.7</gson.version>
<errorprone.version>2.0.19</errorprone.version>
<instrumentation.version>0.3.0</instrumentation.version>
<google.protos.version>0.1.6</google.protos.version>
<protobufGeneratorPath>${project.build.directory}/generated-source/protobuf</protobufGeneratorPath>
<protobuf.version>3.5.1</protobuf.version>
<grpc.version>1.8.0</grpc.version>
<common.protos.version>0.0.3</common.protos.version>
<protobufGeneratorPath>${project.build.directory}/generated-source/protobuf</protobufGeneratorPath>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
<version>1.7.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
<version>1.7.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>googleapis-common-protos</artifactId>
<version>${common.protos.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>${grpc.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>grpcserver-api</artifactId>
<artifactId>grpc-api</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-api</artifactId>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.java.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.java.util.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf-lite</artifactId>
<version>${grpc.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>${grpc.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<version>${grpc.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>${netty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>${errorprone.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.google.instrumentation</groupId>
<artifactId>instrumentation-api</artifactId>
<version>${instrumentation.version}</version>
<optional>true</optional>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>googleapis-common-protos</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-common-protos</artifactId>
<version>${google.protos.version}</version>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.3.7</version>
</dependency>
<!-- Testing Dependencies -->
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -250,9 +167,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.0</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.2.0:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.3.0:exe:${os.detected.classifier}</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}</pluginArtifact>
<protoSourceRoot>src/main/proto</protoSourceRoot>
</configuration>
<executions>
Expand Down
14 changes: 14 additions & 0 deletions grpc/impl/src/main/java/org/opendaylight/telemetry/grpc/notification/StreamDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright © 2017 ZTE, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
package org.opendaylight.telemetry.grpc.notification;

import org.opendaylight.telemetry.grpc.proto.TelemetryStreamRequest;

public interface StreamDataHandler {
void process(TelemetryStreamRequest data);
}
21 changes: 21 additions & 0 deletions grpc/impl/src/main/java/org/opendaylight/telemetry/grpc/notification/TelemetryEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright © 2017 ZTE, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
package org.opendaylight.telemetry.grpc.notification;

import org.opendaylight.telemetry.grpc.proto.TelemetryStreamRequest;

public class TelemetryEvent {
private TelemetryStreamRequest value;
public void setValue(TelemetryStreamRequest value) {
this.value = value;
}

public TelemetryStreamRequest getValue() {
return value;
}
}
Loading