squash! Update system set package to use streaming rpc Update build files Update gnoi.Path to compliant with gnmi.Path Update simple test to use new path

Author: mhines01

file/BUILD.bazel

@@ -3,11 +3,17 @@ load("@io_bazel_rules_go//proto:go_proto_library.bzl", "go_proto_library")
 proto_library(
   name = "file_proto",
   srcs = ["file.proto"],
+  deps = [
+    "//github.com/openconfig/reference/rpc/gnoi:go_default_library"
+  ],
 )
 
 go_proto_library(
     name = "go_default_library",
     srcs = ["file.proto"],
+    deps = [
+      "//github.com/openconfig/reference/rpc/gnoi:go_default_library"
+    ],
     visibility = ["//visibility:public"],
     rules_go_repo_only_for_internal_use = "@",
     has_services = 1,

file/file.proto

@@ -18,6 +18,8 @@ syntax = "proto3";
 
 package gnoi.file;
 
+import "github.com/openconfig/reference/rpc/gnoi/types.proto";
+
 service File {
   // Get read and streams the contents of a file from the target.
   // The file is streamed by sequential messages, each containing up to
@@ -73,7 +75,7 @@ message PutRequest {
   oneof request {
     Details open = 1;
     bytes contents = 2;
-    bytes checksum = 3; // MD5 checksum of the file.
+    gnoi.HashType hash = 3; // MD5 checksum of the file.
   }
 }
 

system/system.proto

@@ -47,7 +47,7 @@ service System {
 
   // SetPackage places a software package (possibly including bootable images)
   // on the target.
-  rpc SetPackage(SetPackageRequest) returns (SetPackageResponse) {}
+  rpc SetPackage(stream SetPackageRequest) returns (SetPackageResponse) {}
 
   // SwitchControlProcessor will switch from the current route processor to the
   // provided route processor. If the current route processor is the same as the
@@ -272,17 +272,23 @@ message TracerouteResponse {
 // Package defines a single package file to be placed on the target.
 message Package {
   string filename = 1;  // Destination path and filename of the package.
-  bytes data = 2;       // Contents of the package.
-  gnoi.HashType hash = 3;    // Verification hash of data.
   string version = 4;   // Version of the package. (vendor internal name)
   bool activate = 5;    // For system packages this will take effect after reboot.
 }
 
 // SetPackageRequest will place the package onto the target and optionally mark
-// it as the next bootable image.
+// it as the next bootable image. The initial message must be a package
+// message containing the filename and information about the file.
+// The final message must be a hash message contains the hash of the file
+// contents.
 message SetPackageRequest {
-  repeated Package packages = 1;
+  oneof request {
+   Package package = 1;
+   bytes contents = 2;
+   gnoi.HashType hash = 3;    // Verification hash of data.
+ }
 }
 
+
 message SetPackageResponse {
 }

test/BUILD

@@ -15,9 +15,17 @@ func TestGNOI(t *testing.T) {
 		in   proto.Message
 		want string
 	}{{
-		desc: "gnoi",
+		desc: "gnoi.Path",
 		in: &gnoi.Path{
-			Elements: []string{"foo", "path"},
+			Origin: "oc",
+			Elem:   []*gnoi.PathElem{{name: "interfaces", key: map[string]string{"name": "Ethernet1/1/0"}}},
+		},
+		want: "elements: \"foo\"\nelements: \"path\"\n",
+	}, {
+		desc: "gnoi.HashType",
+		in: &gnoi.HashType{
+			Method: gnoi.HashMethod_MD5,
+			Hash:   []byte("foo"),
 		},
 		want: "elements: \"foo\"\nelements: \"path\"\n",
 	}, {

test/simple_test.go

@@ -32,13 +32,25 @@ message HashType {
     UNSPECIFIED = 0;
     SHA256 = 1;
     SHA512 = 2;
+    MD5 = 3;
   }
   HashMethod method = 1;
   bytes hash = 2;
 }
 
-// OpenConfig path representation of the target.
-// eg. /interfaces/interface[name=et-1/0/0]
+// Path encodes a data tree path as a series of repeated strings, with
+// each element of the path representing a data tree node name and the
+// associated attributes.
+// Reference: gNMI Specification Section 2.2.2.
 message Path {
-  repeated string elements = 1;
+  string origin = 2;                              // Label to disambiguate path.
+  repeated PathElem elem = 3;                     // Elements of the path.
+}
+
+// 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 {
+  string name = 1;                    // The name of the element in the path.
+  map<string, string> key = 2;        // Map of key (attribute) name to value.
 }