copy nokia protobuf files to proto/Juniper

Author: yyang99

proto/Juniper/juniper_dialout.proto

@@ -1,26 +1,9 @@
-
 syntax = "proto3";
+import "gnmi.proto";
 
-import "juniper_gnmi.proto";
-
-// new grpc service definition having DialOutSubscriber as the RPC name.
-service Subscriber {
-  /*
-  Phase1: Subscriber allows the target to send telemetry update:s (in the form of SubscribeResponse messages,
-  which has the same semantics as in the gNMI Subscribe RPC, to a client. Target will stream the sensor
-  configuration that are configured out of band for this client.
-
-  Phase2: Optionally the client may return the SubscribeRequest message in response to the dial-out connection from the target.
-  In this case, the client may augment the set of subscriptions that are to be published by the target. This SubscribeRequest
-  message has the same semantics as in the Subscribe gNMI RPC.
-
-  In the case that the client specifies neither option, then target waits indefinitely till the sensor subscription is made.
-
-  The configuration of subscriptions associated with the Subscriber RPC may be through the OpenConfig telemetry configuration and operational state model:
-  https://github.com/openconfig/public/blob/master/release/models/telemetry/openconfig-telemetry.yang
-  */
-
-  rpc DialOutSubscriber(stream gnmi.SubscribeResponse) returns (stream gnmi.SubscribeRequest);
+package Nokia.SROS;
 
+service DialoutTelemetry {
+  rpc Publish(stream gnmi.SubscribeResponse) returns (stream PublishResponse);
 }
-
+message PublishResponse {}

proto/Juniper/juniper_gnmi.proto

@@ -17,7 +17,10 @@ syntax = "proto3";
 
 import "google/protobuf/any.proto";
 import "google/protobuf/descriptor.proto";
-import "juniper_gnmi_ext.proto";
+import  public "gnmi_ext.proto";
+//import "github.com/openconfig/gnmi/proto/gnmi_ext/gnmi_ext.proto";
+//import "github.com/openconfig/gnmi/proto/gnmi_ext/gnmi_ext.proto";
+//import "gnmi_ext.proto";
 
 // Package gNMI defines a service specification for the gRPC Network Management
 // Interface. This interface is defined to be a standard interface via which
@@ -37,7 +40,13 @@ extend google.protobuf.FileOptions {
 
 // gNMI_service is the current version of the gNMI service, returned through
 // the Capabilities RPC.
-option (gnmi_service) = "0.7.0";
+option (gnmi_service) = "0.8.0";
+
+option go_package = "github.com/openconfig/gnmi/proto/gnmi";
+option java_multiple_files = true;
+option java_outer_classname = "GnmiProto";
+option java_package = "com.github.gnmi.proto";
+
 
 service gNMI {
   // Capabilities allows the client to retrieve the set of capabilities that
@@ -111,8 +120,9 @@ message TypedValue {
     uint64 uint_val = 3;              // Unsigned integer value.
     bool bool_val = 4;                // Bool value.
     bytes bytes_val = 5;              // Arbitrary byte sequence value.
-    float float_val = 6;              // Floating point value.
-    Decimal64 decimal_val = 7;        // Decimal64 encoded value.
+    float float_val = 6 [deprecated=true]; // Deprecated - use double_val.
+    double double_val = 14;           // Floating point value.
+    Decimal64 decimal_val = 7 [deprecated=true]; // Deprecated - use double_val.
     ScalarArray leaflist_val = 8;     // Mixed type scalar array value.
     google.protobuf.Any any_val = 9;  // protobuf.Any encoded bytes.
     bytes json_val = 10;              // JSON-encoded text.
@@ -121,7 +131,7 @@ message TypedValue {
     // Protobuf binary encoded bytes. The message type is not included.
     // See the specification at
     // github.com/openconfig/reference/blob/master/rpc/gnmi/protobuf-vals.md
-    // for a complete specification.
+    // for a complete specification. [Experimental]
     bytes proto_bytes = 13;
   }
 }
@@ -137,10 +147,10 @@ message Path {
   string origin = 2;                              // Label to disambiguate path.
   repeated PathElem elem = 3;                     // Elements of the path.
   string target = 4;                              // The name of the target
-                                                  // (Sec. 2.2.2.1)
+  // (Sec. 2.2.2.1)
 }
 
-// PathElem encodes an element of a gNMI path, along ith any attributes (keys)
+// PathElem encodes an element of a gNMI path, along with any attributes (keys)
 // that may be associated with it.
 // Reference: gNMI Specification Section 2.2.2.
 message PathElem {
@@ -165,7 +175,7 @@ message Value {
 enum Encoding {
   JSON = 0;           // JSON encoded text.
   BYTES = 1;          // Arbitrarily encoded bytes.
-  PROTO = 2;          // Encoded according to out-of-band agreed Protobuf.
+  PROTO = 2;          // Encoded according to scalar values of TypedValue.
   ASCII = 3;          // ASCII text of an out-of-band agreed format.
   JSON_IETF = 4;      // JSON encoded text as per RFC7951.
 }
@@ -285,7 +295,7 @@ message Subscription {
   Path path = 1;                    // The data tree path.
   SubscriptionMode mode = 2;        // Subscription mode to be used.
   uint64 sample_interval = 3;       // ns between samples in SAMPLE mode.
-  // Indicates whether values that not changed should be sent in a SAMPLE
+  // Indicates whether values that have not changed should be sent in a SAMPLE
   // subscription.
   bool suppress_redundant = 4;
   // Specifies the maximum allowable silent period in nanoseconds when
@@ -455,3 +465,37 @@ message ModelData {
   string version = 3;         // Semantic version of the model.
 }
 
+service gNMIDialOut {
+  // Publish allows the target to send telemetry updates (in the form of
+  // SubscribeResponse messages, which have the same semantics as in the
+  // gNMI Subscribe RPC, to a client. The client may optionally return the
+  // PublishResponse message in response to the dial-out connection from the
+  // target. In this case, the client may modify the set of subscriptions
+  // that are to be published by the target by:
+  //   - Specifying a client_id within the PublishResponse message. In this
+  //     case the target should match pre-configured subscriptions the specified
+  //	   client_id, and send data only for the paths associated with the
+  //     specified client_id.
+  //	 - Specifying a SubscribeRequest message within the subscriptions field of
+  //	   the PublishResponse message. This message has the same semantics as
+  //     in the Subscribe gNMI RPC.
+  // In the case that the client specifies neither option, a default set of
+  // subscriptions (which should be configurable on the target) should be
+  // published to the client (collector).
+  //
+  // The configuration of subscriptions associated with the publish RPC may
+  // be through the OpenConfig telemetry configuration and operational state
+  // model:
+  // https://github.com/openconfig/public/blob/master/release/models/telemetry/openconfig-telemetry.yang
+  rpc Publish(stream SubscribeResponse) returns (stream PublishResponse);
+}
+
+// PublishResponse is the message sent within the Publish RPC of the gNMI
+// dial-out service by the client (collector) to the target. It is used to
+// modify the set of paths that are to be sent by the target to the collector.
+message PublishResponse {
+  oneof request {
+    string client_id = 1;                                    // A string identifying the client to the target.
+    SubscribeRequest subscriptions = 2;	   // Optional specification of the subscriptions.
+  }
+}

proto/Juniper/juniper_gnmi_ext.proto

@@ -21,12 +21,15 @@ syntax = "proto3";
 // extensions defined outside of this package.
 package gnmi_ext;
 
+option go_package = "github.com/openconfig/gnmi/proto/gnmi_ext";
+
 // The Extension message contains a single gNMI extension.
 message Extension {
   oneof ext {
     RegisteredExtension registered_ext = 1;    // A registered extension.
     // Well known extensions.
     MasterArbitration master_arbitration = 2;  // Master arbitration extension.
+    History history = 3;                       // History extension.
   }
 }
 
@@ -44,9 +47,6 @@ enum ExtensionID {
   // New extensions are to be defined within this enumeration - their definition
   // MUST link to a reference describing their implementation.
 
-  // Juniper Telemetry header
-  EID_JUNIPER_TELEMETRY_HEADER = 1;
-
   // An experimental extension that may be used during prototyping of a new
   // extension.
   EID_EXPERIMENTAL = 999;
@@ -75,3 +75,17 @@ message Role {
   // role can read/write.
 }
 
+// The History extension allows clients to request historical data. Its
+// spec can be found at
+// https://github.com/openconfig/reference/blob/master/rpc/gnmi/gnmi-history.md
+message History {
+  oneof request {
+    int64 snapshot_time = 1; // Nanoseconds since the epoch
+    TimeRange range = 2;
+  }
+}
+
+message TimeRange {
+  int64 start = 1; // Nanoseconds since the epoch
+  int64 end = 2;   // Nanoseconds since the epoch
+}