From 90e5e7e4d0c15c5ae69b8a3fd95f5534daf2154a Mon Sep 17 00:00:00 2001 From: Ramesh Rajan Date: Tue, 4 Apr 2023 16:40:42 -0700 Subject: [PATCH 1/4] Add image name used in Install RPC to VerifyResponse and StandyResponse. For images which are named differently from the official image version name, returning image name allows for verifying the image passed in via the Install RPC is running. --- os/os.proto | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/os/os.proto b/os/os.proto index c9a6410f..4c1239e4 100644 --- a/os/os.proto +++ b/os/os.proto @@ -7,7 +7,7 @@ import "types/types.proto"; option go_package = "github.com/openconfig/gnoi/os"; -option (types.gnoi_version) = "0.1.4"; +option (types.gnoi_version) = "0.1.5"; // The OS service provides an interface for OS installation on a Target. The @@ -378,6 +378,13 @@ message VerifyResponse { // executed once per supervisor reply with individual_supervisor_install set // to true bool individual_supervisor_install = 4; + // Golden isos are generated by combining an offlicial release image with third party packages. + // Golden isos can have a different name than the official release image version. + // Install RPC can pass in a golden iso images which is not named the same as the + // official release version. + // Return the image name passed in to the Install RPC. This allows for verifying the image + // provided to the Install RPC is running. + string image_name = 4; } message VerifyStandby { @@ -407,4 +414,7 @@ message StandbyResponse { string id = 1; string version = 2; string activation_fail_message = 3; + / For golden iso images which are not named the same as the official release version + // return the image name. This allows for verifying the image in the Install RPC is + // running. } From b07db1950dc1bc30e5c59f59696141e7cf04d077 Mon Sep 17 00:00:00 2001 From: Ramesh Rajan Date: Wed, 19 Apr 2023 07:06:59 -0700 Subject: [PATCH 2/4] For golden iso images which are not named the same as the official release version, return the image name. This allows for verifying the image in the Install RPC is running. Fix build errors. --- os/os.proto | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/os/os.proto b/os/os.proto index 4c1239e4..42ae1332 100644 --- a/os/os.proto +++ b/os/os.proto @@ -384,7 +384,7 @@ message VerifyResponse { // official release version. // Return the image name passed in to the Install RPC. This allows for verifying the image // provided to the Install RPC is running. - string image_name = 4; + string image_name = 5; } message VerifyStandby { @@ -414,7 +414,8 @@ message StandbyResponse { string id = 1; string version = 2; string activation_fail_message = 3; - / For golden iso images which are not named the same as the official release version + // For golden iso images which are not named the same as the official release version // return the image name. This allows for verifying the image in the Install RPC is // running. + string image_name = 4; } From 03954ede32d196d35cdaab618525cbdf1ed98857 Mon Sep 17 00:00:00 2001 From: Ramesh Rajan Date: Wed, 19 Apr 2023 07:12:33 -0700 Subject: [PATCH 3/4] For golden iso images which are not named the same as the official release version, return the image name. This allows for verifying the image in the Install RPC is running. --- os/os.proto | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/os/os.proto b/os/os.proto index 42ae1332..495c4d48 100644 --- a/os/os.proto +++ b/os/os.proto @@ -378,12 +378,13 @@ message VerifyResponse { // executed once per supervisor reply with individual_supervisor_install set // to true bool individual_supervisor_install = 4; - // Golden isos are generated by combining an offlicial release image with third party packages. - // Golden isos can have a different name than the official release image version. + // Golden isos are generated by combining an offlicial release image with third party + // packages. Golden isos can have a different name than the official release image + // version. // Install RPC can pass in a golden iso images which is not named the same as the // official release version. - // Return the image name passed in to the Install RPC. This allows for verifying the image - // provided to the Install RPC is running. + // Return the image name passed in to the Install RPC. This allows for verifying + // the image provided to the Install RPC is running. string image_name = 5; } From 76d40d404ed90950feee6f64c0effafc2abe766f Mon Sep 17 00:00:00 2001 From: Ramesh Rajan Date: Wed, 19 Apr 2023 11:29:27 -0700 Subject: [PATCH 4/4] Fix length of comment lines. --- os/os.proto | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/os/os.proto b/os/os.proto index 495c4d48..332be381 100644 --- a/os/os.proto +++ b/os/os.proto @@ -378,13 +378,13 @@ message VerifyResponse { // executed once per supervisor reply with individual_supervisor_install set // to true bool individual_supervisor_install = 4; - // Golden isos are generated by combining an offlicial release image with third party - // packages. Golden isos can have a different name than the official release image - // version. - // Install RPC can pass in a golden iso images which is not named the same as the - // official release version. - // Return the image name passed in to the Install RPC. This allows for verifying - // the image provided to the Install RPC is running. + // Golden isos are generated by combining an offlicial release image with + // third party packages. Golden isos can have a different name than the + // official release image version. + // Install RPC can pass in a golden iso images which is not named the same + // as the official release version. + // Return the image name passed in to the Install RPC. This allows for + // verifying the image provided to the Install RPC is running. string image_name = 5; } @@ -415,8 +415,8 @@ message StandbyResponse { string id = 1; string version = 2; string activation_fail_message = 3; - // For golden iso images which are not named the same as the official release version - // return the image name. This allows for verifying the image in the Install RPC is - // running. + // For golden iso images which are not named the same as the official + // release version return the image name. This allows for verifying + // the image in the Install RPC is running. string image_name = 4; }