From c6c60bdeb3b92a769c2aeb735ab4a20a137d981b Mon Sep 17 00:00:00 2001 From: Boris Glimcher Date: Wed, 9 Nov 2022 01:50:13 +0200 Subject: [PATCH 1/2] [storage] [lint] Start enforcing lint errors name, count, comments, ... see #195 Signed-off-by: Boris Glimcher --- storage/Makefile | 1 + storage/v1alpha1/autogen.md | 16 +- storage/v1alpha1/frontend_nvme_pcie.proto | 12 +- storage/v1alpha1/frontend_virtio_blk.proto | 14 +- storage/v1alpha1/frontend_virtio_scsi.proto | 12 +- .../gen/cpp/frontend_nvme_pcie.grpc.pb.h | 5 +- .../v1alpha1/gen/cpp/frontend_nvme_pcie.pb.cc | 268 ++++---- .../v1alpha1/gen/cpp/frontend_nvme_pcie.pb.h | 42 +- .../gen/cpp/frontend_virtio_blk.grpc.pb.h | 5 +- .../gen/cpp/frontend_virtio_blk.pb.cc | 189 ++---- .../v1alpha1/gen/cpp/frontend_virtio_blk.pb.h | 91 +-- .../gen/cpp/frontend_virtio_scsi.grpc.pb.h | 5 +- .../gen/cpp/frontend_virtio_scsi.pb.cc | 287 ++++---- .../gen/cpp/frontend_virtio_scsi.pb.h | 85 +-- .../v1alpha1/gen/go/frontend_nvme_pcie.pb.go | 611 +++++++++--------- .../v1alpha1/gen/go/frontend_virtio_blk.pb.go | 207 +++--- .../gen/go/frontend_virtio_scsi.pb.go | 415 ++++++------ .../storage/v1/FrontendNvmePcieProto.java | 244 +++---- .../storage/v1/FrontendNvmeServiceGrpc.java | 15 + .../storage/v1/FrontendVirtioBlkProto.java | 78 +-- .../v1/FrontendVirtioBlkServiceGrpc.java | 15 + .../storage/v1/FrontendVirtioScsiProto.java | 166 ++--- .../v1/FrontendVirtioScsiServiceGrpc.java | 15 + .../opi_api/storage/v1/NVMeController.java | 8 +- .../storage/v1/NVMeControllerOrBuilder.java | 2 +- .../opi_api/storage/v1/NVMeNamespace.java | 82 +-- .../storage/v1/NVMeNamespaceOrBuilder.java | 11 +- .../java/opi_api/storage/v1/VirtioBlk.java | 228 ++----- .../storage/v1/VirtioBlkOrBuilder.java | 28 +- .../storage/v1/VirtioScsiController.java | 168 +---- .../v1/VirtioScsiControllerOrBuilder.java | 18 +- .../opi_api/storage/v1/VirtioScsiLun.java | 38 +- .../storage/v1/VirtioScsiLunOrBuilder.java | 6 +- .../gen/python/frontend_nvme_pcie_pb2.py | 104 +-- .../gen/python/frontend_nvme_pcie_pb2_grpc.py | 15 +- .../gen/python/frontend_virtio_blk_pb2.py | 40 +- .../python/frontend_virtio_blk_pb2_grpc.py | 15 +- .../gen/python/frontend_virtio_scsi_pb2.py | 76 +-- .../python/frontend_virtio_scsi_pb2_grpc.py | 15 +- 39 files changed, 1538 insertions(+), 2114 deletions(-) diff --git a/storage/Makefile b/storage/Makefile index add4a839..ab909139 100644 --- a/storage/Makefile +++ b/storage/Makefile @@ -15,5 +15,6 @@ all: curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api mv google "${PWD}"/v1alpha1/ docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter -I /common /out/*.proto --output-format summary" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter -I /common /out/frontend*.proto --output-format github --disable-rule=core::0192::has-comments --disable-rule=core::0136 --disable-rule=core::0127 --set-exit-status" docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1alpha1:/protos pseudomuto/protoc-gen-doc -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" rm -rf "${PWD}"/v1alpha1/google diff --git a/storage/v1alpha1/autogen.md b/storage/v1alpha1/autogen.md index 43f49304..e658ac81 100644 --- a/storage/v1alpha1/autogen.md +++ b/storage/v1alpha1/autogen.md @@ -886,7 +886,7 @@ virtual functions under the physical function. | subsystem_id | [opi_api.common.v1.ObjectKey](#opi_api-common-v1-ObjectKey) | | subsystem information | | pcie_id | [NvmeControllerPciId](#opi_api-storage-v1-NvmeControllerPciId) | | xPU's PCI ID for the controller | | max_nsq | [int32](#int32) | | maximum number of host submission queues allowed. If not set, the xPU will provide a default. | -| max_ncq | [int32](#int32) | | maximum number of host completion queues allowed. Optional. If not set, the xPU will provide a default. | +| max_ncq | [int32](#int32) | | maximum number of host completion queues allowed. If not set, the xPU will provide a default. | | sqes | [int32](#int32) | | maximum number of submission queue entries per submission queue, as a power of 2. default value as per spec is 6 | | cqes | [int32](#int32) | | maximum number of completion queue entries per completion queue, as a power of 2. default value as per spec is 4 | | max_namespaces | [int32](#int32) | | maximum Number of namespaces that will be provisioned under the controller. | @@ -1025,14 +1025,14 @@ virtual functions under the physical function. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| id | [opi_api.common.v1.ObjectKey](#opi_api-common-v1-ObjectKey) | | namespace's unique key replaces: int64 id = 1; | +| id | [opi_api.common.v1.ObjectKey](#opi_api-common-v1-ObjectKey) | | namespace's unique key | | subsystem_id | [opi_api.common.v1.ObjectKey](#opi_api-common-v1-ObjectKey) | | subsystem for this namespace | | controller_id | [opi_api.common.v1.ObjectKey](#opi_api-common-v1-ObjectKey) | | key of the PCIe controller object that will host this namespace. | | host_nsid | [int32](#int32) | | NSID present to the host by the NVMe PCIe controller. If not provided, then the controller will assign an unused NSID within the max namespace range - auto assigned nsid may not work for live migration | | block_size | [int64](#int64) | | Block size in bytes, must be power of 2 and must be less than the max io size supported. Typically tested values are 512, and 4k. | -| num_blocks | [int64](#int64) | | Size/Capacity of the namespace in blocks, size in bytes will be BlockSize x NumBlocks. | +| blocks_count | [int64](#int64) | | Size/Capacity of the namespace in blocks, size in bytes will be BlockSize x NumBlocks. | | nguid | [string](#string) | | Globally unique identifier for the namespace | -| eui64 | [int64](#int64) | | 64bit Extended unique identifier for the namespace mandatory if guid is not specified, optional otherwise | +| eui64 | [int64](#int64) | | 64bit Extended unique identifier for the namespace mandatory if guid is not specified | | uuid | [opi_api.common.v1.Uuid](#opi_api-common-v1-Uuid) | | Globally unique identifier for the namespace | | volume_id | [opi_api.common.v1.ObjectKey](#opi_api-common-v1-ObjectKey) | | The back/middle-end volume to back this namespace. | | optimal_write_size | [int32](#int32) | | optimal write size hint to host driver. Host IO stack may use this to regulate IO size. Must be a multiple of the preferred write granularity. Must not exceed the controller maximum IO size value configured in the nvme agent config file. | @@ -1310,7 +1310,7 @@ Intentionally empty. ### FrontendNvmeService - +Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation. | Method Name | Request Type | Response Type | Description | | ----------- | ------------ | ------------- | ------------| @@ -1353,7 +1353,6 @@ Intentionally empty. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | id | [int64](#int64) | | | -| name | [string](#string) | | | | pcie_id | [NvmeControllerPciId](#opi_api-storage-v1-NvmeControllerPciId) | | | | bdev | [string](#string) | | | | max_io_qps | [int64](#int64) | | | @@ -1494,7 +1493,7 @@ Intentionally empty. ### FrontendVirtioBlkService - +Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme. | Method Name | Request Type | Response Type | Description | | ----------- | ------------ | ------------- | ------------| @@ -1541,7 +1540,6 @@ Intentionally empty. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | id | [int64](#int64) | | | -| name | [string](#string) | | | | pcie_id | [NvmeControllerPciId](#opi_api-storage-v1-NvmeControllerPciId) | | | @@ -1815,7 +1813,7 @@ Intentionally empty. ### FrontendVirtioScsiService - +Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk. | Method Name | Request Type | Response Type | Description | | ----------- | ------------ | ------------- | ------------| diff --git a/storage/v1alpha1/frontend_nvme_pcie.proto b/storage/v1alpha1/frontend_nvme_pcie.proto index 83df30f4..610239e7 100755 --- a/storage/v1alpha1/frontend_nvme_pcie.proto +++ b/storage/v1alpha1/frontend_nvme_pcie.proto @@ -16,10 +16,7 @@ import "uuid.proto"; import "google/protobuf/empty.proto"; import "google/api/annotations.proto"; -// Front End (host-facing) APIs. - -// NVMe/PCIe emulation - +// Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation. service FrontendNvmeService { rpc NVMeSubsystemCreate (NVMeSubsystemCreateRequest) returns (NVMeSubsystem) { option (google.api.http) = { @@ -152,7 +149,7 @@ message NVMeController { // If not set, the xPU will provide a default. int32 max_nsq = 5; - // maximum number of host completion queues allowed. Optional. + // maximum number of host completion queues allowed. // If not set, the xPU will provide a default. int32 max_ncq = 6; @@ -171,7 +168,6 @@ message NVMeController { message NVMeNamespace { // namespace's unique key - // replaces: int64 id = 1; common.v1.ObjectKey id = 1; // subsystem for this namespace @@ -192,13 +188,13 @@ message NVMeNamespace { // Size/Capacity of the namespace in blocks, size in bytes will // be BlockSize x NumBlocks. - int64 num_blocks = 6; + int64 blocks_count = 6; // Globally unique identifier for the namespace string nguid = 7; // 64bit Extended unique identifier for the namespace - // mandatory if guid is not specified, optional otherwise + // mandatory if guid is not specified int64 eui64 = 8; // Globally unique identifier for the namespace diff --git a/storage/v1alpha1/frontend_virtio_blk.proto b/storage/v1alpha1/frontend_virtio_blk.proto index 26888b13..aa0a64a3 100755 --- a/storage/v1alpha1/frontend_virtio_blk.proto +++ b/storage/v1alpha1/frontend_virtio_blk.proto @@ -13,10 +13,7 @@ import "common.proto"; import "google/protobuf/empty.proto"; import "google/api/annotations.proto"; -// Front End (host-facing) APIs. - -// Virtio-blk emulation - +// Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme. service FrontendVirtioBlkService { rpc VirtioBlkCreate (VirtioBlkCreateRequest) returns (VirtioBlk) { option (google.api.http) = { @@ -50,11 +47,10 @@ service FrontendVirtioBlkService { message VirtioBlk { int64 id = 1; - string name = 2; - NvmeControllerPciId pcie_id = 3; - string bdev = 4; - int64 max_io_qps = 5; - string serial_number = 6; + NvmeControllerPciId pcie_id = 2; + string bdev = 3; + int64 max_io_qps = 4; + string serial_number = 5; } message VirtioBlkCreateRequest { diff --git a/storage/v1alpha1/frontend_virtio_scsi.proto b/storage/v1alpha1/frontend_virtio_scsi.proto index 9f44cb39..d53237e9 100755 --- a/storage/v1alpha1/frontend_virtio_scsi.proto +++ b/storage/v1alpha1/frontend_virtio_scsi.proto @@ -13,10 +13,7 @@ import "common.proto"; import "google/protobuf/empty.proto"; import "google/api/annotations.proto"; -// Front End (host-facing) APIs. - -// Virtio-scsi emulation - +// Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk. service FrontendVirtioScsiService { rpc VirtioScsiControllerCreate (VirtioScsiControllerCreateRequest) returns (VirtioScsiController) { option (google.api.http) = { @@ -79,14 +76,13 @@ service FrontendVirtioScsiService { message VirtioScsiController { int64 id = 1; - string name = 2; - NvmeControllerPciId pcie_id = 4; + NvmeControllerPciId pcie_id = 2; } message VirtioScsiLun { int64 id = 1; - int64 controller_id = 4; - string bdev = 6; + int64 controller_id = 2; + string bdev = 3; } message VirtioScsiControllerCreateRequest { diff --git a/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.grpc.pb.h b/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.grpc.pb.h index 87348c43..d29c6671 100644 --- a/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.grpc.pb.h +++ b/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.grpc.pb.h @@ -34,10 +34,7 @@ namespace opi_api { namespace storage { namespace v1 { -// Front End (host-facing) APIs. -// -// NVMe/PCIe emulation -// +// Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation. class FrontendNvmeService final { public: static constexpr char const* service_full_name() { diff --git a/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.cc b/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.cc index ceb5e2c6..ff6e8f83 100644 --- a/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.cc +++ b/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.cc @@ -66,7 +66,7 @@ constexpr NVMeNamespace::NVMeNamespace( , uuid_(nullptr) , volume_id_(nullptr) , block_size_(int64_t{0}) - , num_blocks_(int64_t{0}) + , blocks_count_(int64_t{0}) , host_nsid_(0) , optimal_write_size_(0) , eui64_(int64_t{0}) @@ -417,7 +417,7 @@ const uint32_t TableStruct_frontend_5fnvme_5fpcie_2eproto::offsets[] PROTOBUF_SE PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, controller_id_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, host_nsid_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, block_size_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, num_blocks_), + PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, blocks_count_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, nguid_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, eui64_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMeNamespace, uuid_), @@ -671,131 +671,131 @@ const char descriptor_table_protodef_frontend_5fnvme_5fpcie_2eproto[] PROTOBUF_S "\007pcie_id\030\004 \001(\0132\'.opi_api.storage.v1.Nvme" "ControllerPciId\022\017\n\007max_nsq\030\005 \001(\005\022\017\n\007max_" "ncq\030\006 \001(\005\022\014\n\004sqes\030\007 \001(\005\022\014\n\004cqes\030\010 \001(\005\022\026\n" - "\016max_namespaces\030\t \001(\005\"\217\003\n\rNVMeNamespace\022" + "\016max_namespaces\030\t \001(\005\"\221\003\n\rNVMeNamespace\022" "(\n\002id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKe" "y\0222\n\014subsystem_id\030\002 \001(\0132\034.opi_api.common" ".v1.ObjectKey\0223\n\rcontroller_id\030\003 \001(\0132\034.o" "pi_api.common.v1.ObjectKey\022\021\n\thost_nsid\030" - "\004 \001(\005\022\022\n\nblock_size\030\005 \001(\003\022\022\n\nnum_blocks\030" - "\006 \001(\003\022\r\n\005nguid\030\007 \001(\t\022\r\n\005eui64\030\010 \001(\003\022%\n\004u" - "uid\030\t \001(\0132\027.opi_api.common.v1.Uuid\022/\n\tvo" - "lume_id\030\n \001(\0132\034.opi_api.common.v1.Object" - "Key\022\032\n\022optimal_write_size\030\013 \001(\005\022\036\n\026pref_" - "write_granularity\030\014 \001(\005\"R\n\032NVMeSubsystem" - "CreateRequest\0224\n\tsubsystem\030\001 \001(\0132!.opi_a" - "pi.storage.v1.NVMeSubsystem\"P\n\032NVMeSubsy" - "stemDeleteRequest\0222\n\014subsystem_id\030\001 \001(\0132" - "\034.opi_api.common.v1.ObjectKey\"R\n\032NVMeSub" - "systemUpdateRequest\0224\n\tsubsystem\030\001 \001(\0132!" - ".opi_api.storage.v1.NVMeSubsystem\"\032\n\030NVM" - "eSubsystemListRequest\"Q\n\031NVMeSubsystemLi" - "stResponse\0224\n\tsubsystem\030\001 \003(\0132!.opi_api." - "storage.v1.NVMeSubsystem\"M\n\027NVMeSubsyste" - "mGetRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.opi_" - "api.common.v1.ObjectKey\"O\n\031NVMeSubsystem" - "StatsRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.opi" - "_api.common.v1.ObjectKey\"+\n\032NVMeSubsyste" - "mStatsResponse\022\r\n\005stats\030\001 \001(\t\"U\n\033NVMeCon" - "trollerCreateRequest\0226\n\ncontroller\030\001 \001(\013" - "2\".opi_api.storage.v1.NVMeController\"R\n\033" - "NVMeControllerDeleteRequest\0223\n\rcontrolle" - "r_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey" - "\"U\n\033NVMeControllerUpdateRequest\0226\n\ncontr" - "oller\030\001 \001(\0132\".opi_api.storage.v1.NVMeCon" - "troller\"O\n\031NVMeControllerListRequest\0222\n\014" - "subsystem_id\030\001 \001(\0132\034.opi_api.common.v1.O" - "bjectKey\"T\n\032NVMeControllerListResponse\0226" - "\n\ncontroller\030\001 \003(\0132\".opi_api.storage.v1." - "NVMeController\"O\n\030NVMeControllerGetReque" - "st\0223\n\rcontroller_id\030\001 \001(\0132\034.opi_api.comm" - "on.v1.ObjectKey\"F\n\032NVMeControllerStatsRe" - "quest\022(\n\002id\030\001 \001(\0132\034.opi_api.common.v1.Ob" - "jectKey\"V\n\033NVMeControllerStatsResponse\022(" - "\n\002id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey" - "\022\r\n\005stats\030\002 \001(\t\"R\n\032NVMeNamespaceCreateRe" - "quest\0224\n\tnamespace\030\001 \001(\0132!.opi_api.stora" - "ge.v1.NVMeNamespace\"P\n\032NVMeNamespaceDele" - "teRequest\0222\n\014namespace_id\030\001 \001(\0132\034.opi_ap" - "i.common.v1.ObjectKey\"R\n\032NVMeNamespaceUp" - "dateRequest\0224\n\tnamespace\030\001 \001(\0132!.opi_api" - ".storage.v1.NVMeNamespace\"\203\001\n\030NVMeNamesp" - "aceListRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.o" - "pi_api.common.v1.ObjectKey\0223\n\rcontroller" - "_id\030\002 \001(\0132\034.opi_api.common.v1.ObjectKey\"" - "Q\n\031NVMeNamespaceListResponse\0224\n\tnamespac" - "e\030\001 \003(\0132!.opi_api.storage.v1.NVMeNamespa" - "ce\"M\n\027NVMeNamespaceGetRequest\0222\n\014namespa" - "ce_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKe" - "y\"O\n\031NVMeNamespaceStatsRequest\0222\n\014namesp" - "ace_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" - "ey\"U\n\032NVMeNamespaceStatsResponse\022(\n\002id\030\001" - " \001(\0132\034.opi_api.common.v1.ObjectKey\022\r\n\005st" - "ats\030\002 \001(\t2\260\023\n\023FrontendNvmeService\022\213\001\n\023NV" - "MeSubsystemCreate\022..opi_api.storage.v1.N" - "VMeSubsystemCreateRequest\032!.opi_api.stor" - "age.v1.NVMeSubsystem\"!\202\323\344\223\002\033\"\016/v1/subsys" - "tems:\tsubsystem\022\201\001\n\023NVMeSubsystemDelete\022" - "..opi_api.storage.v1.NVMeSubsystemDelete" - "Request\032\026.google.protobuf.Empty\"\"\202\323\344\223\002\034*" - "\032/v1/subsystems/{subsystem}\022\213\001\n\023NVMeSubs" - "ystemUpdate\022..opi_api.storage.v1.NVMeSub" - "systemUpdateRequest\032!.opi_api.storage.v1" - ".NVMeSubsystem\"!\202\323\344\223\002\0332\016/v1/subsystems:\t" - "subsystem\022\210\001\n\021NVMeSubsystemList\022,.opi_ap" - "i.storage.v1.NVMeSubsystemListRequest\032-." - "opi_api.storage.v1.NVMeSubsystemListResp" - "onse\"\026\202\323\344\223\002\020\022\016/v1/subsystems\022\206\001\n\020NVMeSub" - "systemGet\022+.opi_api.storage.v1.NVMeSubsy" - "stemGetRequest\032!.opi_api.storage.v1.NVMe" - "Subsystem\"\"\202\323\344\223\002\034\022\032/v1/subsystems/{subsy" - "stem}\022u\n\022NVMeSubsystemStats\022-.opi_api.st" - "orage.v1.NVMeSubsystemStatsRequest\032..opi" - "_api.storage.v1.NVMeSubsystemStatsRespon" - "se\"\000\022\220\001\n\024NVMeControllerCreate\022/.opi_api." - "storage.v1.NVMeControllerCreateRequest\032\"" - ".opi_api.storage.v1.NVMeController\"#\202\323\344\223" - "\002\035\"\017/v1/controllers:\ncontroller\022\205\001\n\024NVMe" - "ControllerDelete\022/.opi_api.storage.v1.NV" - "MeControllerDeleteRequest\032\026.google.proto" - "buf.Empty\"$\202\323\344\223\002\036*\034/v1/controllers/{cont" - "roller}\022\220\001\n\024NVMeControllerUpdate\022/.opi_a" - "pi.storage.v1.NVMeControllerUpdateReques" - "t\032\".opi_api.storage.v1.NVMeController\"#\202" - "\323\344\223\002\0352\017/v1/controllers:\ncontroller\022\214\001\n\022N" - "VMeControllerList\022-.opi_api.storage.v1.N" - "VMeControllerListRequest\032..opi_api.stora" - "ge.v1.NVMeControllerListResponse\"\027\202\323\344\223\002\021" - "\022\017/v1/controllers\022\213\001\n\021NVMeControllerGet\022" - ",.opi_api.storage.v1.NVMeControllerGetRe" - "quest\032\".opi_api.storage.v1.NVMeControlle" - "r\"$\202\323\344\223\002\036\022\034/v1/controllers/{controller}\022" - "x\n\023NVMeControllerStats\022..opi_api.storage" - ".v1.NVMeControllerStatsRequest\032/.opi_api" - ".storage.v1.NVMeControllerStatsResponse\"" - "\000\022\213\001\n\023NVMeNamespaceCreate\022..opi_api.stor" - "age.v1.NVMeNamespaceCreateRequest\032!.opi_" - "api.storage.v1.NVMeNamespace\"!\202\323\344\223\002\033\"\016/v" - "1/namespaces:\tnamespace\022\201\001\n\023NVMeNamespac" - "eDelete\022..opi_api.storage.v1.NVMeNamespa" - "ceDeleteRequest\032\026.google.protobuf.Empty\"" - "\"\202\323\344\223\002\034*\032/v1/namespaces/{namespace}\022\213\001\n\023" - "NVMeNamespaceUpdate\022..opi_api.storage.v1" - ".NVMeNamespaceUpdateRequest\032!.opi_api.st" - "orage.v1.NVMeNamespace\"!\202\323\344\223\002\0332\016/v1/name" - "spaces:\tnamespace\022\210\001\n\021NVMeNamespaceList\022" - ",.opi_api.storage.v1.NVMeNamespaceListRe" - "quest\032-.opi_api.storage.v1.NVMeNamespace" - "ListResponse\"\026\202\323\344\223\002\020\022\016/v1/namespaces\022\206\001\n" - "\020NVMeNamespaceGet\022+.opi_api.storage.v1.N" - "VMeNamespaceGetRequest\032!.opi_api.storage" - ".v1.NVMeNamespace\"\"\202\323\344\223\002\034\022\032/v1/namespace" - "s/{namespace}\022u\n\022NVMeNamespaceStats\022-.op" - "i_api.storage.v1.NVMeNamespaceStatsReque" - "st\032..opi_api.storage.v1.NVMeNamespaceSta" - "tsResponse\"\000Bd\n\022opi_api.storage.v1B\025Fron" - "tendNvmePcieProtoP\001Z5github.com/opiproje" - "ct/opi-api/storage/v1alpha1/gen/gob\006prot" - "o3" + "\004 \001(\005\022\022\n\nblock_size\030\005 \001(\003\022\024\n\014blocks_coun" + "t\030\006 \001(\003\022\r\n\005nguid\030\007 \001(\t\022\r\n\005eui64\030\010 \001(\003\022%\n" + "\004uuid\030\t \001(\0132\027.opi_api.common.v1.Uuid\022/\n\t" + "volume_id\030\n \001(\0132\034.opi_api.common.v1.Obje" + "ctKey\022\032\n\022optimal_write_size\030\013 \001(\005\022\036\n\026pre" + "f_write_granularity\030\014 \001(\005\"R\n\032NVMeSubsyst" + "emCreateRequest\0224\n\tsubsystem\030\001 \001(\0132!.opi" + "_api.storage.v1.NVMeSubsystem\"P\n\032NVMeSub" + "systemDeleteRequest\0222\n\014subsystem_id\030\001 \001(" + "\0132\034.opi_api.common.v1.ObjectKey\"R\n\032NVMeS" + "ubsystemUpdateRequest\0224\n\tsubsystem\030\001 \001(\013" + "2!.opi_api.storage.v1.NVMeSubsystem\"\032\n\030N" + "VMeSubsystemListRequest\"Q\n\031NVMeSubsystem" + "ListResponse\0224\n\tsubsystem\030\001 \003(\0132!.opi_ap" + "i.storage.v1.NVMeSubsystem\"M\n\027NVMeSubsys" + "temGetRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.op" + "i_api.common.v1.ObjectKey\"O\n\031NVMeSubsyst" + "emStatsRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.o" + "pi_api.common.v1.ObjectKey\"+\n\032NVMeSubsys" + "temStatsResponse\022\r\n\005stats\030\001 \001(\t\"U\n\033NVMeC" + "ontrollerCreateRequest\0226\n\ncontroller\030\001 \001" + "(\0132\".opi_api.storage.v1.NVMeController\"R" + "\n\033NVMeControllerDeleteRequest\0223\n\rcontrol" + "ler_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" + "ey\"U\n\033NVMeControllerUpdateRequest\0226\n\ncon" + "troller\030\001 \001(\0132\".opi_api.storage.v1.NVMeC" + "ontroller\"O\n\031NVMeControllerListRequest\0222" + "\n\014subsystem_id\030\001 \001(\0132\034.opi_api.common.v1" + ".ObjectKey\"T\n\032NVMeControllerListResponse" + "\0226\n\ncontroller\030\001 \003(\0132\".opi_api.storage.v" + "1.NVMeController\"O\n\030NVMeControllerGetReq" + "uest\0223\n\rcontroller_id\030\001 \001(\0132\034.opi_api.co" + "mmon.v1.ObjectKey\"F\n\032NVMeControllerStats" + "Request\022(\n\002id\030\001 \001(\0132\034.opi_api.common.v1." + "ObjectKey\"V\n\033NVMeControllerStatsResponse" + "\022(\n\002id\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" + "ey\022\r\n\005stats\030\002 \001(\t\"R\n\032NVMeNamespaceCreate" + "Request\0224\n\tnamespace\030\001 \001(\0132!.opi_api.sto" + "rage.v1.NVMeNamespace\"P\n\032NVMeNamespaceDe" + "leteRequest\0222\n\014namespace_id\030\001 \001(\0132\034.opi_" + "api.common.v1.ObjectKey\"R\n\032NVMeNamespace" + "UpdateRequest\0224\n\tnamespace\030\001 \001(\0132!.opi_a" + "pi.storage.v1.NVMeNamespace\"\203\001\n\030NVMeName" + "spaceListRequest\0222\n\014subsystem_id\030\001 \001(\0132\034" + ".opi_api.common.v1.ObjectKey\0223\n\rcontroll" + "er_id\030\002 \001(\0132\034.opi_api.common.v1.ObjectKe" + "y\"Q\n\031NVMeNamespaceListResponse\0224\n\tnamesp" + "ace\030\001 \003(\0132!.opi_api.storage.v1.NVMeNames" + "pace\"M\n\027NVMeNamespaceGetRequest\0222\n\014names" + "pace_id\030\001 \001(\0132\034.opi_api.common.v1.Object" + "Key\"O\n\031NVMeNamespaceStatsRequest\0222\n\014name" + "space_id\030\001 \001(\0132\034.opi_api.common.v1.Objec" + "tKey\"U\n\032NVMeNamespaceStatsResponse\022(\n\002id" + "\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey\022\r\n\005" + "stats\030\002 \001(\t2\260\023\n\023FrontendNvmeService\022\213\001\n\023" + "NVMeSubsystemCreate\022..opi_api.storage.v1" + ".NVMeSubsystemCreateRequest\032!.opi_api.st" + "orage.v1.NVMeSubsystem\"!\202\323\344\223\002\033\"\016/v1/subs" + "ystems:\tsubsystem\022\201\001\n\023NVMeSubsystemDelet" + "e\022..opi_api.storage.v1.NVMeSubsystemDele" + "teRequest\032\026.google.protobuf.Empty\"\"\202\323\344\223\002" + "\034*\032/v1/subsystems/{subsystem}\022\213\001\n\023NVMeSu" + "bsystemUpdate\022..opi_api.storage.v1.NVMeS" + "ubsystemUpdateRequest\032!.opi_api.storage." + "v1.NVMeSubsystem\"!\202\323\344\223\002\0332\016/v1/subsystems" + ":\tsubsystem\022\210\001\n\021NVMeSubsystemList\022,.opi_" + "api.storage.v1.NVMeSubsystemListRequest\032" + "-.opi_api.storage.v1.NVMeSubsystemListRe" + "sponse\"\026\202\323\344\223\002\020\022\016/v1/subsystems\022\206\001\n\020NVMeS" + "ubsystemGet\022+.opi_api.storage.v1.NVMeSub" + "systemGetRequest\032!.opi_api.storage.v1.NV" + "MeSubsystem\"\"\202\323\344\223\002\034\022\032/v1/subsystems/{sub" + "system}\022u\n\022NVMeSubsystemStats\022-.opi_api." + "storage.v1.NVMeSubsystemStatsRequest\032..o" + "pi_api.storage.v1.NVMeSubsystemStatsResp" + "onse\"\000\022\220\001\n\024NVMeControllerCreate\022/.opi_ap" + "i.storage.v1.NVMeControllerCreateRequest" + "\032\".opi_api.storage.v1.NVMeController\"#\202\323" + "\344\223\002\035\"\017/v1/controllers:\ncontroller\022\205\001\n\024NV" + "MeControllerDelete\022/.opi_api.storage.v1." + "NVMeControllerDeleteRequest\032\026.google.pro" + "tobuf.Empty\"$\202\323\344\223\002\036*\034/v1/controllers/{co" + "ntroller}\022\220\001\n\024NVMeControllerUpdate\022/.opi" + "_api.storage.v1.NVMeControllerUpdateRequ" + "est\032\".opi_api.storage.v1.NVMeController\"" + "#\202\323\344\223\002\0352\017/v1/controllers:\ncontroller\022\214\001\n" + "\022NVMeControllerList\022-.opi_api.storage.v1" + ".NVMeControllerListRequest\032..opi_api.sto" + "rage.v1.NVMeControllerListResponse\"\027\202\323\344\223" + "\002\021\022\017/v1/controllers\022\213\001\n\021NVMeControllerGe" + "t\022,.opi_api.storage.v1.NVMeControllerGet" + "Request\032\".opi_api.storage.v1.NVMeControl" + "ler\"$\202\323\344\223\002\036\022\034/v1/controllers/{controller" + "}\022x\n\023NVMeControllerStats\022..opi_api.stora" + "ge.v1.NVMeControllerStatsRequest\032/.opi_a" + "pi.storage.v1.NVMeControllerStatsRespons" + "e\"\000\022\213\001\n\023NVMeNamespaceCreate\022..opi_api.st" + "orage.v1.NVMeNamespaceCreateRequest\032!.op" + "i_api.storage.v1.NVMeNamespace\"!\202\323\344\223\002\033\"\016" + "/v1/namespaces:\tnamespace\022\201\001\n\023NVMeNamesp" + "aceDelete\022..opi_api.storage.v1.NVMeNames" + "paceDeleteRequest\032\026.google.protobuf.Empt" + "y\"\"\202\323\344\223\002\034*\032/v1/namespaces/{namespace}\022\213\001" + "\n\023NVMeNamespaceUpdate\022..opi_api.storage." + "v1.NVMeNamespaceUpdateRequest\032!.opi_api." + "storage.v1.NVMeNamespace\"!\202\323\344\223\002\0332\016/v1/na" + "mespaces:\tnamespace\022\210\001\n\021NVMeNamespaceLis" + "t\022,.opi_api.storage.v1.NVMeNamespaceList" + "Request\032-.opi_api.storage.v1.NVMeNamespa" + "ceListResponse\"\026\202\323\344\223\002\020\022\016/v1/namespaces\022\206" + "\001\n\020NVMeNamespaceGet\022+.opi_api.storage.v1" + ".NVMeNamespaceGetRequest\032!.opi_api.stora" + "ge.v1.NVMeNamespace\"\"\202\323\344\223\002\034\022\032/v1/namespa" + "ces/{namespace}\022u\n\022NVMeNamespaceStats\022-." + "opi_api.storage.v1.NVMeNamespaceStatsReq" + "uest\032..opi_api.storage.v1.NVMeNamespaceS" + "tatsResponse\"\000Bd\n\022opi_api.storage.v1B\025Fr" + "ontendNvmePcieProtoP\001Z5github.com/opipro" + "ject/opi-api/storage/v1alpha1/gen/gob\006pr" + "oto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_frontend_5fnvme_5fpcie_2eproto_deps[5] = { &::descriptor_table_common_2eproto, @@ -806,7 +806,7 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor }; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_frontend_5fnvme_5fpcie_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_frontend_5fnvme_5fpcie_2eproto = { - false, false, 5562, descriptor_table_protodef_frontend_5fnvme_5fpcie_2eproto, "frontend_nvme_pcie.proto", + false, false, 5564, descriptor_table_protodef_frontend_5fnvme_5fpcie_2eproto, "frontend_nvme_pcie.proto", &descriptor_table_frontend_5fnvme_5fpcie_2eproto_once, descriptor_table_frontend_5fnvme_5fpcie_2eproto_deps, 5, 27, schemas, file_default_instances, TableStruct_frontend_5fnvme_5fpcie_2eproto::offsets, file_level_metadata_frontend_5fnvme_5fpcie_2eproto, file_level_enum_descriptors_frontend_5fnvme_5fpcie_2eproto, file_level_service_descriptors_frontend_5fnvme_5fpcie_2eproto, @@ -1966,10 +1966,10 @@ const char* NVMeNamespace::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ } else goto handle_unusual; continue; - // int64 num_blocks = 6; + // int64 blocks_count = 6; case 6: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 48)) { - num_blocks_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + blocks_count_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; @@ -2089,10 +2089,10 @@ uint8_t* NVMeNamespace::_InternalSerialize( target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(5, this->_internal_block_size(), target); } - // int64 num_blocks = 6; - if (this->_internal_num_blocks() != 0) { + // int64 blocks_count = 6; + if (this->_internal_blocks_count() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(6, this->_internal_num_blocks(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(6, this->_internal_blocks_count(), target); } // string nguid = 7; @@ -2202,9 +2202,9 @@ size_t NVMeNamespace::ByteSizeLong() const { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_block_size()); } - // int64 num_blocks = 6; - if (this->_internal_num_blocks() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_num_blocks()); + // int64 blocks_count = 6; + if (this->_internal_blocks_count() != 0) { + total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_blocks_count()); } // int32 host_nsid = 4; @@ -2270,8 +2270,8 @@ void NVMeNamespace::MergeFrom(const NVMeNamespace& from) { if (from._internal_block_size() != 0) { _internal_set_block_size(from._internal_block_size()); } - if (from._internal_num_blocks() != 0) { - _internal_set_num_blocks(from._internal_num_blocks()); + if (from._internal_blocks_count() != 0) { + _internal_set_blocks_count(from._internal_blocks_count()); } if (from._internal_host_nsid() != 0) { _internal_set_host_nsid(from._internal_host_nsid()); diff --git a/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.h b/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.h index 72ec2844..7d9b7b67 100644 --- a/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.h +++ b/storage/v1alpha1/gen/cpp/frontend_nvme_pcie.pb.h @@ -817,7 +817,7 @@ class NVMeNamespace final : kUuidFieldNumber = 9, kVolumeIdFieldNumber = 10, kBlockSizeFieldNumber = 5, - kNumBlocksFieldNumber = 6, + kBlocksCountFieldNumber = 6, kHostNsidFieldNumber = 4, kOptimalWriteSizeFieldNumber = 11, kEui64FieldNumber = 8, @@ -936,13 +936,13 @@ class NVMeNamespace final : void _internal_set_block_size(int64_t value); public: - // int64 num_blocks = 6; - void clear_num_blocks(); - int64_t num_blocks() const; - void set_num_blocks(int64_t value); + // int64 blocks_count = 6; + void clear_blocks_count(); + int64_t blocks_count() const; + void set_blocks_count(int64_t value); private: - int64_t _internal_num_blocks() const; - void _internal_set_num_blocks(int64_t value); + int64_t _internal_blocks_count() const; + void _internal_set_blocks_count(int64_t value); public: // int32 host_nsid = 4; @@ -995,7 +995,7 @@ class NVMeNamespace final : ::opi_api::common::v1::Uuid* uuid_; ::opi_api::common::v1::ObjectKey* volume_id_; int64_t block_size_; - int64_t num_blocks_; + int64_t blocks_count_; int32_t host_nsid_; int32_t optimal_write_size_; int64_t eui64_; @@ -5790,24 +5790,24 @@ inline void NVMeNamespace::set_block_size(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.NVMeNamespace.block_size) } -// int64 num_blocks = 6; -inline void NVMeNamespace::clear_num_blocks() { - num_blocks_ = int64_t{0}; +// int64 blocks_count = 6; +inline void NVMeNamespace::clear_blocks_count() { + blocks_count_ = int64_t{0}; } -inline int64_t NVMeNamespace::_internal_num_blocks() const { - return num_blocks_; +inline int64_t NVMeNamespace::_internal_blocks_count() const { + return blocks_count_; } -inline int64_t NVMeNamespace::num_blocks() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.NVMeNamespace.num_blocks) - return _internal_num_blocks(); +inline int64_t NVMeNamespace::blocks_count() const { + // @@protoc_insertion_point(field_get:opi_api.storage.v1.NVMeNamespace.blocks_count) + return _internal_blocks_count(); } -inline void NVMeNamespace::_internal_set_num_blocks(int64_t value) { +inline void NVMeNamespace::_internal_set_blocks_count(int64_t value) { - num_blocks_ = value; + blocks_count_ = value; } -inline void NVMeNamespace::set_num_blocks(int64_t value) { - _internal_set_num_blocks(value); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.NVMeNamespace.num_blocks) +inline void NVMeNamespace::set_blocks_count(int64_t value) { + _internal_set_blocks_count(value); + // @@protoc_insertion_point(field_set:opi_api.storage.v1.NVMeNamespace.blocks_count) } // string nguid = 7; diff --git a/storage/v1alpha1/gen/cpp/frontend_virtio_blk.grpc.pb.h b/storage/v1alpha1/gen/cpp/frontend_virtio_blk.grpc.pb.h index efd1279f..4194212b 100644 --- a/storage/v1alpha1/gen/cpp/frontend_virtio_blk.grpc.pb.h +++ b/storage/v1alpha1/gen/cpp/frontend_virtio_blk.grpc.pb.h @@ -33,10 +33,7 @@ namespace opi_api { namespace storage { namespace v1 { -// Front End (host-facing) APIs. -// -// Virtio-blk emulation -// +// Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme. class FrontendVirtioBlkService final { public: static constexpr char const* service_full_name() { diff --git a/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.cc b/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.cc index 2ae6a4dd..09775063 100644 --- a/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.cc +++ b/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.cc @@ -21,8 +21,7 @@ namespace storage { namespace v1 { constexpr VirtioBlk::VirtioBlk( ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized) - : name_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) - , bdev_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) + : bdev_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) , serial_number_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) , pcie_id_(nullptr) , id_(int64_t{0}) @@ -148,7 +147,6 @@ const uint32_t TableStruct_frontend_5fvirtio_5fblk_2eproto::offsets[] PROTOBUF_S ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioBlk, id_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioBlk, name_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioBlk, pcie_id_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioBlk, bdev_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioBlk, max_io_qps_), @@ -213,14 +211,14 @@ const uint32_t TableStruct_frontend_5fvirtio_5fblk_2eproto::offsets[] PROTOBUF_S }; static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlk)}, - { 12, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkCreateRequest)}, - { 19, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkDeleteRequest)}, - { 26, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkUpdateRequest)}, - { 33, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkListRequest)}, - { 40, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkListResponse)}, - { 47, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkGetRequest)}, - { 54, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkStatsRequest)}, - { 61, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkStatsResponse)}, + { 11, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkCreateRequest)}, + { 18, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkDeleteRequest)}, + { 25, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkUpdateRequest)}, + { 32, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkListRequest)}, + { 39, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkListResponse)}, + { 46, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkGetRequest)}, + { 53, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkStatsRequest)}, + { 60, -1, -1, sizeof(::opi_api::storage::v1::VirtioBlkStatsResponse)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -239,44 +237,44 @@ const char descriptor_table_protodef_frontend_5fvirtio_5fblk_2eproto[] PROTOBUF_ "\n\031frontend_virtio_blk.proto\022\022opi_api.sto" "rage.v1\032\014common.proto\032\033google/protobuf/e" "mpty.proto\032\034google/api/annotations.proto" - "\"\230\001\n\tVirtioBlk\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t" - "\0228\n\007pcie_id\030\003 \001(\0132\'.opi_api.storage.v1.N" - "vmeControllerPciId\022\014\n\004bdev\030\004 \001(\t\022\022\n\nmax_" - "io_qps\030\005 \001(\003\022\025\n\rserial_number\030\006 \001(\t\"K\n\026V" - "irtioBlkCreateRequest\0221\n\ncontroller\030\001 \001(" - "\0132\035.opi_api.storage.v1.VirtioBlk\"/\n\026Virt" - "ioBlkDeleteRequest\022\025\n\rcontroller_id\030\001 \001(" - "\003\"K\n\026VirtioBlkUpdateRequest\0221\n\ncontrolle" - "r\030\001 \001(\0132\035.opi_api.storage.v1.VirtioBlk\"," - "\n\024VirtioBlkListRequest\022\024\n\014virtioblk_id\030\001" - " \001(\003\"J\n\025VirtioBlkListResponse\0221\n\ncontrol" - "ler\030\001 \003(\0132\035.opi_api.storage.v1.VirtioBlk" - "\",\n\023VirtioBlkGetRequest\022\025\n\rcontroller_id" - "\030\001 \001(\003\".\n\025VirtioBlkStatsRequest\022\025\n\rcontr" - "oller_id\030\001 \001(\003\"3\n\026VirtioBlkStatsResponse" - "\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t2\374\005\n\030Frontend" - "VirtioBlkService\022\177\n\017VirtioBlkCreate\022*.op" - "i_api.storage.v1.VirtioBlkCreateRequest\032" - "\035.opi_api.storage.v1.VirtioBlk\"!\202\323\344\223\002\033\"\016" - "/v1/virtioblks:\tvirtioblk\022y\n\017VirtioBlkDe" - "lete\022*.opi_api.storage.v1.VirtioBlkDelet" - "eRequest\032\026.google.protobuf.Empty\"\"\202\323\344\223\002\034" - "*\032/v1/virtioblks/{virtioblk}\022\177\n\017VirtioBl" - "kUpdate\022*.opi_api.storage.v1.VirtioBlkUp" - "dateRequest\032\035.opi_api.storage.v1.VirtioB" - "lk\"!\202\323\344\223\002\0332\016/v1/virtioblks:\tvirtioblk\022|\n" - "\rVirtioBlkList\022(.opi_api.storage.v1.Virt" - "ioBlkListRequest\032).opi_api.storage.v1.Vi" - "rtioBlkListResponse\"\026\202\323\344\223\002\020\022\016/v1/virtiob" - "lks\022z\n\014VirtioBlkGet\022\'.opi_api.storage.v1" - ".VirtioBlkGetRequest\032\035.opi_api.storage.v" - "1.VirtioBlk\"\"\202\323\344\223\002\034\022\032/v1/virtioblks/{vir" - "tioblk}\022i\n\016VirtioBlkStats\022).opi_api.stor" - "age.v1.VirtioBlkStatsRequest\032*.opi_api.s" - "torage.v1.VirtioBlkStatsResponse\"\000Be\n\022op" - "i_api.storage.v1B\026FrontendVirtioBlkProto" - "P\001Z5github.com/opiproject/opi-api/storag" - "e/v1alpha1/gen/gob\006proto3" + "\"\212\001\n\tVirtioBlk\022\n\n\002id\030\001 \001(\003\0228\n\007pcie_id\030\002 " + "\001(\0132\'.opi_api.storage.v1.NvmeControllerP" + "ciId\022\014\n\004bdev\030\003 \001(\t\022\022\n\nmax_io_qps\030\004 \001(\003\022\025" + "\n\rserial_number\030\005 \001(\t\"K\n\026VirtioBlkCreate" + "Request\0221\n\ncontroller\030\001 \001(\0132\035.opi_api.st" + "orage.v1.VirtioBlk\"/\n\026VirtioBlkDeleteReq" + "uest\022\025\n\rcontroller_id\030\001 \001(\003\"K\n\026VirtioBlk" + "UpdateRequest\0221\n\ncontroller\030\001 \001(\0132\035.opi_" + "api.storage.v1.VirtioBlk\",\n\024VirtioBlkLis" + "tRequest\022\024\n\014virtioblk_id\030\001 \001(\003\"J\n\025Virtio" + "BlkListResponse\0221\n\ncontroller\030\001 \003(\0132\035.op" + "i_api.storage.v1.VirtioBlk\",\n\023VirtioBlkG" + "etRequest\022\025\n\rcontroller_id\030\001 \001(\003\".\n\025Virt" + "ioBlkStatsRequest\022\025\n\rcontroller_id\030\001 \001(\003" + "\"3\n\026VirtioBlkStatsResponse\022\n\n\002id\030\001 \001(\003\022\r" + "\n\005stats\030\002 \001(\t2\374\005\n\030FrontendVirtioBlkServi" + "ce\022\177\n\017VirtioBlkCreate\022*.opi_api.storage." + "v1.VirtioBlkCreateRequest\032\035.opi_api.stor" + "age.v1.VirtioBlk\"!\202\323\344\223\002\033\"\016/v1/virtioblks" + ":\tvirtioblk\022y\n\017VirtioBlkDelete\022*.opi_api" + ".storage.v1.VirtioBlkDeleteRequest\032\026.goo" + "gle.protobuf.Empty\"\"\202\323\344\223\002\034*\032/v1/virtiobl" + "ks/{virtioblk}\022\177\n\017VirtioBlkUpdate\022*.opi_" + "api.storage.v1.VirtioBlkUpdateRequest\032\035." + "opi_api.storage.v1.VirtioBlk\"!\202\323\344\223\002\0332\016/v" + "1/virtioblks:\tvirtioblk\022|\n\rVirtioBlkList" + "\022(.opi_api.storage.v1.VirtioBlkListReque" + "st\032).opi_api.storage.v1.VirtioBlkListRes" + "ponse\"\026\202\323\344\223\002\020\022\016/v1/virtioblks\022z\n\014VirtioB" + "lkGet\022\'.opi_api.storage.v1.VirtioBlkGetR" + "equest\032\035.opi_api.storage.v1.VirtioBlk\"\"\202" + "\323\344\223\002\034\022\032/v1/virtioblks/{virtioblk}\022i\n\016Vir" + "tioBlkStats\022).opi_api.storage.v1.VirtioB" + "lkStatsRequest\032*.opi_api.storage.v1.Virt" + "ioBlkStatsResponse\"\000Be\n\022opi_api.storage." + "v1B\026FrontendVirtioBlkProtoP\001Z5github.com" + "/opiproject/opi-api/storage/v1alpha1/gen" + "/gob\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_frontend_5fvirtio_5fblk_2eproto_deps[3] = { &::descriptor_table_common_2eproto, @@ -285,7 +283,7 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor }; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_frontend_5fvirtio_5fblk_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_frontend_5fvirtio_5fblk_2eproto = { - false, false, 1625, descriptor_table_protodef_frontend_5fvirtio_5fblk_2eproto, "frontend_virtio_blk.proto", + false, false, 1611, descriptor_table_protodef_frontend_5fvirtio_5fblk_2eproto, "frontend_virtio_blk.proto", &descriptor_table_frontend_5fvirtio_5fblk_2eproto_once, descriptor_table_frontend_5fvirtio_5fblk_2eproto_deps, 3, 9, schemas, file_default_instances, TableStruct_frontend_5fvirtio_5fblk_2eproto::offsets, file_level_metadata_frontend_5fvirtio_5fblk_2eproto, file_level_enum_descriptors_frontend_5fvirtio_5fblk_2eproto, file_level_service_descriptors_frontend_5fvirtio_5fblk_2eproto, @@ -329,14 +327,6 @@ VirtioBlk::VirtioBlk(::PROTOBUF_NAMESPACE_ID::Arena* arena, VirtioBlk::VirtioBlk(const VirtioBlk& from) : ::PROTOBUF_NAMESPACE_ID::Message() { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_name().empty()) { - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), - GetArenaForAllocation()); - } bdev_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING bdev_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); @@ -365,10 +355,6 @@ VirtioBlk::VirtioBlk(const VirtioBlk& from) } inline void VirtioBlk::SharedCtor() { -name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING bdev_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING bdev_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); @@ -392,7 +378,6 @@ VirtioBlk::~VirtioBlk() { inline void VirtioBlk::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); bdev_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); serial_number_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); if (this != internal_default_instance()) delete pcie_id_; @@ -414,7 +399,6 @@ void VirtioBlk::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - name_.ClearToEmpty(); bdev_.ClearToEmpty(); serial_number_.ClearToEmpty(); if (GetArenaForAllocation() == nullptr && pcie_id_ != nullptr) { @@ -441,27 +425,17 @@ const char* VirtioBlk::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:: } else goto handle_unusual; continue; - // string name = 2; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { - auto str = _internal_mutable_name(); - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); - CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.VirtioBlk.name")); + ptr = ctx->ParseMessage(_internal_mutable_pcie_id(), ptr); CHK_(ptr); } else goto handle_unusual; continue; - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + // string bdev = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { - ptr = ctx->ParseMessage(_internal_mutable_pcie_id(), ptr); - CHK_(ptr); - } else - goto handle_unusual; - continue; - // string bdev = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { auto str = _internal_mutable_bdev(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.VirtioBlk.bdev")); @@ -469,17 +443,17 @@ const char* VirtioBlk::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:: } else goto handle_unusual; continue; - // int64 max_io_qps = 5; - case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 40)) { + // int64 max_io_qps = 4; + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { max_io_qps_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; continue; - // string serial_number = 6; - case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { + // string serial_number = 5; + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { auto str = _internal_mutable_serial_number(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.VirtioBlk.serial_number")); @@ -522,48 +496,38 @@ uint8_t* VirtioBlk::_InternalSerialize( target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_id(), target); } - // string name = 2; - if (!this->_internal_name().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_name().data(), static_cast(this->_internal_name().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "opi_api.storage.v1.VirtioBlk.name"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_name(), target); - } - - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; if (this->_internal_has_pcie_id()) { target = stream->EnsureSpace(target); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessage( - 3, _Internal::pcie_id(this), target, stream); + 2, _Internal::pcie_id(this), target, stream); } - // string bdev = 4; + // string bdev = 3; if (!this->_internal_bdev().empty()) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_bdev().data(), static_cast(this->_internal_bdev().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "opi_api.storage.v1.VirtioBlk.bdev"); target = stream->WriteStringMaybeAliased( - 4, this->_internal_bdev(), target); + 3, this->_internal_bdev(), target); } - // int64 max_io_qps = 5; + // int64 max_io_qps = 4; if (this->_internal_max_io_qps() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(5, this->_internal_max_io_qps(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(4, this->_internal_max_io_qps(), target); } - // string serial_number = 6; + // string serial_number = 5; if (!this->_internal_serial_number().empty()) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_serial_number().data(), static_cast(this->_internal_serial_number().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "opi_api.storage.v1.VirtioBlk.serial_number"); target = stream->WriteStringMaybeAliased( - 6, this->_internal_serial_number(), target); + 5, this->_internal_serial_number(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -582,28 +546,21 @@ size_t VirtioBlk::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // string name = 2; - if (!this->_internal_name().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_name()); - } - - // string bdev = 4; + // string bdev = 3; if (!this->_internal_bdev().empty()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( this->_internal_bdev()); } - // string serial_number = 6; + // string serial_number = 5; if (!this->_internal_serial_number().empty()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( this->_internal_serial_number()); } - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; if (this->_internal_has_pcie_id()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( @@ -615,7 +572,7 @@ size_t VirtioBlk::ByteSizeLong() const { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_id()); } - // int64 max_io_qps = 5; + // int64 max_io_qps = 4; if (this->_internal_max_io_qps() != 0) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_max_io_qps()); } @@ -642,9 +599,6 @@ void VirtioBlk::MergeFrom(const VirtioBlk& from) { uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (!from._internal_name().empty()) { - _internal_set_name(from._internal_name()); - } if (!from._internal_bdev().empty()) { _internal_set_bdev(from._internal_bdev()); } @@ -679,11 +633,6 @@ void VirtioBlk::InternalSwap(VirtioBlk* other) { auto* lhs_arena = GetArenaForAllocation(); auto* rhs_arena = other->GetArenaForAllocation(); _internal_metadata_.InternalSwap(&other->_internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - &name_, lhs_arena, - &other->name_, rhs_arena - ); ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), &bdev_, lhs_arena, diff --git a/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.h b/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.h index 43c9810f..6df89eae 100644 --- a/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.h +++ b/storage/v1alpha1/gen/cpp/frontend_virtio_blk.pb.h @@ -228,28 +228,13 @@ class VirtioBlk final : // accessors ------------------------------------------------------- enum : int { - kNameFieldNumber = 2, - kBdevFieldNumber = 4, - kSerialNumberFieldNumber = 6, - kPcieIdFieldNumber = 3, + kBdevFieldNumber = 3, + kSerialNumberFieldNumber = 5, + kPcieIdFieldNumber = 2, kIdFieldNumber = 1, - kMaxIoQpsFieldNumber = 5, + kMaxIoQpsFieldNumber = 4, }; - // string name = 2; - void clear_name(); - const std::string& name() const; - template - void set_name(ArgT0&& arg0, ArgT... args); - std::string* mutable_name(); - PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* name); - private: - const std::string& _internal_name() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); - public: - - // string bdev = 4; + // string bdev = 3; void clear_bdev(); const std::string& bdev() const; template @@ -263,7 +248,7 @@ class VirtioBlk final : std::string* _internal_mutable_bdev(); public: - // string serial_number = 6; + // string serial_number = 5; void clear_serial_number(); const std::string& serial_number() const; template @@ -277,7 +262,7 @@ class VirtioBlk final : std::string* _internal_mutable_serial_number(); public: - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; bool has_pcie_id() const; private: bool _internal_has_pcie_id() const; @@ -304,7 +289,7 @@ class VirtioBlk final : void _internal_set_id(int64_t value); public: - // int64 max_io_qps = 5; + // int64 max_io_qps = 4; void clear_max_io_qps(); int64_t max_io_qps() const; void set_max_io_qps(int64_t value); @@ -320,7 +305,6 @@ class VirtioBlk final : template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr bdev_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr serial_number_; ::opi_api::storage::v1::NvmeControllerPciId* pcie_id_; @@ -1571,58 +1555,7 @@ inline void VirtioBlk::set_id(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.VirtioBlk.id) } -// string name = 2; -inline void VirtioBlk::clear_name() { - name_.ClearToEmpty(); -} -inline const std::string& VirtioBlk::name() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.VirtioBlk.name) - return _internal_name(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void VirtioBlk::set_name(ArgT0&& arg0, ArgT... args) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.VirtioBlk.name) -} -inline std::string* VirtioBlk::mutable_name() { - std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:opi_api.storage.v1.VirtioBlk.name) - return _s; -} -inline const std::string& VirtioBlk::_internal_name() const { - return name_.Get(); -} -inline void VirtioBlk::_internal_set_name(const std::string& value) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation()); -} -inline std::string* VirtioBlk::_internal_mutable_name() { - - return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation()); -} -inline std::string* VirtioBlk::release_name() { - // @@protoc_insertion_point(field_release:opi_api.storage.v1.VirtioBlk.name) - return name_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -} -inline void VirtioBlk::set_allocated_name(std::string* name) { - if (name != nullptr) { - - } else { - - } - name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, - GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.VirtioBlk.name) -} - -// .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; +// .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; inline bool VirtioBlk::_internal_has_pcie_id() const { return this != internal_default_instance() && pcie_id_ != nullptr; } @@ -1708,7 +1641,7 @@ inline void VirtioBlk::set_allocated_pcie_id(::opi_api::storage::v1::NvmeControl // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.VirtioBlk.pcie_id) } -// string bdev = 4; +// string bdev = 3; inline void VirtioBlk::clear_bdev() { bdev_.ClearToEmpty(); } @@ -1759,7 +1692,7 @@ inline void VirtioBlk::set_allocated_bdev(std::string* bdev) { // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.VirtioBlk.bdev) } -// int64 max_io_qps = 5; +// int64 max_io_qps = 4; inline void VirtioBlk::clear_max_io_qps() { max_io_qps_ = int64_t{0}; } @@ -1779,7 +1712,7 @@ inline void VirtioBlk::set_max_io_qps(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.VirtioBlk.max_io_qps) } -// string serial_number = 6; +// string serial_number = 5; inline void VirtioBlk::clear_serial_number() { serial_number_.ClearToEmpty(); } diff --git a/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.grpc.pb.h b/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.grpc.pb.h index 8297c944..d56bf483 100644 --- a/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.grpc.pb.h +++ b/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.grpc.pb.h @@ -33,10 +33,7 @@ namespace opi_api { namespace storage { namespace v1 { -// Front End (host-facing) APIs. -// -// Virtio-scsi emulation -// +// Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk. class FrontendVirtioScsiService final { public: static constexpr char const* service_full_name() { diff --git a/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.cc b/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.cc index 9c260f01..4222c469 100644 --- a/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.cc +++ b/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.cc @@ -21,8 +21,7 @@ namespace storage { namespace v1 { constexpr VirtioScsiController::VirtioScsiController( ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized) - : name_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) - , pcie_id_(nullptr) + : pcie_id_(nullptr) , id_(int64_t{0}){} struct VirtioScsiControllerDefaultTypeInternal { constexpr VirtioScsiControllerDefaultTypeInternal() @@ -258,7 +257,6 @@ const uint32_t TableStruct_frontend_5fvirtio_5fscsi_2eproto::offsets[] PROTOBUF_ ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioScsiController, id_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioScsiController, name_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioScsiController, pcie_id_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::VirtioScsiLun, _internal_metadata_), @@ -388,23 +386,23 @@ const uint32_t TableStruct_frontend_5fvirtio_5fscsi_2eproto::offsets[] PROTOBUF_ }; static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiController)}, - { 9, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLun)}, - { 18, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerCreateRequest)}, - { 25, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerDeleteRequest)}, - { 32, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerUpdateRequest)}, - { 39, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerListRequest)}, - { 45, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerListResponse)}, - { 52, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerGetRequest)}, - { 59, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerStatsRequest)}, - { 66, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerStatsResponse)}, - { 74, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunCreateRequest)}, - { 81, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunDeleteRequest)}, - { 89, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunUpdateRequest)}, - { 96, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunListRequest)}, - { 103, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunListResponse)}, - { 110, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunGetRequest)}, - { 118, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunStatsRequest)}, - { 126, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunStatsResponse)}, + { 8, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLun)}, + { 17, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerCreateRequest)}, + { 24, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerDeleteRequest)}, + { 31, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerUpdateRequest)}, + { 38, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerListRequest)}, + { 44, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerListResponse)}, + { 51, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerGetRequest)}, + { 58, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerStatsRequest)}, + { 65, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiControllerStatsResponse)}, + { 73, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunCreateRequest)}, + { 80, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunDeleteRequest)}, + { 88, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunUpdateRequest)}, + { 95, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunListRequest)}, + { 102, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunListResponse)}, + { 109, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunGetRequest)}, + { 117, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunStatsRequest)}, + { 125, -1, -1, sizeof(::opi_api::storage::v1::VirtioScsiLunStatsResponse)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -432,88 +430,88 @@ const char descriptor_table_protodef_frontend_5fvirtio_5fscsi_2eproto[] PROTOBUF "\n\032frontend_virtio_scsi.proto\022\022opi_api.st" "orage.v1\032\014common.proto\032\033google/protobuf/" "empty.proto\032\034google/api/annotations.prot" - "o\"j\n\024VirtioScsiController\022\n\n\002id\030\001 \001(\003\022\014\n" - "\004name\030\002 \001(\t\0228\n\007pcie_id\030\004 \001(\0132\'.opi_api.s" - "torage.v1.NvmeControllerPciId\"@\n\rVirtioS" - "csiLun\022\n\n\002id\030\001 \001(\003\022\025\n\rcontroller_id\030\004 \001(" - "\003\022\014\n\004bdev\030\006 \001(\t\"a\n!VirtioScsiControllerC" - "reateRequest\022<\n\ncontroller\030\001 \001(\0132(.opi_a" - "pi.storage.v1.VirtioScsiController\":\n!Vi" - "rtioScsiControllerDeleteRequest\022\025\n\rcontr" - "oller_id\030\001 \001(\003\"a\n!VirtioScsiControllerUp" - "dateRequest\022<\n\ncontroller\030\001 \001(\0132(.opi_ap" - "i.storage.v1.VirtioScsiController\"!\n\037Vir" - "tioScsiControllerListRequest\"`\n VirtioSc" - "siControllerListResponse\022<\n\ncontroller\030\001" - " \003(\0132(.opi_api.storage.v1.VirtioScsiCont" - "roller\"7\n\036VirtioScsiControllerGetRequest" - "\022\025\n\rcontroller_id\030\001 \001(\003\"9\n VirtioScsiCon" - "trollerStatsRequest\022\025\n\rcontroller_id\030\001 \001" - "(\003\">\n!VirtioScsiControllerStatsResponse\022" - "\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t\"L\n\032VirtioScsi" - "LunCreateRequest\022.\n\003lun\030\001 \001(\0132!.opi_api." - "storage.v1.VirtioScsiLun\"C\n\032VirtioScsiLu" - "nDeleteRequest\022\025\n\rcontroller_id\030\001 \001(\003\022\016\n" - "\006lun_id\030\002 \001(\003\"L\n\032VirtioScsiLunUpdateRequ" - "est\022.\n\003lun\030\001 \001(\0132!.opi_api.storage.v1.Vi" - "rtioScsiLun\"1\n\030VirtioScsiLunListRequest\022" - "\025\n\rcontroller_id\030\001 \001(\003\"K\n\031VirtioScsiLunL" - "istResponse\022.\n\003lun\030\001 \003(\0132!.opi_api.stora" - "ge.v1.VirtioScsiLun\"@\n\027VirtioScsiLunGetR" - "equest\022\025\n\rcontroller_id\030\001 \001(\003\022\016\n\006lun_id\030" - "\002 \001(\003\"B\n\031VirtioScsiLunStatsRequest\022\025\n\rco" - "ntroller_id\030\001 \001(\003\022\016\n\006lun_id\030\002 \001(\003\"7\n\032Vir" - "tioScsiLunStatsResponse\022\n\n\002id\030\001 \001(\003\022\r\n\005s" - "tats\030\002 \001(\t2\272\016\n\031FrontendVirtioScsiService" - "\022\252\001\n\032VirtioScsiControllerCreate\0225.opi_ap" - "i.storage.v1.VirtioScsiControllerCreateR" - "equest\032(.opi_api.storage.v1.VirtioScsiCo" - "ntroller\"+\202\323\344\223\002%\"\023/v1/virtioscsictrls:\016v" - "irtioscsictrl\022\231\001\n\032VirtioScsiControllerDe" - "lete\0225.opi_api.storage.v1.VirtioScsiCont" - "rollerDeleteRequest\032\026.google.protobuf.Em" - "pty\",\202\323\344\223\002&*$/v1/virtioscsictrls/{virtio" - "scsictrl}\022\252\001\n\032VirtioScsiControllerUpdate" - "\0225.opi_api.storage.v1.VirtioScsiControll" - "erUpdateRequest\032(.opi_api.storage.v1.Vir" - "tioScsiController\"+\202\323\344\223\002%2\023/v1/virtioscs" - "ictrls:\016virtioscsictrl\022\242\001\n\030VirtioScsiCon" - "trollerList\0223.opi_api.storage.v1.VirtioS" - "csiControllerListRequest\0324.opi_api.stora" - "ge.v1.VirtioScsiControllerListResponse\"\033" - "\202\323\344\223\002\025\022\023/v1/virtioscsictrls\022\245\001\n\027VirtioSc" - "siControllerGet\0222.opi_api.storage.v1.Vir" - "tioScsiControllerGetRequest\032(.opi_api.st" - "orage.v1.VirtioScsiController\",\202\323\344\223\002&\022$/" - "v1/virtioscsictrls/{virtioscsictrl}\022\212\001\n\031" - "VirtioScsiControllerStats\0224.opi_api.stor" - "age.v1.VirtioScsiControllerStatsRequest\032" - "5.opi_api.storage.v1.VirtioScsiControlle" - "rStatsResponse\"\000\022\223\001\n\023VirtioScsiLunCreate" - "\022..opi_api.storage.v1.VirtioScsiLunCreat" - "eRequest\032!.opi_api.storage.v1.VirtioScsi" - "Lun\")\202\323\344\223\002#\"\022/v1/virtioscsiluns:\rvirtios" - "csilun\022\211\001\n\023VirtioScsiLunDelete\022..opi_api" - ".storage.v1.VirtioScsiLunDeleteRequest\032\026" - ".google.protobuf.Empty\"*\202\323\344\223\002$*\"/v1/virt" - "ioscsiluns/{virtioscsilun}\022\223\001\n\023VirtioScs" - "iLunUpdate\022..opi_api.storage.v1.VirtioSc" - "siLunUpdateRequest\032!.opi_api.storage.v1." - "VirtioScsiLun\")\202\323\344\223\002#2\022/v1/virtioscsilun" - "s:\rvirtioscsilun\022\214\001\n\021VirtioScsiLunList\022," - ".opi_api.storage.v1.VirtioScsiLunListReq" - "uest\032-.opi_api.storage.v1.VirtioScsiLunL" - "istResponse\"\032\202\323\344\223\002\024\022\022/v1/virtioscsiluns\022" - "\216\001\n\020VirtioScsiLunGet\022+.opi_api.storage.v" - "1.VirtioScsiLunGetRequest\032!.opi_api.stor" - "age.v1.VirtioScsiLun\"*\202\323\344\223\002$\022\"/v1/virtio" - "scsiluns/{virtioscsilun}\022u\n\022VirtioScsiLu" - "nStats\022-.opi_api.storage.v1.VirtioScsiLu" - "nStatsRequest\032..opi_api.storage.v1.Virti" - "oScsiLunStatsResponse\"\000Bf\n\022opi_api.stora" - "ge.v1B\027FrontendVirtioScsiProtoP\001Z5github" - ".com/opiproject/opi-api/storage/v1alpha1" - "/gen/gob\006proto3" + "o\"\\\n\024VirtioScsiController\022\n\n\002id\030\001 \001(\003\0228\n" + "\007pcie_id\030\002 \001(\0132\'.opi_api.storage.v1.Nvme" + "ControllerPciId\"@\n\rVirtioScsiLun\022\n\n\002id\030\001" + " \001(\003\022\025\n\rcontroller_id\030\002 \001(\003\022\014\n\004bdev\030\003 \001(" + "\t\"a\n!VirtioScsiControllerCreateRequest\022<" + "\n\ncontroller\030\001 \001(\0132(.opi_api.storage.v1." + "VirtioScsiController\":\n!VirtioScsiContro" + "llerDeleteRequest\022\025\n\rcontroller_id\030\001 \001(\003" + "\"a\n!VirtioScsiControllerUpdateRequest\022<\n" + "\ncontroller\030\001 \001(\0132(.opi_api.storage.v1.V" + "irtioScsiController\"!\n\037VirtioScsiControl" + "lerListRequest\"`\n VirtioScsiControllerLi" + "stResponse\022<\n\ncontroller\030\001 \003(\0132(.opi_api" + ".storage.v1.VirtioScsiController\"7\n\036Virt" + "ioScsiControllerGetRequest\022\025\n\rcontroller" + "_id\030\001 \001(\003\"9\n VirtioScsiControllerStatsRe" + "quest\022\025\n\rcontroller_id\030\001 \001(\003\">\n!VirtioSc" + "siControllerStatsResponse\022\n\n\002id\030\001 \001(\003\022\r\n" + "\005stats\030\002 \001(\t\"L\n\032VirtioScsiLunCreateReque" + "st\022.\n\003lun\030\001 \001(\0132!.opi_api.storage.v1.Vir" + "tioScsiLun\"C\n\032VirtioScsiLunDeleteRequest" + "\022\025\n\rcontroller_id\030\001 \001(\003\022\016\n\006lun_id\030\002 \001(\003\"" + "L\n\032VirtioScsiLunUpdateRequest\022.\n\003lun\030\001 \001" + "(\0132!.opi_api.storage.v1.VirtioScsiLun\"1\n" + "\030VirtioScsiLunListRequest\022\025\n\rcontroller_" + "id\030\001 \001(\003\"K\n\031VirtioScsiLunListResponse\022.\n" + "\003lun\030\001 \003(\0132!.opi_api.storage.v1.VirtioSc" + "siLun\"@\n\027VirtioScsiLunGetRequest\022\025\n\rcont" + "roller_id\030\001 \001(\003\022\016\n\006lun_id\030\002 \001(\003\"B\n\031Virti" + "oScsiLunStatsRequest\022\025\n\rcontroller_id\030\001 " + "\001(\003\022\016\n\006lun_id\030\002 \001(\003\"7\n\032VirtioScsiLunStat" + "sResponse\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t2\272\016\n" + "\031FrontendVirtioScsiService\022\252\001\n\032VirtioScs" + "iControllerCreate\0225.opi_api.storage.v1.V" + "irtioScsiControllerCreateRequest\032(.opi_a" + "pi.storage.v1.VirtioScsiController\"+\202\323\344\223" + "\002%\"\023/v1/virtioscsictrls:\016virtioscsictrl\022" + "\231\001\n\032VirtioScsiControllerDelete\0225.opi_api" + ".storage.v1.VirtioScsiControllerDeleteRe" + "quest\032\026.google.protobuf.Empty\",\202\323\344\223\002&*$/" + "v1/virtioscsictrls/{virtioscsictrl}\022\252\001\n\032" + "VirtioScsiControllerUpdate\0225.opi_api.sto" + "rage.v1.VirtioScsiControllerUpdateReques" + "t\032(.opi_api.storage.v1.VirtioScsiControl" + "ler\"+\202\323\344\223\002%2\023/v1/virtioscsictrls:\016virtio" + "scsictrl\022\242\001\n\030VirtioScsiControllerList\0223." + "opi_api.storage.v1.VirtioScsiControllerL" + "istRequest\0324.opi_api.storage.v1.VirtioSc" + "siControllerListResponse\"\033\202\323\344\223\002\025\022\023/v1/vi" + "rtioscsictrls\022\245\001\n\027VirtioScsiControllerGe" + "t\0222.opi_api.storage.v1.VirtioScsiControl" + "lerGetRequest\032(.opi_api.storage.v1.Virti" + "oScsiController\",\202\323\344\223\002&\022$/v1/virtioscsic" + "trls/{virtioscsictrl}\022\212\001\n\031VirtioScsiCont" + "rollerStats\0224.opi_api.storage.v1.VirtioS" + "csiControllerStatsRequest\0325.opi_api.stor" + "age.v1.VirtioScsiControllerStatsResponse" + "\"\000\022\223\001\n\023VirtioScsiLunCreate\022..opi_api.sto" + "rage.v1.VirtioScsiLunCreateRequest\032!.opi" + "_api.storage.v1.VirtioScsiLun\")\202\323\344\223\002#\"\022/" + "v1/virtioscsiluns:\rvirtioscsilun\022\211\001\n\023Vir" + "tioScsiLunDelete\022..opi_api.storage.v1.Vi" + "rtioScsiLunDeleteRequest\032\026.google.protob" + "uf.Empty\"*\202\323\344\223\002$*\"/v1/virtioscsiluns/{vi" + "rtioscsilun}\022\223\001\n\023VirtioScsiLunUpdate\022..o" + "pi_api.storage.v1.VirtioScsiLunUpdateReq" + "uest\032!.opi_api.storage.v1.VirtioScsiLun\"" + ")\202\323\344\223\002#2\022/v1/virtioscsiluns:\rvirtioscsil" + "un\022\214\001\n\021VirtioScsiLunList\022,.opi_api.stora" + "ge.v1.VirtioScsiLunListRequest\032-.opi_api" + ".storage.v1.VirtioScsiLunListResponse\"\032\202" + "\323\344\223\002\024\022\022/v1/virtioscsiluns\022\216\001\n\020VirtioScsi" + "LunGet\022+.opi_api.storage.v1.VirtioScsiLu" + "nGetRequest\032!.opi_api.storage.v1.VirtioS" + "csiLun\"*\202\323\344\223\002$\022\"/v1/virtioscsiluns/{virt" + "ioscsilun}\022u\n\022VirtioScsiLunStats\022-.opi_a" + "pi.storage.v1.VirtioScsiLunStatsRequest\032" + "..opi_api.storage.v1.VirtioScsiLunStatsR" + "esponse\"\000Bf\n\022opi_api.storage.v1B\027Fronten" + "dVirtioScsiProtoP\001Z5github.com/opiprojec" + "t/opi-api/storage/v1alpha1/gen/gob\006proto" + "3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_frontend_5fvirtio_5fscsi_2eproto_deps[3] = { &::descriptor_table_common_2eproto, @@ -522,7 +520,7 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor }; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_frontend_5fvirtio_5fscsi_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_frontend_5fvirtio_5fscsi_2eproto = { - false, false, 3375, descriptor_table_protodef_frontend_5fvirtio_5fscsi_2eproto, "frontend_virtio_scsi.proto", + false, false, 3361, descriptor_table_protodef_frontend_5fvirtio_5fscsi_2eproto, "frontend_virtio_scsi.proto", &descriptor_table_frontend_5fvirtio_5fscsi_2eproto_once, descriptor_table_frontend_5fvirtio_5fscsi_2eproto_deps, 3, 18, schemas, file_default_instances, TableStruct_frontend_5fvirtio_5fscsi_2eproto::offsets, file_level_metadata_frontend_5fvirtio_5fscsi_2eproto, file_level_enum_descriptors_frontend_5fvirtio_5fscsi_2eproto, file_level_service_descriptors_frontend_5fvirtio_5fscsi_2eproto, @@ -566,14 +564,6 @@ VirtioScsiController::VirtioScsiController(::PROTOBUF_NAMESPACE_ID::Arena* arena VirtioScsiController::VirtioScsiController(const VirtioScsiController& from) : ::PROTOBUF_NAMESPACE_ID::Message() { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_name().empty()) { - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), - GetArenaForAllocation()); - } if (from._internal_has_pcie_id()) { pcie_id_ = new ::opi_api::storage::v1::NvmeControllerPciId(*from.pcie_id_); } else { @@ -584,10 +574,6 @@ VirtioScsiController::VirtioScsiController(const VirtioScsiController& from) } inline void VirtioScsiController::SharedCtor() { -name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&pcie_id_) - reinterpret_cast(this)), 0, static_cast(reinterpret_cast(&id_) - @@ -603,7 +589,6 @@ VirtioScsiController::~VirtioScsiController() { inline void VirtioScsiController::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); if (this != internal_default_instance()) delete pcie_id_; } @@ -623,7 +608,6 @@ void VirtioScsiController::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - name_.ClearToEmpty(); if (GetArenaForAllocation() == nullptr && pcie_id_ != nullptr) { delete pcie_id_; } @@ -646,19 +630,9 @@ const char* VirtioScsiController::_InternalParse(const char* ptr, ::PROTOBUF_NAM } else goto handle_unusual; continue; - // string name = 2; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { - auto str = _internal_mutable_name(); - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); - CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.VirtioScsiController.name")); - CHK_(ptr); - } else - goto handle_unusual; - continue; - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { ptr = ctx->ParseMessage(_internal_mutable_pcie_id(), ptr); CHK_(ptr); } else @@ -699,22 +673,12 @@ uint8_t* VirtioScsiController::_InternalSerialize( target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_id(), target); } - // string name = 2; - if (!this->_internal_name().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_name().data(), static_cast(this->_internal_name().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "opi_api.storage.v1.VirtioScsiController.name"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_name(), target); - } - - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; if (this->_internal_has_pcie_id()) { target = stream->EnsureSpace(target); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessage( - 4, _Internal::pcie_id(this), target, stream); + 2, _Internal::pcie_id(this), target, stream); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -733,14 +697,7 @@ size_t VirtioScsiController::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // string name = 2; - if (!this->_internal_name().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_name()); - } - - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; if (this->_internal_has_pcie_id()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( @@ -774,9 +731,6 @@ void VirtioScsiController::MergeFrom(const VirtioScsiController& from) { uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (!from._internal_name().empty()) { - _internal_set_name(from._internal_name()); - } if (from._internal_has_pcie_id()) { _internal_mutable_pcie_id()->::opi_api::storage::v1::NvmeControllerPciId::MergeFrom(from._internal_pcie_id()); } @@ -799,14 +753,7 @@ bool VirtioScsiController::IsInitialized() const { void VirtioScsiController::InternalSwap(VirtioScsiController* other) { using std::swap; - auto* lhs_arena = GetArenaForAllocation(); - auto* rhs_arena = other->GetArenaForAllocation(); _internal_metadata_.InternalSwap(&other->_internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - &name_, lhs_arena, - &other->name_, rhs_arena - ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< PROTOBUF_FIELD_OFFSET(VirtioScsiController, id_) + sizeof(VirtioScsiController::id_) @@ -913,17 +860,17 @@ const char* VirtioScsiLun::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ } else goto handle_unusual; continue; - // int64 controller_id = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + // int64 controller_id = 2; + case 2: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { controller_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; continue; - // string bdev = 6; - case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { + // string bdev = 3; + case 3: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { auto str = _internal_mutable_bdev(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.VirtioScsiLun.bdev")); @@ -966,20 +913,20 @@ uint8_t* VirtioScsiLun::_InternalSerialize( target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_id(), target); } - // int64 controller_id = 4; + // int64 controller_id = 2; if (this->_internal_controller_id() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(4, this->_internal_controller_id(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(2, this->_internal_controller_id(), target); } - // string bdev = 6; + // string bdev = 3; if (!this->_internal_bdev().empty()) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_bdev().data(), static_cast(this->_internal_bdev().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "opi_api.storage.v1.VirtioScsiLun.bdev"); target = stream->WriteStringMaybeAliased( - 6, this->_internal_bdev(), target); + 3, this->_internal_bdev(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -998,7 +945,7 @@ size_t VirtioScsiLun::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // string bdev = 6; + // string bdev = 3; if (!this->_internal_bdev().empty()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( @@ -1010,7 +957,7 @@ size_t VirtioScsiLun::ByteSizeLong() const { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_id()); } - // int64 controller_id = 4; + // int64 controller_id = 2; if (this->_internal_controller_id() != 0) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_controller_id()); } diff --git a/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.h b/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.h index 6249e6d2..8e312c3e 100644 --- a/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.h +++ b/storage/v1alpha1/gen/cpp/frontend_virtio_scsi.pb.h @@ -265,25 +265,10 @@ class VirtioScsiController final : // accessors ------------------------------------------------------- enum : int { - kNameFieldNumber = 2, - kPcieIdFieldNumber = 4, + kPcieIdFieldNumber = 2, kIdFieldNumber = 1, }; - // string name = 2; - void clear_name(); - const std::string& name() const; - template - void set_name(ArgT0&& arg0, ArgT... args); - std::string* mutable_name(); - PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* name); - private: - const std::string& _internal_name() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); - public: - - // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + // .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; bool has_pcie_id() const; private: bool _internal_has_pcie_id() const; @@ -317,7 +302,6 @@ class VirtioScsiController final : template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::opi_api::storage::v1::NvmeControllerPciId* pcie_id_; int64_t id_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; @@ -447,11 +431,11 @@ class VirtioScsiLun final : // accessors ------------------------------------------------------- enum : int { - kBdevFieldNumber = 6, + kBdevFieldNumber = 3, kIdFieldNumber = 1, - kControllerIdFieldNumber = 4, + kControllerIdFieldNumber = 2, }; - // string bdev = 6; + // string bdev = 3; void clear_bdev(); const std::string& bdev() const; template @@ -474,7 +458,7 @@ class VirtioScsiLun final : void _internal_set_id(int64_t value); public: - // int64 controller_id = 4; + // int64 controller_id = 2; void clear_controller_id(); int64_t controller_id() const; void set_controller_id(int64_t value); @@ -2954,58 +2938,7 @@ inline void VirtioScsiController::set_id(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.VirtioScsiController.id) } -// string name = 2; -inline void VirtioScsiController::clear_name() { - name_.ClearToEmpty(); -} -inline const std::string& VirtioScsiController::name() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.VirtioScsiController.name) - return _internal_name(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void VirtioScsiController::set_name(ArgT0&& arg0, ArgT... args) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.VirtioScsiController.name) -} -inline std::string* VirtioScsiController::mutable_name() { - std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:opi_api.storage.v1.VirtioScsiController.name) - return _s; -} -inline const std::string& VirtioScsiController::_internal_name() const { - return name_.Get(); -} -inline void VirtioScsiController::_internal_set_name(const std::string& value) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation()); -} -inline std::string* VirtioScsiController::_internal_mutable_name() { - - return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation()); -} -inline std::string* VirtioScsiController::release_name() { - // @@protoc_insertion_point(field_release:opi_api.storage.v1.VirtioScsiController.name) - return name_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -} -inline void VirtioScsiController::set_allocated_name(std::string* name) { - if (name != nullptr) { - - } else { - - } - name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, - GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.VirtioScsiController.name) -} - -// .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; +// .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; inline bool VirtioScsiController::_internal_has_pcie_id() const { return this != internal_default_instance() && pcie_id_ != nullptr; } @@ -3115,7 +3048,7 @@ inline void VirtioScsiLun::set_id(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.VirtioScsiLun.id) } -// int64 controller_id = 4; +// int64 controller_id = 2; inline void VirtioScsiLun::clear_controller_id() { controller_id_ = int64_t{0}; } @@ -3135,7 +3068,7 @@ inline void VirtioScsiLun::set_controller_id(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.VirtioScsiLun.controller_id) } -// string bdev = 6; +// string bdev = 3; inline void VirtioScsiLun::clear_bdev() { bdev_.ClearToEmpty(); } diff --git a/storage/v1alpha1/gen/go/frontend_nvme_pcie.pb.go b/storage/v1alpha1/gen/go/frontend_nvme_pcie.pb.go index ca227e89..5a9f9d8d 100644 --- a/storage/v1alpha1/gen/go/frontend_nvme_pcie.pb.go +++ b/storage/v1alpha1/gen/go/frontend_nvme_pcie.pb.go @@ -152,7 +152,7 @@ type NVMeController struct { // maximum number of host submission queues allowed. // If not set, the xPU will provide a default. MaxNsq int32 `protobuf:"varint,5,opt,name=max_nsq,json=maxNsq,proto3" json:"max_nsq,omitempty"` - // maximum number of host completion queues allowed. Optional. + // maximum number of host completion queues allowed. // If not set, the xPU will provide a default. MaxNcq int32 `protobuf:"varint,6,opt,name=max_ncq,json=maxNcq,proto3" json:"max_ncq,omitempty"` // maximum number of submission queue entries per submission queue, as a power of 2. @@ -267,7 +267,6 @@ type NVMeNamespace struct { unknownFields protoimpl.UnknownFields // namespace's unique key - // replaces: int64 id = 1; Id *_go.ObjectKey `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // subsystem for this namespace SubsystemId *_go.ObjectKey `protobuf:"bytes,2,opt,name=subsystem_id,json=subsystemId,proto3" json:"subsystem_id,omitempty"` @@ -283,11 +282,11 @@ type NVMeNamespace struct { BlockSize int64 `protobuf:"varint,5,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` // Size/Capacity of the namespace in blocks, size in bytes will // be BlockSize x NumBlocks. - NumBlocks int64 `protobuf:"varint,6,opt,name=num_blocks,json=numBlocks,proto3" json:"num_blocks,omitempty"` + BlocksCount int64 `protobuf:"varint,6,opt,name=blocks_count,json=blocksCount,proto3" json:"blocks_count,omitempty"` // Globally unique identifier for the namespace Nguid string `protobuf:"bytes,7,opt,name=nguid,proto3" json:"nguid,omitempty"` // 64bit Extended unique identifier for the namespace - // mandatory if guid is not specified, optional otherwise + // mandatory if guid is not specified Eui64 int64 `protobuf:"varint,8,opt,name=eui64,proto3" json:"eui64,omitempty"` // Globally unique identifier for the namespace Uuid *_go.Uuid `protobuf:"bytes,9,opt,name=uuid,proto3" json:"uuid,omitempty"` @@ -371,9 +370,9 @@ func (x *NVMeNamespace) GetBlockSize() int64 { return 0 } -func (x *NVMeNamespace) GetNumBlocks() int64 { +func (x *NVMeNamespace) GetBlocksCount() int64 { if x != nil { - return x.NumBlocks + return x.BlocksCount } return 0 } @@ -1615,7 +1614,7 @@ var file_frontend_nvme_pcie_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x71, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x6d, 0x61, 0x78, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x73, 0x22, 0x94, 0x04, 0x0a, 0x0d, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, + 0x73, 0x22, 0x98, 0x04, 0x0a, 0x0d, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x2c, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x02, 0x69, @@ -1631,325 +1630,325 @@ var file_frontend_nvme_pcie_proto_rawDesc = []byte{ 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x4e, 0x73, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x69, 0x7a, - 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6e, 0x75, 0x6d, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6e, 0x75, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, - 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x67, 0x75, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x6e, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x75, 0x69, 0x36, 0x34, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x75, 0x69, 0x36, 0x34, 0x12, 0x2b, 0x0a, 0x04, - 0x75, 0x75, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, 0x70, 0x69, - 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x75, 0x69, 0x64, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x39, 0x0a, 0x09, 0x76, 0x6f, 0x6c, - 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, - 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, - 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x08, 0x76, 0x6f, 0x6c, 0x75, - 0x6d, 0x65, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x12, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x61, 0x6c, 0x5f, - 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x61, 0x6c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x69, - 0x7a, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x70, 0x72, 0x65, 0x66, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, - 0x5f, 0x67, 0x72, 0x61, 0x6e, 0x75, 0x6c, 0x61, 0x72, 0x69, 0x74, 0x79, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x14, 0x70, 0x72, 0x65, 0x66, 0x57, 0x72, 0x69, 0x74, 0x65, 0x47, 0x72, 0x61, - 0x6e, 0x75, 0x6c, 0x61, 0x72, 0x69, 0x74, 0x79, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, - 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, - 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, - 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x09, 0x73, 0x75, - 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x53, - 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, - 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x73, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, - 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, - 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, - 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, - 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x09, 0x73, 0x75, 0x62, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x1a, 0x0a, 0x18, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x22, 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, - 0x0a, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x52, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, - 0x5a, 0x0a, 0x17, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x73, 0x75, - 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, - 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0x5c, 0x0a, 0x19, 0x4e, - 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, - 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, - 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x73, 0x75, - 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0x32, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, - 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x22, 0x61, 0x0a, - 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x42, 0x0a, 0x0a, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x22, 0x60, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x41, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, - 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x49, 0x64, 0x22, 0x61, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x42, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, - 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, - 0x6d, 0x49, 0x64, 0x22, 0x60, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x42, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x5d, 0x0a, 0x18, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x41, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, - 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x72, 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, + 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x67, 0x75, 0x69, 0x64, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x67, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x75, + 0x69, 0x36, 0x34, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x75, 0x69, 0x36, 0x34, + 0x12, 0x2b, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, - 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x02, 0x69, 0x64, - 0x22, 0x61, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x2c, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, - 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, - 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, - 0x61, 0x74, 0x73, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, - 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x3f, 0x0a, 0x0c, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, - 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, - 0x64, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x3f, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x22, 0x9e, 0x01, 0x0a, 0x18, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, - 0x0c, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, - 0x79, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x41, - 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, - 0x64, 0x22, 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3f, - 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, - 0x5a, 0x0a, 0x17, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x6e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x76, 0x31, 0x2e, 0x55, 0x75, 0x69, 0x64, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x39, 0x0a, + 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, - 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5c, 0x0a, 0x19, 0x4e, - 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x6e, 0x61, 0x6d, 0x65, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, - 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, - 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x6e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x22, 0x60, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, - 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, - 0x79, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x32, 0xb0, 0x13, 0x0a, 0x13, - 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x4e, 0x76, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, + 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x08, + 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x12, 0x6f, 0x70, 0x74, 0x69, + 0x6d, 0x61, 0x6c, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0b, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x61, 0x6c, 0x57, 0x72, 0x69, + 0x74, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x70, 0x72, 0x65, 0x66, 0x5f, 0x77, + 0x72, 0x69, 0x74, 0x65, 0x5f, 0x67, 0x72, 0x61, 0x6e, 0x75, 0x6c, 0x61, 0x72, 0x69, 0x74, 0x79, + 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x70, 0x72, 0x65, 0x66, 0x57, 0x72, 0x69, 0x74, + 0x65, 0x47, 0x72, 0x61, 0x6e, 0x75, 0x6c, 0x61, 0x72, 0x69, 0x74, 0x79, 0x22, 0x5d, 0x0a, 0x1a, + 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x73, 0x75, + 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, + 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x52, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, + 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x73, 0x75, 0x62, + 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x73, + 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, + 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x73, 0x75, 0x62, 0x73, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x21, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x75, 0x62, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, - 0x6d, 0x12, 0x81, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, + 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x09, + 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x1a, 0x0a, 0x18, 0x4e, 0x56, 0x4d, + 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, + 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, + 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x22, 0x5a, 0x0a, 0x17, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, + 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, + 0x65, 0x79, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, + 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, + 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, + 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, + 0x52, 0x0b, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0x32, 0x0a, + 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x74, + 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, + 0x74, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, + 0x73, 0x22, 0x61, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x42, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x60, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, + 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x61, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x42, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, - 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x73, - 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x7b, 0x73, 0x75, 0x62, 0x73, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, - 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x2e, + 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, + 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, + 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, + 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x73, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0x60, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x43, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, + 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, + 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x5d, 0x0a, 0x18, 0x4e, 0x56, 0x4d, + 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, + 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, + 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, + 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, + 0x52, 0x02, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x4e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, + 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, + 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, + 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, + 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, + 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, + 0x61, 0x63, 0x65, 0x49, 0x64, 0x22, 0x5d, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, + 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, + 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, + 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x22, 0x9e, 0x01, 0x0a, 0x18, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, + 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x49, 0x64, 0x12, 0x41, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, + 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, + 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x3f, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, + 0x61, 0x63, 0x65, 0x22, 0x5a, 0x0a, 0x17, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, + 0x0a, 0x0c, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, + 0x65, 0x79, 0x52, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x22, + 0x5c, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0c, + 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, + 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, 0x65, 0x79, + 0x52, 0x0b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x22, 0x60, 0x0a, + 0x1a, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, + 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x32, + 0xb0, 0x13, 0x0a, 0x13, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x4e, 0x76, 0x6d, 0x65, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, + 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, + 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, + 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x09, 0x73, 0x75, 0x62, 0x73, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x81, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, + 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, + 0x76, 0x31, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x7b, 0x73, + 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, + 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x32, 0x0e, 0x2f, 0x76, + 0x31, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x09, 0x73, 0x75, + 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x88, 0x01, 0x0a, 0x11, 0x4e, 0x56, 0x4d, 0x65, + 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x32, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x75, - 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x09, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x12, 0x88, 0x01, 0x0a, 0x11, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, - 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, - 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x6f, 0x70, + 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x73, 0x12, 0x86, 0x01, 0x0a, 0x10, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x47, 0x65, 0x74, 0x12, 0x2b, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, - 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, - 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x86, - 0x01, 0x0a, 0x10, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x47, 0x65, 0x74, 0x12, 0x2b, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, - 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, + 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, + 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x2f, + 0x7b, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x7d, 0x12, 0x75, 0x0a, 0x12, 0x4e, + 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, + 0x73, 0x12, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31, - 0x2f, 0x73, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x7b, 0x73, 0x75, 0x62, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x7d, 0x12, 0x75, 0x0a, 0x12, 0x4e, 0x56, 0x4d, 0x65, 0x53, - 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x2d, 0x2e, - 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x6f, + 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x14, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x2f, 0x2e, 0x6f, 0x70, + 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, - 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, - 0x01, 0x0a, 0x14, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x2f, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x0f, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x3a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x85, 0x01, 0x0a, 0x14, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2f, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x2a, + 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, + 0x2f, 0x7b, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x7d, 0x12, 0x90, 0x01, + 0x0a, 0x14, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2f, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, + 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, - 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, - 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, - 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x23, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x0f, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x3a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x12, 0x85, 0x01, 0x0a, 0x14, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2f, 0x2e, 0x6f, 0x70, 0x69, - 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x2a, 0x1c, 0x2f, 0x76, 0x31, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x7d, 0x12, 0x90, 0x01, 0x0a, 0x14, 0x4e, 0x56, - 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x12, 0x2f, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x23, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x1d, 0x32, 0x0f, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x73, 0x3a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x12, 0x8c, 0x01, 0x0a, 0x12, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, + 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, + 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x17, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, + 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, + 0x8b, 0x01, 0x0a, 0x11, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x47, 0x65, 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x32, - 0x0f, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, - 0x3a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x8c, 0x01, 0x0a, - 0x12, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, - 0x69, 0x73, 0x74, 0x12, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, - 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x17, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x76, 0x31, 0x2f, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x8b, 0x01, 0x0a, 0x11, - 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, - 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x22, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x12, 0x1c, 0x2f, 0x76, 0x31, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x7d, 0x12, 0x78, 0x0a, 0x13, 0x4e, 0x56, 0x4d, - 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, - 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x2f, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x21, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x3a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x12, 0x81, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, - 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, - 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x6e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x2e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x12, + 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x73, + 0x2f, 0x7b, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x7d, 0x12, 0x78, 0x0a, + 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, + 0x74, 0x61, 0x74, 0x73, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, + 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, + 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x3a, 0x09, 0x6e, 0x61, 0x6d, 0x65, + 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, + 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x13, 0x4e, 0x56, + 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x32, 0x0e, 0x2f, 0x76, + 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x3a, 0x09, 0x6e, 0x61, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x88, 0x01, 0x0a, 0x11, 0x4e, 0x56, 0x4d, 0x65, + 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x32, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x3a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x12, 0x88, 0x01, 0x0a, 0x11, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, - 0x73, 0x70, 0x61, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, - 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, - 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x6f, 0x70, + 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, + 0x65, 0x73, 0x12, 0x86, 0x01, 0x0a, 0x10, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x47, 0x65, 0x74, 0x12, 0x2b, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, - 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, - 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x12, 0x86, - 0x01, 0x0a, 0x10, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x47, 0x65, 0x74, 0x12, 0x2b, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, - 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, + 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, + 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, + 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x12, 0x75, 0x0a, 0x12, 0x4e, + 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, + 0x73, 0x12, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31, - 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, - 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x7d, 0x12, 0x75, 0x0a, 0x12, 0x4e, 0x56, 0x4d, 0x65, 0x4e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x2d, 0x2e, - 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x6f, - 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x53, - 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x64, - 0x0a, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x2e, 0x76, 0x31, 0x42, 0x15, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x4e, 0x76, - 0x6d, 0x65, 0x50, 0x63, 0x69, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, 0x70, 0x72, 0x6f, - 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x67, 0x65, - 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x42, 0x64, 0x0a, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, + 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x15, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x64, 0x4e, 0x76, 0x6d, 0x65, 0x50, 0x63, 0x69, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, + 0x69, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, + 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, + 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/storage/v1alpha1/gen/go/frontend_virtio_blk.pb.go b/storage/v1alpha1/gen/go/frontend_virtio_blk.pb.go index 18f3da11..cc2cf13d 100644 --- a/storage/v1alpha1/gen/go/frontend_virtio_blk.pb.go +++ b/storage/v1alpha1/gen/go/frontend_virtio_blk.pb.go @@ -35,11 +35,10 @@ type VirtioBlk struct { unknownFields protoimpl.UnknownFields Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - PcieId *NvmeControllerPciId `protobuf:"bytes,3,opt,name=pcie_id,json=pcieId,proto3" json:"pcie_id,omitempty"` - Bdev string `protobuf:"bytes,4,opt,name=bdev,proto3" json:"bdev,omitempty"` - MaxIoQps int64 `protobuf:"varint,5,opt,name=max_io_qps,json=maxIoQps,proto3" json:"max_io_qps,omitempty"` - SerialNumber string `protobuf:"bytes,6,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"` + PcieId *NvmeControllerPciId `protobuf:"bytes,2,opt,name=pcie_id,json=pcieId,proto3" json:"pcie_id,omitempty"` + Bdev string `protobuf:"bytes,3,opt,name=bdev,proto3" json:"bdev,omitempty"` + MaxIoQps int64 `protobuf:"varint,4,opt,name=max_io_qps,json=maxIoQps,proto3" json:"max_io_qps,omitempty"` + SerialNumber string `protobuf:"bytes,5,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"` } func (x *VirtioBlk) Reset() { @@ -81,13 +80,6 @@ func (x *VirtioBlk) GetId() int64 { return 0 } -func (x *VirtioBlk) GetName() string { - if x != nil { - return x.Name - } - return "" -} - func (x *VirtioBlk) GetPcieId() *NvmeControllerPciId { if x != nil { return x.PcieId @@ -510,110 +502,109 @@ var file_frontend_virtio_blk_proto_rawDesc = []byte{ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc8, 0x01, 0x0a, 0x09, 0x56, 0x69, 0x72, + 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb4, 0x01, 0x0a, 0x09, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x40, 0x0a, 0x07, 0x70, 0x63, - 0x69, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4e, 0x76, 0x6d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x50, - 0x63, 0x69, 0x49, 0x64, 0x52, 0x06, 0x70, 0x63, 0x69, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, - 0x62, 0x64, 0x65, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x64, 0x65, 0x76, - 0x12, 0x1c, 0x0a, 0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x71, 0x70, 0x73, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x49, 0x6f, 0x51, 0x70, 0x73, 0x12, 0x23, - 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, - 0x62, 0x65, 0x72, 0x22, 0x57, 0x0a, 0x16, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a, - 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, - 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x3d, 0x0a, 0x16, - 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x16, 0x56, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, - 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x39, 0x0a, 0x14, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, - 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, - 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x0b, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x49, 0x64, 0x22, - 0x56, 0x0a, 0x15, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6f, - 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x52, 0x0a, 0x63, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x3a, 0x0a, 0x13, 0x56, 0x69, 0x72, 0x74, 0x69, - 0x6f, 0x42, 0x6c, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, - 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x15, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, - 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, - 0x64, 0x22, 0x3e, 0x0a, 0x16, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x53, 0x74, - 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, - 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, - 0x73, 0x32, 0xfc, 0x05, 0x0a, 0x18, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7f, - 0x0a, 0x0f, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x12, 0x2a, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, + 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x40, 0x0a, 0x07, 0x70, 0x63, 0x69, 0x65, 0x5f, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x76, 0x6d, + 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x50, 0x63, 0x69, 0x49, 0x64, + 0x52, 0x06, 0x70, 0x63, 0x69, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x64, 0x65, 0x76, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x64, 0x65, 0x76, 0x12, 0x1c, 0x0a, 0x0a, + 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x71, 0x70, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x08, 0x6d, 0x61, 0x78, 0x49, 0x6f, 0x51, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, + 0x72, 0x69, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, + 0x57, 0x0a, 0x16, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3d, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x22, 0x21, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1b, 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, - 0x62, 0x6c, 0x6b, 0x73, 0x3a, 0x09, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x12, - 0x79, 0x0a, 0x0f, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x12, 0x2a, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, - 0x6b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, - 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x73, 0x2f, 0x7b, - 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x7d, 0x12, 0x7f, 0x0a, 0x0f, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2a, 0x2e, + 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x52, 0x0a, 0x63, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x3d, 0x0a, 0x16, 0x56, 0x69, 0x72, 0x74, + 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x16, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x42, 0x6c, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x3d, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x42, 0x6c, 0x6b, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x22, 0x39, 0x0a, 0x14, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x76, 0x69, 0x72, 0x74, + 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, + 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x49, 0x64, 0x22, 0x56, 0x0a, 0x15, 0x56, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, + 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, + 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x22, 0x3a, 0x0a, 0x13, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, + 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, + 0x3c, 0x0a, 0x15, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x53, 0x74, 0x61, 0x74, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3e, 0x0a, + 0x16, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x32, 0xfc, 0x05, + 0x0a, 0x18, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x42, 0x6c, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7f, 0x0a, 0x0f, 0x56, 0x69, + 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x2a, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x55, 0x70, 0x64, 0x61, + 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, - 0x32, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x73, - 0x3a, 0x09, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x12, 0x7c, 0x0a, 0x0d, 0x56, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x2e, 0x6f, - 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, - 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x76, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x73, 0x12, 0x7a, 0x0a, 0x0c, 0x56, 0x69, 0x72, - 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x47, 0x65, 0x74, 0x12, 0x27, 0x2e, 0x6f, 0x70, 0x69, 0x5f, + 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x73, + 0x3a, 0x09, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x12, 0x79, 0x0a, 0x0f, 0x56, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2a, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, 0x76, 0x31, 0x2f, + 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x73, 0x2f, 0x7b, 0x76, 0x69, 0x72, 0x74, + 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x7d, 0x12, 0x7f, 0x0a, 0x0f, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x42, 0x6c, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2a, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, - 0x6b, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x76, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x73, 0x2f, 0x7b, 0x76, 0x69, 0x72, 0x74, 0x69, - 0x6f, 0x62, 0x6c, 0x6b, 0x7d, 0x12, 0x69, 0x0a, 0x0e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, - 0x6c, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x29, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, - 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, - 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x42, 0x6c, 0x6b, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x32, 0x0e, 0x2f, 0x76, + 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x73, 0x3a, 0x09, 0x76, 0x69, + 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, 0x12, 0x7c, 0x0a, 0x0d, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, + 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, + 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, - 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x42, 0x65, 0x0a, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x16, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, - 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, - 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, - 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, - 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x62, 0x6c, 0x6b, 0x73, 0x12, 0x7a, 0x0a, 0x0c, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, + 0x6c, 0x6b, 0x47, 0x65, 0x74, 0x12, 0x27, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x42, 0x6c, 0x6b, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x22, 0x22, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x62, 0x6c, 0x6b, 0x73, 0x2f, 0x7b, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x62, 0x6c, 0x6b, + 0x7d, 0x12, 0x69, 0x0a, 0x0e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x53, 0x74, + 0x61, 0x74, 0x73, 0x12, 0x29, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, + 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, + 0x6c, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x53, 0x74, 0x61, + 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x65, 0x0a, 0x12, + 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, + 0x76, 0x31, 0x42, 0x16, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x69, 0x72, 0x74, + 0x69, 0x6f, 0x42, 0x6c, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x6a, + 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x74, 0x6f, 0x72, + 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/storage/v1alpha1/gen/go/frontend_virtio_scsi.pb.go b/storage/v1alpha1/gen/go/frontend_virtio_scsi.pb.go index f008d57e..3fa2a47a 100644 --- a/storage/v1alpha1/gen/go/frontend_virtio_scsi.pb.go +++ b/storage/v1alpha1/gen/go/frontend_virtio_scsi.pb.go @@ -35,8 +35,7 @@ type VirtioScsiController struct { unknownFields protoimpl.UnknownFields Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - PcieId *NvmeControllerPciId `protobuf:"bytes,4,opt,name=pcie_id,json=pcieId,proto3" json:"pcie_id,omitempty"` + PcieId *NvmeControllerPciId `protobuf:"bytes,2,opt,name=pcie_id,json=pcieId,proto3" json:"pcie_id,omitempty"` } func (x *VirtioScsiController) Reset() { @@ -78,13 +77,6 @@ func (x *VirtioScsiController) GetId() int64 { return 0 } -func (x *VirtioScsiController) GetName() string { - if x != nil { - return x.Name - } - return "" -} - func (x *VirtioScsiController) GetPcieId() *NvmeControllerPciId { if x != nil { return x.PcieId @@ -98,8 +90,8 @@ type VirtioScsiLun struct { unknownFields protoimpl.UnknownFields Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - ControllerId int64 `protobuf:"varint,4,opt,name=controller_id,json=controllerId,proto3" json:"controller_id,omitempty"` - Bdev string `protobuf:"bytes,6,opt,name=bdev,proto3" json:"bdev,omitempty"` + ControllerId int64 `protobuf:"varint,2,opt,name=controller_id,json=controllerId,proto3" json:"controller_id,omitempty"` + Bdev string `protobuf:"bytes,3,opt,name=bdev,proto3" json:"bdev,omitempty"` } func (x *VirtioScsiLun) Reset() { @@ -948,225 +940,224 @@ var file_frontend_virtio_scsi_proto_rawDesc = []byte{ 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7c, 0x0a, 0x14, 0x56, 0x69, 0x72, + 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x68, 0x0a, 0x14, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x40, 0x0a, 0x07, 0x70, 0x63, 0x69, 0x65, 0x5f, 0x69, 0x64, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, - 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x76, 0x6d, 0x65, - 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x50, 0x63, 0x69, 0x49, 0x64, 0x52, - 0x06, 0x70, 0x63, 0x69, 0x65, 0x49, 0x64, 0x22, 0x58, 0x0a, 0x0d, 0x56, 0x69, 0x72, 0x74, 0x69, - 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, - 0x04, 0x62, 0x64, 0x65, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x64, 0x65, - 0x76, 0x22, 0x6d, 0x0a, 0x21, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, - 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x22, 0x48, 0x0a, 0x21, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x21, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x48, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, - 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, - 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x21, 0x0a, 0x1f, 0x56, 0x69, 0x72, - 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x6c, 0x0a, 0x20, + 0x64, 0x12, 0x40, 0x0a, 0x07, 0x70, 0x63, 0x69, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, + 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x76, 0x6d, 0x65, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x50, 0x63, 0x69, 0x49, 0x64, 0x52, 0x06, 0x70, 0x63, 0x69, + 0x65, 0x49, 0x64, 0x22, 0x58, 0x0a, 0x0d, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, + 0x69, 0x4c, 0x75, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x64, 0x65, + 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x62, 0x64, 0x65, 0x76, 0x22, 0x6d, 0x0a, + 0x21, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, + 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, + 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x48, 0x0a, 0x21, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, - 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, - 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x45, 0x0a, 0x1e, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, - 0x64, 0x22, 0x47, 0x0a, 0x20, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x49, 0x0a, 0x21, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, - 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x73, 0x74, 0x61, 0x74, 0x73, 0x22, 0x51, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, - 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x03, 0x6c, 0x75, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, - 0x4c, 0x75, 0x6e, 0x52, 0x03, 0x6c, 0x75, 0x6e, 0x22, 0x58, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x6c, - 0x75, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x75, 0x6e, - 0x49, 0x64, 0x22, 0x51, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, - 0x4c, 0x75, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x33, 0x0a, 0x03, 0x6c, 0x75, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, - 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, - 0x52, 0x03, 0x6c, 0x75, 0x6e, 0x22, 0x3f, 0x0a, 0x18, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, - 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x50, 0x0a, 0x19, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, - 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x03, 0x6c, 0x75, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x21, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x21, 0x0a, 0x1f, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, + 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x6c, 0x0a, 0x20, 0x56, 0x69, 0x72, 0x74, + 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x0a, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, - 0x4c, 0x75, 0x6e, 0x52, 0x03, 0x6c, 0x75, 0x6e, 0x22, 0x55, 0x0a, 0x17, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x6c, 0x75, 0x6e, 0x5f, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x75, 0x6e, 0x49, 0x64, 0x22, - 0x57, 0x0a, 0x19, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, - 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, - 0x64, 0x12, 0x15, 0x0a, 0x06, 0x6c, 0x75, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x05, 0x6c, 0x75, 0x6e, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x32, 0xba, 0x0e, 0x0a, - 0x19, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, - 0x63, 0x73, 0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xaa, 0x01, 0x0a, 0x1a, 0x56, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x35, 0x2e, 0x6f, 0x70, 0x69, 0x5f, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x45, 0x0a, 0x1e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x47, 0x0a, + 0x20, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x22, 0x49, 0x0a, 0x21, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, + 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, + 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, + 0x73, 0x22, 0x51, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, + 0x75, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x33, 0x0a, 0x03, 0x6c, 0x75, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, + 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x52, + 0x03, 0x6c, 0x75, 0x6e, 0x22, 0x58, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, + 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x6c, 0x75, 0x6e, 0x5f, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x75, 0x6e, 0x49, 0x64, 0x22, 0x51, + 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x03, + 0x6c, 0x75, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, - 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x2b, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x25, 0x22, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, - 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x73, 0x3a, 0x0e, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, - 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x12, 0x99, 0x01, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x35, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, - 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x2a, 0x24, 0x2f, - 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, - 0x6c, 0x73, 0x2f, 0x7b, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, - 0x72, 0x6c, 0x7d, 0x12, 0xaa, 0x01, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, - 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x52, 0x03, 0x6c, 0x75, + 0x6e, 0x22, 0x3f, 0x0a, 0x18, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, + 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, + 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x49, 0x64, 0x22, 0x50, 0x0a, 0x19, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, + 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x33, 0x0a, 0x03, 0x6c, 0x75, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6f, + 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x52, + 0x03, 0x6c, 0x75, 0x6e, 0x22, 0x55, 0x0a, 0x17, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, + 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x6c, 0x75, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, 0x75, 0x6e, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x19, 0x56, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, + 0x06, 0x6c, 0x75, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6c, + 0x75, 0x6e, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, + 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x32, 0xba, 0x0e, 0x0a, 0x19, 0x46, 0x72, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xaa, 0x01, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x35, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6f, + 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x22, 0x13, + 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, + 0x72, 0x6c, 0x73, 0x3a, 0x0e, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, + 0x74, 0x72, 0x6c, 0x12, 0x99, 0x01, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, + 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x35, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, - 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, + 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, + 0x79, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x2a, 0x24, 0x2f, 0x76, 0x31, 0x2f, 0x76, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x73, 0x2f, 0x7b, + 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x7d, 0x12, + 0xaa, 0x01, 0x0a, 0x1a, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x35, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, + 0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x32, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, + 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x73, 0x3a, 0x0e, 0x76, 0x69, + 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x12, 0xa2, 0x01, 0x0a, + 0x18, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x33, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x22, 0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x32, 0x13, 0x2f, 0x76, 0x31, - 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x73, - 0x3a, 0x0e, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, - 0x12, 0xa2, 0x01, 0x0a, 0x18, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x33, 0x2e, + 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x76, + 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, + 0x73, 0x12, 0xa5, 0x01, 0x0a, 0x17, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x12, 0x32, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, - 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, - 0x12, 0x13, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, - 0x63, 0x74, 0x72, 0x6c, 0x73, 0x12, 0xa5, 0x01, 0x0a, 0x17, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, - 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, - 0x74, 0x12, 0x32, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, - 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, - 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, - 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, - 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x73, 0x2f, 0x7b, 0x76, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x7d, 0x12, 0x8a, 0x01, - 0x0a, 0x19, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x34, 0x2e, 0x6f, 0x70, - 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x35, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, - 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x93, 0x01, 0x0a, 0x13, 0x56, - 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, + 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x22, 0x2c, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, + 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x73, 0x2f, 0x7b, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x73, 0x63, 0x73, 0x69, 0x63, 0x74, 0x72, 0x6c, 0x7d, 0x12, 0x8a, 0x01, 0x0a, 0x19, 0x56, 0x69, + 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x34, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, + 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, + 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x43, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x93, 0x01, 0x0a, 0x13, 0x56, 0x69, 0x72, 0x74, 0x69, + 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x2e, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, + 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, + 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, + 0x6e, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x12, 0x2f, 0x76, 0x31, 0x2f, 0x76, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x3a, 0x0d, 0x76, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x12, 0x89, 0x01, 0x0a, + 0x13, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2a, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x24, 0x2a, 0x22, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x2f, 0x7b, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x7d, 0x12, 0x93, 0x01, 0x0a, 0x13, 0x56, 0x69, 0x72, + 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, + 0x4c, 0x75, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, + 0x4c, 0x75, 0x6e, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x32, 0x12, 0x2f, 0x76, 0x31, + 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x3a, + 0x0d, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x12, 0x8c, + 0x01, 0x0a, 0x11, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, + 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, + 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, - 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, + 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x1a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x12, 0x12, 0x2f, 0x76, 0x31, 0x2f, 0x76, + 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x12, 0x8e, 0x01, + 0x0a, 0x10, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x47, + 0x65, 0x74, 0x12, 0x2b, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, - 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x12, 0x2f, - 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, - 0x73, 0x3a, 0x0d, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, - 0x12, 0x89, 0x01, 0x0a, 0x13, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, - 0x75, 0x6e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, - 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, - 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x2a, 0x22, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x2f, 0x7b, 0x76, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x7d, 0x12, 0x93, 0x01, 0x0a, - 0x13, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x12, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, - 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, - 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, + 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, + 0x75, 0x6e, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x76, 0x31, 0x2f, + 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x2f, 0x7b, + 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, 0x7d, 0x12, 0x75, + 0x0a, 0x12, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, + 0x74, 0x61, 0x74, 0x73, 0x12, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, - 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x32, - 0x12, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, - 0x75, 0x6e, 0x73, 0x3a, 0x0d, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, - 0x75, 0x6e, 0x12, 0x8c, 0x01, 0x0a, 0x11, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, - 0x69, 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, - 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, - 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x12, 0x12, 0x2f, - 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, 0x6e, - 0x73, 0x12, 0x8e, 0x01, 0x0a, 0x10, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, - 0x4c, 0x75, 0x6e, 0x47, 0x65, 0x74, 0x12, 0x2b, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, - 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, - 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, + 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, - 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, - 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, - 0x6e, 0x73, 0x2f, 0x7b, 0x76, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x73, 0x63, 0x73, 0x69, 0x6c, 0x75, - 0x6e, 0x7d, 0x12, 0x75, 0x0a, 0x12, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, - 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x2d, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, - 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, - 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2e, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, - 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x69, 0x72, - 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x66, 0x0a, 0x12, 0x6f, 0x70, 0x69, - 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x42, - 0x17, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, - 0x63, 0x73, 0x69, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, - 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x73, 0x69, 0x4c, 0x75, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x66, 0x0a, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, + 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x17, 0x46, 0x72, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x64, 0x56, 0x69, 0x72, 0x74, 0x69, 0x6f, 0x53, 0x63, 0x73, 0x69, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, + 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, + 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmePcieProto.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmePcieProto.java index df0206e5..d8c4788e 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmePcieProto.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmePcieProto.java @@ -173,131 +173,131 @@ public static void registerAllExtensions( "\007pcie_id\030\004 \001(\0132\'.opi_api.storage.v1.Nvme" + "ControllerPciId\022\017\n\007max_nsq\030\005 \001(\005\022\017\n\007max_" + "ncq\030\006 \001(\005\022\014\n\004sqes\030\007 \001(\005\022\014\n\004cqes\030\010 \001(\005\022\026\n" + - "\016max_namespaces\030\t \001(\005\"\217\003\n\rNVMeNamespace\022" + + "\016max_namespaces\030\t \001(\005\"\221\003\n\rNVMeNamespace\022" + "(\n\002id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKe" + "y\0222\n\014subsystem_id\030\002 \001(\0132\034.opi_api.common" + ".v1.ObjectKey\0223\n\rcontroller_id\030\003 \001(\0132\034.o" + "pi_api.common.v1.ObjectKey\022\021\n\thost_nsid\030" + - "\004 \001(\005\022\022\n\nblock_size\030\005 \001(\003\022\022\n\nnum_blocks\030" + - "\006 \001(\003\022\r\n\005nguid\030\007 \001(\t\022\r\n\005eui64\030\010 \001(\003\022%\n\004u" + - "uid\030\t \001(\0132\027.opi_api.common.v1.Uuid\022/\n\tvo" + - "lume_id\030\n \001(\0132\034.opi_api.common.v1.Object" + - "Key\022\032\n\022optimal_write_size\030\013 \001(\005\022\036\n\026pref_" + - "write_granularity\030\014 \001(\005\"R\n\032NVMeSubsystem" + - "CreateRequest\0224\n\tsubsystem\030\001 \001(\0132!.opi_a" + - "pi.storage.v1.NVMeSubsystem\"P\n\032NVMeSubsy" + - "stemDeleteRequest\0222\n\014subsystem_id\030\001 \001(\0132" + - "\034.opi_api.common.v1.ObjectKey\"R\n\032NVMeSub" + - "systemUpdateRequest\0224\n\tsubsystem\030\001 \001(\0132!" + - ".opi_api.storage.v1.NVMeSubsystem\"\032\n\030NVM" + - "eSubsystemListRequest\"Q\n\031NVMeSubsystemLi" + - "stResponse\0224\n\tsubsystem\030\001 \003(\0132!.opi_api." + - "storage.v1.NVMeSubsystem\"M\n\027NVMeSubsyste" + - "mGetRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.opi_" + - "api.common.v1.ObjectKey\"O\n\031NVMeSubsystem" + - "StatsRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.opi" + - "_api.common.v1.ObjectKey\"+\n\032NVMeSubsyste" + - "mStatsResponse\022\r\n\005stats\030\001 \001(\t\"U\n\033NVMeCon" + - "trollerCreateRequest\0226\n\ncontroller\030\001 \001(\013" + - "2\".opi_api.storage.v1.NVMeController\"R\n\033" + - "NVMeControllerDeleteRequest\0223\n\rcontrolle" + - "r_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey" + - "\"U\n\033NVMeControllerUpdateRequest\0226\n\ncontr" + - "oller\030\001 \001(\0132\".opi_api.storage.v1.NVMeCon" + - "troller\"O\n\031NVMeControllerListRequest\0222\n\014" + - "subsystem_id\030\001 \001(\0132\034.opi_api.common.v1.O" + - "bjectKey\"T\n\032NVMeControllerListResponse\0226" + - "\n\ncontroller\030\001 \003(\0132\".opi_api.storage.v1." + - "NVMeController\"O\n\030NVMeControllerGetReque" + - "st\0223\n\rcontroller_id\030\001 \001(\0132\034.opi_api.comm" + - "on.v1.ObjectKey\"F\n\032NVMeControllerStatsRe" + - "quest\022(\n\002id\030\001 \001(\0132\034.opi_api.common.v1.Ob" + - "jectKey\"V\n\033NVMeControllerStatsResponse\022(" + - "\n\002id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey" + - "\022\r\n\005stats\030\002 \001(\t\"R\n\032NVMeNamespaceCreateRe" + - "quest\0224\n\tnamespace\030\001 \001(\0132!.opi_api.stora" + - "ge.v1.NVMeNamespace\"P\n\032NVMeNamespaceDele" + - "teRequest\0222\n\014namespace_id\030\001 \001(\0132\034.opi_ap" + - "i.common.v1.ObjectKey\"R\n\032NVMeNamespaceUp" + - "dateRequest\0224\n\tnamespace\030\001 \001(\0132!.opi_api" + - ".storage.v1.NVMeNamespace\"\203\001\n\030NVMeNamesp" + - "aceListRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.o" + - "pi_api.common.v1.ObjectKey\0223\n\rcontroller" + - "_id\030\002 \001(\0132\034.opi_api.common.v1.ObjectKey\"" + - "Q\n\031NVMeNamespaceListResponse\0224\n\tnamespac" + - "e\030\001 \003(\0132!.opi_api.storage.v1.NVMeNamespa" + - "ce\"M\n\027NVMeNamespaceGetRequest\0222\n\014namespa" + - "ce_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectKe" + - "y\"O\n\031NVMeNamespaceStatsRequest\0222\n\014namesp" + - "ace_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" + - "ey\"U\n\032NVMeNamespaceStatsResponse\022(\n\002id\030\001" + - " \001(\0132\034.opi_api.common.v1.ObjectKey\022\r\n\005st" + - "ats\030\002 \001(\t2\260\023\n\023FrontendNvmeService\022\213\001\n\023NV" + - "MeSubsystemCreate\022..opi_api.storage.v1.N" + - "VMeSubsystemCreateRequest\032!.opi_api.stor" + - "age.v1.NVMeSubsystem\"!\202\323\344\223\002\033\"\016/v1/subsys" + - "tems:\tsubsystem\022\201\001\n\023NVMeSubsystemDelete\022" + - "..opi_api.storage.v1.NVMeSubsystemDelete" + - "Request\032\026.google.protobuf.Empty\"\"\202\323\344\223\002\034*" + - "\032/v1/subsystems/{subsystem}\022\213\001\n\023NVMeSubs" + - "ystemUpdate\022..opi_api.storage.v1.NVMeSub" + - "systemUpdateRequest\032!.opi_api.storage.v1" + - ".NVMeSubsystem\"!\202\323\344\223\002\0332\016/v1/subsystems:\t" + - "subsystem\022\210\001\n\021NVMeSubsystemList\022,.opi_ap" + - "i.storage.v1.NVMeSubsystemListRequest\032-." + - "opi_api.storage.v1.NVMeSubsystemListResp" + - "onse\"\026\202\323\344\223\002\020\022\016/v1/subsystems\022\206\001\n\020NVMeSub" + - "systemGet\022+.opi_api.storage.v1.NVMeSubsy" + - "stemGetRequest\032!.opi_api.storage.v1.NVMe" + - "Subsystem\"\"\202\323\344\223\002\034\022\032/v1/subsystems/{subsy" + - "stem}\022u\n\022NVMeSubsystemStats\022-.opi_api.st" + - "orage.v1.NVMeSubsystemStatsRequest\032..opi" + - "_api.storage.v1.NVMeSubsystemStatsRespon" + - "se\"\000\022\220\001\n\024NVMeControllerCreate\022/.opi_api." + - "storage.v1.NVMeControllerCreateRequest\032\"" + - ".opi_api.storage.v1.NVMeController\"#\202\323\344\223" + - "\002\035\"\017/v1/controllers:\ncontroller\022\205\001\n\024NVMe" + - "ControllerDelete\022/.opi_api.storage.v1.NV" + - "MeControllerDeleteRequest\032\026.google.proto" + - "buf.Empty\"$\202\323\344\223\002\036*\034/v1/controllers/{cont" + - "roller}\022\220\001\n\024NVMeControllerUpdate\022/.opi_a" + - "pi.storage.v1.NVMeControllerUpdateReques" + - "t\032\".opi_api.storage.v1.NVMeController\"#\202" + - "\323\344\223\002\0352\017/v1/controllers:\ncontroller\022\214\001\n\022N" + - "VMeControllerList\022-.opi_api.storage.v1.N" + - "VMeControllerListRequest\032..opi_api.stora" + - "ge.v1.NVMeControllerListResponse\"\027\202\323\344\223\002\021" + - "\022\017/v1/controllers\022\213\001\n\021NVMeControllerGet\022" + - ",.opi_api.storage.v1.NVMeControllerGetRe" + - "quest\032\".opi_api.storage.v1.NVMeControlle" + - "r\"$\202\323\344\223\002\036\022\034/v1/controllers/{controller}\022" + - "x\n\023NVMeControllerStats\022..opi_api.storage" + - ".v1.NVMeControllerStatsRequest\032/.opi_api" + - ".storage.v1.NVMeControllerStatsResponse\"" + - "\000\022\213\001\n\023NVMeNamespaceCreate\022..opi_api.stor" + - "age.v1.NVMeNamespaceCreateRequest\032!.opi_" + - "api.storage.v1.NVMeNamespace\"!\202\323\344\223\002\033\"\016/v" + - "1/namespaces:\tnamespace\022\201\001\n\023NVMeNamespac" + - "eDelete\022..opi_api.storage.v1.NVMeNamespa" + - "ceDeleteRequest\032\026.google.protobuf.Empty\"" + - "\"\202\323\344\223\002\034*\032/v1/namespaces/{namespace}\022\213\001\n\023" + - "NVMeNamespaceUpdate\022..opi_api.storage.v1" + - ".NVMeNamespaceUpdateRequest\032!.opi_api.st" + - "orage.v1.NVMeNamespace\"!\202\323\344\223\002\0332\016/v1/name" + - "spaces:\tnamespace\022\210\001\n\021NVMeNamespaceList\022" + - ",.opi_api.storage.v1.NVMeNamespaceListRe" + - "quest\032-.opi_api.storage.v1.NVMeNamespace" + - "ListResponse\"\026\202\323\344\223\002\020\022\016/v1/namespaces\022\206\001\n" + - "\020NVMeNamespaceGet\022+.opi_api.storage.v1.N" + - "VMeNamespaceGetRequest\032!.opi_api.storage" + - ".v1.NVMeNamespace\"\"\202\323\344\223\002\034\022\032/v1/namespace" + - "s/{namespace}\022u\n\022NVMeNamespaceStats\022-.op" + - "i_api.storage.v1.NVMeNamespaceStatsReque" + - "st\032..opi_api.storage.v1.NVMeNamespaceSta" + - "tsResponse\"\000Bd\n\022opi_api.storage.v1B\025Fron" + - "tendNvmePcieProtoP\001Z5github.com/opiproje" + - "ct/opi-api/storage/v1alpha1/gen/gob\006prot" + - "o3" + "\004 \001(\005\022\022\n\nblock_size\030\005 \001(\003\022\024\n\014blocks_coun" + + "t\030\006 \001(\003\022\r\n\005nguid\030\007 \001(\t\022\r\n\005eui64\030\010 \001(\003\022%\n" + + "\004uuid\030\t \001(\0132\027.opi_api.common.v1.Uuid\022/\n\t" + + "volume_id\030\n \001(\0132\034.opi_api.common.v1.Obje" + + "ctKey\022\032\n\022optimal_write_size\030\013 \001(\005\022\036\n\026pre" + + "f_write_granularity\030\014 \001(\005\"R\n\032NVMeSubsyst" + + "emCreateRequest\0224\n\tsubsystem\030\001 \001(\0132!.opi" + + "_api.storage.v1.NVMeSubsystem\"P\n\032NVMeSub" + + "systemDeleteRequest\0222\n\014subsystem_id\030\001 \001(" + + "\0132\034.opi_api.common.v1.ObjectKey\"R\n\032NVMeS" + + "ubsystemUpdateRequest\0224\n\tsubsystem\030\001 \001(\013" + + "2!.opi_api.storage.v1.NVMeSubsystem\"\032\n\030N" + + "VMeSubsystemListRequest\"Q\n\031NVMeSubsystem" + + "ListResponse\0224\n\tsubsystem\030\001 \003(\0132!.opi_ap" + + "i.storage.v1.NVMeSubsystem\"M\n\027NVMeSubsys" + + "temGetRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.op" + + "i_api.common.v1.ObjectKey\"O\n\031NVMeSubsyst" + + "emStatsRequest\0222\n\014subsystem_id\030\001 \001(\0132\034.o" + + "pi_api.common.v1.ObjectKey\"+\n\032NVMeSubsys" + + "temStatsResponse\022\r\n\005stats\030\001 \001(\t\"U\n\033NVMeC" + + "ontrollerCreateRequest\0226\n\ncontroller\030\001 \001" + + "(\0132\".opi_api.storage.v1.NVMeController\"R" + + "\n\033NVMeControllerDeleteRequest\0223\n\rcontrol" + + "ler_id\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" + + "ey\"U\n\033NVMeControllerUpdateRequest\0226\n\ncon" + + "troller\030\001 \001(\0132\".opi_api.storage.v1.NVMeC" + + "ontroller\"O\n\031NVMeControllerListRequest\0222" + + "\n\014subsystem_id\030\001 \001(\0132\034.opi_api.common.v1" + + ".ObjectKey\"T\n\032NVMeControllerListResponse" + + "\0226\n\ncontroller\030\001 \003(\0132\".opi_api.storage.v" + + "1.NVMeController\"O\n\030NVMeControllerGetReq" + + "uest\0223\n\rcontroller_id\030\001 \001(\0132\034.opi_api.co" + + "mmon.v1.ObjectKey\"F\n\032NVMeControllerStats" + + "Request\022(\n\002id\030\001 \001(\0132\034.opi_api.common.v1." + + "ObjectKey\"V\n\033NVMeControllerStatsResponse" + + "\022(\n\002id\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" + + "ey\022\r\n\005stats\030\002 \001(\t\"R\n\032NVMeNamespaceCreate" + + "Request\0224\n\tnamespace\030\001 \001(\0132!.opi_api.sto" + + "rage.v1.NVMeNamespace\"P\n\032NVMeNamespaceDe" + + "leteRequest\0222\n\014namespace_id\030\001 \001(\0132\034.opi_" + + "api.common.v1.ObjectKey\"R\n\032NVMeNamespace" + + "UpdateRequest\0224\n\tnamespace\030\001 \001(\0132!.opi_a" + + "pi.storage.v1.NVMeNamespace\"\203\001\n\030NVMeName" + + "spaceListRequest\0222\n\014subsystem_id\030\001 \001(\0132\034" + + ".opi_api.common.v1.ObjectKey\0223\n\rcontroll" + + "er_id\030\002 \001(\0132\034.opi_api.common.v1.ObjectKe" + + "y\"Q\n\031NVMeNamespaceListResponse\0224\n\tnamesp" + + "ace\030\001 \003(\0132!.opi_api.storage.v1.NVMeNames" + + "pace\"M\n\027NVMeNamespaceGetRequest\0222\n\014names" + + "pace_id\030\001 \001(\0132\034.opi_api.common.v1.Object" + + "Key\"O\n\031NVMeNamespaceStatsRequest\0222\n\014name" + + "space_id\030\001 \001(\0132\034.opi_api.common.v1.Objec" + + "tKey\"U\n\032NVMeNamespaceStatsResponse\022(\n\002id" + + "\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey\022\r\n\005" + + "stats\030\002 \001(\t2\260\023\n\023FrontendNvmeService\022\213\001\n\023" + + "NVMeSubsystemCreate\022..opi_api.storage.v1" + + ".NVMeSubsystemCreateRequest\032!.opi_api.st" + + "orage.v1.NVMeSubsystem\"!\202\323\344\223\002\033\"\016/v1/subs" + + "ystems:\tsubsystem\022\201\001\n\023NVMeSubsystemDelet" + + "e\022..opi_api.storage.v1.NVMeSubsystemDele" + + "teRequest\032\026.google.protobuf.Empty\"\"\202\323\344\223\002" + + "\034*\032/v1/subsystems/{subsystem}\022\213\001\n\023NVMeSu" + + "bsystemUpdate\022..opi_api.storage.v1.NVMeS" + + "ubsystemUpdateRequest\032!.opi_api.storage." + + "v1.NVMeSubsystem\"!\202\323\344\223\002\0332\016/v1/subsystems" + + ":\tsubsystem\022\210\001\n\021NVMeSubsystemList\022,.opi_" + + "api.storage.v1.NVMeSubsystemListRequest\032" + + "-.opi_api.storage.v1.NVMeSubsystemListRe" + + "sponse\"\026\202\323\344\223\002\020\022\016/v1/subsystems\022\206\001\n\020NVMeS" + + "ubsystemGet\022+.opi_api.storage.v1.NVMeSub" + + "systemGetRequest\032!.opi_api.storage.v1.NV" + + "MeSubsystem\"\"\202\323\344\223\002\034\022\032/v1/subsystems/{sub" + + "system}\022u\n\022NVMeSubsystemStats\022-.opi_api." + + "storage.v1.NVMeSubsystemStatsRequest\032..o" + + "pi_api.storage.v1.NVMeSubsystemStatsResp" + + "onse\"\000\022\220\001\n\024NVMeControllerCreate\022/.opi_ap" + + "i.storage.v1.NVMeControllerCreateRequest" + + "\032\".opi_api.storage.v1.NVMeController\"#\202\323" + + "\344\223\002\035\"\017/v1/controllers:\ncontroller\022\205\001\n\024NV" + + "MeControllerDelete\022/.opi_api.storage.v1." + + "NVMeControllerDeleteRequest\032\026.google.pro" + + "tobuf.Empty\"$\202\323\344\223\002\036*\034/v1/controllers/{co" + + "ntroller}\022\220\001\n\024NVMeControllerUpdate\022/.opi" + + "_api.storage.v1.NVMeControllerUpdateRequ" + + "est\032\".opi_api.storage.v1.NVMeController\"" + + "#\202\323\344\223\002\0352\017/v1/controllers:\ncontroller\022\214\001\n" + + "\022NVMeControllerList\022-.opi_api.storage.v1" + + ".NVMeControllerListRequest\032..opi_api.sto" + + "rage.v1.NVMeControllerListResponse\"\027\202\323\344\223" + + "\002\021\022\017/v1/controllers\022\213\001\n\021NVMeControllerGe" + + "t\022,.opi_api.storage.v1.NVMeControllerGet" + + "Request\032\".opi_api.storage.v1.NVMeControl" + + "ler\"$\202\323\344\223\002\036\022\034/v1/controllers/{controller" + + "}\022x\n\023NVMeControllerStats\022..opi_api.stora" + + "ge.v1.NVMeControllerStatsRequest\032/.opi_a" + + "pi.storage.v1.NVMeControllerStatsRespons" + + "e\"\000\022\213\001\n\023NVMeNamespaceCreate\022..opi_api.st" + + "orage.v1.NVMeNamespaceCreateRequest\032!.op" + + "i_api.storage.v1.NVMeNamespace\"!\202\323\344\223\002\033\"\016" + + "/v1/namespaces:\tnamespace\022\201\001\n\023NVMeNamesp" + + "aceDelete\022..opi_api.storage.v1.NVMeNames" + + "paceDeleteRequest\032\026.google.protobuf.Empt" + + "y\"\"\202\323\344\223\002\034*\032/v1/namespaces/{namespace}\022\213\001" + + "\n\023NVMeNamespaceUpdate\022..opi_api.storage." + + "v1.NVMeNamespaceUpdateRequest\032!.opi_api." + + "storage.v1.NVMeNamespace\"!\202\323\344\223\002\0332\016/v1/na" + + "mespaces:\tnamespace\022\210\001\n\021NVMeNamespaceLis" + + "t\022,.opi_api.storage.v1.NVMeNamespaceList" + + "Request\032-.opi_api.storage.v1.NVMeNamespa" + + "ceListResponse\"\026\202\323\344\223\002\020\022\016/v1/namespaces\022\206" + + "\001\n\020NVMeNamespaceGet\022+.opi_api.storage.v1" + + ".NVMeNamespaceGetRequest\032!.opi_api.stora" + + "ge.v1.NVMeNamespace\"\"\202\323\344\223\002\034\022\032/v1/namespa" + + "ces/{namespace}\022u\n\022NVMeNamespaceStats\022-." + + "opi_api.storage.v1.NVMeNamespaceStatsReq" + + "uest\032..opi_api.storage.v1.NVMeNamespaceS" + + "tatsResponse\"\000Bd\n\022opi_api.storage.v1B\025Fr" + + "ontendNvmePcieProtoP\001Z5github.com/opipro" + + "ject/opi-api/storage/v1alpha1/gen/gob\006pr" + + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -325,7 +325,7 @@ public static void registerAllExtensions( internal_static_opi_api_storage_v1_NVMeNamespace_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_opi_api_storage_v1_NVMeNamespace_descriptor, - new java.lang.String[] { "Id", "SubsystemId", "ControllerId", "HostNsid", "BlockSize", "NumBlocks", "Nguid", "Eui64", "Uuid", "VolumeId", "OptimalWriteSize", "PrefWriteGranularity", }); + new java.lang.String[] { "Id", "SubsystemId", "ControllerId", "HostNsid", "BlockSize", "BlocksCount", "Nguid", "Eui64", "Uuid", "VolumeId", "OptimalWriteSize", "PrefWriteGranularity", }); internal_static_opi_api_storage_v1_NVMeSubsystemCreateRequest_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_opi_api_storage_v1_NVMeSubsystemCreateRequest_fieldAccessorTable = new diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmeServiceGrpc.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmeServiceGrpc.java index 8ab94dca..21b91233 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmeServiceGrpc.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendNvmeServiceGrpc.java @@ -3,6 +3,9 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; /** + *
+ * Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation.
+ * 
*/ @javax.annotation.Generated( value = "by gRPC proto compiler", @@ -618,6 +621,9 @@ public FrontendNvmeServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.Ca } /** + *
+   * Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation.
+   * 
*/ public static abstract class FrontendNvmeServiceImplBase implements io.grpc.BindableService { @@ -880,6 +886,9 @@ public void nVMeNamespaceStats(opi_api.storage.v1.NVMeNamespaceStatsRequest requ } /** + *
+   * Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation.
+   * 
*/ public static final class FrontendNvmeServiceStub extends io.grpc.stub.AbstractAsyncStub { private FrontendNvmeServiceStub( @@ -1039,6 +1048,9 @@ public void nVMeNamespaceStats(opi_api.storage.v1.NVMeNamespaceStatsRequest requ } /** + *
+   * Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation.
+   * 
*/ public static final class FrontendNvmeServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { private FrontendNvmeServiceBlockingStub( @@ -1180,6 +1192,9 @@ public opi_api.storage.v1.NVMeNamespaceStatsResponse nVMeNamespaceStats(opi_api. } /** + *
+   * Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation.
+   * 
*/ public static final class FrontendNvmeServiceFutureStub extends io.grpc.stub.AbstractFutureStub { private FrontendNvmeServiceFutureStub( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkProto.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkProto.java index 2905c713..a3487b72 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkProto.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkProto.java @@ -71,44 +71,44 @@ public static void registerAllExtensions( "\n\031frontend_virtio_blk.proto\022\022opi_api.sto" + "rage.v1\032\014common.proto\032\033google/protobuf/e" + "mpty.proto\032\034google/api/annotations.proto" + - "\"\230\001\n\tVirtioBlk\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t" + - "\0228\n\007pcie_id\030\003 \001(\0132\'.opi_api.storage.v1.N" + - "vmeControllerPciId\022\014\n\004bdev\030\004 \001(\t\022\022\n\nmax_" + - "io_qps\030\005 \001(\003\022\025\n\rserial_number\030\006 \001(\t\"K\n\026V" + - "irtioBlkCreateRequest\0221\n\ncontroller\030\001 \001(" + - "\0132\035.opi_api.storage.v1.VirtioBlk\"/\n\026Virt" + - "ioBlkDeleteRequest\022\025\n\rcontroller_id\030\001 \001(" + - "\003\"K\n\026VirtioBlkUpdateRequest\0221\n\ncontrolle" + - "r\030\001 \001(\0132\035.opi_api.storage.v1.VirtioBlk\"," + - "\n\024VirtioBlkListRequest\022\024\n\014virtioblk_id\030\001" + - " \001(\003\"J\n\025VirtioBlkListResponse\0221\n\ncontrol" + - "ler\030\001 \003(\0132\035.opi_api.storage.v1.VirtioBlk" + - "\",\n\023VirtioBlkGetRequest\022\025\n\rcontroller_id" + - "\030\001 \001(\003\".\n\025VirtioBlkStatsRequest\022\025\n\rcontr" + - "oller_id\030\001 \001(\003\"3\n\026VirtioBlkStatsResponse" + - "\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t2\374\005\n\030Frontend" + - "VirtioBlkService\022\177\n\017VirtioBlkCreate\022*.op" + - "i_api.storage.v1.VirtioBlkCreateRequest\032" + - "\035.opi_api.storage.v1.VirtioBlk\"!\202\323\344\223\002\033\"\016" + - "/v1/virtioblks:\tvirtioblk\022y\n\017VirtioBlkDe" + - "lete\022*.opi_api.storage.v1.VirtioBlkDelet" + - "eRequest\032\026.google.protobuf.Empty\"\"\202\323\344\223\002\034" + - "*\032/v1/virtioblks/{virtioblk}\022\177\n\017VirtioBl" + - "kUpdate\022*.opi_api.storage.v1.VirtioBlkUp" + - "dateRequest\032\035.opi_api.storage.v1.VirtioB" + - "lk\"!\202\323\344\223\002\0332\016/v1/virtioblks:\tvirtioblk\022|\n" + - "\rVirtioBlkList\022(.opi_api.storage.v1.Virt" + - "ioBlkListRequest\032).opi_api.storage.v1.Vi" + - "rtioBlkListResponse\"\026\202\323\344\223\002\020\022\016/v1/virtiob" + - "lks\022z\n\014VirtioBlkGet\022\'.opi_api.storage.v1" + - ".VirtioBlkGetRequest\032\035.opi_api.storage.v" + - "1.VirtioBlk\"\"\202\323\344\223\002\034\022\032/v1/virtioblks/{vir" + - "tioblk}\022i\n\016VirtioBlkStats\022).opi_api.stor" + - "age.v1.VirtioBlkStatsRequest\032*.opi_api.s" + - "torage.v1.VirtioBlkStatsResponse\"\000Be\n\022op" + - "i_api.storage.v1B\026FrontendVirtioBlkProto" + - "P\001Z5github.com/opiproject/opi-api/storag" + - "e/v1alpha1/gen/gob\006proto3" + "\"\212\001\n\tVirtioBlk\022\n\n\002id\030\001 \001(\003\0228\n\007pcie_id\030\002 " + + "\001(\0132\'.opi_api.storage.v1.NvmeControllerP" + + "ciId\022\014\n\004bdev\030\003 \001(\t\022\022\n\nmax_io_qps\030\004 \001(\003\022\025" + + "\n\rserial_number\030\005 \001(\t\"K\n\026VirtioBlkCreate" + + "Request\0221\n\ncontroller\030\001 \001(\0132\035.opi_api.st" + + "orage.v1.VirtioBlk\"/\n\026VirtioBlkDeleteReq" + + "uest\022\025\n\rcontroller_id\030\001 \001(\003\"K\n\026VirtioBlk" + + "UpdateRequest\0221\n\ncontroller\030\001 \001(\0132\035.opi_" + + "api.storage.v1.VirtioBlk\",\n\024VirtioBlkLis" + + "tRequest\022\024\n\014virtioblk_id\030\001 \001(\003\"J\n\025Virtio" + + "BlkListResponse\0221\n\ncontroller\030\001 \003(\0132\035.op" + + "i_api.storage.v1.VirtioBlk\",\n\023VirtioBlkG" + + "etRequest\022\025\n\rcontroller_id\030\001 \001(\003\".\n\025Virt" + + "ioBlkStatsRequest\022\025\n\rcontroller_id\030\001 \001(\003" + + "\"3\n\026VirtioBlkStatsResponse\022\n\n\002id\030\001 \001(\003\022\r" + + "\n\005stats\030\002 \001(\t2\374\005\n\030FrontendVirtioBlkServi" + + "ce\022\177\n\017VirtioBlkCreate\022*.opi_api.storage." + + "v1.VirtioBlkCreateRequest\032\035.opi_api.stor" + + "age.v1.VirtioBlk\"!\202\323\344\223\002\033\"\016/v1/virtioblks" + + ":\tvirtioblk\022y\n\017VirtioBlkDelete\022*.opi_api" + + ".storage.v1.VirtioBlkDeleteRequest\032\026.goo" + + "gle.protobuf.Empty\"\"\202\323\344\223\002\034*\032/v1/virtiobl" + + "ks/{virtioblk}\022\177\n\017VirtioBlkUpdate\022*.opi_" + + "api.storage.v1.VirtioBlkUpdateRequest\032\035." + + "opi_api.storage.v1.VirtioBlk\"!\202\323\344\223\002\0332\016/v" + + "1/virtioblks:\tvirtioblk\022|\n\rVirtioBlkList" + + "\022(.opi_api.storage.v1.VirtioBlkListReque" + + "st\032).opi_api.storage.v1.VirtioBlkListRes" + + "ponse\"\026\202\323\344\223\002\020\022\016/v1/virtioblks\022z\n\014VirtioB" + + "lkGet\022\'.opi_api.storage.v1.VirtioBlkGetR" + + "equest\032\035.opi_api.storage.v1.VirtioBlk\"\"\202" + + "\323\344\223\002\034\022\032/v1/virtioblks/{virtioblk}\022i\n\016Vir" + + "tioBlkStats\022).opi_api.storage.v1.VirtioB" + + "lkStatsRequest\032*.opi_api.storage.v1.Virt" + + "ioBlkStatsResponse\"\000Be\n\022opi_api.storage." + + "v1B\026FrontendVirtioBlkProtoP\001Z5github.com" + + "/opiproject/opi-api/storage/v1alpha1/gen" + + "/gob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -122,7 +122,7 @@ public static void registerAllExtensions( internal_static_opi_api_storage_v1_VirtioBlk_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_opi_api_storage_v1_VirtioBlk_descriptor, - new java.lang.String[] { "Id", "Name", "PcieId", "Bdev", "MaxIoQps", "SerialNumber", }); + new java.lang.String[] { "Id", "PcieId", "Bdev", "MaxIoQps", "SerialNumber", }); internal_static_opi_api_storage_v1_VirtioBlkCreateRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_opi_api_storage_v1_VirtioBlkCreateRequest_fieldAccessorTable = new diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkServiceGrpc.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkServiceGrpc.java index a46ea272..26388509 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkServiceGrpc.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioBlkServiceGrpc.java @@ -3,6 +3,9 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; /** + *
+ * Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme.
+ * 
*/ @javax.annotation.Generated( value = "by gRPC proto compiler", @@ -246,6 +249,9 @@ public FrontendVirtioBlkServiceFutureStub newStub(io.grpc.Channel channel, io.gr } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme.
+   * 
*/ public static abstract class FrontendVirtioBlkServiceImplBase implements io.grpc.BindableService { @@ -340,6 +346,9 @@ public void virtioBlkStats(opi_api.storage.v1.VirtioBlkStatsRequest request, } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme.
+   * 
*/ public static final class FrontendVirtioBlkServiceStub extends io.grpc.stub.AbstractAsyncStub { private FrontendVirtioBlkServiceStub( @@ -403,6 +412,9 @@ public void virtioBlkStats(opi_api.storage.v1.VirtioBlkStatsRequest request, } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme.
+   * 
*/ public static final class FrontendVirtioBlkServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { private FrontendVirtioBlkServiceBlockingStub( @@ -460,6 +472,9 @@ public opi_api.storage.v1.VirtioBlkStatsResponse virtioBlkStats(opi_api.storage. } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme.
+   * 
*/ public static final class FrontendVirtioBlkServiceFutureStub extends io.grpc.stub.AbstractFutureStub { private FrontendVirtioBlkServiceFutureStub( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiProto.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiProto.java index 6a02e840..6cd2d662 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiProto.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiProto.java @@ -116,88 +116,88 @@ public static void registerAllExtensions( "\n\032frontend_virtio_scsi.proto\022\022opi_api.st" + "orage.v1\032\014common.proto\032\033google/protobuf/" + "empty.proto\032\034google/api/annotations.prot" + - "o\"j\n\024VirtioScsiController\022\n\n\002id\030\001 \001(\003\022\014\n" + - "\004name\030\002 \001(\t\0228\n\007pcie_id\030\004 \001(\0132\'.opi_api.s" + - "torage.v1.NvmeControllerPciId\"@\n\rVirtioS" + - "csiLun\022\n\n\002id\030\001 \001(\003\022\025\n\rcontroller_id\030\004 \001(" + - "\003\022\014\n\004bdev\030\006 \001(\t\"a\n!VirtioScsiControllerC" + - "reateRequest\022<\n\ncontroller\030\001 \001(\0132(.opi_a" + - "pi.storage.v1.VirtioScsiController\":\n!Vi" + - "rtioScsiControllerDeleteRequest\022\025\n\rcontr" + - "oller_id\030\001 \001(\003\"a\n!VirtioScsiControllerUp" + - "dateRequest\022<\n\ncontroller\030\001 \001(\0132(.opi_ap" + - "i.storage.v1.VirtioScsiController\"!\n\037Vir" + - "tioScsiControllerListRequest\"`\n VirtioSc" + - "siControllerListResponse\022<\n\ncontroller\030\001" + - " \003(\0132(.opi_api.storage.v1.VirtioScsiCont" + - "roller\"7\n\036VirtioScsiControllerGetRequest" + - "\022\025\n\rcontroller_id\030\001 \001(\003\"9\n VirtioScsiCon" + - "trollerStatsRequest\022\025\n\rcontroller_id\030\001 \001" + - "(\003\">\n!VirtioScsiControllerStatsResponse\022" + - "\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t\"L\n\032VirtioScsi" + - "LunCreateRequest\022.\n\003lun\030\001 \001(\0132!.opi_api." + - "storage.v1.VirtioScsiLun\"C\n\032VirtioScsiLu" + - "nDeleteRequest\022\025\n\rcontroller_id\030\001 \001(\003\022\016\n" + - "\006lun_id\030\002 \001(\003\"L\n\032VirtioScsiLunUpdateRequ" + - "est\022.\n\003lun\030\001 \001(\0132!.opi_api.storage.v1.Vi" + - "rtioScsiLun\"1\n\030VirtioScsiLunListRequest\022" + - "\025\n\rcontroller_id\030\001 \001(\003\"K\n\031VirtioScsiLunL" + - "istResponse\022.\n\003lun\030\001 \003(\0132!.opi_api.stora" + - "ge.v1.VirtioScsiLun\"@\n\027VirtioScsiLunGetR" + - "equest\022\025\n\rcontroller_id\030\001 \001(\003\022\016\n\006lun_id\030" + - "\002 \001(\003\"B\n\031VirtioScsiLunStatsRequest\022\025\n\rco" + - "ntroller_id\030\001 \001(\003\022\016\n\006lun_id\030\002 \001(\003\"7\n\032Vir" + - "tioScsiLunStatsResponse\022\n\n\002id\030\001 \001(\003\022\r\n\005s" + - "tats\030\002 \001(\t2\272\016\n\031FrontendVirtioScsiService" + - "\022\252\001\n\032VirtioScsiControllerCreate\0225.opi_ap" + - "i.storage.v1.VirtioScsiControllerCreateR" + - "equest\032(.opi_api.storage.v1.VirtioScsiCo" + - "ntroller\"+\202\323\344\223\002%\"\023/v1/virtioscsictrls:\016v" + - "irtioscsictrl\022\231\001\n\032VirtioScsiControllerDe" + - "lete\0225.opi_api.storage.v1.VirtioScsiCont" + - "rollerDeleteRequest\032\026.google.protobuf.Em" + - "pty\",\202\323\344\223\002&*$/v1/virtioscsictrls/{virtio" + - "scsictrl}\022\252\001\n\032VirtioScsiControllerUpdate" + - "\0225.opi_api.storage.v1.VirtioScsiControll" + - "erUpdateRequest\032(.opi_api.storage.v1.Vir" + - "tioScsiController\"+\202\323\344\223\002%2\023/v1/virtioscs" + - "ictrls:\016virtioscsictrl\022\242\001\n\030VirtioScsiCon" + - "trollerList\0223.opi_api.storage.v1.VirtioS" + - "csiControllerListRequest\0324.opi_api.stora" + - "ge.v1.VirtioScsiControllerListResponse\"\033" + - "\202\323\344\223\002\025\022\023/v1/virtioscsictrls\022\245\001\n\027VirtioSc" + - "siControllerGet\0222.opi_api.storage.v1.Vir" + - "tioScsiControllerGetRequest\032(.opi_api.st" + - "orage.v1.VirtioScsiController\",\202\323\344\223\002&\022$/" + - "v1/virtioscsictrls/{virtioscsictrl}\022\212\001\n\031" + - "VirtioScsiControllerStats\0224.opi_api.stor" + - "age.v1.VirtioScsiControllerStatsRequest\032" + - "5.opi_api.storage.v1.VirtioScsiControlle" + - "rStatsResponse\"\000\022\223\001\n\023VirtioScsiLunCreate" + - "\022..opi_api.storage.v1.VirtioScsiLunCreat" + - "eRequest\032!.opi_api.storage.v1.VirtioScsi" + - "Lun\")\202\323\344\223\002#\"\022/v1/virtioscsiluns:\rvirtios" + - "csilun\022\211\001\n\023VirtioScsiLunDelete\022..opi_api" + - ".storage.v1.VirtioScsiLunDeleteRequest\032\026" + - ".google.protobuf.Empty\"*\202\323\344\223\002$*\"/v1/virt" + - "ioscsiluns/{virtioscsilun}\022\223\001\n\023VirtioScs" + - "iLunUpdate\022..opi_api.storage.v1.VirtioSc" + - "siLunUpdateRequest\032!.opi_api.storage.v1." + - "VirtioScsiLun\")\202\323\344\223\002#2\022/v1/virtioscsilun" + - "s:\rvirtioscsilun\022\214\001\n\021VirtioScsiLunList\022," + - ".opi_api.storage.v1.VirtioScsiLunListReq" + - "uest\032-.opi_api.storage.v1.VirtioScsiLunL" + - "istResponse\"\032\202\323\344\223\002\024\022\022/v1/virtioscsiluns\022" + - "\216\001\n\020VirtioScsiLunGet\022+.opi_api.storage.v" + - "1.VirtioScsiLunGetRequest\032!.opi_api.stor" + - "age.v1.VirtioScsiLun\"*\202\323\344\223\002$\022\"/v1/virtio" + - "scsiluns/{virtioscsilun}\022u\n\022VirtioScsiLu" + - "nStats\022-.opi_api.storage.v1.VirtioScsiLu" + - "nStatsRequest\032..opi_api.storage.v1.Virti" + - "oScsiLunStatsResponse\"\000Bf\n\022opi_api.stora" + - "ge.v1B\027FrontendVirtioScsiProtoP\001Z5github" + - ".com/opiproject/opi-api/storage/v1alpha1" + - "/gen/gob\006proto3" + "o\"\\\n\024VirtioScsiController\022\n\n\002id\030\001 \001(\003\0228\n" + + "\007pcie_id\030\002 \001(\0132\'.opi_api.storage.v1.Nvme" + + "ControllerPciId\"@\n\rVirtioScsiLun\022\n\n\002id\030\001" + + " \001(\003\022\025\n\rcontroller_id\030\002 \001(\003\022\014\n\004bdev\030\003 \001(" + + "\t\"a\n!VirtioScsiControllerCreateRequest\022<" + + "\n\ncontroller\030\001 \001(\0132(.opi_api.storage.v1." + + "VirtioScsiController\":\n!VirtioScsiContro" + + "llerDeleteRequest\022\025\n\rcontroller_id\030\001 \001(\003" + + "\"a\n!VirtioScsiControllerUpdateRequest\022<\n" + + "\ncontroller\030\001 \001(\0132(.opi_api.storage.v1.V" + + "irtioScsiController\"!\n\037VirtioScsiControl" + + "lerListRequest\"`\n VirtioScsiControllerLi" + + "stResponse\022<\n\ncontroller\030\001 \003(\0132(.opi_api" + + ".storage.v1.VirtioScsiController\"7\n\036Virt" + + "ioScsiControllerGetRequest\022\025\n\rcontroller" + + "_id\030\001 \001(\003\"9\n VirtioScsiControllerStatsRe" + + "quest\022\025\n\rcontroller_id\030\001 \001(\003\">\n!VirtioSc" + + "siControllerStatsResponse\022\n\n\002id\030\001 \001(\003\022\r\n" + + "\005stats\030\002 \001(\t\"L\n\032VirtioScsiLunCreateReque" + + "st\022.\n\003lun\030\001 \001(\0132!.opi_api.storage.v1.Vir" + + "tioScsiLun\"C\n\032VirtioScsiLunDeleteRequest" + + "\022\025\n\rcontroller_id\030\001 \001(\003\022\016\n\006lun_id\030\002 \001(\003\"" + + "L\n\032VirtioScsiLunUpdateRequest\022.\n\003lun\030\001 \001" + + "(\0132!.opi_api.storage.v1.VirtioScsiLun\"1\n" + + "\030VirtioScsiLunListRequest\022\025\n\rcontroller_" + + "id\030\001 \001(\003\"K\n\031VirtioScsiLunListResponse\022.\n" + + "\003lun\030\001 \003(\0132!.opi_api.storage.v1.VirtioSc" + + "siLun\"@\n\027VirtioScsiLunGetRequest\022\025\n\rcont" + + "roller_id\030\001 \001(\003\022\016\n\006lun_id\030\002 \001(\003\"B\n\031Virti" + + "oScsiLunStatsRequest\022\025\n\rcontroller_id\030\001 " + + "\001(\003\022\016\n\006lun_id\030\002 \001(\003\"7\n\032VirtioScsiLunStat" + + "sResponse\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t2\272\016\n" + + "\031FrontendVirtioScsiService\022\252\001\n\032VirtioScs" + + "iControllerCreate\0225.opi_api.storage.v1.V" + + "irtioScsiControllerCreateRequest\032(.opi_a" + + "pi.storage.v1.VirtioScsiController\"+\202\323\344\223" + + "\002%\"\023/v1/virtioscsictrls:\016virtioscsictrl\022" + + "\231\001\n\032VirtioScsiControllerDelete\0225.opi_api" + + ".storage.v1.VirtioScsiControllerDeleteRe" + + "quest\032\026.google.protobuf.Empty\",\202\323\344\223\002&*$/" + + "v1/virtioscsictrls/{virtioscsictrl}\022\252\001\n\032" + + "VirtioScsiControllerUpdate\0225.opi_api.sto" + + "rage.v1.VirtioScsiControllerUpdateReques" + + "t\032(.opi_api.storage.v1.VirtioScsiControl" + + "ler\"+\202\323\344\223\002%2\023/v1/virtioscsictrls:\016virtio" + + "scsictrl\022\242\001\n\030VirtioScsiControllerList\0223." + + "opi_api.storage.v1.VirtioScsiControllerL" + + "istRequest\0324.opi_api.storage.v1.VirtioSc" + + "siControllerListResponse\"\033\202\323\344\223\002\025\022\023/v1/vi" + + "rtioscsictrls\022\245\001\n\027VirtioScsiControllerGe" + + "t\0222.opi_api.storage.v1.VirtioScsiControl" + + "lerGetRequest\032(.opi_api.storage.v1.Virti" + + "oScsiController\",\202\323\344\223\002&\022$/v1/virtioscsic" + + "trls/{virtioscsictrl}\022\212\001\n\031VirtioScsiCont" + + "rollerStats\0224.opi_api.storage.v1.VirtioS" + + "csiControllerStatsRequest\0325.opi_api.stor" + + "age.v1.VirtioScsiControllerStatsResponse" + + "\"\000\022\223\001\n\023VirtioScsiLunCreate\022..opi_api.sto" + + "rage.v1.VirtioScsiLunCreateRequest\032!.opi" + + "_api.storage.v1.VirtioScsiLun\")\202\323\344\223\002#\"\022/" + + "v1/virtioscsiluns:\rvirtioscsilun\022\211\001\n\023Vir" + + "tioScsiLunDelete\022..opi_api.storage.v1.Vi" + + "rtioScsiLunDeleteRequest\032\026.google.protob" + + "uf.Empty\"*\202\323\344\223\002$*\"/v1/virtioscsiluns/{vi" + + "rtioscsilun}\022\223\001\n\023VirtioScsiLunUpdate\022..o" + + "pi_api.storage.v1.VirtioScsiLunUpdateReq" + + "uest\032!.opi_api.storage.v1.VirtioScsiLun\"" + + ")\202\323\344\223\002#2\022/v1/virtioscsiluns:\rvirtioscsil" + + "un\022\214\001\n\021VirtioScsiLunList\022,.opi_api.stora" + + "ge.v1.VirtioScsiLunListRequest\032-.opi_api" + + ".storage.v1.VirtioScsiLunListResponse\"\032\202" + + "\323\344\223\002\024\022\022/v1/virtioscsiluns\022\216\001\n\020VirtioScsi" + + "LunGet\022+.opi_api.storage.v1.VirtioScsiLu" + + "nGetRequest\032!.opi_api.storage.v1.VirtioS" + + "csiLun\"*\202\323\344\223\002$\022\"/v1/virtioscsiluns/{virt" + + "ioscsilun}\022u\n\022VirtioScsiLunStats\022-.opi_a" + + "pi.storage.v1.VirtioScsiLunStatsRequest\032" + + "..opi_api.storage.v1.VirtioScsiLunStatsR" + + "esponse\"\000Bf\n\022opi_api.storage.v1B\027Fronten" + + "dVirtioScsiProtoP\001Z5github.com/opiprojec" + + "t/opi-api/storage/v1alpha1/gen/gob\006proto" + + "3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -211,7 +211,7 @@ public static void registerAllExtensions( internal_static_opi_api_storage_v1_VirtioScsiController_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_opi_api_storage_v1_VirtioScsiController_descriptor, - new java.lang.String[] { "Id", "Name", "PcieId", }); + new java.lang.String[] { "Id", "PcieId", }); internal_static_opi_api_storage_v1_VirtioScsiLun_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_opi_api_storage_v1_VirtioScsiLun_fieldAccessorTable = new diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiServiceGrpc.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiServiceGrpc.java index a9fcc35c..09e5ce2c 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiServiceGrpc.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/FrontendVirtioScsiServiceGrpc.java @@ -3,6 +3,9 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; /** + *
+ * Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk.
+ * 
*/ @javax.annotation.Generated( value = "by gRPC proto compiler", @@ -432,6 +435,9 @@ public FrontendVirtioScsiServiceFutureStub newStub(io.grpc.Channel channel, io.g } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk.
+   * 
*/ public static abstract class FrontendVirtioScsiServiceImplBase implements io.grpc.BindableService { @@ -610,6 +616,9 @@ public void virtioScsiLunStats(opi_api.storage.v1.VirtioScsiLunStatsRequest requ } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk.
+   * 
*/ public static final class FrontendVirtioScsiServiceStub extends io.grpc.stub.AbstractAsyncStub { private FrontendVirtioScsiServiceStub( @@ -721,6 +730,9 @@ public void virtioScsiLunStats(opi_api.storage.v1.VirtioScsiLunStatsRequest requ } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk.
+   * 
*/ public static final class FrontendVirtioScsiServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { private FrontendVirtioScsiServiceBlockingStub( @@ -820,6 +832,9 @@ public opi_api.storage.v1.VirtioScsiLunStatsResponse virtioScsiLunStats(opi_api. } /** + *
+   * Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk.
+   * 
*/ public static final class FrontendVirtioScsiServiceFutureStub extends io.grpc.stub.AbstractFutureStub { private FrontendVirtioScsiServiceFutureStub( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeController.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeController.java index 7f9be061..03535aae 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeController.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeController.java @@ -299,7 +299,7 @@ public int getMaxNsq() { private int maxNcq_; /** *
-   * maximum number of host completion queues allowed. Optional.
+   * maximum number of host completion queues allowed.
    * If not set, the xPU will provide a default.
    * 
* @@ -1396,7 +1396,7 @@ public Builder clearMaxNsq() { private int maxNcq_ ; /** *
-     * maximum number of host completion queues allowed. Optional.
+     * maximum number of host completion queues allowed.
      * If not set, the xPU will provide a default.
      * 
* @@ -1409,7 +1409,7 @@ public int getMaxNcq() { } /** *
-     * maximum number of host completion queues allowed. Optional.
+     * maximum number of host completion queues allowed.
      * If not set, the xPU will provide a default.
      * 
* @@ -1425,7 +1425,7 @@ public Builder setMaxNcq(int value) { } /** *
-     * maximum number of host completion queues allowed. Optional.
+     * maximum number of host completion queues allowed.
      * If not set, the xPU will provide a default.
      * 
* diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeControllerOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeControllerOrBuilder.java index fb3a7f83..39039f8c 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeControllerOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeControllerOrBuilder.java @@ -112,7 +112,7 @@ public interface NVMeControllerOrBuilder extends /** *
-   * maximum number of host completion queues allowed. Optional.
+   * maximum number of host completion queues allowed.
    * If not set, the xPU will provide a default.
    * 
* diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespace.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespace.java index fed7ec8c..363e43a0 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespace.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespace.java @@ -100,7 +100,7 @@ private NVMeNamespace( } case 48: { - numBlocks_ = input.readInt64(); + blocksCount_ = input.readInt64(); break; } case 58: { @@ -187,7 +187,6 @@ private NVMeNamespace( /** *
    * namespace's unique key
-   * replaces: int64 id = 1;
    * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -200,7 +199,6 @@ public boolean hasId() { /** *
    * namespace's unique key
-   * replaces: int64 id = 1;
    * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -213,7 +211,6 @@ public opi_api.common.v1.ObjectKey getId() { /** *
    * namespace's unique key
-   * replaces: int64 id = 1;
    * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -333,20 +330,20 @@ public long getBlockSize() { return blockSize_; } - public static final int NUM_BLOCKS_FIELD_NUMBER = 6; - private long numBlocks_; + public static final int BLOCKS_COUNT_FIELD_NUMBER = 6; + private long blocksCount_; /** *
    * Size/Capacity of the namespace in blocks, size in bytes will
    * be BlockSize x NumBlocks.
    * 
* - * int64 num_blocks = 6; - * @return The numBlocks. + * int64 blocks_count = 6; + * @return The blocksCount. */ @java.lang.Override - public long getNumBlocks() { - return numBlocks_; + public long getBlocksCount() { + return blocksCount_; } public static final int NGUID_FIELD_NUMBER = 7; @@ -400,7 +397,7 @@ public java.lang.String getNguid() { /** *
    * 64bit Extended unique identifier for the namespace
-   * mandatory if guid is not specified, optional otherwise
+   * mandatory if guid is not specified
    * 
* * int64 eui64 = 8; @@ -551,8 +548,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (blockSize_ != 0L) { output.writeInt64(5, blockSize_); } - if (numBlocks_ != 0L) { - output.writeInt64(6, numBlocks_); + if (blocksCount_ != 0L) { + output.writeInt64(6, blocksCount_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nguid_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, nguid_); @@ -601,9 +598,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt64Size(5, blockSize_); } - if (numBlocks_ != 0L) { + if (blocksCount_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(6, numBlocks_); + .computeInt64Size(6, blocksCount_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nguid_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, nguid_); @@ -662,8 +659,8 @@ public boolean equals(final java.lang.Object obj) { != other.getHostNsid()) return false; if (getBlockSize() != other.getBlockSize()) return false; - if (getNumBlocks() - != other.getNumBlocks()) return false; + if (getBlocksCount() + != other.getBlocksCount()) return false; if (!getNguid() .equals(other.getNguid())) return false; if (getEui64() @@ -710,9 +707,9 @@ public int hashCode() { hash = (37 * hash) + BLOCK_SIZE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getBlockSize()); - hash = (37 * hash) + NUM_BLOCKS_FIELD_NUMBER; + hash = (37 * hash) + BLOCKS_COUNT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getNumBlocks()); + getBlocksCount()); hash = (37 * hash) + NGUID_FIELD_NUMBER; hash = (53 * hash) + getNguid().hashCode(); hash = (37 * hash) + EUI64_FIELD_NUMBER; @@ -885,7 +882,7 @@ public Builder clear() { blockSize_ = 0L; - numBlocks_ = 0L; + blocksCount_ = 0L; nguid_ = ""; @@ -950,7 +947,7 @@ public opi_api.storage.v1.NVMeNamespace buildPartial() { } result.hostNsid_ = hostNsid_; result.blockSize_ = blockSize_; - result.numBlocks_ = numBlocks_; + result.blocksCount_ = blocksCount_; result.nguid_ = nguid_; result.eui64_ = eui64_; if (uuidBuilder_ == null) { @@ -1028,8 +1025,8 @@ public Builder mergeFrom(opi_api.storage.v1.NVMeNamespace other) { if (other.getBlockSize() != 0L) { setBlockSize(other.getBlockSize()); } - if (other.getNumBlocks() != 0L) { - setNumBlocks(other.getNumBlocks()); + if (other.getBlocksCount() != 0L) { + setBlocksCount(other.getBlocksCount()); } if (!other.getNguid().isEmpty()) { nguid_ = other.nguid_; @@ -1085,7 +1082,6 @@ public Builder mergeFrom( /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1097,7 +1093,6 @@ public boolean hasId() { /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1113,7 +1108,6 @@ public opi_api.common.v1.ObjectKey getId() { /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1134,7 +1128,6 @@ public Builder setId(opi_api.common.v1.ObjectKey value) { /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1153,7 +1146,6 @@ public Builder setId( /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1176,7 +1168,6 @@ public Builder mergeId(opi_api.common.v1.ObjectKey value) { /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1195,7 +1186,6 @@ public Builder clearId() { /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1208,7 +1198,6 @@ public opi_api.common.v1.ObjectKey.Builder getIdBuilder() { /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1224,7 +1213,6 @@ public opi_api.common.v1.ObjectKeyOrBuilder getIdOrBuilder() { /** *
      * namespace's unique key
-     * replaces: int64 id = 1;
      * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -1651,19 +1639,19 @@ public Builder clearBlockSize() { return this; } - private long numBlocks_ ; + private long blocksCount_ ; /** *
      * Size/Capacity of the namespace in blocks, size in bytes will
      * be BlockSize x NumBlocks.
      * 
* - * int64 num_blocks = 6; - * @return The numBlocks. + * int64 blocks_count = 6; + * @return The blocksCount. */ @java.lang.Override - public long getNumBlocks() { - return numBlocks_; + public long getBlocksCount() { + return blocksCount_; } /** *
@@ -1671,13 +1659,13 @@ public long getNumBlocks() {
      * be BlockSize x NumBlocks.
      * 
* - * int64 num_blocks = 6; - * @param value The numBlocks to set. + * int64 blocks_count = 6; + * @param value The blocksCount to set. * @return This builder for chaining. */ - public Builder setNumBlocks(long value) { + public Builder setBlocksCount(long value) { - numBlocks_ = value; + blocksCount_ = value; onChanged(); return this; } @@ -1687,12 +1675,12 @@ public Builder setNumBlocks(long value) { * be BlockSize x NumBlocks. * * - * int64 num_blocks = 6; + * int64 blocks_count = 6; * @return This builder for chaining. */ - public Builder clearNumBlocks() { + public Builder clearBlocksCount() { - numBlocks_ = 0L; + blocksCount_ = 0L; onChanged(); return this; } @@ -1797,7 +1785,7 @@ public Builder setNguidBytes( /** *
      * 64bit Extended unique identifier for the namespace
-     * mandatory if guid is not specified, optional otherwise
+     * mandatory if guid is not specified
      * 
* * int64 eui64 = 8; @@ -1810,7 +1798,7 @@ public long getEui64() { /** *
      * 64bit Extended unique identifier for the namespace
-     * mandatory if guid is not specified, optional otherwise
+     * mandatory if guid is not specified
      * 
* * int64 eui64 = 8; @@ -1826,7 +1814,7 @@ public Builder setEui64(long value) { /** *
      * 64bit Extended unique identifier for the namespace
-     * mandatory if guid is not specified, optional otherwise
+     * mandatory if guid is not specified
      * 
* * int64 eui64 = 8; diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespaceOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespaceOrBuilder.java index ba1ec347..00ab87a3 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespaceOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMeNamespaceOrBuilder.java @@ -10,7 +10,6 @@ public interface NVMeNamespaceOrBuilder extends /** *
    * namespace's unique key
-   * replaces: int64 id = 1;
    * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -20,7 +19,6 @@ public interface NVMeNamespaceOrBuilder extends /** *
    * namespace's unique key
-   * replaces: int64 id = 1;
    * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -30,7 +28,6 @@ public interface NVMeNamespaceOrBuilder extends /** *
    * namespace's unique key
-   * replaces: int64 id = 1;
    * 
* * .opi_api.common.v1.ObjectKey id = 1; @@ -121,10 +118,10 @@ public interface NVMeNamespaceOrBuilder extends * be BlockSize x NumBlocks. * * - * int64 num_blocks = 6; - * @return The numBlocks. + * int64 blocks_count = 6; + * @return The blocksCount. */ - long getNumBlocks(); + long getBlocksCount(); /** *
@@ -149,7 +146,7 @@ public interface NVMeNamespaceOrBuilder extends
   /**
    * 
    * 64bit Extended unique identifier for the namespace
-   * mandatory if guid is not specified, optional otherwise
+   * mandatory if guid is not specified
    * 
* * int64 eui64 = 8; diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlk.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlk.java index 817e5557..36bc9cd9 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlk.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlk.java @@ -16,7 +16,6 @@ private VirtioBlk(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private VirtioBlk() { - name_ = ""; bdev_ = ""; serialNumber_ = ""; } @@ -57,12 +56,6 @@ private VirtioBlk( break; } case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 26: { opi_api.storage.v1.NvmeControllerPciId.Builder subBuilder = null; if (pcieId_ != null) { subBuilder = pcieId_.toBuilder(); @@ -75,18 +68,18 @@ private VirtioBlk( break; } - case 34: { + case 26: { java.lang.String s = input.readStringRequireUtf8(); bdev_ = s; break; } - case 40: { + case 32: { maxIoQps_ = input.readInt64(); break; } - case 50: { + case 42: { java.lang.String s = input.readStringRequireUtf8(); serialNumber_ = s; @@ -135,48 +128,10 @@ public long getId() { return id_; } - public static final int NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object name_; - /** - * string name = 2; - * @return The name. - */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int PCIE_ID_FIELD_NUMBER = 3; + public static final int PCIE_ID_FIELD_NUMBER = 2; private opi_api.storage.v1.NvmeControllerPciId pcieId_; /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return Whether the pcieId field is set. */ @java.lang.Override @@ -184,7 +139,7 @@ public boolean hasPcieId() { return pcieId_ != null; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return The pcieId. */ @java.lang.Override @@ -192,17 +147,17 @@ public opi_api.storage.v1.NvmeControllerPciId getPcieId() { return pcieId_ == null ? opi_api.storage.v1.NvmeControllerPciId.getDefaultInstance() : pcieId_; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ @java.lang.Override public opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder() { return getPcieId(); } - public static final int BDEV_FIELD_NUMBER = 4; + public static final int BDEV_FIELD_NUMBER = 3; private volatile java.lang.Object bdev_; /** - * string bdev = 4; + * string bdev = 3; * @return The bdev. */ @java.lang.Override @@ -219,7 +174,7 @@ public java.lang.String getBdev() { } } /** - * string bdev = 4; + * string bdev = 3; * @return The bytes for bdev. */ @java.lang.Override @@ -237,10 +192,10 @@ public java.lang.String getBdev() { } } - public static final int MAX_IO_QPS_FIELD_NUMBER = 5; + public static final int MAX_IO_QPS_FIELD_NUMBER = 4; private long maxIoQps_; /** - * int64 max_io_qps = 5; + * int64 max_io_qps = 4; * @return The maxIoQps. */ @java.lang.Override @@ -248,10 +203,10 @@ public long getMaxIoQps() { return maxIoQps_; } - public static final int SERIAL_NUMBER_FIELD_NUMBER = 6; + public static final int SERIAL_NUMBER_FIELD_NUMBER = 5; private volatile java.lang.Object serialNumber_; /** - * string serial_number = 6; + * string serial_number = 5; * @return The serialNumber. */ @java.lang.Override @@ -268,7 +223,7 @@ public java.lang.String getSerialNumber() { } } /** - * string serial_number = 6; + * string serial_number = 5; * @return The bytes for serialNumber. */ @java.lang.Override @@ -303,20 +258,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (id_ != 0L) { output.writeInt64(1, id_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); - } if (pcieId_ != null) { - output.writeMessage(3, getPcieId()); + output.writeMessage(2, getPcieId()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bdev_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, bdev_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, bdev_); } if (maxIoQps_ != 0L) { - output.writeInt64(5, maxIoQps_); + output.writeInt64(4, maxIoQps_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serialNumber_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, serialNumber_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, serialNumber_); } unknownFields.writeTo(output); } @@ -331,22 +283,19 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt64Size(1, id_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); - } if (pcieId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getPcieId()); + .computeMessageSize(2, getPcieId()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bdev_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, bdev_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, bdev_); } if (maxIoQps_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(5, maxIoQps_); + .computeInt64Size(4, maxIoQps_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serialNumber_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, serialNumber_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, serialNumber_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -365,8 +314,6 @@ public boolean equals(final java.lang.Object obj) { if (getId() != other.getId()) return false; - if (!getName() - .equals(other.getName())) return false; if (hasPcieId() != other.hasPcieId()) return false; if (hasPcieId()) { if (!getPcieId() @@ -392,8 +339,6 @@ public int hashCode() { hash = (37 * hash) + ID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getId()); - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getName().hashCode(); if (hasPcieId()) { hash = (37 * hash) + PCIE_ID_FIELD_NUMBER; hash = (53 * hash) + getPcieId().hashCode(); @@ -540,8 +485,6 @@ public Builder clear() { super.clear(); id_ = 0L; - name_ = ""; - if (pcieIdBuilder_ == null) { pcieId_ = null; } else { @@ -581,7 +524,6 @@ public opi_api.storage.v1.VirtioBlk build() { public opi_api.storage.v1.VirtioBlk buildPartial() { opi_api.storage.v1.VirtioBlk result = new opi_api.storage.v1.VirtioBlk(this); result.id_ = id_; - result.name_ = name_; if (pcieIdBuilder_ == null) { result.pcieId_ = pcieId_; } else { @@ -641,10 +583,6 @@ public Builder mergeFrom(opi_api.storage.v1.VirtioBlk other) { if (other.getId() != 0L) { setId(other.getId()); } - if (!other.getName().isEmpty()) { - name_ = other.name_; - onChanged(); - } if (other.hasPcieId()) { mergePcieId(other.getPcieId()); } @@ -719,94 +657,18 @@ public Builder clearId() { return this; } - private java.lang.Object name_ = ""; - /** - * string name = 2; - * @return The name. - */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * string name = 2; - * @param value The name to set. - * @return This builder for chaining. - */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - name_ = value; - onChanged(); - return this; - } - /** - * string name = 2; - * @return This builder for chaining. - */ - public Builder clearName() { - - name_ = getDefaultInstance().getName(); - onChanged(); - return this; - } - /** - * string name = 2; - * @param value The bytes for name to set. - * @return This builder for chaining. - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - name_ = value; - onChanged(); - return this; - } - private opi_api.storage.v1.NvmeControllerPciId pcieId_; private com.google.protobuf.SingleFieldBuilderV3< opi_api.storage.v1.NvmeControllerPciId, opi_api.storage.v1.NvmeControllerPciId.Builder, opi_api.storage.v1.NvmeControllerPciIdOrBuilder> pcieIdBuilder_; /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return Whether the pcieId field is set. */ public boolean hasPcieId() { return pcieIdBuilder_ != null || pcieId_ != null; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return The pcieId. */ public opi_api.storage.v1.NvmeControllerPciId getPcieId() { @@ -817,7 +679,7 @@ public opi_api.storage.v1.NvmeControllerPciId getPcieId() { } } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder setPcieId(opi_api.storage.v1.NvmeControllerPciId value) { if (pcieIdBuilder_ == null) { @@ -833,7 +695,7 @@ public Builder setPcieId(opi_api.storage.v1.NvmeControllerPciId value) { return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder setPcieId( opi_api.storage.v1.NvmeControllerPciId.Builder builderForValue) { @@ -847,7 +709,7 @@ public Builder setPcieId( return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder mergePcieId(opi_api.storage.v1.NvmeControllerPciId value) { if (pcieIdBuilder_ == null) { @@ -865,7 +727,7 @@ public Builder mergePcieId(opi_api.storage.v1.NvmeControllerPciId value) { return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder clearPcieId() { if (pcieIdBuilder_ == null) { @@ -879,7 +741,7 @@ public Builder clearPcieId() { return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public opi_api.storage.v1.NvmeControllerPciId.Builder getPcieIdBuilder() { @@ -887,7 +749,7 @@ public opi_api.storage.v1.NvmeControllerPciId.Builder getPcieIdBuilder() { return getPcieIdFieldBuilder().getBuilder(); } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder() { if (pcieIdBuilder_ != null) { @@ -898,7 +760,7 @@ public opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder() { } } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ private com.google.protobuf.SingleFieldBuilderV3< opi_api.storage.v1.NvmeControllerPciId, opi_api.storage.v1.NvmeControllerPciId.Builder, opi_api.storage.v1.NvmeControllerPciIdOrBuilder> @@ -916,7 +778,7 @@ public opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder() { private java.lang.Object bdev_ = ""; /** - * string bdev = 4; + * string bdev = 3; * @return The bdev. */ public java.lang.String getBdev() { @@ -932,7 +794,7 @@ public java.lang.String getBdev() { } } /** - * string bdev = 4; + * string bdev = 3; * @return The bytes for bdev. */ public com.google.protobuf.ByteString @@ -949,7 +811,7 @@ public java.lang.String getBdev() { } } /** - * string bdev = 4; + * string bdev = 3; * @param value The bdev to set. * @return This builder for chaining. */ @@ -964,7 +826,7 @@ public Builder setBdev( return this; } /** - * string bdev = 4; + * string bdev = 3; * @return This builder for chaining. */ public Builder clearBdev() { @@ -974,7 +836,7 @@ public Builder clearBdev() { return this; } /** - * string bdev = 4; + * string bdev = 3; * @param value The bytes for bdev to set. * @return This builder for chaining. */ @@ -992,7 +854,7 @@ public Builder setBdevBytes( private long maxIoQps_ ; /** - * int64 max_io_qps = 5; + * int64 max_io_qps = 4; * @return The maxIoQps. */ @java.lang.Override @@ -1000,7 +862,7 @@ public long getMaxIoQps() { return maxIoQps_; } /** - * int64 max_io_qps = 5; + * int64 max_io_qps = 4; * @param value The maxIoQps to set. * @return This builder for chaining. */ @@ -1011,7 +873,7 @@ public Builder setMaxIoQps(long value) { return this; } /** - * int64 max_io_qps = 5; + * int64 max_io_qps = 4; * @return This builder for chaining. */ public Builder clearMaxIoQps() { @@ -1023,7 +885,7 @@ public Builder clearMaxIoQps() { private java.lang.Object serialNumber_ = ""; /** - * string serial_number = 6; + * string serial_number = 5; * @return The serialNumber. */ public java.lang.String getSerialNumber() { @@ -1039,7 +901,7 @@ public java.lang.String getSerialNumber() { } } /** - * string serial_number = 6; + * string serial_number = 5; * @return The bytes for serialNumber. */ public com.google.protobuf.ByteString @@ -1056,7 +918,7 @@ public java.lang.String getSerialNumber() { } } /** - * string serial_number = 6; + * string serial_number = 5; * @param value The serialNumber to set. * @return This builder for chaining. */ @@ -1071,7 +933,7 @@ public Builder setSerialNumber( return this; } /** - * string serial_number = 6; + * string serial_number = 5; * @return This builder for chaining. */ public Builder clearSerialNumber() { @@ -1081,7 +943,7 @@ public Builder clearSerialNumber() { return this; } /** - * string serial_number = 6; + * string serial_number = 5; * @param value The bytes for serialNumber to set. * @return This builder for chaining. */ diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlkOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlkOrBuilder.java index 9d9396f2..e5eebe23 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlkOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioBlkOrBuilder.java @@ -14,57 +14,45 @@ public interface VirtioBlkOrBuilder extends long getId(); /** - * string name = 2; - * @return The name. - */ - java.lang.String getName(); - /** - * string name = 2; - * @return The bytes for name. - */ - com.google.protobuf.ByteString - getNameBytes(); - - /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return Whether the pcieId field is set. */ boolean hasPcieId(); /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return The pcieId. */ opi_api.storage.v1.NvmeControllerPciId getPcieId(); /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 3; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder(); /** - * string bdev = 4; + * string bdev = 3; * @return The bdev. */ java.lang.String getBdev(); /** - * string bdev = 4; + * string bdev = 3; * @return The bytes for bdev. */ com.google.protobuf.ByteString getBdevBytes(); /** - * int64 max_io_qps = 5; + * int64 max_io_qps = 4; * @return The maxIoQps. */ long getMaxIoQps(); /** - * string serial_number = 6; + * string serial_number = 5; * @return The serialNumber. */ java.lang.String getSerialNumber(); /** - * string serial_number = 6; + * string serial_number = 5; * @return The bytes for serialNumber. */ com.google.protobuf.ByteString diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiController.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiController.java index d2ae9126..6beb585e 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiController.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiController.java @@ -16,7 +16,6 @@ private VirtioScsiController(com.google.protobuf.GeneratedMessageV3.Builder b super(builder); } private VirtioScsiController() { - name_ = ""; } @java.lang.Override @@ -55,12 +54,6 @@ private VirtioScsiController( break; } case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 34: { opi_api.storage.v1.NvmeControllerPciId.Builder subBuilder = null; if (pcieId_ != null) { subBuilder = pcieId_.toBuilder(); @@ -116,48 +109,10 @@ public long getId() { return id_; } - public static final int NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object name_; - /** - * string name = 2; - * @return The name. - */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int PCIE_ID_FIELD_NUMBER = 4; + public static final int PCIE_ID_FIELD_NUMBER = 2; private opi_api.storage.v1.NvmeControllerPciId pcieId_; /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return Whether the pcieId field is set. */ @java.lang.Override @@ -165,7 +120,7 @@ public boolean hasPcieId() { return pcieId_ != null; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return The pcieId. */ @java.lang.Override @@ -173,7 +128,7 @@ public opi_api.storage.v1.NvmeControllerPciId getPcieId() { return pcieId_ == null ? opi_api.storage.v1.NvmeControllerPciId.getDefaultInstance() : pcieId_; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ @java.lang.Override public opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder() { @@ -197,11 +152,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (id_ != 0L) { output.writeInt64(1, id_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); - } if (pcieId_ != null) { - output.writeMessage(4, getPcieId()); + output.writeMessage(2, getPcieId()); } unknownFields.writeTo(output); } @@ -216,12 +168,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt64Size(1, id_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); - } if (pcieId_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getPcieId()); + .computeMessageSize(2, getPcieId()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -240,8 +189,6 @@ public boolean equals(final java.lang.Object obj) { if (getId() != other.getId()) return false; - if (!getName() - .equals(other.getName())) return false; if (hasPcieId() != other.hasPcieId()) return false; if (hasPcieId()) { if (!getPcieId() @@ -261,8 +208,6 @@ public int hashCode() { hash = (37 * hash) + ID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getId()); - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getName().hashCode(); if (hasPcieId()) { hash = (37 * hash) + PCIE_ID_FIELD_NUMBER; hash = (53 * hash) + getPcieId().hashCode(); @@ -402,8 +347,6 @@ public Builder clear() { super.clear(); id_ = 0L; - name_ = ""; - if (pcieIdBuilder_ == null) { pcieId_ = null; } else { @@ -437,7 +380,6 @@ public opi_api.storage.v1.VirtioScsiController build() { public opi_api.storage.v1.VirtioScsiController buildPartial() { opi_api.storage.v1.VirtioScsiController result = new opi_api.storage.v1.VirtioScsiController(this); result.id_ = id_; - result.name_ = name_; if (pcieIdBuilder_ == null) { result.pcieId_ = pcieId_; } else { @@ -494,10 +436,6 @@ public Builder mergeFrom(opi_api.storage.v1.VirtioScsiController other) { if (other.getId() != 0L) { setId(other.getId()); } - if (!other.getName().isEmpty()) { - name_ = other.name_; - onChanged(); - } if (other.hasPcieId()) { mergePcieId(other.getPcieId()); } @@ -561,94 +499,18 @@ public Builder clearId() { return this; } - private java.lang.Object name_ = ""; - /** - * string name = 2; - * @return The name. - */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * string name = 2; - * @param value The name to set. - * @return This builder for chaining. - */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - name_ = value; - onChanged(); - return this; - } - /** - * string name = 2; - * @return This builder for chaining. - */ - public Builder clearName() { - - name_ = getDefaultInstance().getName(); - onChanged(); - return this; - } - /** - * string name = 2; - * @param value The bytes for name to set. - * @return This builder for chaining. - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - name_ = value; - onChanged(); - return this; - } - private opi_api.storage.v1.NvmeControllerPciId pcieId_; private com.google.protobuf.SingleFieldBuilderV3< opi_api.storage.v1.NvmeControllerPciId, opi_api.storage.v1.NvmeControllerPciId.Builder, opi_api.storage.v1.NvmeControllerPciIdOrBuilder> pcieIdBuilder_; /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return Whether the pcieId field is set. */ public boolean hasPcieId() { return pcieIdBuilder_ != null || pcieId_ != null; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return The pcieId. */ public opi_api.storage.v1.NvmeControllerPciId getPcieId() { @@ -659,7 +521,7 @@ public opi_api.storage.v1.NvmeControllerPciId getPcieId() { } } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder setPcieId(opi_api.storage.v1.NvmeControllerPciId value) { if (pcieIdBuilder_ == null) { @@ -675,7 +537,7 @@ public Builder setPcieId(opi_api.storage.v1.NvmeControllerPciId value) { return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder setPcieId( opi_api.storage.v1.NvmeControllerPciId.Builder builderForValue) { @@ -689,7 +551,7 @@ public Builder setPcieId( return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder mergePcieId(opi_api.storage.v1.NvmeControllerPciId value) { if (pcieIdBuilder_ == null) { @@ -707,7 +569,7 @@ public Builder mergePcieId(opi_api.storage.v1.NvmeControllerPciId value) { return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public Builder clearPcieId() { if (pcieIdBuilder_ == null) { @@ -721,7 +583,7 @@ public Builder clearPcieId() { return this; } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public opi_api.storage.v1.NvmeControllerPciId.Builder getPcieIdBuilder() { @@ -729,7 +591,7 @@ public opi_api.storage.v1.NvmeControllerPciId.Builder getPcieIdBuilder() { return getPcieIdFieldBuilder().getBuilder(); } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ public opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder() { if (pcieIdBuilder_ != null) { @@ -740,7 +602,7 @@ public opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder() { } } /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ private com.google.protobuf.SingleFieldBuilderV3< opi_api.storage.v1.NvmeControllerPciId, opi_api.storage.v1.NvmeControllerPciId.Builder, opi_api.storage.v1.NvmeControllerPciIdOrBuilder> diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiControllerOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiControllerOrBuilder.java index 4796473f..ada1dbcd 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiControllerOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiControllerOrBuilder.java @@ -14,29 +14,17 @@ public interface VirtioScsiControllerOrBuilder extends long getId(); /** - * string name = 2; - * @return The name. - */ - java.lang.String getName(); - /** - * string name = 2; - * @return The bytes for name. - */ - com.google.protobuf.ByteString - getNameBytes(); - - /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return Whether the pcieId field is set. */ boolean hasPcieId(); /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; * @return The pcieId. */ opi_api.storage.v1.NvmeControllerPciId getPcieId(); /** - * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 4; + * .opi_api.storage.v1.NvmeControllerPciId pcie_id = 2; */ opi_api.storage.v1.NvmeControllerPciIdOrBuilder getPcieIdOrBuilder(); } diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLun.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLun.java index 1236b0bd..c624def3 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLun.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLun.java @@ -54,12 +54,12 @@ private VirtioScsiLun( id_ = input.readInt64(); break; } - case 32: { + case 16: { controllerId_ = input.readInt64(); break; } - case 50: { + case 26: { java.lang.String s = input.readStringRequireUtf8(); bdev_ = s; @@ -108,10 +108,10 @@ public long getId() { return id_; } - public static final int CONTROLLER_ID_FIELD_NUMBER = 4; + public static final int CONTROLLER_ID_FIELD_NUMBER = 2; private long controllerId_; /** - * int64 controller_id = 4; + * int64 controller_id = 2; * @return The controllerId. */ @java.lang.Override @@ -119,10 +119,10 @@ public long getControllerId() { return controllerId_; } - public static final int BDEV_FIELD_NUMBER = 6; + public static final int BDEV_FIELD_NUMBER = 3; private volatile java.lang.Object bdev_; /** - * string bdev = 6; + * string bdev = 3; * @return The bdev. */ @java.lang.Override @@ -139,7 +139,7 @@ public java.lang.String getBdev() { } } /** - * string bdev = 6; + * string bdev = 3; * @return The bytes for bdev. */ @java.lang.Override @@ -175,10 +175,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeInt64(1, id_); } if (controllerId_ != 0L) { - output.writeInt64(4, controllerId_); + output.writeInt64(2, controllerId_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bdev_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, bdev_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, bdev_); } unknownFields.writeTo(output); } @@ -195,10 +195,10 @@ public int getSerializedSize() { } if (controllerId_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(4, controllerId_); + .computeInt64Size(2, controllerId_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bdev_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, bdev_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, bdev_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -528,7 +528,7 @@ public Builder clearId() { private long controllerId_ ; /** - * int64 controller_id = 4; + * int64 controller_id = 2; * @return The controllerId. */ @java.lang.Override @@ -536,7 +536,7 @@ public long getControllerId() { return controllerId_; } /** - * int64 controller_id = 4; + * int64 controller_id = 2; * @param value The controllerId to set. * @return This builder for chaining. */ @@ -547,7 +547,7 @@ public Builder setControllerId(long value) { return this; } /** - * int64 controller_id = 4; + * int64 controller_id = 2; * @return This builder for chaining. */ public Builder clearControllerId() { @@ -559,7 +559,7 @@ public Builder clearControllerId() { private java.lang.Object bdev_ = ""; /** - * string bdev = 6; + * string bdev = 3; * @return The bdev. */ public java.lang.String getBdev() { @@ -575,7 +575,7 @@ public java.lang.String getBdev() { } } /** - * string bdev = 6; + * string bdev = 3; * @return The bytes for bdev. */ public com.google.protobuf.ByteString @@ -592,7 +592,7 @@ public java.lang.String getBdev() { } } /** - * string bdev = 6; + * string bdev = 3; * @param value The bdev to set. * @return This builder for chaining. */ @@ -607,7 +607,7 @@ public Builder setBdev( return this; } /** - * string bdev = 6; + * string bdev = 3; * @return This builder for chaining. */ public Builder clearBdev() { @@ -617,7 +617,7 @@ public Builder clearBdev() { return this; } /** - * string bdev = 6; + * string bdev = 3; * @param value The bytes for bdev to set. * @return This builder for chaining. */ diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLunOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLunOrBuilder.java index 6ae02509..8a0bc8e5 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLunOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/VirtioScsiLunOrBuilder.java @@ -14,18 +14,18 @@ public interface VirtioScsiLunOrBuilder extends long getId(); /** - * int64 controller_id = 4; + * int64 controller_id = 2; * @return The controllerId. */ long getControllerId(); /** - * string bdev = 6; + * string bdev = 3; * @return The bdev. */ java.lang.String getBdev(); /** - * string bdev = 6; + * string bdev = 3; * @return The bytes for bdev. */ com.google.protobuf.ByteString diff --git a/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2.py b/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2.py index 8cdc868b..37b78f0d 100644 --- a/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2.py +++ b/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2.py @@ -19,7 +19,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66rontend_nvme_pcie.proto\x12\x12opi_api.storage.v1\x1a\x0c\x63ommon.proto\x1a\x10object_key.proto\x1a\nuuid.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1cgoogle/api/annotations.proto\"\xb8\x01\n\rNVMeSubsystem\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x0b\n\x03nqn\x18\x02 \x01(\t\x12\x15\n\rserial_number\x18\x03 \x01(\t\x12\x14\n\x0cmodel_number\x18\x04 \x01(\t\x12\x16\n\x0emax_namespaces\x18\x05 \x01(\x03\x12\x19\n\x11\x66irmware_revision\x18\x06 \x01(\t\x12\x10\n\x08\x66ru_guid\x18\x07 \x01(\x0c\"\x9a\x02\n\x0eNVMeController\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x1a\n\x12nvme_controller_id\x18\x02 \x01(\x05\x12\x32\n\x0csubsystem_id\x18\x03 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x38\n\x07pcie_id\x18\x04 \x01(\x0b\x32\'.opi_api.storage.v1.NvmeControllerPciId\x12\x0f\n\x07max_nsq\x18\x05 \x01(\x05\x12\x0f\n\x07max_ncq\x18\x06 \x01(\x05\x12\x0c\n\x04sqes\x18\x07 \x01(\x05\x12\x0c\n\x04\x63qes\x18\x08 \x01(\x05\x12\x16\n\x0emax_namespaces\x18\t \x01(\x05\"\x8f\x03\n\rNVMeNamespace\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x32\n\x0csubsystem_id\x18\x02 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x33\n\rcontroller_id\x18\x03 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x11\n\thost_nsid\x18\x04 \x01(\x05\x12\x12\n\nblock_size\x18\x05 \x01(\x03\x12\x12\n\nnum_blocks\x18\x06 \x01(\x03\x12\r\n\x05nguid\x18\x07 \x01(\t\x12\r\n\x05\x65ui64\x18\x08 \x01(\x03\x12%\n\x04uuid\x18\t \x01(\x0b\x32\x17.opi_api.common.v1.Uuid\x12/\n\tvolume_id\x18\n \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x1a\n\x12optimal_write_size\x18\x0b \x01(\x05\x12\x1e\n\x16pref_write_granularity\x18\x0c \x01(\x05\"R\n\x1aNVMeSubsystemCreateRequest\x12\x34\n\tsubsystem\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeSubsystem\"P\n\x1aNVMeSubsystemDeleteRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"R\n\x1aNVMeSubsystemUpdateRequest\x12\x34\n\tsubsystem\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeSubsystem\"\x1a\n\x18NVMeSubsystemListRequest\"Q\n\x19NVMeSubsystemListResponse\x12\x34\n\tsubsystem\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.NVMeSubsystem\"M\n\x17NVMeSubsystemGetRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"O\n\x19NVMeSubsystemStatsRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"+\n\x1aNVMeSubsystemStatsResponse\x12\r\n\x05stats\x18\x01 \x01(\t\"U\n\x1bNVMeControllerCreateRequest\x12\x36\n\ncontroller\x18\x01 \x01(\x0b\x32\".opi_api.storage.v1.NVMeController\"R\n\x1bNVMeControllerDeleteRequest\x12\x33\n\rcontroller_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"U\n\x1bNVMeControllerUpdateRequest\x12\x36\n\ncontroller\x18\x01 \x01(\x0b\x32\".opi_api.storage.v1.NVMeController\"O\n\x19NVMeControllerListRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"T\n\x1aNVMeControllerListResponse\x12\x36\n\ncontroller\x18\x01 \x03(\x0b\x32\".opi_api.storage.v1.NVMeController\"O\n\x18NVMeControllerGetRequest\x12\x33\n\rcontroller_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"F\n\x1aNVMeControllerStatsRequest\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"V\n\x1bNVMeControllerStatsResponse\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\r\n\x05stats\x18\x02 \x01(\t\"R\n\x1aNVMeNamespaceCreateRequest\x12\x34\n\tnamespace\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeNamespace\"P\n\x1aNVMeNamespaceDeleteRequest\x12\x32\n\x0cnamespace_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"R\n\x1aNVMeNamespaceUpdateRequest\x12\x34\n\tnamespace\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeNamespace\"\x83\x01\n\x18NVMeNamespaceListRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x33\n\rcontroller_id\x18\x02 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"Q\n\x19NVMeNamespaceListResponse\x12\x34\n\tnamespace\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.NVMeNamespace\"M\n\x17NVMeNamespaceGetRequest\x12\x32\n\x0cnamespace_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"O\n\x19NVMeNamespaceStatsRequest\x12\x32\n\x0cnamespace_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"U\n\x1aNVMeNamespaceStatsResponse\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\r\n\x05stats\x18\x02 \x01(\t2\xb0\x13\n\x13\x46rontendNvmeService\x12\x8b\x01\n\x13NVMeSubsystemCreate\x12..opi_api.storage.v1.NVMeSubsystemCreateRequest\x1a!.opi_api.storage.v1.NVMeSubsystem\"!\x82\xd3\xe4\x93\x02\x1b\"\x0e/v1/subsystems:\tsubsystem\x12\x81\x01\n\x13NVMeSubsystemDelete\x12..opi_api.storage.v1.NVMeSubsystemDeleteRequest\x1a\x16.google.protobuf.Empty\"\"\x82\xd3\xe4\x93\x02\x1c*\x1a/v1/subsystems/{subsystem}\x12\x8b\x01\n\x13NVMeSubsystemUpdate\x12..opi_api.storage.v1.NVMeSubsystemUpdateRequest\x1a!.opi_api.storage.v1.NVMeSubsystem\"!\x82\xd3\xe4\x93\x02\x1b\x32\x0e/v1/subsystems:\tsubsystem\x12\x88\x01\n\x11NVMeSubsystemList\x12,.opi_api.storage.v1.NVMeSubsystemListRequest\x1a-.opi_api.storage.v1.NVMeSubsystemListResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1/subsystems\x12\x86\x01\n\x10NVMeSubsystemGet\x12+.opi_api.storage.v1.NVMeSubsystemGetRequest\x1a!.opi_api.storage.v1.NVMeSubsystem\"\"\x82\xd3\xe4\x93\x02\x1c\x12\x1a/v1/subsystems/{subsystem}\x12u\n\x12NVMeSubsystemStats\x12-.opi_api.storage.v1.NVMeSubsystemStatsRequest\x1a..opi_api.storage.v1.NVMeSubsystemStatsResponse\"\x00\x12\x90\x01\n\x14NVMeControllerCreate\x12/.opi_api.storage.v1.NVMeControllerCreateRequest\x1a\".opi_api.storage.v1.NVMeController\"#\x82\xd3\xe4\x93\x02\x1d\"\x0f/v1/controllers:\ncontroller\x12\x85\x01\n\x14NVMeControllerDelete\x12/.opi_api.storage.v1.NVMeControllerDeleteRequest\x1a\x16.google.protobuf.Empty\"$\x82\xd3\xe4\x93\x02\x1e*\x1c/v1/controllers/{controller}\x12\x90\x01\n\x14NVMeControllerUpdate\x12/.opi_api.storage.v1.NVMeControllerUpdateRequest\x1a\".opi_api.storage.v1.NVMeController\"#\x82\xd3\xe4\x93\x02\x1d\x32\x0f/v1/controllers:\ncontroller\x12\x8c\x01\n\x12NVMeControllerList\x12-.opi_api.storage.v1.NVMeControllerListRequest\x1a..opi_api.storage.v1.NVMeControllerListResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/v1/controllers\x12\x8b\x01\n\x11NVMeControllerGet\x12,.opi_api.storage.v1.NVMeControllerGetRequest\x1a\".opi_api.storage.v1.NVMeController\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/v1/controllers/{controller}\x12x\n\x13NVMeControllerStats\x12..opi_api.storage.v1.NVMeControllerStatsRequest\x1a/.opi_api.storage.v1.NVMeControllerStatsResponse\"\x00\x12\x8b\x01\n\x13NVMeNamespaceCreate\x12..opi_api.storage.v1.NVMeNamespaceCreateRequest\x1a!.opi_api.storage.v1.NVMeNamespace\"!\x82\xd3\xe4\x93\x02\x1b\"\x0e/v1/namespaces:\tnamespace\x12\x81\x01\n\x13NVMeNamespaceDelete\x12..opi_api.storage.v1.NVMeNamespaceDeleteRequest\x1a\x16.google.protobuf.Empty\"\"\x82\xd3\xe4\x93\x02\x1c*\x1a/v1/namespaces/{namespace}\x12\x8b\x01\n\x13NVMeNamespaceUpdate\x12..opi_api.storage.v1.NVMeNamespaceUpdateRequest\x1a!.opi_api.storage.v1.NVMeNamespace\"!\x82\xd3\xe4\x93\x02\x1b\x32\x0e/v1/namespaces:\tnamespace\x12\x88\x01\n\x11NVMeNamespaceList\x12,.opi_api.storage.v1.NVMeNamespaceListRequest\x1a-.opi_api.storage.v1.NVMeNamespaceListResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1/namespaces\x12\x86\x01\n\x10NVMeNamespaceGet\x12+.opi_api.storage.v1.NVMeNamespaceGetRequest\x1a!.opi_api.storage.v1.NVMeNamespace\"\"\x82\xd3\xe4\x93\x02\x1c\x12\x1a/v1/namespaces/{namespace}\x12u\n\x12NVMeNamespaceStats\x12-.opi_api.storage.v1.NVMeNamespaceStatsRequest\x1a..opi_api.storage.v1.NVMeNamespaceStatsResponse\"\x00\x42\x64\n\x12opi_api.storage.v1B\x15\x46rontendNvmePcieProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66rontend_nvme_pcie.proto\x12\x12opi_api.storage.v1\x1a\x0c\x63ommon.proto\x1a\x10object_key.proto\x1a\nuuid.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1cgoogle/api/annotations.proto\"\xb8\x01\n\rNVMeSubsystem\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x0b\n\x03nqn\x18\x02 \x01(\t\x12\x15\n\rserial_number\x18\x03 \x01(\t\x12\x14\n\x0cmodel_number\x18\x04 \x01(\t\x12\x16\n\x0emax_namespaces\x18\x05 \x01(\x03\x12\x19\n\x11\x66irmware_revision\x18\x06 \x01(\t\x12\x10\n\x08\x66ru_guid\x18\x07 \x01(\x0c\"\x9a\x02\n\x0eNVMeController\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x1a\n\x12nvme_controller_id\x18\x02 \x01(\x05\x12\x32\n\x0csubsystem_id\x18\x03 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x38\n\x07pcie_id\x18\x04 \x01(\x0b\x32\'.opi_api.storage.v1.NvmeControllerPciId\x12\x0f\n\x07max_nsq\x18\x05 \x01(\x05\x12\x0f\n\x07max_ncq\x18\x06 \x01(\x05\x12\x0c\n\x04sqes\x18\x07 \x01(\x05\x12\x0c\n\x04\x63qes\x18\x08 \x01(\x05\x12\x16\n\x0emax_namespaces\x18\t \x01(\x05\"\x91\x03\n\rNVMeNamespace\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x32\n\x0csubsystem_id\x18\x02 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x33\n\rcontroller_id\x18\x03 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x11\n\thost_nsid\x18\x04 \x01(\x05\x12\x12\n\nblock_size\x18\x05 \x01(\x03\x12\x14\n\x0c\x62locks_count\x18\x06 \x01(\x03\x12\r\n\x05nguid\x18\x07 \x01(\t\x12\r\n\x05\x65ui64\x18\x08 \x01(\x03\x12%\n\x04uuid\x18\t \x01(\x0b\x32\x17.opi_api.common.v1.Uuid\x12/\n\tvolume_id\x18\n \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x1a\n\x12optimal_write_size\x18\x0b \x01(\x05\x12\x1e\n\x16pref_write_granularity\x18\x0c \x01(\x05\"R\n\x1aNVMeSubsystemCreateRequest\x12\x34\n\tsubsystem\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeSubsystem\"P\n\x1aNVMeSubsystemDeleteRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"R\n\x1aNVMeSubsystemUpdateRequest\x12\x34\n\tsubsystem\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeSubsystem\"\x1a\n\x18NVMeSubsystemListRequest\"Q\n\x19NVMeSubsystemListResponse\x12\x34\n\tsubsystem\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.NVMeSubsystem\"M\n\x17NVMeSubsystemGetRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"O\n\x19NVMeSubsystemStatsRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"+\n\x1aNVMeSubsystemStatsResponse\x12\r\n\x05stats\x18\x01 \x01(\t\"U\n\x1bNVMeControllerCreateRequest\x12\x36\n\ncontroller\x18\x01 \x01(\x0b\x32\".opi_api.storage.v1.NVMeController\"R\n\x1bNVMeControllerDeleteRequest\x12\x33\n\rcontroller_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"U\n\x1bNVMeControllerUpdateRequest\x12\x36\n\ncontroller\x18\x01 \x01(\x0b\x32\".opi_api.storage.v1.NVMeController\"O\n\x19NVMeControllerListRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"T\n\x1aNVMeControllerListResponse\x12\x36\n\ncontroller\x18\x01 \x03(\x0b\x32\".opi_api.storage.v1.NVMeController\"O\n\x18NVMeControllerGetRequest\x12\x33\n\rcontroller_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"F\n\x1aNVMeControllerStatsRequest\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"V\n\x1bNVMeControllerStatsResponse\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\r\n\x05stats\x18\x02 \x01(\t\"R\n\x1aNVMeNamespaceCreateRequest\x12\x34\n\tnamespace\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeNamespace\"P\n\x1aNVMeNamespaceDeleteRequest\x12\x32\n\x0cnamespace_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"R\n\x1aNVMeNamespaceUpdateRequest\x12\x34\n\tnamespace\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.NVMeNamespace\"\x83\x01\n\x18NVMeNamespaceListRequest\x12\x32\n\x0csubsystem_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x33\n\rcontroller_id\x18\x02 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"Q\n\x19NVMeNamespaceListResponse\x12\x34\n\tnamespace\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.NVMeNamespace\"M\n\x17NVMeNamespaceGetRequest\x12\x32\n\x0cnamespace_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"O\n\x19NVMeNamespaceStatsRequest\x12\x32\n\x0cnamespace_id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"U\n\x1aNVMeNamespaceStatsResponse\x12(\n\x02id\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\r\n\x05stats\x18\x02 \x01(\t2\xb0\x13\n\x13\x46rontendNvmeService\x12\x8b\x01\n\x13NVMeSubsystemCreate\x12..opi_api.storage.v1.NVMeSubsystemCreateRequest\x1a!.opi_api.storage.v1.NVMeSubsystem\"!\x82\xd3\xe4\x93\x02\x1b\"\x0e/v1/subsystems:\tsubsystem\x12\x81\x01\n\x13NVMeSubsystemDelete\x12..opi_api.storage.v1.NVMeSubsystemDeleteRequest\x1a\x16.google.protobuf.Empty\"\"\x82\xd3\xe4\x93\x02\x1c*\x1a/v1/subsystems/{subsystem}\x12\x8b\x01\n\x13NVMeSubsystemUpdate\x12..opi_api.storage.v1.NVMeSubsystemUpdateRequest\x1a!.opi_api.storage.v1.NVMeSubsystem\"!\x82\xd3\xe4\x93\x02\x1b\x32\x0e/v1/subsystems:\tsubsystem\x12\x88\x01\n\x11NVMeSubsystemList\x12,.opi_api.storage.v1.NVMeSubsystemListRequest\x1a-.opi_api.storage.v1.NVMeSubsystemListResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1/subsystems\x12\x86\x01\n\x10NVMeSubsystemGet\x12+.opi_api.storage.v1.NVMeSubsystemGetRequest\x1a!.opi_api.storage.v1.NVMeSubsystem\"\"\x82\xd3\xe4\x93\x02\x1c\x12\x1a/v1/subsystems/{subsystem}\x12u\n\x12NVMeSubsystemStats\x12-.opi_api.storage.v1.NVMeSubsystemStatsRequest\x1a..opi_api.storage.v1.NVMeSubsystemStatsResponse\"\x00\x12\x90\x01\n\x14NVMeControllerCreate\x12/.opi_api.storage.v1.NVMeControllerCreateRequest\x1a\".opi_api.storage.v1.NVMeController\"#\x82\xd3\xe4\x93\x02\x1d\"\x0f/v1/controllers:\ncontroller\x12\x85\x01\n\x14NVMeControllerDelete\x12/.opi_api.storage.v1.NVMeControllerDeleteRequest\x1a\x16.google.protobuf.Empty\"$\x82\xd3\xe4\x93\x02\x1e*\x1c/v1/controllers/{controller}\x12\x90\x01\n\x14NVMeControllerUpdate\x12/.opi_api.storage.v1.NVMeControllerUpdateRequest\x1a\".opi_api.storage.v1.NVMeController\"#\x82\xd3\xe4\x93\x02\x1d\x32\x0f/v1/controllers:\ncontroller\x12\x8c\x01\n\x12NVMeControllerList\x12-.opi_api.storage.v1.NVMeControllerListRequest\x1a..opi_api.storage.v1.NVMeControllerListResponse\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/v1/controllers\x12\x8b\x01\n\x11NVMeControllerGet\x12,.opi_api.storage.v1.NVMeControllerGetRequest\x1a\".opi_api.storage.v1.NVMeController\"$\x82\xd3\xe4\x93\x02\x1e\x12\x1c/v1/controllers/{controller}\x12x\n\x13NVMeControllerStats\x12..opi_api.storage.v1.NVMeControllerStatsRequest\x1a/.opi_api.storage.v1.NVMeControllerStatsResponse\"\x00\x12\x8b\x01\n\x13NVMeNamespaceCreate\x12..opi_api.storage.v1.NVMeNamespaceCreateRequest\x1a!.opi_api.storage.v1.NVMeNamespace\"!\x82\xd3\xe4\x93\x02\x1b\"\x0e/v1/namespaces:\tnamespace\x12\x81\x01\n\x13NVMeNamespaceDelete\x12..opi_api.storage.v1.NVMeNamespaceDeleteRequest\x1a\x16.google.protobuf.Empty\"\"\x82\xd3\xe4\x93\x02\x1c*\x1a/v1/namespaces/{namespace}\x12\x8b\x01\n\x13NVMeNamespaceUpdate\x12..opi_api.storage.v1.NVMeNamespaceUpdateRequest\x1a!.opi_api.storage.v1.NVMeNamespace\"!\x82\xd3\xe4\x93\x02\x1b\x32\x0e/v1/namespaces:\tnamespace\x12\x88\x01\n\x11NVMeNamespaceList\x12,.opi_api.storage.v1.NVMeNamespaceListRequest\x1a-.opi_api.storage.v1.NVMeNamespaceListResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1/namespaces\x12\x86\x01\n\x10NVMeNamespaceGet\x12+.opi_api.storage.v1.NVMeNamespaceGetRequest\x1a!.opi_api.storage.v1.NVMeNamespace\"\"\x82\xd3\xe4\x93\x02\x1c\x12\x1a/v1/namespaces/{namespace}\x12u\n\x12NVMeNamespaceStats\x12-.opi_api.storage.v1.NVMeNamespaceStatsRequest\x1a..opi_api.storage.v1.NVMeNamespaceStatsResponse\"\x00\x42\x64\n\x12opi_api.storage.v1B\x15\x46rontendNvmePcieProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3') @@ -279,55 +279,55 @@ _NVMECONTROLLER._serialized_start=339 _NVMECONTROLLER._serialized_end=621 _NVMENAMESPACE._serialized_start=624 - _NVMENAMESPACE._serialized_end=1023 - _NVMESUBSYSTEMCREATEREQUEST._serialized_start=1025 - _NVMESUBSYSTEMCREATEREQUEST._serialized_end=1107 - _NVMESUBSYSTEMDELETEREQUEST._serialized_start=1109 - _NVMESUBSYSTEMDELETEREQUEST._serialized_end=1189 - _NVMESUBSYSTEMUPDATEREQUEST._serialized_start=1191 - _NVMESUBSYSTEMUPDATEREQUEST._serialized_end=1273 - _NVMESUBSYSTEMLISTREQUEST._serialized_start=1275 - _NVMESUBSYSTEMLISTREQUEST._serialized_end=1301 - _NVMESUBSYSTEMLISTRESPONSE._serialized_start=1303 - _NVMESUBSYSTEMLISTRESPONSE._serialized_end=1384 - _NVMESUBSYSTEMGETREQUEST._serialized_start=1386 - _NVMESUBSYSTEMGETREQUEST._serialized_end=1463 - _NVMESUBSYSTEMSTATSREQUEST._serialized_start=1465 - _NVMESUBSYSTEMSTATSREQUEST._serialized_end=1544 - _NVMESUBSYSTEMSTATSRESPONSE._serialized_start=1546 - _NVMESUBSYSTEMSTATSRESPONSE._serialized_end=1589 - _NVMECONTROLLERCREATEREQUEST._serialized_start=1591 - _NVMECONTROLLERCREATEREQUEST._serialized_end=1676 - _NVMECONTROLLERDELETEREQUEST._serialized_start=1678 - _NVMECONTROLLERDELETEREQUEST._serialized_end=1760 - _NVMECONTROLLERUPDATEREQUEST._serialized_start=1762 - _NVMECONTROLLERUPDATEREQUEST._serialized_end=1847 - _NVMECONTROLLERLISTREQUEST._serialized_start=1849 - _NVMECONTROLLERLISTREQUEST._serialized_end=1928 - _NVMECONTROLLERLISTRESPONSE._serialized_start=1930 - _NVMECONTROLLERLISTRESPONSE._serialized_end=2014 - _NVMECONTROLLERGETREQUEST._serialized_start=2016 - _NVMECONTROLLERGETREQUEST._serialized_end=2095 - _NVMECONTROLLERSTATSREQUEST._serialized_start=2097 - _NVMECONTROLLERSTATSREQUEST._serialized_end=2167 - _NVMECONTROLLERSTATSRESPONSE._serialized_start=2169 - _NVMECONTROLLERSTATSRESPONSE._serialized_end=2255 - _NVMENAMESPACECREATEREQUEST._serialized_start=2257 - _NVMENAMESPACECREATEREQUEST._serialized_end=2339 - _NVMENAMESPACEDELETEREQUEST._serialized_start=2341 - _NVMENAMESPACEDELETEREQUEST._serialized_end=2421 - _NVMENAMESPACEUPDATEREQUEST._serialized_start=2423 - _NVMENAMESPACEUPDATEREQUEST._serialized_end=2505 - _NVMENAMESPACELISTREQUEST._serialized_start=2508 - _NVMENAMESPACELISTREQUEST._serialized_end=2639 - _NVMENAMESPACELISTRESPONSE._serialized_start=2641 - _NVMENAMESPACELISTRESPONSE._serialized_end=2722 - _NVMENAMESPACEGETREQUEST._serialized_start=2724 - _NVMENAMESPACEGETREQUEST._serialized_end=2801 - _NVMENAMESPACESTATSREQUEST._serialized_start=2803 - _NVMENAMESPACESTATSREQUEST._serialized_end=2882 - _NVMENAMESPACESTATSRESPONSE._serialized_start=2884 - _NVMENAMESPACESTATSRESPONSE._serialized_end=2969 - _FRONTENDNVMESERVICE._serialized_start=2972 - _FRONTENDNVMESERVICE._serialized_end=5452 + _NVMENAMESPACE._serialized_end=1025 + _NVMESUBSYSTEMCREATEREQUEST._serialized_start=1027 + _NVMESUBSYSTEMCREATEREQUEST._serialized_end=1109 + _NVMESUBSYSTEMDELETEREQUEST._serialized_start=1111 + _NVMESUBSYSTEMDELETEREQUEST._serialized_end=1191 + _NVMESUBSYSTEMUPDATEREQUEST._serialized_start=1193 + _NVMESUBSYSTEMUPDATEREQUEST._serialized_end=1275 + _NVMESUBSYSTEMLISTREQUEST._serialized_start=1277 + _NVMESUBSYSTEMLISTREQUEST._serialized_end=1303 + _NVMESUBSYSTEMLISTRESPONSE._serialized_start=1305 + _NVMESUBSYSTEMLISTRESPONSE._serialized_end=1386 + _NVMESUBSYSTEMGETREQUEST._serialized_start=1388 + _NVMESUBSYSTEMGETREQUEST._serialized_end=1465 + _NVMESUBSYSTEMSTATSREQUEST._serialized_start=1467 + _NVMESUBSYSTEMSTATSREQUEST._serialized_end=1546 + _NVMESUBSYSTEMSTATSRESPONSE._serialized_start=1548 + _NVMESUBSYSTEMSTATSRESPONSE._serialized_end=1591 + _NVMECONTROLLERCREATEREQUEST._serialized_start=1593 + _NVMECONTROLLERCREATEREQUEST._serialized_end=1678 + _NVMECONTROLLERDELETEREQUEST._serialized_start=1680 + _NVMECONTROLLERDELETEREQUEST._serialized_end=1762 + _NVMECONTROLLERUPDATEREQUEST._serialized_start=1764 + _NVMECONTROLLERUPDATEREQUEST._serialized_end=1849 + _NVMECONTROLLERLISTREQUEST._serialized_start=1851 + _NVMECONTROLLERLISTREQUEST._serialized_end=1930 + _NVMECONTROLLERLISTRESPONSE._serialized_start=1932 + _NVMECONTROLLERLISTRESPONSE._serialized_end=2016 + _NVMECONTROLLERGETREQUEST._serialized_start=2018 + _NVMECONTROLLERGETREQUEST._serialized_end=2097 + _NVMECONTROLLERSTATSREQUEST._serialized_start=2099 + _NVMECONTROLLERSTATSREQUEST._serialized_end=2169 + _NVMECONTROLLERSTATSRESPONSE._serialized_start=2171 + _NVMECONTROLLERSTATSRESPONSE._serialized_end=2257 + _NVMENAMESPACECREATEREQUEST._serialized_start=2259 + _NVMENAMESPACECREATEREQUEST._serialized_end=2341 + _NVMENAMESPACEDELETEREQUEST._serialized_start=2343 + _NVMENAMESPACEDELETEREQUEST._serialized_end=2423 + _NVMENAMESPACEUPDATEREQUEST._serialized_start=2425 + _NVMENAMESPACEUPDATEREQUEST._serialized_end=2507 + _NVMENAMESPACELISTREQUEST._serialized_start=2510 + _NVMENAMESPACELISTREQUEST._serialized_end=2641 + _NVMENAMESPACELISTRESPONSE._serialized_start=2643 + _NVMENAMESPACELISTRESPONSE._serialized_end=2724 + _NVMENAMESPACEGETREQUEST._serialized_start=2726 + _NVMENAMESPACEGETREQUEST._serialized_end=2803 + _NVMENAMESPACESTATSREQUEST._serialized_start=2805 + _NVMENAMESPACESTATSREQUEST._serialized_end=2884 + _NVMENAMESPACESTATSRESPONSE._serialized_start=2886 + _NVMENAMESPACESTATSRESPONSE._serialized_end=2971 + _FRONTENDNVMESERVICE._serialized_start=2974 + _FRONTENDNVMESERVICE._serialized_end=5454 # @@protoc_insertion_point(module_scope) diff --git a/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2_grpc.py b/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2_grpc.py index 4793ad45..0cb7db5d 100644 --- a/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2_grpc.py +++ b/storage/v1alpha1/gen/python/frontend_nvme_pcie_pb2_grpc.py @@ -7,10 +7,7 @@ class FrontendNvmeServiceStub(object): - """Front End (host-facing) APIs. - - NVMe/PCIe emulation - + """Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation. """ def __init__(self, channel): @@ -112,10 +109,7 @@ def __init__(self, channel): class FrontendNvmeServiceServicer(object): - """Front End (host-facing) APIs. - - NVMe/PCIe emulation - + """Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation. """ def NVMeSubsystemCreate(self, request, context): @@ -327,10 +321,7 @@ def add_FrontendNvmeServiceServicer_to_server(servicer, server): # This class is part of an EXPERIMENTAL API. class FrontendNvmeService(object): - """Front End (host-facing) APIs. - - NVMe/PCIe emulation - + """Front End (host-facing) APIs. Mostly used for NVMe/PCIe emulation and host presentation. """ @staticmethod diff --git a/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2.py b/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2.py index 4ae706f3..52397586 100644 --- a/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2.py +++ b/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2.py @@ -17,7 +17,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x66rontend_virtio_blk.proto\x12\x12opi_api.storage.v1\x1a\x0c\x63ommon.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1cgoogle/api/annotations.proto\"\x98\x01\n\tVirtioBlk\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x38\n\x07pcie_id\x18\x03 \x01(\x0b\x32\'.opi_api.storage.v1.NvmeControllerPciId\x12\x0c\n\x04\x62\x64\x65v\x18\x04 \x01(\t\x12\x12\n\nmax_io_qps\x18\x05 \x01(\x03\x12\x15\n\rserial_number\x18\x06 \x01(\t\"K\n\x16VirtioBlkCreateRequest\x12\x31\n\ncontroller\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.VirtioBlk\"/\n\x16VirtioBlkDeleteRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"K\n\x16VirtioBlkUpdateRequest\x12\x31\n\ncontroller\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.VirtioBlk\",\n\x14VirtioBlkListRequest\x12\x14\n\x0cvirtioblk_id\x18\x01 \x01(\x03\"J\n\x15VirtioBlkListResponse\x12\x31\n\ncontroller\x18\x01 \x03(\x0b\x32\x1d.opi_api.storage.v1.VirtioBlk\",\n\x13VirtioBlkGetRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\".\n\x15VirtioBlkStatsRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"3\n\x16VirtioBlkStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t2\xfc\x05\n\x18\x46rontendVirtioBlkService\x12\x7f\n\x0fVirtioBlkCreate\x12*.opi_api.storage.v1.VirtioBlkCreateRequest\x1a\x1d.opi_api.storage.v1.VirtioBlk\"!\x82\xd3\xe4\x93\x02\x1b\"\x0e/v1/virtioblks:\tvirtioblk\x12y\n\x0fVirtioBlkDelete\x12*.opi_api.storage.v1.VirtioBlkDeleteRequest\x1a\x16.google.protobuf.Empty\"\"\x82\xd3\xe4\x93\x02\x1c*\x1a/v1/virtioblks/{virtioblk}\x12\x7f\n\x0fVirtioBlkUpdate\x12*.opi_api.storage.v1.VirtioBlkUpdateRequest\x1a\x1d.opi_api.storage.v1.VirtioBlk\"!\x82\xd3\xe4\x93\x02\x1b\x32\x0e/v1/virtioblks:\tvirtioblk\x12|\n\rVirtioBlkList\x12(.opi_api.storage.v1.VirtioBlkListRequest\x1a).opi_api.storage.v1.VirtioBlkListResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1/virtioblks\x12z\n\x0cVirtioBlkGet\x12\'.opi_api.storage.v1.VirtioBlkGetRequest\x1a\x1d.opi_api.storage.v1.VirtioBlk\"\"\x82\xd3\xe4\x93\x02\x1c\x12\x1a/v1/virtioblks/{virtioblk}\x12i\n\x0eVirtioBlkStats\x12).opi_api.storage.v1.VirtioBlkStatsRequest\x1a*.opi_api.storage.v1.VirtioBlkStatsResponse\"\x00\x42\x65\n\x12opi_api.storage.v1B\x16\x46rontendVirtioBlkProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x66rontend_virtio_blk.proto\x12\x12opi_api.storage.v1\x1a\x0c\x63ommon.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1cgoogle/api/annotations.proto\"\x8a\x01\n\tVirtioBlk\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x38\n\x07pcie_id\x18\x02 \x01(\x0b\x32\'.opi_api.storage.v1.NvmeControllerPciId\x12\x0c\n\x04\x62\x64\x65v\x18\x03 \x01(\t\x12\x12\n\nmax_io_qps\x18\x04 \x01(\x03\x12\x15\n\rserial_number\x18\x05 \x01(\t\"K\n\x16VirtioBlkCreateRequest\x12\x31\n\ncontroller\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.VirtioBlk\"/\n\x16VirtioBlkDeleteRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"K\n\x16VirtioBlkUpdateRequest\x12\x31\n\ncontroller\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.VirtioBlk\",\n\x14VirtioBlkListRequest\x12\x14\n\x0cvirtioblk_id\x18\x01 \x01(\x03\"J\n\x15VirtioBlkListResponse\x12\x31\n\ncontroller\x18\x01 \x03(\x0b\x32\x1d.opi_api.storage.v1.VirtioBlk\",\n\x13VirtioBlkGetRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\".\n\x15VirtioBlkStatsRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"3\n\x16VirtioBlkStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t2\xfc\x05\n\x18\x46rontendVirtioBlkService\x12\x7f\n\x0fVirtioBlkCreate\x12*.opi_api.storage.v1.VirtioBlkCreateRequest\x1a\x1d.opi_api.storage.v1.VirtioBlk\"!\x82\xd3\xe4\x93\x02\x1b\"\x0e/v1/virtioblks:\tvirtioblk\x12y\n\x0fVirtioBlkDelete\x12*.opi_api.storage.v1.VirtioBlkDeleteRequest\x1a\x16.google.protobuf.Empty\"\"\x82\xd3\xe4\x93\x02\x1c*\x1a/v1/virtioblks/{virtioblk}\x12\x7f\n\x0fVirtioBlkUpdate\x12*.opi_api.storage.v1.VirtioBlkUpdateRequest\x1a\x1d.opi_api.storage.v1.VirtioBlk\"!\x82\xd3\xe4\x93\x02\x1b\x32\x0e/v1/virtioblks:\tvirtioblk\x12|\n\rVirtioBlkList\x12(.opi_api.storage.v1.VirtioBlkListRequest\x1a).opi_api.storage.v1.VirtioBlkListResponse\"\x16\x82\xd3\xe4\x93\x02\x10\x12\x0e/v1/virtioblks\x12z\n\x0cVirtioBlkGet\x12\'.opi_api.storage.v1.VirtioBlkGetRequest\x1a\x1d.opi_api.storage.v1.VirtioBlk\"\"\x82\xd3\xe4\x93\x02\x1c\x12\x1a/v1/virtioblks/{virtioblk}\x12i\n\x0eVirtioBlkStats\x12).opi_api.storage.v1.VirtioBlkStatsRequest\x1a*.opi_api.storage.v1.VirtioBlkStatsResponse\"\x00\x42\x65\n\x12opi_api.storage.v1B\x16\x46rontendVirtioBlkProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3') @@ -109,23 +109,23 @@ _FRONTENDVIRTIOBLKSERVICE.methods_by_name['VirtioBlkGet']._options = None _FRONTENDVIRTIOBLKSERVICE.methods_by_name['VirtioBlkGet']._serialized_options = b'\202\323\344\223\002\034\022\032/v1/virtioblks/{virtioblk}' _VIRTIOBLK._serialized_start=123 - _VIRTIOBLK._serialized_end=275 - _VIRTIOBLKCREATEREQUEST._serialized_start=277 - _VIRTIOBLKCREATEREQUEST._serialized_end=352 - _VIRTIOBLKDELETEREQUEST._serialized_start=354 - _VIRTIOBLKDELETEREQUEST._serialized_end=401 - _VIRTIOBLKUPDATEREQUEST._serialized_start=403 - _VIRTIOBLKUPDATEREQUEST._serialized_end=478 - _VIRTIOBLKLISTREQUEST._serialized_start=480 - _VIRTIOBLKLISTREQUEST._serialized_end=524 - _VIRTIOBLKLISTRESPONSE._serialized_start=526 - _VIRTIOBLKLISTRESPONSE._serialized_end=600 - _VIRTIOBLKGETREQUEST._serialized_start=602 - _VIRTIOBLKGETREQUEST._serialized_end=646 - _VIRTIOBLKSTATSREQUEST._serialized_start=648 - _VIRTIOBLKSTATSREQUEST._serialized_end=694 - _VIRTIOBLKSTATSRESPONSE._serialized_start=696 - _VIRTIOBLKSTATSRESPONSE._serialized_end=747 - _FRONTENDVIRTIOBLKSERVICE._serialized_start=750 - _FRONTENDVIRTIOBLKSERVICE._serialized_end=1514 + _VIRTIOBLK._serialized_end=261 + _VIRTIOBLKCREATEREQUEST._serialized_start=263 + _VIRTIOBLKCREATEREQUEST._serialized_end=338 + _VIRTIOBLKDELETEREQUEST._serialized_start=340 + _VIRTIOBLKDELETEREQUEST._serialized_end=387 + _VIRTIOBLKUPDATEREQUEST._serialized_start=389 + _VIRTIOBLKUPDATEREQUEST._serialized_end=464 + _VIRTIOBLKLISTREQUEST._serialized_start=466 + _VIRTIOBLKLISTREQUEST._serialized_end=510 + _VIRTIOBLKLISTRESPONSE._serialized_start=512 + _VIRTIOBLKLISTRESPONSE._serialized_end=586 + _VIRTIOBLKGETREQUEST._serialized_start=588 + _VIRTIOBLKGETREQUEST._serialized_end=632 + _VIRTIOBLKSTATSREQUEST._serialized_start=634 + _VIRTIOBLKSTATSREQUEST._serialized_end=680 + _VIRTIOBLKSTATSRESPONSE._serialized_start=682 + _VIRTIOBLKSTATSRESPONSE._serialized_end=733 + _FRONTENDVIRTIOBLKSERVICE._serialized_start=736 + _FRONTENDVIRTIOBLKSERVICE._serialized_end=1500 # @@protoc_insertion_point(module_scope) diff --git a/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2_grpc.py b/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2_grpc.py index 07d0586d..e19fc07b 100644 --- a/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2_grpc.py +++ b/storage/v1alpha1/gen/python/frontend_virtio_blk_pb2_grpc.py @@ -7,10 +7,7 @@ class FrontendVirtioBlkServiceStub(object): - """Front End (host-facing) APIs. - - Virtio-blk emulation - + """Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme. """ def __init__(self, channel): @@ -52,10 +49,7 @@ def __init__(self, channel): class FrontendVirtioBlkServiceServicer(object): - """Front End (host-facing) APIs. - - Virtio-blk emulation - + """Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme. """ def VirtioBlkCreate(self, request, context): @@ -135,10 +129,7 @@ def add_FrontendVirtioBlkServiceServicer_to_server(servicer, server): # This class is part of an EXPERIMENTAL API. class FrontendVirtioBlkService(object): - """Front End (host-facing) APIs. - - Virtio-blk emulation - + """Front End (host-facing) APIs. Mostly used for Virtio-blk emulation emulation and host presentation as alternative to Nvme. """ @staticmethod diff --git a/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2.py b/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2.py index fea7afed..debe9c51 100644 --- a/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2.py +++ b/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2.py @@ -17,7 +17,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66rontend_virtio_scsi.proto\x12\x12opi_api.storage.v1\x1a\x0c\x63ommon.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1cgoogle/api/annotations.proto\"j\n\x14VirtioScsiController\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x38\n\x07pcie_id\x18\x04 \x01(\x0b\x32\'.opi_api.storage.v1.NvmeControllerPciId\"@\n\rVirtioScsiLun\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x15\n\rcontroller_id\x18\x04 \x01(\x03\x12\x0c\n\x04\x62\x64\x65v\x18\x06 \x01(\t\"a\n!VirtioScsiControllerCreateRequest\x12<\n\ncontroller\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.VirtioScsiController\":\n!VirtioScsiControllerDeleteRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"a\n!VirtioScsiControllerUpdateRequest\x12<\n\ncontroller\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.VirtioScsiController\"!\n\x1fVirtioScsiControllerListRequest\"`\n VirtioScsiControllerListResponse\x12<\n\ncontroller\x18\x01 \x03(\x0b\x32(.opi_api.storage.v1.VirtioScsiController\"7\n\x1eVirtioScsiControllerGetRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"9\n VirtioScsiControllerStatsRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\">\n!VirtioScsiControllerStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t\"L\n\x1aVirtioScsiLunCreateRequest\x12.\n\x03lun\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.VirtioScsiLun\"C\n\x1aVirtioScsiLunDeleteRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\x12\x0e\n\x06lun_id\x18\x02 \x01(\x03\"L\n\x1aVirtioScsiLunUpdateRequest\x12.\n\x03lun\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.VirtioScsiLun\"1\n\x18VirtioScsiLunListRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"K\n\x19VirtioScsiLunListResponse\x12.\n\x03lun\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.VirtioScsiLun\"@\n\x17VirtioScsiLunGetRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\x12\x0e\n\x06lun_id\x18\x02 \x01(\x03\"B\n\x19VirtioScsiLunStatsRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\x12\x0e\n\x06lun_id\x18\x02 \x01(\x03\"7\n\x1aVirtioScsiLunStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t2\xba\x0e\n\x19\x46rontendVirtioScsiService\x12\xaa\x01\n\x1aVirtioScsiControllerCreate\x12\x35.opi_api.storage.v1.VirtioScsiControllerCreateRequest\x1a(.opi_api.storage.v1.VirtioScsiController\"+\x82\xd3\xe4\x93\x02%\"\x13/v1/virtioscsictrls:\x0evirtioscsictrl\x12\x99\x01\n\x1aVirtioScsiControllerDelete\x12\x35.opi_api.storage.v1.VirtioScsiControllerDeleteRequest\x1a\x16.google.protobuf.Empty\",\x82\xd3\xe4\x93\x02&*$/v1/virtioscsictrls/{virtioscsictrl}\x12\xaa\x01\n\x1aVirtioScsiControllerUpdate\x12\x35.opi_api.storage.v1.VirtioScsiControllerUpdateRequest\x1a(.opi_api.storage.v1.VirtioScsiController\"+\x82\xd3\xe4\x93\x02%2\x13/v1/virtioscsictrls:\x0evirtioscsictrl\x12\xa2\x01\n\x18VirtioScsiControllerList\x12\x33.opi_api.storage.v1.VirtioScsiControllerListRequest\x1a\x34.opi_api.storage.v1.VirtioScsiControllerListResponse\"\x1b\x82\xd3\xe4\x93\x02\x15\x12\x13/v1/virtioscsictrls\x12\xa5\x01\n\x17VirtioScsiControllerGet\x12\x32.opi_api.storage.v1.VirtioScsiControllerGetRequest\x1a(.opi_api.storage.v1.VirtioScsiController\",\x82\xd3\xe4\x93\x02&\x12$/v1/virtioscsictrls/{virtioscsictrl}\x12\x8a\x01\n\x19VirtioScsiControllerStats\x12\x34.opi_api.storage.v1.VirtioScsiControllerStatsRequest\x1a\x35.opi_api.storage.v1.VirtioScsiControllerStatsResponse\"\x00\x12\x93\x01\n\x13VirtioScsiLunCreate\x12..opi_api.storage.v1.VirtioScsiLunCreateRequest\x1a!.opi_api.storage.v1.VirtioScsiLun\")\x82\xd3\xe4\x93\x02#\"\x12/v1/virtioscsiluns:\rvirtioscsilun\x12\x89\x01\n\x13VirtioScsiLunDelete\x12..opi_api.storage.v1.VirtioScsiLunDeleteRequest\x1a\x16.google.protobuf.Empty\"*\x82\xd3\xe4\x93\x02$*\"/v1/virtioscsiluns/{virtioscsilun}\x12\x93\x01\n\x13VirtioScsiLunUpdate\x12..opi_api.storage.v1.VirtioScsiLunUpdateRequest\x1a!.opi_api.storage.v1.VirtioScsiLun\")\x82\xd3\xe4\x93\x02#2\x12/v1/virtioscsiluns:\rvirtioscsilun\x12\x8c\x01\n\x11VirtioScsiLunList\x12,.opi_api.storage.v1.VirtioScsiLunListRequest\x1a-.opi_api.storage.v1.VirtioScsiLunListResponse\"\x1a\x82\xd3\xe4\x93\x02\x14\x12\x12/v1/virtioscsiluns\x12\x8e\x01\n\x10VirtioScsiLunGet\x12+.opi_api.storage.v1.VirtioScsiLunGetRequest\x1a!.opi_api.storage.v1.VirtioScsiLun\"*\x82\xd3\xe4\x93\x02$\x12\"/v1/virtioscsiluns/{virtioscsilun}\x12u\n\x12VirtioScsiLunStats\x12-.opi_api.storage.v1.VirtioScsiLunStatsRequest\x1a..opi_api.storage.v1.VirtioScsiLunStatsResponse\"\x00\x42\x66\n\x12opi_api.storage.v1B\x17\x46rontendVirtioScsiProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66rontend_virtio_scsi.proto\x12\x12opi_api.storage.v1\x1a\x0c\x63ommon.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1cgoogle/api/annotations.proto\"\\\n\x14VirtioScsiController\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x38\n\x07pcie_id\x18\x02 \x01(\x0b\x32\'.opi_api.storage.v1.NvmeControllerPciId\"@\n\rVirtioScsiLun\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x15\n\rcontroller_id\x18\x02 \x01(\x03\x12\x0c\n\x04\x62\x64\x65v\x18\x03 \x01(\t\"a\n!VirtioScsiControllerCreateRequest\x12<\n\ncontroller\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.VirtioScsiController\":\n!VirtioScsiControllerDeleteRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"a\n!VirtioScsiControllerUpdateRequest\x12<\n\ncontroller\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.VirtioScsiController\"!\n\x1fVirtioScsiControllerListRequest\"`\n VirtioScsiControllerListResponse\x12<\n\ncontroller\x18\x01 \x03(\x0b\x32(.opi_api.storage.v1.VirtioScsiController\"7\n\x1eVirtioScsiControllerGetRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"9\n VirtioScsiControllerStatsRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\">\n!VirtioScsiControllerStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t\"L\n\x1aVirtioScsiLunCreateRequest\x12.\n\x03lun\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.VirtioScsiLun\"C\n\x1aVirtioScsiLunDeleteRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\x12\x0e\n\x06lun_id\x18\x02 \x01(\x03\"L\n\x1aVirtioScsiLunUpdateRequest\x12.\n\x03lun\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.VirtioScsiLun\"1\n\x18VirtioScsiLunListRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\"K\n\x19VirtioScsiLunListResponse\x12.\n\x03lun\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.VirtioScsiLun\"@\n\x17VirtioScsiLunGetRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\x12\x0e\n\x06lun_id\x18\x02 \x01(\x03\"B\n\x19VirtioScsiLunStatsRequest\x12\x15\n\rcontroller_id\x18\x01 \x01(\x03\x12\x0e\n\x06lun_id\x18\x02 \x01(\x03\"7\n\x1aVirtioScsiLunStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t2\xba\x0e\n\x19\x46rontendVirtioScsiService\x12\xaa\x01\n\x1aVirtioScsiControllerCreate\x12\x35.opi_api.storage.v1.VirtioScsiControllerCreateRequest\x1a(.opi_api.storage.v1.VirtioScsiController\"+\x82\xd3\xe4\x93\x02%\"\x13/v1/virtioscsictrls:\x0evirtioscsictrl\x12\x99\x01\n\x1aVirtioScsiControllerDelete\x12\x35.opi_api.storage.v1.VirtioScsiControllerDeleteRequest\x1a\x16.google.protobuf.Empty\",\x82\xd3\xe4\x93\x02&*$/v1/virtioscsictrls/{virtioscsictrl}\x12\xaa\x01\n\x1aVirtioScsiControllerUpdate\x12\x35.opi_api.storage.v1.VirtioScsiControllerUpdateRequest\x1a(.opi_api.storage.v1.VirtioScsiController\"+\x82\xd3\xe4\x93\x02%2\x13/v1/virtioscsictrls:\x0evirtioscsictrl\x12\xa2\x01\n\x18VirtioScsiControllerList\x12\x33.opi_api.storage.v1.VirtioScsiControllerListRequest\x1a\x34.opi_api.storage.v1.VirtioScsiControllerListResponse\"\x1b\x82\xd3\xe4\x93\x02\x15\x12\x13/v1/virtioscsictrls\x12\xa5\x01\n\x17VirtioScsiControllerGet\x12\x32.opi_api.storage.v1.VirtioScsiControllerGetRequest\x1a(.opi_api.storage.v1.VirtioScsiController\",\x82\xd3\xe4\x93\x02&\x12$/v1/virtioscsictrls/{virtioscsictrl}\x12\x8a\x01\n\x19VirtioScsiControllerStats\x12\x34.opi_api.storage.v1.VirtioScsiControllerStatsRequest\x1a\x35.opi_api.storage.v1.VirtioScsiControllerStatsResponse\"\x00\x12\x93\x01\n\x13VirtioScsiLunCreate\x12..opi_api.storage.v1.VirtioScsiLunCreateRequest\x1a!.opi_api.storage.v1.VirtioScsiLun\")\x82\xd3\xe4\x93\x02#\"\x12/v1/virtioscsiluns:\rvirtioscsilun\x12\x89\x01\n\x13VirtioScsiLunDelete\x12..opi_api.storage.v1.VirtioScsiLunDeleteRequest\x1a\x16.google.protobuf.Empty\"*\x82\xd3\xe4\x93\x02$*\"/v1/virtioscsiluns/{virtioscsilun}\x12\x93\x01\n\x13VirtioScsiLunUpdate\x12..opi_api.storage.v1.VirtioScsiLunUpdateRequest\x1a!.opi_api.storage.v1.VirtioScsiLun\")\x82\xd3\xe4\x93\x02#2\x12/v1/virtioscsiluns:\rvirtioscsilun\x12\x8c\x01\n\x11VirtioScsiLunList\x12,.opi_api.storage.v1.VirtioScsiLunListRequest\x1a-.opi_api.storage.v1.VirtioScsiLunListResponse\"\x1a\x82\xd3\xe4\x93\x02\x14\x12\x12/v1/virtioscsiluns\x12\x8e\x01\n\x10VirtioScsiLunGet\x12+.opi_api.storage.v1.VirtioScsiLunGetRequest\x1a!.opi_api.storage.v1.VirtioScsiLun\"*\x82\xd3\xe4\x93\x02$\x12\"/v1/virtioscsiluns/{virtioscsilun}\x12u\n\x12VirtioScsiLunStats\x12-.opi_api.storage.v1.VirtioScsiLunStatsRequest\x1a..opi_api.storage.v1.VirtioScsiLunStatsResponse\"\x00\x42\x66\n\x12opi_api.storage.v1B\x17\x46rontendVirtioScsiProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3') @@ -191,41 +191,41 @@ _FRONTENDVIRTIOSCSISERVICE.methods_by_name['VirtioScsiLunGet']._options = None _FRONTENDVIRTIOSCSISERVICE.methods_by_name['VirtioScsiLunGet']._serialized_options = b'\202\323\344\223\002$\022\"/v1/virtioscsiluns/{virtioscsilun}' _VIRTIOSCSICONTROLLER._serialized_start=123 - _VIRTIOSCSICONTROLLER._serialized_end=229 - _VIRTIOSCSILUN._serialized_start=231 - _VIRTIOSCSILUN._serialized_end=295 - _VIRTIOSCSICONTROLLERCREATEREQUEST._serialized_start=297 - _VIRTIOSCSICONTROLLERCREATEREQUEST._serialized_end=394 - _VIRTIOSCSICONTROLLERDELETEREQUEST._serialized_start=396 - _VIRTIOSCSICONTROLLERDELETEREQUEST._serialized_end=454 - _VIRTIOSCSICONTROLLERUPDATEREQUEST._serialized_start=456 - _VIRTIOSCSICONTROLLERUPDATEREQUEST._serialized_end=553 - _VIRTIOSCSICONTROLLERLISTREQUEST._serialized_start=555 - _VIRTIOSCSICONTROLLERLISTREQUEST._serialized_end=588 - _VIRTIOSCSICONTROLLERLISTRESPONSE._serialized_start=590 - _VIRTIOSCSICONTROLLERLISTRESPONSE._serialized_end=686 - _VIRTIOSCSICONTROLLERGETREQUEST._serialized_start=688 - _VIRTIOSCSICONTROLLERGETREQUEST._serialized_end=743 - _VIRTIOSCSICONTROLLERSTATSREQUEST._serialized_start=745 - _VIRTIOSCSICONTROLLERSTATSREQUEST._serialized_end=802 - _VIRTIOSCSICONTROLLERSTATSRESPONSE._serialized_start=804 - _VIRTIOSCSICONTROLLERSTATSRESPONSE._serialized_end=866 - _VIRTIOSCSILUNCREATEREQUEST._serialized_start=868 - _VIRTIOSCSILUNCREATEREQUEST._serialized_end=944 - _VIRTIOSCSILUNDELETEREQUEST._serialized_start=946 - _VIRTIOSCSILUNDELETEREQUEST._serialized_end=1013 - _VIRTIOSCSILUNUPDATEREQUEST._serialized_start=1015 - _VIRTIOSCSILUNUPDATEREQUEST._serialized_end=1091 - _VIRTIOSCSILUNLISTREQUEST._serialized_start=1093 - _VIRTIOSCSILUNLISTREQUEST._serialized_end=1142 - _VIRTIOSCSILUNLISTRESPONSE._serialized_start=1144 - _VIRTIOSCSILUNLISTRESPONSE._serialized_end=1219 - _VIRTIOSCSILUNGETREQUEST._serialized_start=1221 - _VIRTIOSCSILUNGETREQUEST._serialized_end=1285 - _VIRTIOSCSILUNSTATSREQUEST._serialized_start=1287 - _VIRTIOSCSILUNSTATSREQUEST._serialized_end=1353 - _VIRTIOSCSILUNSTATSRESPONSE._serialized_start=1355 - _VIRTIOSCSILUNSTATSRESPONSE._serialized_end=1410 - _FRONTENDVIRTIOSCSISERVICE._serialized_start=1413 - _FRONTENDVIRTIOSCSISERVICE._serialized_end=3263 + _VIRTIOSCSICONTROLLER._serialized_end=215 + _VIRTIOSCSILUN._serialized_start=217 + _VIRTIOSCSILUN._serialized_end=281 + _VIRTIOSCSICONTROLLERCREATEREQUEST._serialized_start=283 + _VIRTIOSCSICONTROLLERCREATEREQUEST._serialized_end=380 + _VIRTIOSCSICONTROLLERDELETEREQUEST._serialized_start=382 + _VIRTIOSCSICONTROLLERDELETEREQUEST._serialized_end=440 + _VIRTIOSCSICONTROLLERUPDATEREQUEST._serialized_start=442 + _VIRTIOSCSICONTROLLERUPDATEREQUEST._serialized_end=539 + _VIRTIOSCSICONTROLLERLISTREQUEST._serialized_start=541 + _VIRTIOSCSICONTROLLERLISTREQUEST._serialized_end=574 + _VIRTIOSCSICONTROLLERLISTRESPONSE._serialized_start=576 + _VIRTIOSCSICONTROLLERLISTRESPONSE._serialized_end=672 + _VIRTIOSCSICONTROLLERGETREQUEST._serialized_start=674 + _VIRTIOSCSICONTROLLERGETREQUEST._serialized_end=729 + _VIRTIOSCSICONTROLLERSTATSREQUEST._serialized_start=731 + _VIRTIOSCSICONTROLLERSTATSREQUEST._serialized_end=788 + _VIRTIOSCSICONTROLLERSTATSRESPONSE._serialized_start=790 + _VIRTIOSCSICONTROLLERSTATSRESPONSE._serialized_end=852 + _VIRTIOSCSILUNCREATEREQUEST._serialized_start=854 + _VIRTIOSCSILUNCREATEREQUEST._serialized_end=930 + _VIRTIOSCSILUNDELETEREQUEST._serialized_start=932 + _VIRTIOSCSILUNDELETEREQUEST._serialized_end=999 + _VIRTIOSCSILUNUPDATEREQUEST._serialized_start=1001 + _VIRTIOSCSILUNUPDATEREQUEST._serialized_end=1077 + _VIRTIOSCSILUNLISTREQUEST._serialized_start=1079 + _VIRTIOSCSILUNLISTREQUEST._serialized_end=1128 + _VIRTIOSCSILUNLISTRESPONSE._serialized_start=1130 + _VIRTIOSCSILUNLISTRESPONSE._serialized_end=1205 + _VIRTIOSCSILUNGETREQUEST._serialized_start=1207 + _VIRTIOSCSILUNGETREQUEST._serialized_end=1271 + _VIRTIOSCSILUNSTATSREQUEST._serialized_start=1273 + _VIRTIOSCSILUNSTATSREQUEST._serialized_end=1339 + _VIRTIOSCSILUNSTATSRESPONSE._serialized_start=1341 + _VIRTIOSCSILUNSTATSRESPONSE._serialized_end=1396 + _FRONTENDVIRTIOSCSISERVICE._serialized_start=1399 + _FRONTENDVIRTIOSCSISERVICE._serialized_end=3249 # @@protoc_insertion_point(module_scope) diff --git a/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2_grpc.py b/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2_grpc.py index c9711adf..43ea2663 100644 --- a/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2_grpc.py +++ b/storage/v1alpha1/gen/python/frontend_virtio_scsi_pb2_grpc.py @@ -7,10 +7,7 @@ class FrontendVirtioScsiServiceStub(object): - """Front End (host-facing) APIs. - - Virtio-scsi emulation - + """Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk. """ def __init__(self, channel): @@ -82,10 +79,7 @@ def __init__(self, channel): class FrontendVirtioScsiServiceServicer(object): - """Front End (host-facing) APIs. - - Virtio-scsi emulation - + """Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk. """ def VirtioScsiControllerCreate(self, request, context): @@ -231,10 +225,7 @@ def add_FrontendVirtioScsiServiceServicer_to_server(servicer, server): # This class is part of an EXPERIMENTAL API. class FrontendVirtioScsiService(object): - """Front End (host-facing) APIs. - - Virtio-scsi emulation - + """Front End (host-facing) APIs. Mostly used for Virtio-scsi emulation emulation and host presentation as alternative to Virtio-blk. """ @staticmethod From 00067a04ac121f1d06f6f7f0d5442fb4f36134cd Mon Sep 17 00:00:00 2001 From: Boris Glimcher Date: Wed, 9 Nov 2022 03:24:29 +0200 Subject: [PATCH 2/2] [storage] [lint] Enforcing lint errors on backend Signed-off-by: Boris Glimcher --- storage/Makefile | 2 +- storage/v1alpha1/autogen.md | 45 +-- storage/v1alpha1/backend_aio.proto | 12 +- storage/v1alpha1/backend_null.proto | 10 +- storage/v1alpha1/backend_nvme_tcp.proto | 54 ++- storage/v1alpha1/common.proto | 2 +- .../v1alpha1/gen/cpp/backend_aio.grpc.pb.h | 3 +- storage/v1alpha1/gen/cpp/backend_aio.pb.cc | 225 ++++------- storage/v1alpha1/gen/cpp/backend_aio.pb.h | 127 ++---- .../v1alpha1/gen/cpp/backend_null.grpc.pb.h | 3 +- storage/v1alpha1/gen/cpp/backend_null.pb.cc | 217 ++++------ storage/v1alpha1/gen/cpp/backend_null.pb.h | 121 ++---- .../gen/cpp/backend_nvme_tcp.grpc.pb.h | 5 +- .../v1alpha1/gen/cpp/backend_nvme_tcp.pb.cc | 140 +++---- .../v1alpha1/gen/cpp/backend_nvme_tcp.pb.h | 79 ++-- storage/v1alpha1/gen/cpp/common.pb.cc | 36 +- storage/v1alpha1/gen/cpp/common.pb.h | 42 +- storage/v1alpha1/gen/go/backend_aio.pb.go | 39 +- storage/v1alpha1/gen/go/backend_null.pb.go | 33 +- .../v1alpha1/gen/go/backend_nvme_tcp.pb.go | 374 +++++++++--------- storage/v1alpha1/gen/go/common.pb.go | 36 +- .../opi_api/storage/v1/AioController.java | 272 ++++--------- .../storage/v1/AioControllerOrBuilder.java | 30 +- .../storage/v1/AioControllerServiceGrpc.java | 15 + .../opi_api/storage/v1/BackendAioProto.java | 82 ++-- .../opi_api/storage/v1/BackendNullProto.java | 76 ++-- .../storage/v1/BackendNvmeTcpProto.java | 113 +++--- .../java/opi_api/storage/v1/CommonProto.java | 12 +- .../storage/v1/NVMfRemoteController.java | 74 ++-- .../v1/NVMfRemoteControllerOrBuilder.java | 6 +- .../v1/NVMfRemoteControllerServiceGrpc.java | 15 + .../java/opi_api/storage/v1/NullDebug.java | 250 +++--------- .../storage/v1/NullDebugOrBuilder.java | 26 +- .../storage/v1/NullDebugServiceGrpc.java | 15 + .../opi_api/storage/v1/NvmeAddressFamily.java | 59 +-- .../storage/v1/NvmeControllerPciId.java | 62 +-- .../v1/NvmeControllerPciIdOrBuilder.java | 6 +- .../opi_api/storage/v1/NvmeMultipath.java | 39 +- .../opi_api/storage/v1/NvmeTransportType.java | 59 +-- .../v1alpha1/gen/python/backend_aio_pb2.py | 44 +-- .../gen/python/backend_aio_pb2_grpc.py | 9 +- .../v1alpha1/gen/python/backend_null_pb2.py | 56 +-- .../gen/python/backend_null_pb2_grpc.py | 9 +- .../gen/python/backend_nvme_tcp_pb2.py | 97 ++--- .../gen/python/backend_nvme_tcp_pb2_grpc.py | 15 +- storage/v1alpha1/gen/python/common_pb2.py | 4 +- 46 files changed, 1286 insertions(+), 1764 deletions(-) diff --git a/storage/Makefile b/storage/Makefile index ab909139..66f18d62 100644 --- a/storage/Makefile +++ b/storage/Makefile @@ -15,6 +15,6 @@ all: curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api mv google "${PWD}"/v1alpha1/ docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter -I /common /out/*.proto --output-format summary" - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter -I /common /out/frontend*.proto --output-format github --disable-rule=core::0192::has-comments --disable-rule=core::0136 --disable-rule=core::0127 --set-exit-status" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter -I /common /out/*.proto --output-format github --disable-rule=core::0192::has-comments --disable-rule=core::0136 --disable-rule=core::0127 --set-exit-status" docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1alpha1:/protos pseudomuto/protoc-gen-doc -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto" rm -rf "${PWD}"/v1alpha1/google diff --git a/storage/v1alpha1/autogen.md b/storage/v1alpha1/autogen.md index e658ac81..c9041f5b 100644 --- a/storage/v1alpha1/autogen.md +++ b/storage/v1alpha1/autogen.md @@ -154,9 +154,8 @@ | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | handle | [opi_api.common.v1.ObjectKey](#opi_api-common-v1-ObjectKey) | | handle is an opaque object handle that is not user settable. handle will be returned with created object | -| name | [string](#string) | | | | block_size | [int64](#int64) | | | -| num_blocks | [int64](#int64) | | | +| blocks_count | [int64](#int64) | | | | uuid | [opi_api.common.v1.Uuid](#opi_api-common-v1-Uuid) | | | | filename | [string](#string) | | | @@ -305,7 +304,7 @@ Intentionally empty ### AioControllerService - +Back End (network-facing) APIs. This service is for AIO generic kernel block device. | Method Name | Request Type | Response Type | Description | | ----------- | ------------ | ------------- | ------------| @@ -352,9 +351,8 @@ Intentionally empty | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | id | [int64](#int64) | | | -| name | [string](#string) | | | | block_size | [int64](#int64) | | | -| num_blocks | [int64](#int64) | | | +| blocks_count | [int64](#int64) | | | | uuid | [opi_api.common.v1.Uuid](#opi_api-common-v1-Uuid) | | | @@ -532,7 +530,7 @@ Intentionally empty. ### NullDebugService - +Back End (network-facing) APIs. This is debug interface for null block devices. | Method Name | Request Type | Response Type | Description | | ----------- | ------------ | ------------- | ------------| @@ -587,7 +585,7 @@ Intentionally empty. | hdgst | [bool](#bool) | | | | ddgst | [bool](#bool) | | | | multipath | [NvmeMultipath](#opi_api-storage-v1-NvmeMultipath) | | | -| num_io_queues | [int64](#int64) | | | +| io_queues_count | [int64](#int64) | | | | queue_size | [int64](#int64) | | | @@ -770,11 +768,12 @@ Intentionally empty. | Name | Number | Description | | ---- | ------ | ----------- | -| NVMF_ADRFAM_IPV4 | 0 | | -| NVMF_ADRFAM_IPV6 | 1 | | -| NVMF_ADRFAM_IB | 2 | | -| NVMF_ADRFAM_FC | 3 | | -| NVMF_ADRFAM_INTRA_HOST | 4 | | +| NVME_ADDRESS_FAMILY_UNSPECIFIED | 0 | | +| NVMF_ADRFAM_IPV4 | 1 | | +| NVMF_ADRFAM_IPV6 | 2 | | +| NVMF_ADRFAM_IB | 3 | | +| NVMF_ADRFAM_FC | 4 | | +| NVMF_ADRFAM_INTRA_HOST | 5 | | @@ -785,9 +784,10 @@ Intentionally empty. | Name | Number | Description | | ---- | ------ | ----------- | -| NVME_MPIO_DISABLE | 0 | | -| NVME_MPIO_FAILOVER | 1 | | -| NVME_MPIO_MULTIPATH | 2 | | +| NVME_MULTIPATH_UNSPECIFIED | 0 | | +| NVME_MULTIPATH_DISABLE | 1 | | +| NVME_MULTIPATH_FAILOVER | 2 | | +| NVME_MULTIPATH_MULTIPATH | 3 | | @@ -798,11 +798,12 @@ Intentionally empty. | Name | Number | Description | | ---- | ------ | ----------- | -| NVME_TRANSPORT_FC | 0 | | -| NVME_TRANSPORT_PCIE | 1 | | -| NVME_TRANSPORT_RDMA | 2 | | -| NVME_TRANSPORT_TCP | 3 | | -| NVME_TRANSPORT_CUSTOM | 4 | | +| NVME_TRANSPORT_TYPE_UNSPECIFIED | 0 | | +| NVME_TRANSPORT_FC | 1 | | +| NVME_TRANSPORT_PCIE | 2 | | +| NVME_TRANSPORT_RDMA | 3 | | +| NVME_TRANSPORT_TCP | 4 | | +| NVME_TRANSPORT_CUSTOM | 5 | | @@ -813,7 +814,7 @@ Intentionally empty. ### NVMfRemoteControllerService - +Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service. | Method Name | Request Type | Response Type | Description | | ----------- | ------------ | ------------- | ------------| @@ -849,7 +850,7 @@ virtual functions under the physical function. | ----- | ---- | ----- | ----------- | | bus | [int32](#int32) | | Bus number, provided for future usage if needed. Currently set to ’0’ | | device | [int32](#int32) | | Device number, based on the NVMe device layout | -| function | [int32](#int32) | | Physical function, always set to 0 in current model | +| func | [int32](#int32) | | Physical function, always set to 0 in current model | | virtual_function | [int32](#int32) | | SRIOV Virtual function within the Device and Physical function. Set to 0 for Physical Function. Virtual Function numbering starts from 1 | diff --git a/storage/v1alpha1/backend_aio.proto b/storage/v1alpha1/backend_aio.proto index e9f2b1e9..d23ccc4c 100644 --- a/storage/v1alpha1/backend_aio.proto +++ b/storage/v1alpha1/backend_aio.proto @@ -14,8 +14,7 @@ import "google/protobuf/empty.proto"; import "object_key.proto"; import "uuid.proto"; -// Back End (network-facing) APIs. - +// Back End (network-facing) APIs. This service is for AIO generic kernel block device. service AioControllerService { rpc AioControllerCreate (AioControllerCreateRequest) returns (AioController) {} rpc AioControllerDelete (AioControllerDeleteRequest) returns (google.protobuf.Empty) {} @@ -30,11 +29,10 @@ message AioController { // handle will be returned with created object common.v1.ObjectKey handle = 1; - string name = 2; - int64 block_size = 3; - int64 num_blocks = 4; - common.v1.Uuid uuid =5; - string filename = 6; + int64 block_size = 2; + int64 blocks_count = 3; + common.v1.Uuid uuid = 4; + string filename = 5; } message AioControllerCreateRequest { diff --git a/storage/v1alpha1/backend_null.proto b/storage/v1alpha1/backend_null.proto index abb169ee..3ad529e6 100755 --- a/storage/v1alpha1/backend_null.proto +++ b/storage/v1alpha1/backend_null.proto @@ -12,8 +12,7 @@ option go_package = "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"; import "object_key.proto"; import "uuid.proto"; -// Back End (network-facing) APIs. - +// Back End (network-facing) APIs. This is debug interface for null block devices. service NullDebugService { rpc NullDebugCreate (NullDebugCreateRequest) returns (NullDebugCreateResponse) {} rpc NullDebugDelete (NullDebugDeleteRequest) returns (NullDebugDeleteResponse) {} @@ -25,10 +24,9 @@ service NullDebugService { message NullDebug { int64 id = 1; - string name = 2; - int64 block_size = 3; - int64 num_blocks = 4; - common.v1.Uuid uuid = 5; + int64 block_size = 2; + int64 blocks_count = 3; + common.v1.Uuid uuid = 4; } message NullDebugCreateRequest { diff --git a/storage/v1alpha1/backend_nvme_tcp.proto b/storage/v1alpha1/backend_nvme_tcp.proto index 52f38d88..23f2dbdf 100755 --- a/storage/v1alpha1/backend_nvme_tcp.proto +++ b/storage/v1alpha1/backend_nvme_tcp.proto @@ -10,10 +10,7 @@ option java_outer_classname = "BackendNvmeTcpProto"; option go_package = "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"; -// Back End (network-facing) APIs. - -// NVMe/TCP and NVMe/RoCEv2 - +// Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service. service NVMfRemoteControllerService { rpc NVMfRemoteControllerConnect (NVMfRemoteControllerConnectRequest) returns (NVMfRemoteControllerConnectResponse) {} rpc NVMfRemoteControllerDisconnect (NVMfRemoteControllerDisconnectRequest) returns (NVMfRemoteControllerDisconnectResponse) {} @@ -33,31 +30,8 @@ message NVMfRemoteController { bool hdgst = 7; bool ddgst = 8; NvmeMultipath multipath = 9; - int64 num_io_queues = 10; + int64 io_queues_count = 10; int64 queue_size = 11; - -} - -enum NvmeTransportType { - NVME_TRANSPORT_FC = 0; - NVME_TRANSPORT_PCIE = 1; - NVME_TRANSPORT_RDMA = 2; - NVME_TRANSPORT_TCP = 3; - NVME_TRANSPORT_CUSTOM = 4; -} - -enum NvmeAddressFamily { - NVMF_ADRFAM_IPV4 = 0; - NVMF_ADRFAM_IPV6 = 1; - NVMF_ADRFAM_IB = 2; - NVMF_ADRFAM_FC = 3; - NVMF_ADRFAM_INTRA_HOST = 4; -} - -enum NvmeMultipath { - NVME_MPIO_DISABLE = 0; - NVME_MPIO_FAILOVER = 1; - NVME_MPIO_MULTIPATH = 2; } message NVMfRemoteControllerConnectRequest { @@ -109,3 +83,27 @@ message NVMfRemoteControllerStatsResponse { string stats = 2; } +enum NvmeTransportType { + NVME_TRANSPORT_TYPE_UNSPECIFIED = 0; + NVME_TRANSPORT_FC = 1; + NVME_TRANSPORT_PCIE = 2; + NVME_TRANSPORT_RDMA = 3; + NVME_TRANSPORT_TCP = 4; + NVME_TRANSPORT_CUSTOM = 5; +} + +enum NvmeAddressFamily { + NVME_ADDRESS_FAMILY_UNSPECIFIED = 0; + NVMF_ADRFAM_IPV4 = 1; + NVMF_ADRFAM_IPV6 = 2; + NVMF_ADRFAM_IB = 3; + NVMF_ADRFAM_FC = 4; + NVMF_ADRFAM_INTRA_HOST = 5; +} + +enum NvmeMultipath { + NVME_MULTIPATH_UNSPECIFIED = 0; + NVME_MULTIPATH_DISABLE = 1; + NVME_MULTIPATH_FAILOVER = 2; + NVME_MULTIPATH_MULTIPATH = 3; +} diff --git a/storage/v1alpha1/common.proto b/storage/v1alpha1/common.proto index 2f82f705..7f108b11 100755 --- a/storage/v1alpha1/common.proto +++ b/storage/v1alpha1/common.proto @@ -24,7 +24,7 @@ message NvmeControllerPciId { int32 device = 2; // Physical function, always set to 0 in current model - int32 function = 3; + int32 func = 3; // SRIOV Virtual function within the Device and Physical function. // Set to 0 for Physical Function. Virtual Function numbering starts from 1 diff --git a/storage/v1alpha1/gen/cpp/backend_aio.grpc.pb.h b/storage/v1alpha1/gen/cpp/backend_aio.grpc.pb.h index 83d06e2e..42201722 100644 --- a/storage/v1alpha1/gen/cpp/backend_aio.grpc.pb.h +++ b/storage/v1alpha1/gen/cpp/backend_aio.grpc.pb.h @@ -33,8 +33,7 @@ namespace opi_api { namespace storage { namespace v1 { -// Back End (network-facing) APIs. -// +// Back End (network-facing) APIs. This service is for AIO generic kernel block device. class AioControllerService final { public: static constexpr char const* service_full_name() { diff --git a/storage/v1alpha1/gen/cpp/backend_aio.pb.cc b/storage/v1alpha1/gen/cpp/backend_aio.pb.cc index 9abe5970..539cae42 100644 --- a/storage/v1alpha1/gen/cpp/backend_aio.pb.cc +++ b/storage/v1alpha1/gen/cpp/backend_aio.pb.cc @@ -21,12 +21,11 @@ namespace storage { namespace v1 { constexpr AioController::AioController( ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized) - : name_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) - , filename_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) + : filename_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) , handle_(nullptr) , uuid_(nullptr) , block_size_(int64_t{0}) - , num_blocks_(int64_t{0}){} + , blocks_count_(int64_t{0}){} struct AioControllerDefaultTypeInternal { constexpr AioControllerDefaultTypeInternal() : _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) {} @@ -159,9 +158,8 @@ const uint32_t TableStruct_backend_5faio_2eproto::offsets[] PROTOBUF_SECTION_VAR ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::AioController, handle_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::AioController, name_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::AioController, block_size_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::AioController, num_blocks_), + PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::AioController, blocks_count_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::AioController, uuid_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::AioController, filename_), ~0u, // no _has_bits_ @@ -230,15 +228,15 @@ const uint32_t TableStruct_backend_5faio_2eproto::offsets[] PROTOBUF_SECTION_VAR }; static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, -1, sizeof(::opi_api::storage::v1::AioController)}, - { 12, -1, -1, sizeof(::opi_api::storage::v1::AioControllerCreateRequest)}, - { 19, -1, -1, sizeof(::opi_api::storage::v1::AioControllerDeleteRequest)}, - { 26, -1, -1, sizeof(::opi_api::storage::v1::AioControllerUpdateRequest)}, - { 33, -1, -1, sizeof(::opi_api::storage::v1::AioControllerList)}, - { 40, -1, -1, sizeof(::opi_api::storage::v1::AioControllerGetRequest)}, - { 47, -1, -1, sizeof(::opi_api::storage::v1::AioControllerGetListRequest)}, - { 53, -1, -1, sizeof(::opi_api::storage::v1::AioControllerGetStatsRequest)}, - { 60, -1, -1, sizeof(::opi_api::storage::v1::AioControllerStatsRequest)}, - { 67, -1, -1, sizeof(::opi_api::storage::v1::AioControllerStats)}, + { 11, -1, -1, sizeof(::opi_api::storage::v1::AioControllerCreateRequest)}, + { 18, -1, -1, sizeof(::opi_api::storage::v1::AioControllerDeleteRequest)}, + { 25, -1, -1, sizeof(::opi_api::storage::v1::AioControllerUpdateRequest)}, + { 32, -1, -1, sizeof(::opi_api::storage::v1::AioControllerList)}, + { 39, -1, -1, sizeof(::opi_api::storage::v1::AioControllerGetRequest)}, + { 46, -1, -1, sizeof(::opi_api::storage::v1::AioControllerGetListRequest)}, + { 52, -1, -1, sizeof(::opi_api::storage::v1::AioControllerGetStatsRequest)}, + { 59, -1, -1, sizeof(::opi_api::storage::v1::AioControllerStatsRequest)}, + { 66, -1, -1, sizeof(::opi_api::storage::v1::AioControllerStats)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -257,47 +255,47 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = const char descriptor_table_protodef_backend_5faio_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\021backend_aio.proto\022\022opi_api.storage.v1\032" "\033google/protobuf/empty.proto\032\020object_key" - ".proto\032\nuuid.proto\"\254\001\n\rAioController\022,\n\006" + ".proto\032\nuuid.proto\"\240\001\n\rAioController\022,\n\006" "handle\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" - "ey\022\014\n\004name\030\002 \001(\t\022\022\n\nblock_size\030\003 \001(\003\022\022\n\n" - "num_blocks\030\004 \001(\003\022%\n\004uuid\030\005 \001(\0132\027.opi_api" - ".common.v1.Uuid\022\020\n\010filename\030\006 \001(\t\"O\n\032Aio" - "ControllerCreateRequest\0221\n\006device\030\001 \001(\0132" - "!.opi_api.storage.v1.AioController\"J\n\032Ai" - "oControllerDeleteRequest\022,\n\006handle\030\001 \001(\013" - "2\034.opi_api.common.v1.ObjectKey\"O\n\032AioCon" - "trollerUpdateRequest\0221\n\006device\030\001 \001(\0132!.o" - "pi_api.storage.v1.AioController\"F\n\021AioCo" - "ntrollerList\0221\n\006device\030\001 \003(\0132!.opi_api.s" - "torage.v1.AioController\"G\n\027AioController" - "GetRequest\022,\n\006handle\030\001 \001(\0132\034.opi_api.com" - "mon.v1.ObjectKey\"\035\n\033AioControllerGetList" - "Request\"L\n\034AioControllerGetStatsRequest\022" - ",\n\006handle\030\001 \001(\0132\034.opi_api.common.v1.Obje" - "ctKey\"I\n\031AioControllerStatsRequest\022,\n\006ha" - "ndle\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey" - "\"Q\n\022AioControllerStats\022,\n\006handle\030\001 \001(\0132\034" - ".opi_api.common.v1.ObjectKey\022\r\n\005stats\030\002 " - "\001(\t2\234\005\n\024AioControllerService\022j\n\023AioContr" - "ollerCreate\022..opi_api.storage.v1.AioCont" - "rollerCreateRequest\032!.opi_api.storage.v1" - ".AioController\"\000\022_\n\023AioControllerDelete\022" - "..opi_api.storage.v1.AioControllerDelete" - "Request\032\026.google.protobuf.Empty\"\000\022d\n\020Aio" - "ControllerGet\022+.opi_api.storage.v1.AioCo" - "ntrollerGetRequest\032!.opi_api.storage.v1." - "AioController\"\000\022p\n\024AioControllerGetList\022" - "/.opi_api.storage.v1.AioControllerGetLis" - "tRequest\032%.opi_api.storage.v1.AioControl" - "lerList\"\000\022s\n\025AioControllerGetStats\0220.opi" - "_api.storage.v1.AioControllerGetStatsReq" - "uest\032&.opi_api.storage.v1.AioControllerS" - "tats\"\000\022j\n\023AioControllerUpdate\022..opi_api." - "storage.v1.AioControllerUpdateRequest\032!." - "opi_api.storage.v1.AioController\"\000B^\n\022op" - "i_api.storage.v1B\017BackendAioProtoP\001Z5git" - "hub.com/opiproject/opi-api/storage/v1alp" - "ha1/gen/gob\006proto3" + "ey\022\022\n\nblock_size\030\002 \001(\003\022\024\n\014blocks_count\030\003" + " \001(\003\022%\n\004uuid\030\004 \001(\0132\027.opi_api.common.v1.U" + "uid\022\020\n\010filename\030\005 \001(\t\"O\n\032AioControllerCr" + "eateRequest\0221\n\006device\030\001 \001(\0132!.opi_api.st" + "orage.v1.AioController\"J\n\032AioControllerD" + "eleteRequest\022,\n\006handle\030\001 \001(\0132\034.opi_api.c" + "ommon.v1.ObjectKey\"O\n\032AioControllerUpdat" + "eRequest\0221\n\006device\030\001 \001(\0132!.opi_api.stora" + "ge.v1.AioController\"F\n\021AioControllerList" + "\0221\n\006device\030\001 \003(\0132!.opi_api.storage.v1.Ai" + "oController\"G\n\027AioControllerGetRequest\022," + "\n\006handle\030\001 \001(\0132\034.opi_api.common.v1.Objec" + "tKey\"\035\n\033AioControllerGetListRequest\"L\n\034A" + "ioControllerGetStatsRequest\022,\n\006handle\030\001 " + "\001(\0132\034.opi_api.common.v1.ObjectKey\"I\n\031Aio" + "ControllerStatsRequest\022,\n\006handle\030\001 \001(\0132\034" + ".opi_api.common.v1.ObjectKey\"Q\n\022AioContr" + "ollerStats\022,\n\006handle\030\001 \001(\0132\034.opi_api.com" + "mon.v1.ObjectKey\022\r\n\005stats\030\002 \001(\t2\234\005\n\024AioC" + "ontrollerService\022j\n\023AioControllerCreate\022" + "..opi_api.storage.v1.AioControllerCreate" + "Request\032!.opi_api.storage.v1.AioControll" + "er\"\000\022_\n\023AioControllerDelete\022..opi_api.st" + "orage.v1.AioControllerDeleteRequest\032\026.go" + "ogle.protobuf.Empty\"\000\022d\n\020AioControllerGe" + "t\022+.opi_api.storage.v1.AioControllerGetR" + "equest\032!.opi_api.storage.v1.AioControlle" + "r\"\000\022p\n\024AioControllerGetList\022/.opi_api.st" + "orage.v1.AioControllerGetListRequest\032%.o" + "pi_api.storage.v1.AioControllerList\"\000\022s\n" + "\025AioControllerGetStats\0220.opi_api.storage" + ".v1.AioControllerGetStatsRequest\032&.opi_a" + "pi.storage.v1.AioControllerStats\"\000\022j\n\023Ai" + "oControllerUpdate\022..opi_api.storage.v1.A" + "ioControllerUpdateRequest\032!.opi_api.stor" + "age.v1.AioController\"\000B^\n\022opi_api.storag" + "e.v1B\017BackendAioProtoP\001Z5github.com/opip" + "roject/opi-api/storage/v1alpha1/gen/gob\006" + "proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_backend_5faio_2eproto_deps[3] = { &::descriptor_table_google_2fprotobuf_2fempty_2eproto, @@ -306,7 +304,7 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor }; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_backend_5faio_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_backend_5faio_2eproto = { - false, false, 1698, descriptor_table_protodef_backend_5faio_2eproto, "backend_aio.proto", + false, false, 1686, descriptor_table_protodef_backend_5faio_2eproto, "backend_aio.proto", &descriptor_table_backend_5faio_2eproto_once, descriptor_table_backend_5faio_2eproto_deps, 3, 10, schemas, file_default_instances, TableStruct_backend_5faio_2eproto::offsets, file_level_metadata_backend_5faio_2eproto, file_level_enum_descriptors_backend_5faio_2eproto, file_level_service_descriptors_backend_5faio_2eproto, @@ -361,14 +359,6 @@ AioController::AioController(::PROTOBUF_NAMESPACE_ID::Arena* arena, AioController::AioController(const AioController& from) : ::PROTOBUF_NAMESPACE_ID::Message() { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_name().empty()) { - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), - GetArenaForAllocation()); - } filename_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING filename_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); @@ -388,24 +378,20 @@ AioController::AioController(const AioController& from) uuid_ = nullptr; } ::memcpy(&block_size_, &from.block_size_, - static_cast(reinterpret_cast(&num_blocks_) - - reinterpret_cast(&block_size_)) + sizeof(num_blocks_)); + static_cast(reinterpret_cast(&blocks_count_) - + reinterpret_cast(&block_size_)) + sizeof(blocks_count_)); // @@protoc_insertion_point(copy_constructor:opi_api.storage.v1.AioController) } inline void AioController::SharedCtor() { -name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING filename_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING filename_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&handle_) - reinterpret_cast(this)), - 0, static_cast(reinterpret_cast(&num_blocks_) - - reinterpret_cast(&handle_)) + sizeof(num_blocks_)); + 0, static_cast(reinterpret_cast(&blocks_count_) - + reinterpret_cast(&handle_)) + sizeof(blocks_count_)); } AioController::~AioController() { @@ -417,7 +403,6 @@ AioController::~AioController() { inline void AioController::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); filename_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); if (this != internal_default_instance()) delete handle_; if (this != internal_default_instance()) delete uuid_; @@ -439,7 +424,6 @@ void AioController::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - name_.ClearToEmpty(); filename_.ClearToEmpty(); if (GetArenaForAllocation() == nullptr && handle_ != nullptr) { delete handle_; @@ -450,8 +434,8 @@ void AioController::Clear() { } uuid_ = nullptr; ::memset(&block_size_, 0, static_cast( - reinterpret_cast(&num_blocks_) - - reinterpret_cast(&block_size_)) + sizeof(num_blocks_)); + reinterpret_cast(&blocks_count_) - + reinterpret_cast(&block_size_)) + sizeof(blocks_count_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -469,43 +453,33 @@ const char* AioController::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ } else goto handle_unusual; continue; - // string name = 2; + // int64 block_size = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { - auto str = _internal_mutable_name(); - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); - CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.AioController.name")); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + block_size_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; continue; - // int64 block_size = 3; + // int64 blocks_count = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - block_size_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + blocks_count_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; continue; - // int64 num_blocks = 4; + // .opi_api.common.v1.Uuid uuid = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { - num_blocks_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { + ptr = ctx->ParseMessage(_internal_mutable_uuid(), ptr); CHK_(ptr); } else goto handle_unusual; continue; - // .opi_api.common.v1.Uuid uuid = 5; + // string filename = 5; case 5: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { - ptr = ctx->ParseMessage(_internal_mutable_uuid(), ptr); - CHK_(ptr); - } else - goto handle_unusual; - continue; - // string filename = 6; - case 6: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { auto str = _internal_mutable_filename(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.AioController.filename")); @@ -550,44 +524,34 @@ uint8_t* AioController::_InternalSerialize( 1, _Internal::handle(this), target, stream); } - // string name = 2; - if (!this->_internal_name().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_name().data(), static_cast(this->_internal_name().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "opi_api.storage.v1.AioController.name"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_name(), target); - } - - // int64 block_size = 3; + // int64 block_size = 2; if (this->_internal_block_size() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(3, this->_internal_block_size(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(2, this->_internal_block_size(), target); } - // int64 num_blocks = 4; - if (this->_internal_num_blocks() != 0) { + // int64 blocks_count = 3; + if (this->_internal_blocks_count() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(4, this->_internal_num_blocks(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(3, this->_internal_blocks_count(), target); } - // .opi_api.common.v1.Uuid uuid = 5; + // .opi_api.common.v1.Uuid uuid = 4; if (this->_internal_has_uuid()) { target = stream->EnsureSpace(target); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessage( - 5, _Internal::uuid(this), target, stream); + 4, _Internal::uuid(this), target, stream); } - // string filename = 6; + // string filename = 5; if (!this->_internal_filename().empty()) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_filename().data(), static_cast(this->_internal_filename().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "opi_api.storage.v1.AioController.filename"); target = stream->WriteStringMaybeAliased( - 6, this->_internal_filename(), target); + 5, this->_internal_filename(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -606,14 +570,7 @@ size_t AioController::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // string name = 2; - if (!this->_internal_name().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_name()); - } - - // string filename = 6; + // string filename = 5; if (!this->_internal_filename().empty()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( @@ -627,21 +584,21 @@ size_t AioController::ByteSizeLong() const { *handle_); } - // .opi_api.common.v1.Uuid uuid = 5; + // .opi_api.common.v1.Uuid uuid = 4; if (this->_internal_has_uuid()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( *uuid_); } - // int64 block_size = 3; + // int64 block_size = 2; if (this->_internal_block_size() != 0) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_block_size()); } - // int64 num_blocks = 4; - if (this->_internal_num_blocks() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_num_blocks()); + // int64 blocks_count = 3; + if (this->_internal_blocks_count() != 0) { + total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_blocks_count()); } return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); @@ -666,9 +623,6 @@ void AioController::MergeFrom(const AioController& from) { uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (!from._internal_name().empty()) { - _internal_set_name(from._internal_name()); - } if (!from._internal_filename().empty()) { _internal_set_filename(from._internal_filename()); } @@ -681,8 +635,8 @@ void AioController::MergeFrom(const AioController& from) { if (from._internal_block_size() != 0) { _internal_set_block_size(from._internal_block_size()); } - if (from._internal_num_blocks() != 0) { - _internal_set_num_blocks(from._internal_num_blocks()); + if (from._internal_blocks_count() != 0) { + _internal_set_blocks_count(from._internal_blocks_count()); } _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -703,19 +657,14 @@ void AioController::InternalSwap(AioController* other) { auto* lhs_arena = GetArenaForAllocation(); auto* rhs_arena = other->GetArenaForAllocation(); _internal_metadata_.InternalSwap(&other->_internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - &name_, lhs_arena, - &other->name_, rhs_arena - ); ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), &filename_, lhs_arena, &other->filename_, rhs_arena ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(AioController, num_blocks_) - + sizeof(AioController::num_blocks_) + PROTOBUF_FIELD_OFFSET(AioController, blocks_count_) + + sizeof(AioController::blocks_count_) - PROTOBUF_FIELD_OFFSET(AioController, handle_)>( reinterpret_cast(&handle_), reinterpret_cast(&other->handle_)); diff --git a/storage/v1alpha1/gen/cpp/backend_aio.pb.h b/storage/v1alpha1/gen/cpp/backend_aio.pb.h index 07df9124..86f33a4f 100644 --- a/storage/v1alpha1/gen/cpp/backend_aio.pb.h +++ b/storage/v1alpha1/gen/cpp/backend_aio.pb.h @@ -233,28 +233,13 @@ class AioController final : // accessors ------------------------------------------------------- enum : int { - kNameFieldNumber = 2, - kFilenameFieldNumber = 6, + kFilenameFieldNumber = 5, kHandleFieldNumber = 1, - kUuidFieldNumber = 5, - kBlockSizeFieldNumber = 3, - kNumBlocksFieldNumber = 4, + kUuidFieldNumber = 4, + kBlockSizeFieldNumber = 2, + kBlocksCountFieldNumber = 3, }; - // string name = 2; - void clear_name(); - const std::string& name() const; - template - void set_name(ArgT0&& arg0, ArgT... args); - std::string* mutable_name(); - PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* name); - private: - const std::string& _internal_name() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); - public: - - // string filename = 6; + // string filename = 5; void clear_filename(); const std::string& filename() const; template @@ -286,7 +271,7 @@ class AioController final : ::opi_api::common::v1::ObjectKey* handle); ::opi_api::common::v1::ObjectKey* unsafe_arena_release_handle(); - // .opi_api.common.v1.Uuid uuid = 5; + // .opi_api.common.v1.Uuid uuid = 4; bool has_uuid() const; private: bool _internal_has_uuid() const; @@ -304,7 +289,7 @@ class AioController final : ::opi_api::common::v1::Uuid* uuid); ::opi_api::common::v1::Uuid* unsafe_arena_release_uuid(); - // int64 block_size = 3; + // int64 block_size = 2; void clear_block_size(); int64_t block_size() const; void set_block_size(int64_t value); @@ -313,13 +298,13 @@ class AioController final : void _internal_set_block_size(int64_t value); public: - // int64 num_blocks = 4; - void clear_num_blocks(); - int64_t num_blocks() const; - void set_num_blocks(int64_t value); + // int64 blocks_count = 3; + void clear_blocks_count(); + int64_t blocks_count() const; + void set_blocks_count(int64_t value); private: - int64_t _internal_num_blocks() const; - void _internal_set_num_blocks(int64_t value); + int64_t _internal_blocks_count() const; + void _internal_set_blocks_count(int64_t value); public: // @@protoc_insertion_point(class_scope:opi_api.storage.v1.AioController) @@ -329,12 +314,11 @@ class AioController final : template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filename_; ::opi_api::common::v1::ObjectKey* handle_; ::opi_api::common::v1::Uuid* uuid_; int64_t block_size_; - int64_t num_blocks_; + int64_t blocks_count_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_backend_5faio_2eproto; }; @@ -1809,58 +1793,7 @@ inline void AioController::set_allocated_handle(::opi_api::common::v1::ObjectKey // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.AioController.handle) } -// string name = 2; -inline void AioController::clear_name() { - name_.ClearToEmpty(); -} -inline const std::string& AioController::name() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.AioController.name) - return _internal_name(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void AioController::set_name(ArgT0&& arg0, ArgT... args) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.AioController.name) -} -inline std::string* AioController::mutable_name() { - std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:opi_api.storage.v1.AioController.name) - return _s; -} -inline const std::string& AioController::_internal_name() const { - return name_.Get(); -} -inline void AioController::_internal_set_name(const std::string& value) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation()); -} -inline std::string* AioController::_internal_mutable_name() { - - return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation()); -} -inline std::string* AioController::release_name() { - // @@protoc_insertion_point(field_release:opi_api.storage.v1.AioController.name) - return name_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -} -inline void AioController::set_allocated_name(std::string* name) { - if (name != nullptr) { - - } else { - - } - name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, - GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.AioController.name) -} - -// int64 block_size = 3; +// int64 block_size = 2; inline void AioController::clear_block_size() { block_size_ = int64_t{0}; } @@ -1880,27 +1813,27 @@ inline void AioController::set_block_size(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.AioController.block_size) } -// int64 num_blocks = 4; -inline void AioController::clear_num_blocks() { - num_blocks_ = int64_t{0}; +// int64 blocks_count = 3; +inline void AioController::clear_blocks_count() { + blocks_count_ = int64_t{0}; } -inline int64_t AioController::_internal_num_blocks() const { - return num_blocks_; +inline int64_t AioController::_internal_blocks_count() const { + return blocks_count_; } -inline int64_t AioController::num_blocks() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.AioController.num_blocks) - return _internal_num_blocks(); +inline int64_t AioController::blocks_count() const { + // @@protoc_insertion_point(field_get:opi_api.storage.v1.AioController.blocks_count) + return _internal_blocks_count(); } -inline void AioController::_internal_set_num_blocks(int64_t value) { +inline void AioController::_internal_set_blocks_count(int64_t value) { - num_blocks_ = value; + blocks_count_ = value; } -inline void AioController::set_num_blocks(int64_t value) { - _internal_set_num_blocks(value); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.AioController.num_blocks) +inline void AioController::set_blocks_count(int64_t value) { + _internal_set_blocks_count(value); + // @@protoc_insertion_point(field_set:opi_api.storage.v1.AioController.blocks_count) } -// .opi_api.common.v1.Uuid uuid = 5; +// .opi_api.common.v1.Uuid uuid = 4; inline bool AioController::_internal_has_uuid() const { return this != internal_default_instance() && uuid_ != nullptr; } @@ -1986,7 +1919,7 @@ inline void AioController::set_allocated_uuid(::opi_api::common::v1::Uuid* uuid) // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.AioController.uuid) } -// string filename = 6; +// string filename = 5; inline void AioController::clear_filename() { filename_.ClearToEmpty(); } diff --git a/storage/v1alpha1/gen/cpp/backend_null.grpc.pb.h b/storage/v1alpha1/gen/cpp/backend_null.grpc.pb.h index ade9a658..a66757f6 100644 --- a/storage/v1alpha1/gen/cpp/backend_null.grpc.pb.h +++ b/storage/v1alpha1/gen/cpp/backend_null.grpc.pb.h @@ -33,8 +33,7 @@ namespace opi_api { namespace storage { namespace v1 { -// Back End (network-facing) APIs. -// +// Back End (network-facing) APIs. This is debug interface for null block devices. class NullDebugService final { public: static constexpr char const* service_full_name() { diff --git a/storage/v1alpha1/gen/cpp/backend_null.pb.cc b/storage/v1alpha1/gen/cpp/backend_null.pb.cc index f70f98b3..9862d2ef 100644 --- a/storage/v1alpha1/gen/cpp/backend_null.pb.cc +++ b/storage/v1alpha1/gen/cpp/backend_null.pb.cc @@ -21,11 +21,10 @@ namespace storage { namespace v1 { constexpr NullDebug::NullDebug( ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized) - : name_(&::PROTOBUF_NAMESPACE_ID::internal::fixed_address_empty_string) - , uuid_(nullptr) + : uuid_(nullptr) , id_(int64_t{0}) , block_size_(int64_t{0}) - , num_blocks_(int64_t{0}){} + , blocks_count_(int64_t{0}){} struct NullDebugDefaultTypeInternal { constexpr NullDebugDefaultTypeInternal() : _instance(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized{}) {} @@ -191,9 +190,8 @@ const uint32_t TableStruct_backend_5fnull_2eproto::offsets[] PROTOBUF_SECTION_VA ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NullDebug, id_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NullDebug, name_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NullDebug, block_size_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NullDebug, num_blocks_), + PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NullDebug, blocks_count_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NullDebug, uuid_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NullDebugCreateRequest, _internal_metadata_), @@ -279,18 +277,18 @@ const uint32_t TableStruct_backend_5fnull_2eproto::offsets[] PROTOBUF_SECTION_VA }; static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, -1, sizeof(::opi_api::storage::v1::NullDebug)}, - { 11, -1, -1, sizeof(::opi_api::storage::v1::NullDebugCreateRequest)}, - { 18, -1, -1, sizeof(::opi_api::storage::v1::NullDebugCreateResponse)}, - { 24, -1, -1, sizeof(::opi_api::storage::v1::NullDebugDeleteRequest)}, - { 31, -1, -1, sizeof(::opi_api::storage::v1::NullDebugDeleteResponse)}, - { 37, -1, -1, sizeof(::opi_api::storage::v1::NullDebugUpdateRequest)}, - { 44, -1, -1, sizeof(::opi_api::storage::v1::NullDebugUpdateResponse)}, - { 50, -1, -1, sizeof(::opi_api::storage::v1::NullDebugListRequest)}, - { 56, -1, -1, sizeof(::opi_api::storage::v1::NullDebugListResponse)}, - { 63, -1, -1, sizeof(::opi_api::storage::v1::NullDebugGetRequest)}, - { 70, -1, -1, sizeof(::opi_api::storage::v1::NullDebugGetResponse)}, - { 77, -1, -1, sizeof(::opi_api::storage::v1::NullDebugStatsRequest)}, - { 84, -1, -1, sizeof(::opi_api::storage::v1::NullDebugStatsResponse)}, + { 10, -1, -1, sizeof(::opi_api::storage::v1::NullDebugCreateRequest)}, + { 17, -1, -1, sizeof(::opi_api::storage::v1::NullDebugCreateResponse)}, + { 23, -1, -1, sizeof(::opi_api::storage::v1::NullDebugDeleteRequest)}, + { 30, -1, -1, sizeof(::opi_api::storage::v1::NullDebugDeleteResponse)}, + { 36, -1, -1, sizeof(::opi_api::storage::v1::NullDebugUpdateRequest)}, + { 43, -1, -1, sizeof(::opi_api::storage::v1::NullDebugUpdateResponse)}, + { 49, -1, -1, sizeof(::opi_api::storage::v1::NullDebugListRequest)}, + { 55, -1, -1, sizeof(::opi_api::storage::v1::NullDebugListResponse)}, + { 62, -1, -1, sizeof(::opi_api::storage::v1::NullDebugGetRequest)}, + { 69, -1, -1, sizeof(::opi_api::storage::v1::NullDebugGetResponse)}, + { 76, -1, -1, sizeof(::opi_api::storage::v1::NullDebugStatsRequest)}, + { 83, -1, -1, sizeof(::opi_api::storage::v1::NullDebugStatsResponse)}, }; static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = { @@ -311,43 +309,43 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = const char descriptor_table_protodef_backend_5fnull_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\022backend_null.proto\022\022opi_api.storage.v1" - "\032\020object_key.proto\032\nuuid.proto\"t\n\tNullDe" - "bug\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\022\n\nblock_s" - "ize\030\003 \001(\003\022\022\n\nnum_blocks\030\004 \001(\003\022%\n\004uuid\030\005 " - "\001(\0132\027.opi_api.common.v1.Uuid\"G\n\026NullDebu" - "gCreateRequest\022-\n\006device\030\001 \001(\0132\035.opi_api" - ".storage.v1.NullDebug\"\031\n\027NullDebugCreate" - "Response\"$\n\026NullDebugDeleteRequest\022\n\n\002id" - "\030\001 \001(\003\"\031\n\027NullDebugDeleteResponse\"G\n\026Nul" - "lDebugUpdateRequest\022-\n\006device\030\001 \001(\0132\035.op" - "i_api.storage.v1.NullDebug\"\031\n\027NullDebugU" - "pdateResponse\"\026\n\024NullDebugListRequest\"F\n" - "\025NullDebugListResponse\022-\n\006device\030\001 \003(\0132\035" - ".opi_api.storage.v1.NullDebug\"!\n\023NullDeb" - "ugGetRequest\022\n\n\002id\030\001 \001(\003\"E\n\024NullDebugGet" - "Response\022-\n\006device\030\001 \001(\0132\035.opi_api.stora" - "ge.v1.NullDebug\"#\n\025NullDebugStatsRequest" - "\022\n\n\002id\030\001 \001(\003\"3\n\026NullDebugStatsResponse\022\n" - "\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t2\224\005\n\020NullDebugS" - "ervice\022l\n\017NullDebugCreate\022*.opi_api.stor" - "age.v1.NullDebugCreateRequest\032+.opi_api." - "storage.v1.NullDebugCreateResponse\"\000\022l\n\017" - "NullDebugDelete\022*.opi_api.storage.v1.Nul" - "lDebugDeleteRequest\032+.opi_api.storage.v1" - ".NullDebugDeleteResponse\"\000\022l\n\017NullDebugU" - "pdate\022*.opi_api.storage.v1.NullDebugUpda" - "teRequest\032+.opi_api.storage.v1.NullDebug" - "UpdateResponse\"\000\022f\n\rNullDebugList\022(.opi_" - "api.storage.v1.NullDebugListRequest\032).op" - "i_api.storage.v1.NullDebugListResponse\"\000" - "\022c\n\014NullDebugGet\022\'.opi_api.storage.v1.Nu" - "llDebugGetRequest\032(.opi_api.storage.v1.N" - "ullDebugGetResponse\"\000\022i\n\016NullDebugStats\022" - ").opi_api.storage.v1.NullDebugStatsReque" - "st\032*.opi_api.storage.v1.NullDebugStatsRe" - "sponse\"\000B_\n\022opi_api.storage.v1B\020BackendN" - "ullProtoP\001Z5github.com/opiproject/opi-ap" - "i/storage/v1alpha1/gen/gob\006proto3" + "\032\020object_key.proto\032\nuuid.proto\"h\n\tNullDe" + "bug\022\n\n\002id\030\001 \001(\003\022\022\n\nblock_size\030\002 \001(\003\022\024\n\014b" + "locks_count\030\003 \001(\003\022%\n\004uuid\030\004 \001(\0132\027.opi_ap" + "i.common.v1.Uuid\"G\n\026NullDebugCreateReque" + "st\022-\n\006device\030\001 \001(\0132\035.opi_api.storage.v1." + "NullDebug\"\031\n\027NullDebugCreateResponse\"$\n\026" + "NullDebugDeleteRequest\022\n\n\002id\030\001 \001(\003\"\031\n\027Nu" + "llDebugDeleteResponse\"G\n\026NullDebugUpdate" + "Request\022-\n\006device\030\001 \001(\0132\035.opi_api.storag" + "e.v1.NullDebug\"\031\n\027NullDebugUpdateRespons" + "e\"\026\n\024NullDebugListRequest\"F\n\025NullDebugLi" + "stResponse\022-\n\006device\030\001 \003(\0132\035.opi_api.sto" + "rage.v1.NullDebug\"!\n\023NullDebugGetRequest" + "\022\n\n\002id\030\001 \001(\003\"E\n\024NullDebugGetResponse\022-\n\006" + "device\030\001 \001(\0132\035.opi_api.storage.v1.NullDe" + "bug\"#\n\025NullDebugStatsRequest\022\n\n\002id\030\001 \001(\003" + "\"3\n\026NullDebugStatsResponse\022\n\n\002id\030\001 \001(\003\022\r" + "\n\005stats\030\002 \001(\t2\224\005\n\020NullDebugService\022l\n\017Nu" + "llDebugCreate\022*.opi_api.storage.v1.NullD" + "ebugCreateRequest\032+.opi_api.storage.v1.N" + "ullDebugCreateResponse\"\000\022l\n\017NullDebugDel" + "ete\022*.opi_api.storage.v1.NullDebugDelete" + "Request\032+.opi_api.storage.v1.NullDebugDe" + "leteResponse\"\000\022l\n\017NullDebugUpdate\022*.opi_" + "api.storage.v1.NullDebugUpdateRequest\032+." + "opi_api.storage.v1.NullDebugUpdateRespon" + "se\"\000\022f\n\rNullDebugList\022(.opi_api.storage." + "v1.NullDebugListRequest\032).opi_api.storag" + "e.v1.NullDebugListResponse\"\000\022c\n\014NullDebu" + "gGet\022\'.opi_api.storage.v1.NullDebugGetRe" + "quest\032(.opi_api.storage.v1.NullDebugGetR" + "esponse\"\000\022i\n\016NullDebugStats\022).opi_api.st" + "orage.v1.NullDebugStatsRequest\032*.opi_api" + ".storage.v1.NullDebugStatsResponse\"\000B_\n\022" + "opi_api.storage.v1B\020BackendNullProtoP\001Z5" + "github.com/opiproject/opi-api/storage/v1" + "alpha1/gen/gob\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_backend_5fnull_2eproto_deps[2] = { &::descriptor_table_object_5fkey_2eproto, @@ -355,7 +353,7 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor }; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_backend_5fnull_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_backend_5fnull_2eproto = { - false, false, 1513, descriptor_table_protodef_backend_5fnull_2eproto, "backend_null.proto", + false, false, 1501, descriptor_table_protodef_backend_5fnull_2eproto, "backend_null.proto", &descriptor_table_backend_5fnull_2eproto_once, descriptor_table_backend_5fnull_2eproto_deps, 2, 13, schemas, file_default_instances, TableStruct_backend_5fnull_2eproto::offsets, file_level_metadata_backend_5fnull_2eproto, file_level_enum_descriptors_backend_5fnull_2eproto, file_level_service_descriptors_backend_5fnull_2eproto, @@ -399,34 +397,22 @@ NullDebug::NullDebug(::PROTOBUF_NAMESPACE_ID::Arena* arena, NullDebug::NullDebug(const NullDebug& from) : ::PROTOBUF_NAMESPACE_ID::Message() { _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); - name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_name().empty()) { - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), - GetArenaForAllocation()); - } if (from._internal_has_uuid()) { uuid_ = new ::opi_api::common::v1::Uuid(*from.uuid_); } else { uuid_ = nullptr; } ::memcpy(&id_, &from.id_, - static_cast(reinterpret_cast(&num_blocks_) - - reinterpret_cast(&id_)) + sizeof(num_blocks_)); + static_cast(reinterpret_cast(&blocks_count_) - + reinterpret_cast(&id_)) + sizeof(blocks_count_)); // @@protoc_insertion_point(copy_constructor:opi_api.storage.v1.NullDebug) } inline void NullDebug::SharedCtor() { -name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING ::memset(reinterpret_cast(this) + static_cast( reinterpret_cast(&uuid_) - reinterpret_cast(this)), - 0, static_cast(reinterpret_cast(&num_blocks_) - - reinterpret_cast(&uuid_)) + sizeof(num_blocks_)); + 0, static_cast(reinterpret_cast(&blocks_count_) - + reinterpret_cast(&uuid_)) + sizeof(blocks_count_)); } NullDebug::~NullDebug() { @@ -438,7 +424,6 @@ NullDebug::~NullDebug() { inline void NullDebug::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); - name_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited()); if (this != internal_default_instance()) delete uuid_; } @@ -458,14 +443,13 @@ void NullDebug::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - name_.ClearToEmpty(); if (GetArenaForAllocation() == nullptr && uuid_ != nullptr) { delete uuid_; } uuid_ = nullptr; ::memset(&id_, 0, static_cast( - reinterpret_cast(&num_blocks_) - - reinterpret_cast(&id_)) + sizeof(num_blocks_)); + reinterpret_cast(&blocks_count_) - + reinterpret_cast(&id_)) + sizeof(blocks_count_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -483,35 +467,25 @@ const char* NullDebug::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID:: } else goto handle_unusual; continue; - // string name = 2; + // int64 block_size = 2; case 2: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 18)) { - auto str = _internal_mutable_name(); - ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); - CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "opi_api.storage.v1.NullDebug.name")); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { + block_size_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; continue; - // int64 block_size = 3; + // int64 blocks_count = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - block_size_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + blocks_count_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; continue; - // int64 num_blocks = 4; + // .opi_api.common.v1.Uuid uuid = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { - num_blocks_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); - CHK_(ptr); - } else - goto handle_unusual; - continue; - // .opi_api.common.v1.Uuid uuid = 5; - case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { ptr = ctx->ParseMessage(_internal_mutable_uuid(), ptr); CHK_(ptr); } else @@ -552,34 +526,24 @@ uint8_t* NullDebug::_InternalSerialize( target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(1, this->_internal_id(), target); } - // string name = 2; - if (!this->_internal_name().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_name().data(), static_cast(this->_internal_name().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "opi_api.storage.v1.NullDebug.name"); - target = stream->WriteStringMaybeAliased( - 2, this->_internal_name(), target); - } - - // int64 block_size = 3; + // int64 block_size = 2; if (this->_internal_block_size() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(3, this->_internal_block_size(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(2, this->_internal_block_size(), target); } - // int64 num_blocks = 4; - if (this->_internal_num_blocks() != 0) { + // int64 blocks_count = 3; + if (this->_internal_blocks_count() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(4, this->_internal_num_blocks(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(3, this->_internal_blocks_count(), target); } - // .opi_api.common.v1.Uuid uuid = 5; + // .opi_api.common.v1.Uuid uuid = 4; if (this->_internal_has_uuid()) { target = stream->EnsureSpace(target); target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite:: InternalWriteMessage( - 5, _Internal::uuid(this), target, stream); + 4, _Internal::uuid(this), target, stream); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -598,14 +562,7 @@ size_t NullDebug::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // string name = 2; - if (!this->_internal_name().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_name()); - } - - // .opi_api.common.v1.Uuid uuid = 5; + // .opi_api.common.v1.Uuid uuid = 4; if (this->_internal_has_uuid()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize( @@ -617,14 +574,14 @@ size_t NullDebug::ByteSizeLong() const { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_id()); } - // int64 block_size = 3; + // int64 block_size = 2; if (this->_internal_block_size() != 0) { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_block_size()); } - // int64 num_blocks = 4; - if (this->_internal_num_blocks() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_num_blocks()); + // int64 blocks_count = 3; + if (this->_internal_blocks_count() != 0) { + total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_blocks_count()); } return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); @@ -649,9 +606,6 @@ void NullDebug::MergeFrom(const NullDebug& from) { uint32_t cached_has_bits = 0; (void) cached_has_bits; - if (!from._internal_name().empty()) { - _internal_set_name(from._internal_name()); - } if (from._internal_has_uuid()) { _internal_mutable_uuid()->::opi_api::common::v1::Uuid::MergeFrom(from._internal_uuid()); } @@ -661,8 +615,8 @@ void NullDebug::MergeFrom(const NullDebug& from) { if (from._internal_block_size() != 0) { _internal_set_block_size(from._internal_block_size()); } - if (from._internal_num_blocks() != 0) { - _internal_set_num_blocks(from._internal_num_blocks()); + if (from._internal_blocks_count() != 0) { + _internal_set_blocks_count(from._internal_blocks_count()); } _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -680,17 +634,10 @@ bool NullDebug::IsInitialized() const { void NullDebug::InternalSwap(NullDebug* other) { using std::swap; - auto* lhs_arena = GetArenaForAllocation(); - auto* rhs_arena = other->GetArenaForAllocation(); _internal_metadata_.InternalSwap(&other->_internal_metadata_); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), - &name_, lhs_arena, - &other->name_, rhs_arena - ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(NullDebug, num_blocks_) - + sizeof(NullDebug::num_blocks_) + PROTOBUF_FIELD_OFFSET(NullDebug, blocks_count_) + + sizeof(NullDebug::blocks_count_) - PROTOBUF_FIELD_OFFSET(NullDebug, uuid_)>( reinterpret_cast(&uuid_), reinterpret_cast(&other->uuid_)); diff --git a/storage/v1alpha1/gen/cpp/backend_null.pb.h b/storage/v1alpha1/gen/cpp/backend_null.pb.h index 77c244ef..4a33897b 100644 --- a/storage/v1alpha1/gen/cpp/backend_null.pb.h +++ b/storage/v1alpha1/gen/cpp/backend_null.pb.h @@ -244,27 +244,12 @@ class NullDebug final : // accessors ------------------------------------------------------- enum : int { - kNameFieldNumber = 2, - kUuidFieldNumber = 5, + kUuidFieldNumber = 4, kIdFieldNumber = 1, - kBlockSizeFieldNumber = 3, - kNumBlocksFieldNumber = 4, + kBlockSizeFieldNumber = 2, + kBlocksCountFieldNumber = 3, }; - // string name = 2; - void clear_name(); - const std::string& name() const; - template - void set_name(ArgT0&& arg0, ArgT... args); - std::string* mutable_name(); - PROTOBUF_NODISCARD std::string* release_name(); - void set_allocated_name(std::string* name); - private: - const std::string& _internal_name() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value); - std::string* _internal_mutable_name(); - public: - - // .opi_api.common.v1.Uuid uuid = 5; + // .opi_api.common.v1.Uuid uuid = 4; bool has_uuid() const; private: bool _internal_has_uuid() const; @@ -291,7 +276,7 @@ class NullDebug final : void _internal_set_id(int64_t value); public: - // int64 block_size = 3; + // int64 block_size = 2; void clear_block_size(); int64_t block_size() const; void set_block_size(int64_t value); @@ -300,13 +285,13 @@ class NullDebug final : void _internal_set_block_size(int64_t value); public: - // int64 num_blocks = 4; - void clear_num_blocks(); - int64_t num_blocks() const; - void set_num_blocks(int64_t value); + // int64 blocks_count = 3; + void clear_blocks_count(); + int64_t blocks_count() const; + void set_blocks_count(int64_t value); private: - int64_t _internal_num_blocks() const; - void _internal_set_num_blocks(int64_t value); + int64_t _internal_blocks_count() const; + void _internal_set_blocks_count(int64_t value); public: // @@protoc_insertion_point(class_scope:opi_api.storage.v1.NullDebug) @@ -316,11 +301,10 @@ class NullDebug final : template friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper; typedef void InternalArenaConstructable_; typedef void DestructorSkippable_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_; ::opi_api::common::v1::Uuid* uuid_; int64_t id_; int64_t block_size_; - int64_t num_blocks_; + int64_t blocks_count_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_backend_5fnull_2eproto; }; @@ -2047,58 +2031,7 @@ inline void NullDebug::set_id(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.NullDebug.id) } -// string name = 2; -inline void NullDebug::clear_name() { - name_.ClearToEmpty(); -} -inline const std::string& NullDebug::name() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.NullDebug.name) - return _internal_name(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void NullDebug::set_name(ArgT0&& arg0, ArgT... args) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.NullDebug.name) -} -inline std::string* NullDebug::mutable_name() { - std::string* _s = _internal_mutable_name(); - // @@protoc_insertion_point(field_mutable:opi_api.storage.v1.NullDebug.name) - return _s; -} -inline const std::string& NullDebug::_internal_name() const { - return name_.Get(); -} -inline void NullDebug::_internal_set_name(const std::string& value) { - - name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation()); -} -inline std::string* NullDebug::_internal_mutable_name() { - - return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation()); -} -inline std::string* NullDebug::release_name() { - // @@protoc_insertion_point(field_release:opi_api.storage.v1.NullDebug.name) - return name_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation()); -} -inline void NullDebug::set_allocated_name(std::string* name) { - if (name != nullptr) { - - } else { - - } - name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name, - GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (name_.IsDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited())) { - name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), "", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:opi_api.storage.v1.NullDebug.name) -} - -// int64 block_size = 3; +// int64 block_size = 2; inline void NullDebug::clear_block_size() { block_size_ = int64_t{0}; } @@ -2118,27 +2051,27 @@ inline void NullDebug::set_block_size(int64_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.NullDebug.block_size) } -// int64 num_blocks = 4; -inline void NullDebug::clear_num_blocks() { - num_blocks_ = int64_t{0}; +// int64 blocks_count = 3; +inline void NullDebug::clear_blocks_count() { + blocks_count_ = int64_t{0}; } -inline int64_t NullDebug::_internal_num_blocks() const { - return num_blocks_; +inline int64_t NullDebug::_internal_blocks_count() const { + return blocks_count_; } -inline int64_t NullDebug::num_blocks() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.NullDebug.num_blocks) - return _internal_num_blocks(); +inline int64_t NullDebug::blocks_count() const { + // @@protoc_insertion_point(field_get:opi_api.storage.v1.NullDebug.blocks_count) + return _internal_blocks_count(); } -inline void NullDebug::_internal_set_num_blocks(int64_t value) { +inline void NullDebug::_internal_set_blocks_count(int64_t value) { - num_blocks_ = value; + blocks_count_ = value; } -inline void NullDebug::set_num_blocks(int64_t value) { - _internal_set_num_blocks(value); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.NullDebug.num_blocks) +inline void NullDebug::set_blocks_count(int64_t value) { + _internal_set_blocks_count(value); + // @@protoc_insertion_point(field_set:opi_api.storage.v1.NullDebug.blocks_count) } -// .opi_api.common.v1.Uuid uuid = 5; +// .opi_api.common.v1.Uuid uuid = 4; inline bool NullDebug::_internal_has_uuid() const { return this != internal_default_instance() && uuid_ != nullptr; } diff --git a/storage/v1alpha1/gen/cpp/backend_nvme_tcp.grpc.pb.h b/storage/v1alpha1/gen/cpp/backend_nvme_tcp.grpc.pb.h index 3b3f7554..85a6fe42 100644 --- a/storage/v1alpha1/gen/cpp/backend_nvme_tcp.grpc.pb.h +++ b/storage/v1alpha1/gen/cpp/backend_nvme_tcp.grpc.pb.h @@ -33,10 +33,7 @@ namespace opi_api { namespace storage { namespace v1 { -// Back End (network-facing) APIs. -// -// NVMe/TCP and NVMe/RoCEv2 -// +// Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service. class NVMfRemoteControllerService final { public: static constexpr char const* service_full_name() { diff --git a/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.cc b/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.cc index fca5a86c..d62d516e 100644 --- a/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.cc +++ b/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.cc @@ -33,7 +33,7 @@ constexpr NVMfRemoteController::NVMfRemoteController( , ddgst_(false) , multipath_(0) - , num_io_queues_(int64_t{0}) + , io_queues_count_(int64_t{0}) , queue_size_(int64_t{0}){} struct NVMfRemoteControllerDefaultTypeInternal { constexpr NVMfRemoteControllerDefaultTypeInternal() @@ -209,7 +209,7 @@ const uint32_t TableStruct_backend_5fnvme_5ftcp_2eproto::offsets[] PROTOBUF_SECT PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMfRemoteController, hdgst_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMfRemoteController, ddgst_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMfRemoteController, multipath_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMfRemoteController, num_io_queues_), + PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMfRemoteController, io_queues_count_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMfRemoteController, queue_size_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NVMfRemoteControllerConnectRequest, _internal_metadata_), @@ -328,70 +328,73 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = const char descriptor_table_protodef_backend_5fnvme_5ftcp_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = "\n\026backend_nvme_tcp.proto\022\022opi_api.storag" - "e.v1\"\300\002\n\024NVMfRemoteController\022\n\n\002id\030\001 \001(" + "e.v1\"\302\002\n\024NVMfRemoteController\022\n\n\002id\030\001 \001(" "\003\0225\n\006trtype\030\002 \001(\0162%.opi_api.storage.v1.N" "vmeTransportType\0225\n\006adrfam\030\003 \001(\0162%.opi_a" "pi.storage.v1.NvmeAddressFamily\022\016\n\006tradd" "r\030\004 \001(\t\022\017\n\007trsvcid\030\005 \001(\003\022\016\n\006subnqn\030\006 \001(\t" "\022\r\n\005hdgst\030\007 \001(\010\022\r\n\005ddgst\030\010 \001(\010\0224\n\tmultip" "ath\030\t \001(\0162!.opi_api.storage.v1.NvmeMulti" - "path\022\025\n\rnum_io_queues\030\n \001(\003\022\022\n\nqueue_siz" - "e\030\013 \001(\003\"\\\n\"NVMfRemoteControllerConnectRe" - "quest\0226\n\004ctrl\030\001 \001(\0132(.opi_api.storage.v1" - ".NVMfRemoteController\"%\n#NVMfRemoteContr" - "ollerConnectResponse\"3\n%NVMfRemoteContro" - "llerDisconnectRequest\022\n\n\002id\030\001 \001(\003\"(\n&NVM" - "fRemoteControllerDisconnectResponse\".\n N" - "VMfRemoteControllerResetRequest\022\n\n\002id\030\001 " - "\001(\003\"#\n!NVMfRemoteControllerResetResponse" - "\"-\n\037NVMfRemoteControllerListRequest\022\n\n\002i" - "d\030\001 \001(\003\"Z\n NVMfRemoteControllerListRespo" - "nse\0226\n\004ctrl\030\001 \003(\0132(.opi_api.storage.v1.N" - "VMfRemoteController\",\n\036NVMfRemoteControl" - "lerGetRequest\022\n\n\002id\030\001 \001(\003\"Y\n\037NVMfRemoteC" - "ontrollerGetResponse\0226\n\004ctrl\030\001 \001(\0132(.opi" - "_api.storage.v1.NVMfRemoteController\".\n " - "NVMfRemoteControllerStatsRequest\022\n\n\002id\030\001" - " \001(\003\">\n!NVMfRemoteControllerStatsRespons" - "e\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t*\217\001\n\021NvmeTra" - "nsportType\022\025\n\021NVME_TRANSPORT_FC\020\000\022\027\n\023NVM" - "E_TRANSPORT_PCIE\020\001\022\027\n\023NVME_TRANSPORT_RDM" - "A\020\002\022\026\n\022NVME_TRANSPORT_TCP\020\003\022\031\n\025NVME_TRAN" - "SPORT_CUSTOM\020\004*\203\001\n\021NvmeAddressFamily\022\024\n\020" - "NVMF_ADRFAM_IPV4\020\000\022\024\n\020NVMF_ADRFAM_IPV6\020\001" - "\022\022\n\016NVMF_ADRFAM_IB\020\002\022\022\n\016NVMF_ADRFAM_FC\020\003" - "\022\032\n\026NVMF_ADRFAM_INTRA_HOST\020\004*W\n\rNvmeMult" - "ipath\022\025\n\021NVME_MPIO_DISABLE\020\000\022\026\n\022NVME_MPI" - "O_FAILOVER\020\001\022\027\n\023NVME_MPIO_MULTIPATH\020\0022\367\006" - "\n\033NVMfRemoteControllerService\022\220\001\n\033NVMfRe" - "moteControllerConnect\0226.opi_api.storage." - "v1.NVMfRemoteControllerConnectRequest\0327." - "opi_api.storage.v1.NVMfRemoteControllerC" - "onnectResponse\"\000\022\231\001\n\036NVMfRemoteControlle" - "rDisconnect\0229.opi_api.storage.v1.NVMfRem" - "oteControllerDisconnectRequest\032:.opi_api" - ".storage.v1.NVMfRemoteControllerDisconne" - "ctResponse\"\000\022\212\001\n\031NVMfRemoteControllerRes" - "et\0224.opi_api.storage.v1.NVMfRemoteContro" - "llerResetRequest\0325.opi_api.storage.v1.NV" - "MfRemoteControllerResetResponse\"\000\022\207\001\n\030NV" - "MfRemoteControllerList\0223.opi_api.storage" - ".v1.NVMfRemoteControllerListRequest\0324.op" - "i_api.storage.v1.NVMfRemoteControllerLis" - "tResponse\"\000\022\204\001\n\027NVMfRemoteControllerGet\022" - "2.opi_api.storage.v1.NVMfRemoteControlle" - "rGetRequest\0323.opi_api.storage.v1.NVMfRem" - "oteControllerGetResponse\"\000\022\212\001\n\031NVMfRemot" - "eControllerStats\0224.opi_api.storage.v1.NV" - "MfRemoteControllerStatsRequest\0325.opi_api" - ".storage.v1.NVMfRemoteControllerStatsRes" - "ponse\"\000Bb\n\022opi_api.storage.v1B\023BackendNv" - "meTcpProtoP\001Z5github.com/opiproject/opi-" - "api/storage/v1alpha1/gen/gob\006proto3" + "path\022\027\n\017io_queues_count\030\n \001(\003\022\022\n\nqueue_s" + "ize\030\013 \001(\003\"\\\n\"NVMfRemoteControllerConnect" + "Request\0226\n\004ctrl\030\001 \001(\0132(.opi_api.storage." + "v1.NVMfRemoteController\"%\n#NVMfRemoteCon" + "trollerConnectResponse\"3\n%NVMfRemoteCont" + "rollerDisconnectRequest\022\n\n\002id\030\001 \001(\003\"(\n&N" + "VMfRemoteControllerDisconnectResponse\".\n" + " NVMfRemoteControllerResetRequest\022\n\n\002id\030" + "\001 \001(\003\"#\n!NVMfRemoteControllerResetRespon" + "se\"-\n\037NVMfRemoteControllerListRequest\022\n\n" + "\002id\030\001 \001(\003\"Z\n NVMfRemoteControllerListRes" + "ponse\0226\n\004ctrl\030\001 \003(\0132(.opi_api.storage.v1" + ".NVMfRemoteController\",\n\036NVMfRemoteContr" + "ollerGetRequest\022\n\n\002id\030\001 \001(\003\"Y\n\037NVMfRemot" + "eControllerGetResponse\0226\n\004ctrl\030\001 \001(\0132(.o" + "pi_api.storage.v1.NVMfRemoteController\"." + "\n NVMfRemoteControllerStatsRequest\022\n\n\002id" + "\030\001 \001(\003\">\n!NVMfRemoteControllerStatsRespo" + "nse\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t*\264\001\n\021NvmeT" + "ransportType\022#\n\037NVME_TRANSPORT_TYPE_UNSP" + "ECIFIED\020\000\022\025\n\021NVME_TRANSPORT_FC\020\001\022\027\n\023NVME" + "_TRANSPORT_PCIE\020\002\022\027\n\023NVME_TRANSPORT_RDMA" + "\020\003\022\026\n\022NVME_TRANSPORT_TCP\020\004\022\031\n\025NVME_TRANS" + "PORT_CUSTOM\020\005*\250\001\n\021NvmeAddressFamily\022#\n\037N" + "VME_ADDRESS_FAMILY_UNSPECIFIED\020\000\022\024\n\020NVMF" + "_ADRFAM_IPV4\020\001\022\024\n\020NVMF_ADRFAM_IPV6\020\002\022\022\n\016" + "NVMF_ADRFAM_IB\020\003\022\022\n\016NVMF_ADRFAM_FC\020\004\022\032\n\026" + "NVMF_ADRFAM_INTRA_HOST\020\005*\206\001\n\rNvmeMultipa" + "th\022\036\n\032NVME_MULTIPATH_UNSPECIFIED\020\000\022\032\n\026NV" + "ME_MULTIPATH_DISABLE\020\001\022\033\n\027NVME_MULTIPATH" + "_FAILOVER\020\002\022\034\n\030NVME_MULTIPATH_MULTIPATH\020" + "\0032\367\006\n\033NVMfRemoteControllerService\022\220\001\n\033NV" + "MfRemoteControllerConnect\0226.opi_api.stor" + "age.v1.NVMfRemoteControllerConnectReques" + "t\0327.opi_api.storage.v1.NVMfRemoteControl" + "lerConnectResponse\"\000\022\231\001\n\036NVMfRemoteContr" + "ollerDisconnect\0229.opi_api.storage.v1.NVM" + "fRemoteControllerDisconnectRequest\032:.opi" + "_api.storage.v1.NVMfRemoteControllerDisc" + "onnectResponse\"\000\022\212\001\n\031NVMfRemoteControlle" + "rReset\0224.opi_api.storage.v1.NVMfRemoteCo" + "ntrollerResetRequest\0325.opi_api.storage.v" + "1.NVMfRemoteControllerResetResponse\"\000\022\207\001" + "\n\030NVMfRemoteControllerList\0223.opi_api.sto" + "rage.v1.NVMfRemoteControllerListRequest\032" + "4.opi_api.storage.v1.NVMfRemoteControlle" + "rListResponse\"\000\022\204\001\n\027NVMfRemoteController" + "Get\0222.opi_api.storage.v1.NVMfRemoteContr" + "ollerGetRequest\0323.opi_api.storage.v1.NVM" + "fRemoteControllerGetResponse\"\000\022\212\001\n\031NVMfR" + "emoteControllerStats\0224.opi_api.storage.v" + "1.NVMfRemoteControllerStatsRequest\0325.opi" + "_api.storage.v1.NVMfRemoteControllerStat" + "sResponse\"\000Bb\n\022opi_api.storage.v1B\023Backe" + "ndNvmeTcpProtoP\001Z5github.com/opiproject/" + "opi-api/storage/v1alpha1/gen/gob\006proto3" ; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_backend_5fnvme_5ftcp_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_backend_5fnvme_5ftcp_2eproto = { - false, false, 2435, descriptor_table_protodef_backend_5fnvme_5ftcp_2eproto, "backend_nvme_tcp.proto", + false, false, 2559, descriptor_table_protodef_backend_5fnvme_5ftcp_2eproto, "backend_nvme_tcp.proto", &descriptor_table_backend_5fnvme_5ftcp_2eproto_once, nullptr, 0, 13, schemas, file_default_instances, TableStruct_backend_5fnvme_5ftcp_2eproto::offsets, file_level_metadata_backend_5fnvme_5ftcp_2eproto, file_level_enum_descriptors_backend_5fnvme_5ftcp_2eproto, file_level_service_descriptors_backend_5fnvme_5ftcp_2eproto, @@ -416,6 +419,7 @@ bool NvmeTransportType_IsValid(int value) { case 2: case 3: case 4: + case 5: return true; default: return false; @@ -433,6 +437,7 @@ bool NvmeAddressFamily_IsValid(int value) { case 2: case 3: case 4: + case 5: return true; default: return false; @@ -448,6 +453,7 @@ bool NvmeMultipath_IsValid(int value) { case 0: case 1: case 2: + case 3: return true; default: return false; @@ -632,10 +638,10 @@ const char* NVMfRemoteController::_InternalParse(const char* ptr, ::PROTOBUF_NAM } else goto handle_unusual; continue; - // int64 num_io_queues = 10; + // int64 io_queues_count = 10; case 10: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 80)) { - num_io_queues_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + io_queues_count_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; @@ -742,10 +748,10 @@ uint8_t* NVMfRemoteController::_InternalSerialize( 9, this->_internal_multipath(), target); } - // int64 num_io_queues = 10; - if (this->_internal_num_io_queues() != 0) { + // int64 io_queues_count = 10; + if (this->_internal_io_queues_count() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(10, this->_internal_num_io_queues(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64ToArray(10, this->_internal_io_queues_count(), target); } // int64 queue_size = 11; @@ -822,9 +828,9 @@ size_t NVMfRemoteController::ByteSizeLong() const { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_multipath()); } - // int64 num_io_queues = 10; - if (this->_internal_num_io_queues() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_num_io_queues()); + // int64 io_queues_count = 10; + if (this->_internal_io_queues_count() != 0) { + total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int64SizePlusOne(this->_internal_io_queues_count()); } // int64 queue_size = 11; @@ -881,8 +887,8 @@ void NVMfRemoteController::MergeFrom(const NVMfRemoteController& from) { if (from._internal_multipath() != 0) { _internal_set_multipath(from._internal_multipath()); } - if (from._internal_num_io_queues() != 0) { - _internal_set_num_io_queues(from._internal_num_io_queues()); + if (from._internal_io_queues_count() != 0) { + _internal_set_io_queues_count(from._internal_io_queues_count()); } if (from._internal_queue_size() != 0) { _internal_set_queue_size(from._internal_queue_size()); diff --git a/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.h b/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.h index 420e5be9..6961673d 100644 --- a/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.h +++ b/storage/v1alpha1/gen/cpp/backend_nvme_tcp.pb.h @@ -120,16 +120,17 @@ namespace storage { namespace v1 { enum NvmeTransportType : int { - NVME_TRANSPORT_FC = 0, - NVME_TRANSPORT_PCIE = 1, - NVME_TRANSPORT_RDMA = 2, - NVME_TRANSPORT_TCP = 3, - NVME_TRANSPORT_CUSTOM = 4, + NVME_TRANSPORT_TYPE_UNSPECIFIED = 0, + NVME_TRANSPORT_FC = 1, + NVME_TRANSPORT_PCIE = 2, + NVME_TRANSPORT_RDMA = 3, + NVME_TRANSPORT_TCP = 4, + NVME_TRANSPORT_CUSTOM = 5, NvmeTransportType_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), NvmeTransportType_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits::max() }; bool NvmeTransportType_IsValid(int value); -constexpr NvmeTransportType NvmeTransportType_MIN = NVME_TRANSPORT_FC; +constexpr NvmeTransportType NvmeTransportType_MIN = NVME_TRANSPORT_TYPE_UNSPECIFIED; constexpr NvmeTransportType NvmeTransportType_MAX = NVME_TRANSPORT_CUSTOM; constexpr int NvmeTransportType_ARRAYSIZE = NvmeTransportType_MAX + 1; @@ -148,16 +149,17 @@ inline bool NvmeTransportType_Parse( NvmeTransportType_descriptor(), name, value); } enum NvmeAddressFamily : int { - NVMF_ADRFAM_IPV4 = 0, - NVMF_ADRFAM_IPV6 = 1, - NVMF_ADRFAM_IB = 2, - NVMF_ADRFAM_FC = 3, - NVMF_ADRFAM_INTRA_HOST = 4, + NVME_ADDRESS_FAMILY_UNSPECIFIED = 0, + NVMF_ADRFAM_IPV4 = 1, + NVMF_ADRFAM_IPV6 = 2, + NVMF_ADRFAM_IB = 3, + NVMF_ADRFAM_FC = 4, + NVMF_ADRFAM_INTRA_HOST = 5, NvmeAddressFamily_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), NvmeAddressFamily_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits::max() }; bool NvmeAddressFamily_IsValid(int value); -constexpr NvmeAddressFamily NvmeAddressFamily_MIN = NVMF_ADRFAM_IPV4; +constexpr NvmeAddressFamily NvmeAddressFamily_MIN = NVME_ADDRESS_FAMILY_UNSPECIFIED; constexpr NvmeAddressFamily NvmeAddressFamily_MAX = NVMF_ADRFAM_INTRA_HOST; constexpr int NvmeAddressFamily_ARRAYSIZE = NvmeAddressFamily_MAX + 1; @@ -176,15 +178,16 @@ inline bool NvmeAddressFamily_Parse( NvmeAddressFamily_descriptor(), name, value); } enum NvmeMultipath : int { - NVME_MPIO_DISABLE = 0, - NVME_MPIO_FAILOVER = 1, - NVME_MPIO_MULTIPATH = 2, + NVME_MULTIPATH_UNSPECIFIED = 0, + NVME_MULTIPATH_DISABLE = 1, + NVME_MULTIPATH_FAILOVER = 2, + NVME_MULTIPATH_MULTIPATH = 3, NvmeMultipath_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits::min(), NvmeMultipath_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits::max() }; bool NvmeMultipath_IsValid(int value); -constexpr NvmeMultipath NvmeMultipath_MIN = NVME_MPIO_DISABLE; -constexpr NvmeMultipath NvmeMultipath_MAX = NVME_MPIO_MULTIPATH; +constexpr NvmeMultipath NvmeMultipath_MIN = NVME_MULTIPATH_UNSPECIFIED; +constexpr NvmeMultipath NvmeMultipath_MAX = NVME_MULTIPATH_MULTIPATH; constexpr int NvmeMultipath_ARRAYSIZE = NvmeMultipath_MAX + 1; const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* NvmeMultipath_descriptor(); @@ -334,7 +337,7 @@ class NVMfRemoteController final : kHdgstFieldNumber = 7, kDdgstFieldNumber = 8, kMultipathFieldNumber = 9, - kNumIoQueuesFieldNumber = 10, + kIoQueuesCountFieldNumber = 10, kQueueSizeFieldNumber = 11, }; // string traddr = 4; @@ -428,13 +431,13 @@ class NVMfRemoteController final : void _internal_set_multipath(::opi_api::storage::v1::NvmeMultipath value); public: - // int64 num_io_queues = 10; - void clear_num_io_queues(); - int64_t num_io_queues() const; - void set_num_io_queues(int64_t value); + // int64 io_queues_count = 10; + void clear_io_queues_count(); + int64_t io_queues_count() const; + void set_io_queues_count(int64_t value); private: - int64_t _internal_num_io_queues() const; - void _internal_set_num_io_queues(int64_t value); + int64_t _internal_io_queues_count() const; + void _internal_set_io_queues_count(int64_t value); public: // int64 queue_size = 11; @@ -462,7 +465,7 @@ class NVMfRemoteController final : bool hdgst_; bool ddgst_; int multipath_; - int64_t num_io_queues_; + int64_t io_queues_count_; int64_t queue_size_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_backend_5fnvme_5ftcp_2eproto; @@ -2431,24 +2434,24 @@ inline void NVMfRemoteController::set_multipath(::opi_api::storage::v1::NvmeMult // @@protoc_insertion_point(field_set:opi_api.storage.v1.NVMfRemoteController.multipath) } -// int64 num_io_queues = 10; -inline void NVMfRemoteController::clear_num_io_queues() { - num_io_queues_ = int64_t{0}; +// int64 io_queues_count = 10; +inline void NVMfRemoteController::clear_io_queues_count() { + io_queues_count_ = int64_t{0}; } -inline int64_t NVMfRemoteController::_internal_num_io_queues() const { - return num_io_queues_; +inline int64_t NVMfRemoteController::_internal_io_queues_count() const { + return io_queues_count_; } -inline int64_t NVMfRemoteController::num_io_queues() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.NVMfRemoteController.num_io_queues) - return _internal_num_io_queues(); +inline int64_t NVMfRemoteController::io_queues_count() const { + // @@protoc_insertion_point(field_get:opi_api.storage.v1.NVMfRemoteController.io_queues_count) + return _internal_io_queues_count(); } -inline void NVMfRemoteController::_internal_set_num_io_queues(int64_t value) { +inline void NVMfRemoteController::_internal_set_io_queues_count(int64_t value) { - num_io_queues_ = value; + io_queues_count_ = value; } -inline void NVMfRemoteController::set_num_io_queues(int64_t value) { - _internal_set_num_io_queues(value); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.NVMfRemoteController.num_io_queues) +inline void NVMfRemoteController::set_io_queues_count(int64_t value) { + _internal_set_io_queues_count(value); + // @@protoc_insertion_point(field_set:opi_api.storage.v1.NVMfRemoteController.io_queues_count) } // int64 queue_size = 11; diff --git a/storage/v1alpha1/gen/cpp/common.pb.cc b/storage/v1alpha1/gen/cpp/common.pb.cc index b0cb2f62..993639ea 100644 --- a/storage/v1alpha1/gen/cpp/common.pb.cc +++ b/storage/v1alpha1/gen/cpp/common.pb.cc @@ -23,7 +23,7 @@ constexpr NvmeControllerPciId::NvmeControllerPciId( ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized) : bus_(0) , device_(0) - , function_(0) + , func_(0) , virtual_function_(0){} struct NvmeControllerPciIdDefaultTypeInternal { constexpr NvmeControllerPciIdDefaultTypeInternal() @@ -50,7 +50,7 @@ const uint32_t TableStruct_common_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(p ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NvmeControllerPciId, bus_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NvmeControllerPciId, device_), - PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NvmeControllerPciId, function_), + PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NvmeControllerPciId, func_), PROTOBUF_FIELD_OFFSET(::opi_api::storage::v1::NvmeControllerPciId, virtual_function_), }; static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { @@ -62,16 +62,16 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = }; const char descriptor_table_protodef_common_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = - "\n\014common.proto\022\022opi_api.storage.v1\"^\n\023Nv" + "\n\014common.proto\022\022opi_api.storage.v1\"Z\n\023Nv" "meControllerPciId\022\013\n\003bus\030\001 \001(\005\022\016\n\006device" - "\030\002 \001(\005\022\020\n\010function\030\003 \001(\005\022\030\n\020virtual_func" - "tion\030\004 \001(\005BZ\n\022opi_api.storage.v1B\013Common" - "ProtoP\001Z5github.com/opiproject/opi-api/s" - "torage/v1alpha1/gen/gob\006proto3" + "\030\002 \001(\005\022\014\n\004func\030\003 \001(\005\022\030\n\020virtual_function" + "\030\004 \001(\005BZ\n\022opi_api.storage.v1B\013CommonProt" + "oP\001Z5github.com/opiproject/opi-api/stora" + "ge/v1alpha1/gen/gob\006proto3" ; static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_common_2eproto_once; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_common_2eproto = { - false, false, 230, descriptor_table_protodef_common_2eproto, "common.proto", + false, false, 226, descriptor_table_protodef_common_2eproto, "common.proto", &descriptor_table_common_2eproto_once, nullptr, 0, 1, schemas, file_default_instances, TableStruct_common_2eproto::offsets, file_level_metadata_common_2eproto, file_level_enum_descriptors_common_2eproto, file_level_service_descriptors_common_2eproto, @@ -172,10 +172,10 @@ const char* NvmeControllerPciId::_InternalParse(const char* ptr, ::PROTOBUF_NAME } else goto handle_unusual; continue; - // int32 function = 3; + // int32 func = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 24)) { - function_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); + func_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr); CHK_(ptr); } else goto handle_unusual; @@ -229,10 +229,10 @@ uint8_t* NvmeControllerPciId::_InternalSerialize( target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(2, this->_internal_device(), target); } - // int32 function = 3; - if (this->_internal_function() != 0) { + // int32 func = 3; + if (this->_internal_func() != 0) { target = stream->EnsureSpace(target); - target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_function(), target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt32ToArray(3, this->_internal_func(), target); } // int32 virtual_function = 4; @@ -267,9 +267,9 @@ size_t NvmeControllerPciId::ByteSizeLong() const { total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_device()); } - // int32 function = 3; - if (this->_internal_function() != 0) { - total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_function()); + // int32 func = 3; + if (this->_internal_func() != 0) { + total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32SizePlusOne(this->_internal_func()); } // int32 virtual_function = 4; @@ -305,8 +305,8 @@ void NvmeControllerPciId::MergeFrom(const NvmeControllerPciId& from) { if (from._internal_device() != 0) { _internal_set_device(from._internal_device()); } - if (from._internal_function() != 0) { - _internal_set_function(from._internal_function()); + if (from._internal_func() != 0) { + _internal_set_func(from._internal_func()); } if (from._internal_virtual_function() != 0) { _internal_set_virtual_function(from._internal_virtual_function()); diff --git a/storage/v1alpha1/gen/cpp/common.pb.h b/storage/v1alpha1/gen/cpp/common.pb.h index 4df464c5..4f47dadd 100644 --- a/storage/v1alpha1/gen/cpp/common.pb.h +++ b/storage/v1alpha1/gen/cpp/common.pb.h @@ -195,7 +195,7 @@ class NvmeControllerPciId final : enum : int { kBusFieldNumber = 1, kDeviceFieldNumber = 2, - kFunctionFieldNumber = 3, + kFuncFieldNumber = 3, kVirtualFunctionFieldNumber = 4, }; // int32 bus = 1; @@ -216,13 +216,13 @@ class NvmeControllerPciId final : void _internal_set_device(int32_t value); public: - // int32 function = 3; - void clear_function(); - int32_t function() const; - void set_function(int32_t value); + // int32 func = 3; + void clear_func(); + int32_t func() const; + void set_func(int32_t value); private: - int32_t _internal_function() const; - void _internal_set_function(int32_t value); + int32_t _internal_func() const; + void _internal_set_func(int32_t value); public: // int32 virtual_function = 4; @@ -243,7 +243,7 @@ class NvmeControllerPciId final : typedef void DestructorSkippable_; int32_t bus_; int32_t device_; - int32_t function_; + int32_t func_; int32_t virtual_function_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_common_2eproto; @@ -299,24 +299,24 @@ inline void NvmeControllerPciId::set_device(int32_t value) { // @@protoc_insertion_point(field_set:opi_api.storage.v1.NvmeControllerPciId.device) } -// int32 function = 3; -inline void NvmeControllerPciId::clear_function() { - function_ = 0; +// int32 func = 3; +inline void NvmeControllerPciId::clear_func() { + func_ = 0; } -inline int32_t NvmeControllerPciId::_internal_function() const { - return function_; +inline int32_t NvmeControllerPciId::_internal_func() const { + return func_; } -inline int32_t NvmeControllerPciId::function() const { - // @@protoc_insertion_point(field_get:opi_api.storage.v1.NvmeControllerPciId.function) - return _internal_function(); +inline int32_t NvmeControllerPciId::func() const { + // @@protoc_insertion_point(field_get:opi_api.storage.v1.NvmeControllerPciId.func) + return _internal_func(); } -inline void NvmeControllerPciId::_internal_set_function(int32_t value) { +inline void NvmeControllerPciId::_internal_set_func(int32_t value) { - function_ = value; + func_ = value; } -inline void NvmeControllerPciId::set_function(int32_t value) { - _internal_set_function(value); - // @@protoc_insertion_point(field_set:opi_api.storage.v1.NvmeControllerPciId.function) +inline void NvmeControllerPciId::set_func(int32_t value) { + _internal_set_func(value); + // @@protoc_insertion_point(field_set:opi_api.storage.v1.NvmeControllerPciId.func) } // int32 virtual_function = 4; diff --git a/storage/v1alpha1/gen/go/backend_aio.pb.go b/storage/v1alpha1/gen/go/backend_aio.pb.go index 2be08d14..79e7dde9 100644 --- a/storage/v1alpha1/gen/go/backend_aio.pb.go +++ b/storage/v1alpha1/gen/go/backend_aio.pb.go @@ -36,12 +36,11 @@ type AioController struct { // handle is an opaque object handle that is not user settable. // handle will be returned with created object - Handle *_go.ObjectKey `protobuf:"bytes,1,opt,name=handle,proto3" json:"handle,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - BlockSize int64 `protobuf:"varint,3,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` - NumBlocks int64 `protobuf:"varint,4,opt,name=num_blocks,json=numBlocks,proto3" json:"num_blocks,omitempty"` - Uuid *_go.Uuid `protobuf:"bytes,5,opt,name=uuid,proto3" json:"uuid,omitempty"` - Filename string `protobuf:"bytes,6,opt,name=filename,proto3" json:"filename,omitempty"` + Handle *_go.ObjectKey `protobuf:"bytes,1,opt,name=handle,proto3" json:"handle,omitempty"` + BlockSize int64 `protobuf:"varint,2,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` + BlocksCount int64 `protobuf:"varint,3,opt,name=blocks_count,json=blocksCount,proto3" json:"blocks_count,omitempty"` + Uuid *_go.Uuid `protobuf:"bytes,4,opt,name=uuid,proto3" json:"uuid,omitempty"` + Filename string `protobuf:"bytes,5,opt,name=filename,proto3" json:"filename,omitempty"` } func (x *AioController) Reset() { @@ -83,13 +82,6 @@ func (x *AioController) GetHandle() *_go.ObjectKey { return nil } -func (x *AioController) GetName() string { - if x != nil { - return x.Name - } - return "" -} - func (x *AioController) GetBlockSize() int64 { if x != nil { return x.BlockSize @@ -97,9 +89,9 @@ func (x *AioController) GetBlockSize() int64 { return 0 } -func (x *AioController) GetNumBlocks() int64 { +func (x *AioController) GetBlocksCount() int64 { if x != nil { - return x.NumBlocks + return x.BlocksCount } return 0 } @@ -549,20 +541,19 @@ var file_backend_aio_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x75, 0x75, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xe0, 0x01, 0x0a, 0x0d, 0x41, 0x69, 0x6f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0xd0, 0x01, 0x0a, 0x0d, 0x41, 0x69, 0x6f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x34, 0x0a, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x4b, - 0x65, 0x79, 0x52, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, - 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, - 0x0a, 0x6e, 0x75, 0x6d, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x09, 0x6e, 0x75, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x2b, 0x0a, 0x04, - 0x75, 0x75, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, 0x70, 0x69, + 0x65, 0x79, 0x52, 0x06, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, + 0x63, 0x6b, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2b, 0x0a, 0x04, + 0x75, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x75, 0x69, 0x64, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, - 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, + 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x57, 0x0a, 0x1a, 0x41, 0x69, 0x6f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x39, 0x0a, 0x06, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, diff --git a/storage/v1alpha1/gen/go/backend_null.pb.go b/storage/v1alpha1/gen/go/backend_null.pb.go index eb78efd6..29d3380e 100644 --- a/storage/v1alpha1/gen/go/backend_null.pb.go +++ b/storage/v1alpha1/gen/go/backend_null.pb.go @@ -33,11 +33,10 @@ type NullDebug struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - BlockSize int64 `protobuf:"varint,3,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` - NumBlocks int64 `protobuf:"varint,4,opt,name=num_blocks,json=numBlocks,proto3" json:"num_blocks,omitempty"` - Uuid *_go.Uuid `protobuf:"bytes,5,opt,name=uuid,proto3" json:"uuid,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + BlockSize int64 `protobuf:"varint,2,opt,name=block_size,json=blockSize,proto3" json:"block_size,omitempty"` + BlocksCount int64 `protobuf:"varint,3,opt,name=blocks_count,json=blocksCount,proto3" json:"blocks_count,omitempty"` + Uuid *_go.Uuid `protobuf:"bytes,4,opt,name=uuid,proto3" json:"uuid,omitempty"` } func (x *NullDebug) Reset() { @@ -79,13 +78,6 @@ func (x *NullDebug) GetId() int64 { return 0 } -func (x *NullDebug) GetName() string { - if x != nil { - return x.Name - } - return "" -} - func (x *NullDebug) GetBlockSize() int64 { if x != nil { return x.BlockSize @@ -93,9 +85,9 @@ func (x *NullDebug) GetBlockSize() int64 { return 0 } -func (x *NullDebug) GetNumBlocks() int64 { +func (x *NullDebug) GetBlocksCount() int64 { if x != nil { - return x.NumBlocks + return x.BlocksCount } return 0 } @@ -650,14 +642,13 @@ var file_backend_null_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x10, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x75, 0x75, 0x69, 0x64, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9a, 0x01, 0x0a, 0x09, 0x4e, 0x75, 0x6c, 0x6c, 0x44, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, 0x01, 0x0a, 0x09, 0x4e, 0x75, 0x6c, 0x6c, 0x44, 0x65, 0x62, 0x75, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, - 0x6b, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x6c, - 0x6f, 0x63, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6e, 0x75, 0x6d, 0x5f, 0x62, - 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6e, 0x75, 0x6d, - 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x2b, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x05, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, + 0x69, 0x7a, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x5f, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, + 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2b, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x75, 0x69, 0x64, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x22, 0x4f, 0x0a, 0x16, 0x4e, 0x75, 0x6c, 0x6c, 0x44, 0x65, 0x62, 0x75, 0x67, diff --git a/storage/v1alpha1/gen/go/backend_nvme_tcp.pb.go b/storage/v1alpha1/gen/go/backend_nvme_tcp.pb.go index c228fdc0..e258b209 100644 --- a/storage/v1alpha1/gen/go/backend_nvme_tcp.pb.go +++ b/storage/v1alpha1/gen/go/backend_nvme_tcp.pb.go @@ -30,28 +30,31 @@ const ( type NvmeTransportType int32 const ( - NvmeTransportType_NVME_TRANSPORT_FC NvmeTransportType = 0 - NvmeTransportType_NVME_TRANSPORT_PCIE NvmeTransportType = 1 - NvmeTransportType_NVME_TRANSPORT_RDMA NvmeTransportType = 2 - NvmeTransportType_NVME_TRANSPORT_TCP NvmeTransportType = 3 - NvmeTransportType_NVME_TRANSPORT_CUSTOM NvmeTransportType = 4 + NvmeTransportType_NVME_TRANSPORT_TYPE_UNSPECIFIED NvmeTransportType = 0 + NvmeTransportType_NVME_TRANSPORT_FC NvmeTransportType = 1 + NvmeTransportType_NVME_TRANSPORT_PCIE NvmeTransportType = 2 + NvmeTransportType_NVME_TRANSPORT_RDMA NvmeTransportType = 3 + NvmeTransportType_NVME_TRANSPORT_TCP NvmeTransportType = 4 + NvmeTransportType_NVME_TRANSPORT_CUSTOM NvmeTransportType = 5 ) // Enum value maps for NvmeTransportType. var ( NvmeTransportType_name = map[int32]string{ - 0: "NVME_TRANSPORT_FC", - 1: "NVME_TRANSPORT_PCIE", - 2: "NVME_TRANSPORT_RDMA", - 3: "NVME_TRANSPORT_TCP", - 4: "NVME_TRANSPORT_CUSTOM", + 0: "NVME_TRANSPORT_TYPE_UNSPECIFIED", + 1: "NVME_TRANSPORT_FC", + 2: "NVME_TRANSPORT_PCIE", + 3: "NVME_TRANSPORT_RDMA", + 4: "NVME_TRANSPORT_TCP", + 5: "NVME_TRANSPORT_CUSTOM", } NvmeTransportType_value = map[string]int32{ - "NVME_TRANSPORT_FC": 0, - "NVME_TRANSPORT_PCIE": 1, - "NVME_TRANSPORT_RDMA": 2, - "NVME_TRANSPORT_TCP": 3, - "NVME_TRANSPORT_CUSTOM": 4, + "NVME_TRANSPORT_TYPE_UNSPECIFIED": 0, + "NVME_TRANSPORT_FC": 1, + "NVME_TRANSPORT_PCIE": 2, + "NVME_TRANSPORT_RDMA": 3, + "NVME_TRANSPORT_TCP": 4, + "NVME_TRANSPORT_CUSTOM": 5, } ) @@ -85,28 +88,31 @@ func (NvmeTransportType) EnumDescriptor() ([]byte, []int) { type NvmeAddressFamily int32 const ( - NvmeAddressFamily_NVMF_ADRFAM_IPV4 NvmeAddressFamily = 0 - NvmeAddressFamily_NVMF_ADRFAM_IPV6 NvmeAddressFamily = 1 - NvmeAddressFamily_NVMF_ADRFAM_IB NvmeAddressFamily = 2 - NvmeAddressFamily_NVMF_ADRFAM_FC NvmeAddressFamily = 3 - NvmeAddressFamily_NVMF_ADRFAM_INTRA_HOST NvmeAddressFamily = 4 + NvmeAddressFamily_NVME_ADDRESS_FAMILY_UNSPECIFIED NvmeAddressFamily = 0 + NvmeAddressFamily_NVMF_ADRFAM_IPV4 NvmeAddressFamily = 1 + NvmeAddressFamily_NVMF_ADRFAM_IPV6 NvmeAddressFamily = 2 + NvmeAddressFamily_NVMF_ADRFAM_IB NvmeAddressFamily = 3 + NvmeAddressFamily_NVMF_ADRFAM_FC NvmeAddressFamily = 4 + NvmeAddressFamily_NVMF_ADRFAM_INTRA_HOST NvmeAddressFamily = 5 ) // Enum value maps for NvmeAddressFamily. var ( NvmeAddressFamily_name = map[int32]string{ - 0: "NVMF_ADRFAM_IPV4", - 1: "NVMF_ADRFAM_IPV6", - 2: "NVMF_ADRFAM_IB", - 3: "NVMF_ADRFAM_FC", - 4: "NVMF_ADRFAM_INTRA_HOST", + 0: "NVME_ADDRESS_FAMILY_UNSPECIFIED", + 1: "NVMF_ADRFAM_IPV4", + 2: "NVMF_ADRFAM_IPV6", + 3: "NVMF_ADRFAM_IB", + 4: "NVMF_ADRFAM_FC", + 5: "NVMF_ADRFAM_INTRA_HOST", } NvmeAddressFamily_value = map[string]int32{ - "NVMF_ADRFAM_IPV4": 0, - "NVMF_ADRFAM_IPV6": 1, - "NVMF_ADRFAM_IB": 2, - "NVMF_ADRFAM_FC": 3, - "NVMF_ADRFAM_INTRA_HOST": 4, + "NVME_ADDRESS_FAMILY_UNSPECIFIED": 0, + "NVMF_ADRFAM_IPV4": 1, + "NVMF_ADRFAM_IPV6": 2, + "NVMF_ADRFAM_IB": 3, + "NVMF_ADRFAM_FC": 4, + "NVMF_ADRFAM_INTRA_HOST": 5, } ) @@ -140,22 +146,25 @@ func (NvmeAddressFamily) EnumDescriptor() ([]byte, []int) { type NvmeMultipath int32 const ( - NvmeMultipath_NVME_MPIO_DISABLE NvmeMultipath = 0 - NvmeMultipath_NVME_MPIO_FAILOVER NvmeMultipath = 1 - NvmeMultipath_NVME_MPIO_MULTIPATH NvmeMultipath = 2 + NvmeMultipath_NVME_MULTIPATH_UNSPECIFIED NvmeMultipath = 0 + NvmeMultipath_NVME_MULTIPATH_DISABLE NvmeMultipath = 1 + NvmeMultipath_NVME_MULTIPATH_FAILOVER NvmeMultipath = 2 + NvmeMultipath_NVME_MULTIPATH_MULTIPATH NvmeMultipath = 3 ) // Enum value maps for NvmeMultipath. var ( NvmeMultipath_name = map[int32]string{ - 0: "NVME_MPIO_DISABLE", - 1: "NVME_MPIO_FAILOVER", - 2: "NVME_MPIO_MULTIPATH", + 0: "NVME_MULTIPATH_UNSPECIFIED", + 1: "NVME_MULTIPATH_DISABLE", + 2: "NVME_MULTIPATH_FAILOVER", + 3: "NVME_MULTIPATH_MULTIPATH", } NvmeMultipath_value = map[string]int32{ - "NVME_MPIO_DISABLE": 0, - "NVME_MPIO_FAILOVER": 1, - "NVME_MPIO_MULTIPATH": 2, + "NVME_MULTIPATH_UNSPECIFIED": 0, + "NVME_MULTIPATH_DISABLE": 1, + "NVME_MULTIPATH_FAILOVER": 2, + "NVME_MULTIPATH_MULTIPATH": 3, } ) @@ -191,17 +200,17 @@ type NVMfRemoteController struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Trtype NvmeTransportType `protobuf:"varint,2,opt,name=trtype,proto3,enum=opi_api.storage.v1.NvmeTransportType" json:"trtype,omitempty"` - Adrfam NvmeAddressFamily `protobuf:"varint,3,opt,name=adrfam,proto3,enum=opi_api.storage.v1.NvmeAddressFamily" json:"adrfam,omitempty"` - Traddr string `protobuf:"bytes,4,opt,name=traddr,proto3" json:"traddr,omitempty"` - Trsvcid int64 `protobuf:"varint,5,opt,name=trsvcid,proto3" json:"trsvcid,omitempty"` - Subnqn string `protobuf:"bytes,6,opt,name=subnqn,proto3" json:"subnqn,omitempty"` - Hdgst bool `protobuf:"varint,7,opt,name=hdgst,proto3" json:"hdgst,omitempty"` - Ddgst bool `protobuf:"varint,8,opt,name=ddgst,proto3" json:"ddgst,omitempty"` - Multipath NvmeMultipath `protobuf:"varint,9,opt,name=multipath,proto3,enum=opi_api.storage.v1.NvmeMultipath" json:"multipath,omitempty"` - NumIoQueues int64 `protobuf:"varint,10,opt,name=num_io_queues,json=numIoQueues,proto3" json:"num_io_queues,omitempty"` - QueueSize int64 `protobuf:"varint,11,opt,name=queue_size,json=queueSize,proto3" json:"queue_size,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Trtype NvmeTransportType `protobuf:"varint,2,opt,name=trtype,proto3,enum=opi_api.storage.v1.NvmeTransportType" json:"trtype,omitempty"` + Adrfam NvmeAddressFamily `protobuf:"varint,3,opt,name=adrfam,proto3,enum=opi_api.storage.v1.NvmeAddressFamily" json:"adrfam,omitempty"` + Traddr string `protobuf:"bytes,4,opt,name=traddr,proto3" json:"traddr,omitempty"` + Trsvcid int64 `protobuf:"varint,5,opt,name=trsvcid,proto3" json:"trsvcid,omitempty"` + Subnqn string `protobuf:"bytes,6,opt,name=subnqn,proto3" json:"subnqn,omitempty"` + Hdgst bool `protobuf:"varint,7,opt,name=hdgst,proto3" json:"hdgst,omitempty"` + Ddgst bool `protobuf:"varint,8,opt,name=ddgst,proto3" json:"ddgst,omitempty"` + Multipath NvmeMultipath `protobuf:"varint,9,opt,name=multipath,proto3,enum=opi_api.storage.v1.NvmeMultipath" json:"multipath,omitempty"` + IoQueuesCount int64 `protobuf:"varint,10,opt,name=io_queues_count,json=ioQueuesCount,proto3" json:"io_queues_count,omitempty"` + QueueSize int64 `protobuf:"varint,11,opt,name=queue_size,json=queueSize,proto3" json:"queue_size,omitempty"` } func (x *NVMfRemoteController) Reset() { @@ -247,14 +256,14 @@ func (x *NVMfRemoteController) GetTrtype() NvmeTransportType { if x != nil { return x.Trtype } - return NvmeTransportType_NVME_TRANSPORT_FC + return NvmeTransportType_NVME_TRANSPORT_TYPE_UNSPECIFIED } func (x *NVMfRemoteController) GetAdrfam() NvmeAddressFamily { if x != nil { return x.Adrfam } - return NvmeAddressFamily_NVMF_ADRFAM_IPV4 + return NvmeAddressFamily_NVME_ADDRESS_FAMILY_UNSPECIFIED } func (x *NVMfRemoteController) GetTraddr() string { @@ -296,12 +305,12 @@ func (x *NVMfRemoteController) GetMultipath() NvmeMultipath { if x != nil { return x.Multipath } - return NvmeMultipath_NVME_MPIO_DISABLE + return NvmeMultipath_NVME_MULTIPATH_UNSPECIFIED } -func (x *NVMfRemoteController) GetNumIoQueues() int64 { +func (x *NVMfRemoteController) GetIoQueuesCount() int64 { if x != nil { - return x.NumIoQueues + return x.IoQueuesCount } return 0 } @@ -863,7 +872,7 @@ var File_backend_nvme_tcp_proto protoreflect.FileDescriptor var file_backend_nvme_tcp_proto_rawDesc = []byte{ 0x0a, 0x16, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x6e, 0x76, 0x6d, 0x65, 0x5f, 0x74, 0x63, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, - 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x22, 0x9e, 0x03, 0x0a, + 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x22, 0xa2, 0x03, 0x0a, 0x14, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x3d, 0x0a, 0x06, 0x74, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, @@ -885,144 +894,151 @@ var file_backend_nvme_tcp_proto_rawDesc = []byte{ 0x74, 0x69, 0x70, 0x61, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x76, 0x6d, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x74, 0x68, 0x52, - 0x09, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x74, 0x68, 0x12, 0x22, 0x0a, 0x0d, 0x6e, 0x75, - 0x6d, 0x5f, 0x69, 0x6f, 0x5f, 0x71, 0x75, 0x65, 0x75, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0b, 0x6e, 0x75, 0x6d, 0x49, 0x6f, 0x51, 0x75, 0x65, 0x75, 0x65, 0x73, 0x12, 0x1d, - 0x0a, 0x0a, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x09, 0x71, 0x75, 0x65, 0x75, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x62, 0x0a, - 0x22, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x04, 0x63, 0x74, 0x72, - 0x6c, 0x22, 0x25, 0x0a, 0x23, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, + 0x09, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x61, 0x74, 0x68, 0x12, 0x26, 0x0a, 0x0f, 0x69, 0x6f, + 0x5f, 0x71, 0x75, 0x65, 0x75, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0d, 0x69, 0x6f, 0x51, 0x75, 0x65, 0x75, 0x65, 0x73, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, + 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x71, 0x75, 0x65, 0x75, 0x65, 0x53, 0x69, 0x7a, + 0x65, 0x22, 0x62, 0x0a, 0x22, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x37, 0x0a, 0x25, 0x4e, 0x56, 0x4d, 0x66, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, + 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, + 0x04, 0x63, 0x74, 0x72, 0x6c, 0x22, 0x25, 0x0a, 0x23, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, + 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, + 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x37, 0x0a, 0x25, + 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x28, 0x0a, 0x26, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, + 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x32, 0x0a, 0x20, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x02, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x21, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, + 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x0a, 0x1f, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, - 0x64, 0x22, 0x28, 0x0a, 0x26, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, - 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x0a, 0x20, 0x4e, - 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, - 0x23, 0x0a, 0x21, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x31, 0x0a, 0x1f, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x60, 0x0a, 0x20, 0x4e, 0x56, 0x4d, 0x66, 0x52, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3c, 0x0a, 0x04, 0x63, - 0x74, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, - 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, - 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x52, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x22, 0x30, 0x0a, 0x1e, 0x4e, 0x56, 0x4d, - 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x5f, 0x0a, 0x1f, 0x4e, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x60, 0x0a, 0x20, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3c, - 0x0a, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, - 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x22, 0x32, 0x0a, 0x20, - 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, - 0x22, 0x49, 0x0a, 0x21, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2a, 0x8f, 0x01, 0x0a, 0x11, - 0x4e, 0x76, 0x6d, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x15, 0x0a, 0x11, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, - 0x4f, 0x52, 0x54, 0x5f, 0x46, 0x43, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x45, - 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x50, 0x43, 0x49, 0x45, 0x10, - 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, - 0x4f, 0x52, 0x54, 0x5f, 0x52, 0x44, 0x4d, 0x41, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x4e, 0x56, - 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x43, 0x50, - 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, - 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x43, 0x55, 0x53, 0x54, 0x4f, 0x4d, 0x10, 0x04, 0x2a, 0x83, 0x01, - 0x0a, 0x11, 0x4e, 0x76, 0x6d, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x46, 0x61, 0x6d, - 0x69, 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x56, 0x4d, 0x46, 0x5f, 0x41, 0x44, 0x52, 0x46, - 0x41, 0x4d, 0x5f, 0x49, 0x50, 0x56, 0x34, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x56, 0x4d, - 0x46, 0x5f, 0x41, 0x44, 0x52, 0x46, 0x41, 0x4d, 0x5f, 0x49, 0x50, 0x56, 0x36, 0x10, 0x01, 0x12, - 0x12, 0x0a, 0x0e, 0x4e, 0x56, 0x4d, 0x46, 0x5f, 0x41, 0x44, 0x52, 0x46, 0x41, 0x4d, 0x5f, 0x49, - 0x42, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x56, 0x4d, 0x46, 0x5f, 0x41, 0x44, 0x52, 0x46, - 0x41, 0x4d, 0x5f, 0x46, 0x43, 0x10, 0x03, 0x12, 0x1a, 0x0a, 0x16, 0x4e, 0x56, 0x4d, 0x46, 0x5f, - 0x41, 0x44, 0x52, 0x46, 0x41, 0x4d, 0x5f, 0x49, 0x4e, 0x54, 0x52, 0x41, 0x5f, 0x48, 0x4f, 0x53, - 0x54, 0x10, 0x04, 0x2a, 0x57, 0x0a, 0x0d, 0x4e, 0x76, 0x6d, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, - 0x70, 0x61, 0x74, 0x68, 0x12, 0x15, 0x0a, 0x11, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x4d, 0x50, 0x49, - 0x4f, 0x5f, 0x44, 0x49, 0x53, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x4e, - 0x56, 0x4d, 0x45, 0x5f, 0x4d, 0x50, 0x49, 0x4f, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x4f, 0x56, 0x45, - 0x52, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x4d, 0x50, 0x49, 0x4f, - 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x54, 0x48, 0x10, 0x02, 0x32, 0xf7, 0x06, 0x0a, - 0x1b, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x90, 0x01, 0x0a, - 0x1b, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x36, 0x2e, 0x6f, - 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, - 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, - 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, - 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x99, 0x01, 0x0a, 0x1e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, - 0x63, 0x74, 0x12, 0x39, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, - 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, - 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, + 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x3c, 0x0a, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8a, 0x01, 0x0a, 0x19, - 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x12, 0x34, 0x2e, 0x6f, 0x70, 0x69, 0x5f, - 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x22, 0x30, 0x0a, + 0x1e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, + 0x5f, 0x0a, 0x1f, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x3c, 0x0a, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x28, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x04, 0x63, 0x74, 0x72, 0x6c, + 0x22, 0x32, 0x0a, 0x20, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x02, 0x69, 0x64, 0x22, 0x49, 0x0a, 0x21, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, + 0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2a, + 0xb4, 0x01, 0x0a, 0x11, 0x4e, 0x76, 0x6d, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, + 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x1f, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x54, 0x52, + 0x41, 0x4e, 0x53, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, + 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x4e, 0x56, + 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x46, 0x43, 0x10, + 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, + 0x4f, 0x52, 0x54, 0x5f, 0x50, 0x43, 0x49, 0x45, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x56, + 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x52, 0x44, 0x4d, + 0x41, 0x10, 0x03, 0x12, 0x16, 0x0a, 0x12, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, + 0x53, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x54, 0x43, 0x50, 0x10, 0x04, 0x12, 0x19, 0x0a, 0x15, 0x4e, + 0x56, 0x4d, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x43, 0x55, + 0x53, 0x54, 0x4f, 0x4d, 0x10, 0x05, 0x2a, 0xa8, 0x01, 0x0a, 0x11, 0x4e, 0x76, 0x6d, 0x65, 0x41, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x46, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x12, 0x23, 0x0a, 0x1f, + 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x41, 0x44, 0x44, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x46, 0x41, 0x4d, + 0x49, 0x4c, 0x59, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, + 0x00, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x56, 0x4d, 0x46, 0x5f, 0x41, 0x44, 0x52, 0x46, 0x41, 0x4d, + 0x5f, 0x49, 0x50, 0x56, 0x34, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x56, 0x4d, 0x46, 0x5f, + 0x41, 0x44, 0x52, 0x46, 0x41, 0x4d, 0x5f, 0x49, 0x50, 0x56, 0x36, 0x10, 0x02, 0x12, 0x12, 0x0a, + 0x0e, 0x4e, 0x56, 0x4d, 0x46, 0x5f, 0x41, 0x44, 0x52, 0x46, 0x41, 0x4d, 0x5f, 0x49, 0x42, 0x10, + 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x56, 0x4d, 0x46, 0x5f, 0x41, 0x44, 0x52, 0x46, 0x41, 0x4d, + 0x5f, 0x46, 0x43, 0x10, 0x04, 0x12, 0x1a, 0x0a, 0x16, 0x4e, 0x56, 0x4d, 0x46, 0x5f, 0x41, 0x44, + 0x52, 0x46, 0x41, 0x4d, 0x5f, 0x49, 0x4e, 0x54, 0x52, 0x41, 0x5f, 0x48, 0x4f, 0x53, 0x54, 0x10, + 0x05, 0x2a, 0x86, 0x01, 0x0a, 0x0d, 0x4e, 0x76, 0x6d, 0x65, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, + 0x61, 0x74, 0x68, 0x12, 0x1e, 0x0a, 0x1a, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, + 0x49, 0x50, 0x41, 0x54, 0x48, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, + 0x44, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x16, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, + 0x49, 0x50, 0x41, 0x54, 0x48, 0x5f, 0x44, 0x49, 0x53, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x01, 0x12, + 0x1b, 0x0a, 0x17, 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x54, + 0x48, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x4f, 0x56, 0x45, 0x52, 0x10, 0x02, 0x12, 0x1c, 0x0a, 0x18, + 0x4e, 0x56, 0x4d, 0x45, 0x5f, 0x4d, 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x54, 0x48, 0x5f, 0x4d, + 0x55, 0x4c, 0x54, 0x49, 0x50, 0x41, 0x54, 0x48, 0x10, 0x03, 0x32, 0xf7, 0x06, 0x0a, 0x1b, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x35, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x87, 0x01, 0x0a, 0x18, 0x4e, 0x56, 0x4d, - 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x33, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6f, 0x70, 0x69, + 0x6c, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x90, 0x01, 0x0a, 0x1b, 0x4e, + 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x36, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x17, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x12, 0x32, - 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x33, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, + 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x99, 0x01, + 0x0a, 0x1e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, + 0x12, 0x39, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, + 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x6f, 0x70, + 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8a, 0x01, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x34, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, + 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x12, 0x34, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, + 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x62, 0x0a, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, - 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x13, 0x42, 0x61, - 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x4e, 0x76, 0x6d, 0x65, 0x54, 0x63, 0x70, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x6f, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, - 0x70, 0x69, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, - 0x68, 0x61, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x87, 0x01, 0x0a, 0x18, 0x4e, 0x56, 0x4d, 0x66, 0x52, + 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, + 0x69, 0x73, 0x74, 0x12, 0x33, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, + 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, + 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, + 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, + 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x84, 0x01, 0x0a, 0x17, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x12, 0x32, 0x2e, 0x6f, + 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x33, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, + 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8a, 0x01, 0x0a, 0x19, 0x4e, 0x56, 0x4d, 0x66, + 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, + 0x53, 0x74, 0x61, 0x74, 0x73, 0x12, 0x34, 0x2e, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, + 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, + 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x6f, 0x70, + 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x4e, 0x56, 0x4d, 0x66, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x42, 0x62, 0x0a, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, + 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x13, 0x42, 0x61, 0x63, 0x6b, + 0x65, 0x6e, 0x64, 0x4e, 0x76, 0x6d, 0x65, 0x54, 0x63, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, + 0x69, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, + 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, + 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/storage/v1alpha1/gen/go/common.pb.go b/storage/v1alpha1/gen/go/common.pb.go index 3e17bfaa..f1eb4e05 100644 --- a/storage/v1alpha1/gen/go/common.pb.go +++ b/storage/v1alpha1/gen/go/common.pb.go @@ -39,7 +39,7 @@ type NvmeControllerPciId struct { // Device number, based on the NVMe device layout Device int32 `protobuf:"varint,2,opt,name=device,proto3" json:"device,omitempty"` // Physical function, always set to 0 in current model - Function int32 `protobuf:"varint,3,opt,name=function,proto3" json:"function,omitempty"` + Func int32 `protobuf:"varint,3,opt,name=func,proto3" json:"func,omitempty"` // SRIOV Virtual function within the Device and Physical function. // Set to 0 for Physical Function. Virtual Function numbering starts from 1 VirtualFunction int32 `protobuf:"varint,4,opt,name=virtual_function,json=virtualFunction,proto3" json:"virtual_function,omitempty"` @@ -91,9 +91,9 @@ func (x *NvmeControllerPciId) GetDevice() int32 { return 0 } -func (x *NvmeControllerPciId) GetFunction() int32 { +func (x *NvmeControllerPciId) GetFunc() int32 { if x != nil { - return x.Function + return x.Func } return 0 } @@ -110,21 +110,21 @@ var File_common_proto protoreflect.FileDescriptor var file_common_proto_rawDesc = []byte{ 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, - 0x76, 0x31, 0x22, 0x86, 0x01, 0x0a, 0x13, 0x4e, 0x76, 0x6d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x50, 0x63, 0x69, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x75, - 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x62, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, - 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x64, 0x65, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x29, 0x0a, 0x10, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x76, 0x69, 0x72, 0x74, - 0x75, 0x61, 0x6c, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x5a, 0x0a, 0x12, 0x6f, - 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, - 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, - 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, - 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, - 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, - 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x31, 0x22, 0x7e, 0x0a, 0x13, 0x4e, 0x76, 0x6d, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x50, 0x63, 0x69, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x75, 0x73, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x62, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x64, + 0x65, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x64, 0x65, 0x76, + 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75, 0x6e, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x66, 0x75, 0x6e, 0x63, 0x12, 0x29, 0x0a, 0x10, 0x76, 0x69, 0x72, 0x74, 0x75, + 0x61, 0x6c, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x0f, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x42, 0x5a, 0x0a, 0x12, 0x6f, 0x70, 0x69, 0x5f, 0x61, 0x70, 0x69, 0x2e, 0x73, 0x74, + 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x69, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2f, 0x6f, + 0x70, 0x69, 0x2d, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x76, + 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x6f, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/AioController.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/AioController.java index 6f2d9c69..690b9b36 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/AioController.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/AioController.java @@ -16,7 +16,6 @@ private AioController(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } private AioController() { - name_ = ""; filename_ = ""; } @@ -63,23 +62,17 @@ private AioController( break; } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 24: { + case 16: { blockSize_ = input.readInt64(); break; } - case 32: { + case 24: { - numBlocks_ = input.readInt64(); + blocksCount_ = input.readInt64(); break; } - case 42: { + case 34: { opi_api.common.v1.Uuid.Builder subBuilder = null; if (uuid_ != null) { subBuilder = uuid_.toBuilder(); @@ -92,7 +85,7 @@ private AioController( break; } - case 50: { + case 42: { java.lang.String s = input.readStringRequireUtf8(); filename_ = s; @@ -171,48 +164,10 @@ public opi_api.common.v1.ObjectKeyOrBuilder getHandleOrBuilder() { return getHandle(); } - public static final int NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object name_; - /** - * string name = 2; - * @return The name. - */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int BLOCK_SIZE_FIELD_NUMBER = 3; + public static final int BLOCK_SIZE_FIELD_NUMBER = 2; private long blockSize_; /** - * int64 block_size = 3; + * int64 block_size = 2; * @return The blockSize. */ @java.lang.Override @@ -220,21 +175,21 @@ public long getBlockSize() { return blockSize_; } - public static final int NUM_BLOCKS_FIELD_NUMBER = 4; - private long numBlocks_; + public static final int BLOCKS_COUNT_FIELD_NUMBER = 3; + private long blocksCount_; /** - * int64 num_blocks = 4; - * @return The numBlocks. + * int64 blocks_count = 3; + * @return The blocksCount. */ @java.lang.Override - public long getNumBlocks() { - return numBlocks_; + public long getBlocksCount() { + return blocksCount_; } - public static final int UUID_FIELD_NUMBER = 5; + public static final int UUID_FIELD_NUMBER = 4; private opi_api.common.v1.Uuid uuid_; /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return Whether the uuid field is set. */ @java.lang.Override @@ -242,7 +197,7 @@ public boolean hasUuid() { return uuid_ != null; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return The uuid. */ @java.lang.Override @@ -250,17 +205,17 @@ public opi_api.common.v1.Uuid getUuid() { return uuid_ == null ? opi_api.common.v1.Uuid.getDefaultInstance() : uuid_; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ @java.lang.Override public opi_api.common.v1.UuidOrBuilder getUuidOrBuilder() { return getUuid(); } - public static final int FILENAME_FIELD_NUMBER = 6; + public static final int FILENAME_FIELD_NUMBER = 5; private volatile java.lang.Object filename_; /** - * string filename = 6; + * string filename = 5; * @return The filename. */ @java.lang.Override @@ -277,7 +232,7 @@ public java.lang.String getFilename() { } } /** - * string filename = 6; + * string filename = 5; * @return The bytes for filename. */ @java.lang.Override @@ -312,20 +267,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (handle_ != null) { output.writeMessage(1, getHandle()); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); - } if (blockSize_ != 0L) { - output.writeInt64(3, blockSize_); + output.writeInt64(2, blockSize_); } - if (numBlocks_ != 0L) { - output.writeInt64(4, numBlocks_); + if (blocksCount_ != 0L) { + output.writeInt64(3, blocksCount_); } if (uuid_ != null) { - output.writeMessage(5, getUuid()); + output.writeMessage(4, getUuid()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filename_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, filename_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, filename_); } unknownFields.writeTo(output); } @@ -340,23 +292,20 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getHandle()); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); - } if (blockSize_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(3, blockSize_); + .computeInt64Size(2, blockSize_); } - if (numBlocks_ != 0L) { + if (blocksCount_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(4, numBlocks_); + .computeInt64Size(3, blocksCount_); } if (uuid_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getUuid()); + .computeMessageSize(4, getUuid()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filename_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, filename_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, filename_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -378,12 +327,10 @@ public boolean equals(final java.lang.Object obj) { if (!getHandle() .equals(other.getHandle())) return false; } - if (!getName() - .equals(other.getName())) return false; if (getBlockSize() != other.getBlockSize()) return false; - if (getNumBlocks() - != other.getNumBlocks()) return false; + if (getBlocksCount() + != other.getBlocksCount()) return false; if (hasUuid() != other.hasUuid()) return false; if (hasUuid()) { if (!getUuid() @@ -406,14 +353,12 @@ public int hashCode() { hash = (37 * hash) + HANDLE_FIELD_NUMBER; hash = (53 * hash) + getHandle().hashCode(); } - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getName().hashCode(); hash = (37 * hash) + BLOCK_SIZE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getBlockSize()); - hash = (37 * hash) + NUM_BLOCKS_FIELD_NUMBER; + hash = (37 * hash) + BLOCKS_COUNT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getNumBlocks()); + getBlocksCount()); if (hasUuid()) { hash = (37 * hash) + UUID_FIELD_NUMBER; hash = (53 * hash) + getUuid().hashCode(); @@ -559,11 +504,9 @@ public Builder clear() { handle_ = null; handleBuilder_ = null; } - name_ = ""; - blockSize_ = 0L; - numBlocks_ = 0L; + blocksCount_ = 0L; if (uuidBuilder_ == null) { uuid_ = null; @@ -604,9 +547,8 @@ public opi_api.storage.v1.AioController buildPartial() { } else { result.handle_ = handleBuilder_.build(); } - result.name_ = name_; result.blockSize_ = blockSize_; - result.numBlocks_ = numBlocks_; + result.blocksCount_ = blocksCount_; if (uuidBuilder_ == null) { result.uuid_ = uuid_; } else { @@ -664,15 +606,11 @@ public Builder mergeFrom(opi_api.storage.v1.AioController other) { if (other.hasHandle()) { mergeHandle(other.getHandle()); } - if (!other.getName().isEmpty()) { - name_ = other.name_; - onChanged(); - } if (other.getBlockSize() != 0L) { setBlockSize(other.getBlockSize()); } - if (other.getNumBlocks() != 0L) { - setNumBlocks(other.getNumBlocks()); + if (other.getBlocksCount() != 0L) { + setBlocksCount(other.getBlocksCount()); } if (other.hasUuid()) { mergeUuid(other.getUuid()); @@ -874,85 +812,9 @@ public opi_api.common.v1.ObjectKeyOrBuilder getHandleOrBuilder() { return handleBuilder_; } - private java.lang.Object name_ = ""; - /** - * string name = 2; - * @return The name. - */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * string name = 2; - * @param value The name to set. - * @return This builder for chaining. - */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - name_ = value; - onChanged(); - return this; - } - /** - * string name = 2; - * @return This builder for chaining. - */ - public Builder clearName() { - - name_ = getDefaultInstance().getName(); - onChanged(); - return this; - } - /** - * string name = 2; - * @param value The bytes for name to set. - * @return This builder for chaining. - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - name_ = value; - onChanged(); - return this; - } - private long blockSize_ ; /** - * int64 block_size = 3; + * int64 block_size = 2; * @return The blockSize. */ @java.lang.Override @@ -960,7 +822,7 @@ public long getBlockSize() { return blockSize_; } /** - * int64 block_size = 3; + * int64 block_size = 2; * @param value The blockSize to set. * @return This builder for chaining. */ @@ -971,7 +833,7 @@ public Builder setBlockSize(long value) { return this; } /** - * int64 block_size = 3; + * int64 block_size = 2; * @return This builder for chaining. */ public Builder clearBlockSize() { @@ -981,33 +843,33 @@ public Builder clearBlockSize() { return this; } - private long numBlocks_ ; + private long blocksCount_ ; /** - * int64 num_blocks = 4; - * @return The numBlocks. + * int64 blocks_count = 3; + * @return The blocksCount. */ @java.lang.Override - public long getNumBlocks() { - return numBlocks_; + public long getBlocksCount() { + return blocksCount_; } /** - * int64 num_blocks = 4; - * @param value The numBlocks to set. + * int64 blocks_count = 3; + * @param value The blocksCount to set. * @return This builder for chaining. */ - public Builder setNumBlocks(long value) { + public Builder setBlocksCount(long value) { - numBlocks_ = value; + blocksCount_ = value; onChanged(); return this; } /** - * int64 num_blocks = 4; + * int64 blocks_count = 3; * @return This builder for chaining. */ - public Builder clearNumBlocks() { + public Builder clearBlocksCount() { - numBlocks_ = 0L; + blocksCount_ = 0L; onChanged(); return this; } @@ -1016,14 +878,14 @@ public Builder clearNumBlocks() { private com.google.protobuf.SingleFieldBuilderV3< opi_api.common.v1.Uuid, opi_api.common.v1.Uuid.Builder, opi_api.common.v1.UuidOrBuilder> uuidBuilder_; /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return Whether the uuid field is set. */ public boolean hasUuid() { return uuidBuilder_ != null || uuid_ != null; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return The uuid. */ public opi_api.common.v1.Uuid getUuid() { @@ -1034,7 +896,7 @@ public opi_api.common.v1.Uuid getUuid() { } } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder setUuid(opi_api.common.v1.Uuid value) { if (uuidBuilder_ == null) { @@ -1050,7 +912,7 @@ public Builder setUuid(opi_api.common.v1.Uuid value) { return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder setUuid( opi_api.common.v1.Uuid.Builder builderForValue) { @@ -1064,7 +926,7 @@ public Builder setUuid( return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder mergeUuid(opi_api.common.v1.Uuid value) { if (uuidBuilder_ == null) { @@ -1082,7 +944,7 @@ public Builder mergeUuid(opi_api.common.v1.Uuid value) { return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder clearUuid() { if (uuidBuilder_ == null) { @@ -1096,7 +958,7 @@ public Builder clearUuid() { return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public opi_api.common.v1.Uuid.Builder getUuidBuilder() { @@ -1104,7 +966,7 @@ public opi_api.common.v1.Uuid.Builder getUuidBuilder() { return getUuidFieldBuilder().getBuilder(); } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public opi_api.common.v1.UuidOrBuilder getUuidOrBuilder() { if (uuidBuilder_ != null) { @@ -1115,7 +977,7 @@ public opi_api.common.v1.UuidOrBuilder getUuidOrBuilder() { } } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ private com.google.protobuf.SingleFieldBuilderV3< opi_api.common.v1.Uuid, opi_api.common.v1.Uuid.Builder, opi_api.common.v1.UuidOrBuilder> @@ -1133,7 +995,7 @@ public opi_api.common.v1.UuidOrBuilder getUuidOrBuilder() { private java.lang.Object filename_ = ""; /** - * string filename = 6; + * string filename = 5; * @return The filename. */ public java.lang.String getFilename() { @@ -1149,7 +1011,7 @@ public java.lang.String getFilename() { } } /** - * string filename = 6; + * string filename = 5; * @return The bytes for filename. */ public com.google.protobuf.ByteString @@ -1166,7 +1028,7 @@ public java.lang.String getFilename() { } } /** - * string filename = 6; + * string filename = 5; * @param value The filename to set. * @return This builder for chaining. */ @@ -1181,7 +1043,7 @@ public Builder setFilename( return this; } /** - * string filename = 6; + * string filename = 5; * @return This builder for chaining. */ public Builder clearFilename() { @@ -1191,7 +1053,7 @@ public Builder clearFilename() { return this; } /** - * string filename = 6; + * string filename = 5; * @param value The bytes for filename to set. * @return This builder for chaining. */ diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerOrBuilder.java index f445cc69..066eb471 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerOrBuilder.java @@ -38,51 +38,39 @@ public interface AioControllerOrBuilder extends opi_api.common.v1.ObjectKeyOrBuilder getHandleOrBuilder(); /** - * string name = 2; - * @return The name. - */ - java.lang.String getName(); - /** - * string name = 2; - * @return The bytes for name. - */ - com.google.protobuf.ByteString - getNameBytes(); - - /** - * int64 block_size = 3; + * int64 block_size = 2; * @return The blockSize. */ long getBlockSize(); /** - * int64 num_blocks = 4; - * @return The numBlocks. + * int64 blocks_count = 3; + * @return The blocksCount. */ - long getNumBlocks(); + long getBlocksCount(); /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return Whether the uuid field is set. */ boolean hasUuid(); /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return The uuid. */ opi_api.common.v1.Uuid getUuid(); /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ opi_api.common.v1.UuidOrBuilder getUuidOrBuilder(); /** - * string filename = 6; + * string filename = 5; * @return The filename. */ java.lang.String getFilename(); /** - * string filename = 6; + * string filename = 5; * @return The bytes for filename. */ com.google.protobuf.ByteString diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerServiceGrpc.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerServiceGrpc.java index 2dfd9af9..6b42f109 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerServiceGrpc.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/AioControllerServiceGrpc.java @@ -3,6 +3,9 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; /** + *
+ * Back End (network-facing) APIs. This service is for AIO generic kernel block device.
+ * 
*/ @javax.annotation.Generated( value = "by gRPC proto compiler", @@ -246,6 +249,9 @@ public AioControllerServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.C } /** + *
+   * Back End (network-facing) APIs. This service is for AIO generic kernel block device.
+   * 
*/ public static abstract class AioControllerServiceImplBase implements io.grpc.BindableService { @@ -340,6 +346,9 @@ public void aioControllerUpdate(opi_api.storage.v1.AioControllerUpdateRequest re } /** + *
+   * Back End (network-facing) APIs. This service is for AIO generic kernel block device.
+   * 
*/ public static final class AioControllerServiceStub extends io.grpc.stub.AbstractAsyncStub { private AioControllerServiceStub( @@ -403,6 +412,9 @@ public void aioControllerUpdate(opi_api.storage.v1.AioControllerUpdateRequest re } /** + *
+   * Back End (network-facing) APIs. This service is for AIO generic kernel block device.
+   * 
*/ public static final class AioControllerServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { private AioControllerServiceBlockingStub( @@ -460,6 +472,9 @@ public opi_api.storage.v1.AioController aioControllerUpdate(opi_api.storage.v1.A } /** + *
+   * Back End (network-facing) APIs. This service is for AIO generic kernel block device.
+   * 
*/ public static final class AioControllerServiceFutureStub extends io.grpc.stub.AbstractFutureStub { private AioControllerServiceFutureStub( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendAioProto.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendAioProto.java index 07e42e60..dc83501b 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendAioProto.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendAioProto.java @@ -75,47 +75,47 @@ public static void registerAllExtensions( java.lang.String[] descriptorData = { "\n\021backend_aio.proto\022\022opi_api.storage.v1\032" + "\033google/protobuf/empty.proto\032\020object_key" + - ".proto\032\nuuid.proto\"\254\001\n\rAioController\022,\n\006" + + ".proto\032\nuuid.proto\"\240\001\n\rAioController\022,\n\006" + "handle\030\001 \001(\0132\034.opi_api.common.v1.ObjectK" + - "ey\022\014\n\004name\030\002 \001(\t\022\022\n\nblock_size\030\003 \001(\003\022\022\n\n" + - "num_blocks\030\004 \001(\003\022%\n\004uuid\030\005 \001(\0132\027.opi_api" + - ".common.v1.Uuid\022\020\n\010filename\030\006 \001(\t\"O\n\032Aio" + - "ControllerCreateRequest\0221\n\006device\030\001 \001(\0132" + - "!.opi_api.storage.v1.AioController\"J\n\032Ai" + - "oControllerDeleteRequest\022,\n\006handle\030\001 \001(\013" + - "2\034.opi_api.common.v1.ObjectKey\"O\n\032AioCon" + - "trollerUpdateRequest\0221\n\006device\030\001 \001(\0132!.o" + - "pi_api.storage.v1.AioController\"F\n\021AioCo" + - "ntrollerList\0221\n\006device\030\001 \003(\0132!.opi_api.s" + - "torage.v1.AioController\"G\n\027AioController" + - "GetRequest\022,\n\006handle\030\001 \001(\0132\034.opi_api.com" + - "mon.v1.ObjectKey\"\035\n\033AioControllerGetList" + - "Request\"L\n\034AioControllerGetStatsRequest\022" + - ",\n\006handle\030\001 \001(\0132\034.opi_api.common.v1.Obje" + - "ctKey\"I\n\031AioControllerStatsRequest\022,\n\006ha" + - "ndle\030\001 \001(\0132\034.opi_api.common.v1.ObjectKey" + - "\"Q\n\022AioControllerStats\022,\n\006handle\030\001 \001(\0132\034" + - ".opi_api.common.v1.ObjectKey\022\r\n\005stats\030\002 " + - "\001(\t2\234\005\n\024AioControllerService\022j\n\023AioContr" + - "ollerCreate\022..opi_api.storage.v1.AioCont" + - "rollerCreateRequest\032!.opi_api.storage.v1" + - ".AioController\"\000\022_\n\023AioControllerDelete\022" + - "..opi_api.storage.v1.AioControllerDelete" + - "Request\032\026.google.protobuf.Empty\"\000\022d\n\020Aio" + - "ControllerGet\022+.opi_api.storage.v1.AioCo" + - "ntrollerGetRequest\032!.opi_api.storage.v1." + - "AioController\"\000\022p\n\024AioControllerGetList\022" + - "/.opi_api.storage.v1.AioControllerGetLis" + - "tRequest\032%.opi_api.storage.v1.AioControl" + - "lerList\"\000\022s\n\025AioControllerGetStats\0220.opi" + - "_api.storage.v1.AioControllerGetStatsReq" + - "uest\032&.opi_api.storage.v1.AioControllerS" + - "tats\"\000\022j\n\023AioControllerUpdate\022..opi_api." + - "storage.v1.AioControllerUpdateRequest\032!." + - "opi_api.storage.v1.AioController\"\000B^\n\022op" + - "i_api.storage.v1B\017BackendAioProtoP\001Z5git" + - "hub.com/opiproject/opi-api/storage/v1alp" + - "ha1/gen/gob\006proto3" + "ey\022\022\n\nblock_size\030\002 \001(\003\022\024\n\014blocks_count\030\003" + + " \001(\003\022%\n\004uuid\030\004 \001(\0132\027.opi_api.common.v1.U" + + "uid\022\020\n\010filename\030\005 \001(\t\"O\n\032AioControllerCr" + + "eateRequest\0221\n\006device\030\001 \001(\0132!.opi_api.st" + + "orage.v1.AioController\"J\n\032AioControllerD" + + "eleteRequest\022,\n\006handle\030\001 \001(\0132\034.opi_api.c" + + "ommon.v1.ObjectKey\"O\n\032AioControllerUpdat" + + "eRequest\0221\n\006device\030\001 \001(\0132!.opi_api.stora" + + "ge.v1.AioController\"F\n\021AioControllerList" + + "\0221\n\006device\030\001 \003(\0132!.opi_api.storage.v1.Ai" + + "oController\"G\n\027AioControllerGetRequest\022," + + "\n\006handle\030\001 \001(\0132\034.opi_api.common.v1.Objec" + + "tKey\"\035\n\033AioControllerGetListRequest\"L\n\034A" + + "ioControllerGetStatsRequest\022,\n\006handle\030\001 " + + "\001(\0132\034.opi_api.common.v1.ObjectKey\"I\n\031Aio" + + "ControllerStatsRequest\022,\n\006handle\030\001 \001(\0132\034" + + ".opi_api.common.v1.ObjectKey\"Q\n\022AioContr" + + "ollerStats\022,\n\006handle\030\001 \001(\0132\034.opi_api.com" + + "mon.v1.ObjectKey\022\r\n\005stats\030\002 \001(\t2\234\005\n\024AioC" + + "ontrollerService\022j\n\023AioControllerCreate\022" + + "..opi_api.storage.v1.AioControllerCreate" + + "Request\032!.opi_api.storage.v1.AioControll" + + "er\"\000\022_\n\023AioControllerDelete\022..opi_api.st" + + "orage.v1.AioControllerDeleteRequest\032\026.go" + + "ogle.protobuf.Empty\"\000\022d\n\020AioControllerGe" + + "t\022+.opi_api.storage.v1.AioControllerGetR" + + "equest\032!.opi_api.storage.v1.AioControlle" + + "r\"\000\022p\n\024AioControllerGetList\022/.opi_api.st" + + "orage.v1.AioControllerGetListRequest\032%.o" + + "pi_api.storage.v1.AioControllerList\"\000\022s\n" + + "\025AioControllerGetStats\0220.opi_api.storage" + + ".v1.AioControllerGetStatsRequest\032&.opi_a" + + "pi.storage.v1.AioControllerStats\"\000\022j\n\023Ai" + + "oControllerUpdate\022..opi_api.storage.v1.A" + + "ioControllerUpdateRequest\032!.opi_api.stor" + + "age.v1.AioController\"\000B^\n\022opi_api.storag" + + "e.v1B\017BackendAioProtoP\001Z5github.com/opip" + + "roject/opi-api/storage/v1alpha1/gen/gob\006" + + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -129,7 +129,7 @@ public static void registerAllExtensions( internal_static_opi_api_storage_v1_AioController_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_opi_api_storage_v1_AioController_descriptor, - new java.lang.String[] { "Handle", "Name", "BlockSize", "NumBlocks", "Uuid", "Filename", }); + new java.lang.String[] { "Handle", "BlockSize", "BlocksCount", "Uuid", "Filename", }); internal_static_opi_api_storage_v1_AioControllerCreateRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_opi_api_storage_v1_AioControllerCreateRequest_fieldAccessorTable = new diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNullProto.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNullProto.java index 0ede8009..0e797cf8 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNullProto.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNullProto.java @@ -89,43 +89,43 @@ public static void registerAllExtensions( static { java.lang.String[] descriptorData = { "\n\022backend_null.proto\022\022opi_api.storage.v1" + - "\032\020object_key.proto\032\nuuid.proto\"t\n\tNullDe" + - "bug\022\n\n\002id\030\001 \001(\003\022\014\n\004name\030\002 \001(\t\022\022\n\nblock_s" + - "ize\030\003 \001(\003\022\022\n\nnum_blocks\030\004 \001(\003\022%\n\004uuid\030\005 " + - "\001(\0132\027.opi_api.common.v1.Uuid\"G\n\026NullDebu" + - "gCreateRequest\022-\n\006device\030\001 \001(\0132\035.opi_api" + - ".storage.v1.NullDebug\"\031\n\027NullDebugCreate" + - "Response\"$\n\026NullDebugDeleteRequest\022\n\n\002id" + - "\030\001 \001(\003\"\031\n\027NullDebugDeleteResponse\"G\n\026Nul" + - "lDebugUpdateRequest\022-\n\006device\030\001 \001(\0132\035.op" + - "i_api.storage.v1.NullDebug\"\031\n\027NullDebugU" + - "pdateResponse\"\026\n\024NullDebugListRequest\"F\n" + - "\025NullDebugListResponse\022-\n\006device\030\001 \003(\0132\035" + - ".opi_api.storage.v1.NullDebug\"!\n\023NullDeb" + - "ugGetRequest\022\n\n\002id\030\001 \001(\003\"E\n\024NullDebugGet" + - "Response\022-\n\006device\030\001 \001(\0132\035.opi_api.stora" + - "ge.v1.NullDebug\"#\n\025NullDebugStatsRequest" + - "\022\n\n\002id\030\001 \001(\003\"3\n\026NullDebugStatsResponse\022\n" + - "\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t2\224\005\n\020NullDebugS" + - "ervice\022l\n\017NullDebugCreate\022*.opi_api.stor" + - "age.v1.NullDebugCreateRequest\032+.opi_api." + - "storage.v1.NullDebugCreateResponse\"\000\022l\n\017" + - "NullDebugDelete\022*.opi_api.storage.v1.Nul" + - "lDebugDeleteRequest\032+.opi_api.storage.v1" + - ".NullDebugDeleteResponse\"\000\022l\n\017NullDebugU" + - "pdate\022*.opi_api.storage.v1.NullDebugUpda" + - "teRequest\032+.opi_api.storage.v1.NullDebug" + - "UpdateResponse\"\000\022f\n\rNullDebugList\022(.opi_" + - "api.storage.v1.NullDebugListRequest\032).op" + - "i_api.storage.v1.NullDebugListResponse\"\000" + - "\022c\n\014NullDebugGet\022\'.opi_api.storage.v1.Nu" + - "llDebugGetRequest\032(.opi_api.storage.v1.N" + - "ullDebugGetResponse\"\000\022i\n\016NullDebugStats\022" + - ").opi_api.storage.v1.NullDebugStatsReque" + - "st\032*.opi_api.storage.v1.NullDebugStatsRe" + - "sponse\"\000B_\n\022opi_api.storage.v1B\020BackendN" + - "ullProtoP\001Z5github.com/opiproject/opi-ap" + - "i/storage/v1alpha1/gen/gob\006proto3" + "\032\020object_key.proto\032\nuuid.proto\"h\n\tNullDe" + + "bug\022\n\n\002id\030\001 \001(\003\022\022\n\nblock_size\030\002 \001(\003\022\024\n\014b" + + "locks_count\030\003 \001(\003\022%\n\004uuid\030\004 \001(\0132\027.opi_ap" + + "i.common.v1.Uuid\"G\n\026NullDebugCreateReque" + + "st\022-\n\006device\030\001 \001(\0132\035.opi_api.storage.v1." + + "NullDebug\"\031\n\027NullDebugCreateResponse\"$\n\026" + + "NullDebugDeleteRequest\022\n\n\002id\030\001 \001(\003\"\031\n\027Nu" + + "llDebugDeleteResponse\"G\n\026NullDebugUpdate" + + "Request\022-\n\006device\030\001 \001(\0132\035.opi_api.storag" + + "e.v1.NullDebug\"\031\n\027NullDebugUpdateRespons" + + "e\"\026\n\024NullDebugListRequest\"F\n\025NullDebugLi" + + "stResponse\022-\n\006device\030\001 \003(\0132\035.opi_api.sto" + + "rage.v1.NullDebug\"!\n\023NullDebugGetRequest" + + "\022\n\n\002id\030\001 \001(\003\"E\n\024NullDebugGetResponse\022-\n\006" + + "device\030\001 \001(\0132\035.opi_api.storage.v1.NullDe" + + "bug\"#\n\025NullDebugStatsRequest\022\n\n\002id\030\001 \001(\003" + + "\"3\n\026NullDebugStatsResponse\022\n\n\002id\030\001 \001(\003\022\r" + + "\n\005stats\030\002 \001(\t2\224\005\n\020NullDebugService\022l\n\017Nu" + + "llDebugCreate\022*.opi_api.storage.v1.NullD" + + "ebugCreateRequest\032+.opi_api.storage.v1.N" + + "ullDebugCreateResponse\"\000\022l\n\017NullDebugDel" + + "ete\022*.opi_api.storage.v1.NullDebugDelete" + + "Request\032+.opi_api.storage.v1.NullDebugDe" + + "leteResponse\"\000\022l\n\017NullDebugUpdate\022*.opi_" + + "api.storage.v1.NullDebugUpdateRequest\032+." + + "opi_api.storage.v1.NullDebugUpdateRespon" + + "se\"\000\022f\n\rNullDebugList\022(.opi_api.storage." + + "v1.NullDebugListRequest\032).opi_api.storag" + + "e.v1.NullDebugListResponse\"\000\022c\n\014NullDebu" + + "gGet\022\'.opi_api.storage.v1.NullDebugGetRe" + + "quest\032(.opi_api.storage.v1.NullDebugGetR" + + "esponse\"\000\022i\n\016NullDebugStats\022).opi_api.st" + + "orage.v1.NullDebugStatsRequest\032*.opi_api" + + ".storage.v1.NullDebugStatsResponse\"\000B_\n\022" + + "opi_api.storage.v1B\020BackendNullProtoP\001Z5" + + "github.com/opiproject/opi-api/storage/v1" + + "alpha1/gen/gob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -138,7 +138,7 @@ public static void registerAllExtensions( internal_static_opi_api_storage_v1_NullDebug_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_opi_api_storage_v1_NullDebug_descriptor, - new java.lang.String[] { "Id", "Name", "BlockSize", "NumBlocks", "Uuid", }); + new java.lang.String[] { "Id", "BlockSize", "BlocksCount", "Uuid", }); internal_static_opi_api_storage_v1_NullDebugCreateRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_opi_api_storage_v1_NullDebugCreateRequest_fieldAccessorTable = new diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNvmeTcpProto.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNvmeTcpProto.java index d98eeaf5..789958c2 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNvmeTcpProto.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/BackendNvmeTcpProto.java @@ -89,66 +89,69 @@ public static void registerAllExtensions( static { java.lang.String[] descriptorData = { "\n\026backend_nvme_tcp.proto\022\022opi_api.storag" + - "e.v1\"\300\002\n\024NVMfRemoteController\022\n\n\002id\030\001 \001(" + + "e.v1\"\302\002\n\024NVMfRemoteController\022\n\n\002id\030\001 \001(" + "\003\0225\n\006trtype\030\002 \001(\0162%.opi_api.storage.v1.N" + "vmeTransportType\0225\n\006adrfam\030\003 \001(\0162%.opi_a" + "pi.storage.v1.NvmeAddressFamily\022\016\n\006tradd" + "r\030\004 \001(\t\022\017\n\007trsvcid\030\005 \001(\003\022\016\n\006subnqn\030\006 \001(\t" + "\022\r\n\005hdgst\030\007 \001(\010\022\r\n\005ddgst\030\010 \001(\010\0224\n\tmultip" + "ath\030\t \001(\0162!.opi_api.storage.v1.NvmeMulti" + - "path\022\025\n\rnum_io_queues\030\n \001(\003\022\022\n\nqueue_siz" + - "e\030\013 \001(\003\"\\\n\"NVMfRemoteControllerConnectRe" + - "quest\0226\n\004ctrl\030\001 \001(\0132(.opi_api.storage.v1" + - ".NVMfRemoteController\"%\n#NVMfRemoteContr" + - "ollerConnectResponse\"3\n%NVMfRemoteContro" + - "llerDisconnectRequest\022\n\n\002id\030\001 \001(\003\"(\n&NVM" + - "fRemoteControllerDisconnectResponse\".\n N" + - "VMfRemoteControllerResetRequest\022\n\n\002id\030\001 " + - "\001(\003\"#\n!NVMfRemoteControllerResetResponse" + - "\"-\n\037NVMfRemoteControllerListRequest\022\n\n\002i" + - "d\030\001 \001(\003\"Z\n NVMfRemoteControllerListRespo" + - "nse\0226\n\004ctrl\030\001 \003(\0132(.opi_api.storage.v1.N" + - "VMfRemoteController\",\n\036NVMfRemoteControl" + - "lerGetRequest\022\n\n\002id\030\001 \001(\003\"Y\n\037NVMfRemoteC" + - "ontrollerGetResponse\0226\n\004ctrl\030\001 \001(\0132(.opi" + - "_api.storage.v1.NVMfRemoteController\".\n " + - "NVMfRemoteControllerStatsRequest\022\n\n\002id\030\001" + - " \001(\003\">\n!NVMfRemoteControllerStatsRespons" + - "e\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t*\217\001\n\021NvmeTra" + - "nsportType\022\025\n\021NVME_TRANSPORT_FC\020\000\022\027\n\023NVM" + - "E_TRANSPORT_PCIE\020\001\022\027\n\023NVME_TRANSPORT_RDM" + - "A\020\002\022\026\n\022NVME_TRANSPORT_TCP\020\003\022\031\n\025NVME_TRAN" + - "SPORT_CUSTOM\020\004*\203\001\n\021NvmeAddressFamily\022\024\n\020" + - "NVMF_ADRFAM_IPV4\020\000\022\024\n\020NVMF_ADRFAM_IPV6\020\001" + - "\022\022\n\016NVMF_ADRFAM_IB\020\002\022\022\n\016NVMF_ADRFAM_FC\020\003" + - "\022\032\n\026NVMF_ADRFAM_INTRA_HOST\020\004*W\n\rNvmeMult" + - "ipath\022\025\n\021NVME_MPIO_DISABLE\020\000\022\026\n\022NVME_MPI" + - "O_FAILOVER\020\001\022\027\n\023NVME_MPIO_MULTIPATH\020\0022\367\006" + - "\n\033NVMfRemoteControllerService\022\220\001\n\033NVMfRe" + - "moteControllerConnect\0226.opi_api.storage." + - "v1.NVMfRemoteControllerConnectRequest\0327." + - "opi_api.storage.v1.NVMfRemoteControllerC" + - "onnectResponse\"\000\022\231\001\n\036NVMfRemoteControlle" + - "rDisconnect\0229.opi_api.storage.v1.NVMfRem" + - "oteControllerDisconnectRequest\032:.opi_api" + - ".storage.v1.NVMfRemoteControllerDisconne" + - "ctResponse\"\000\022\212\001\n\031NVMfRemoteControllerRes" + - "et\0224.opi_api.storage.v1.NVMfRemoteContro" + - "llerResetRequest\0325.opi_api.storage.v1.NV" + - "MfRemoteControllerResetResponse\"\000\022\207\001\n\030NV" + - "MfRemoteControllerList\0223.opi_api.storage" + - ".v1.NVMfRemoteControllerListRequest\0324.op" + - "i_api.storage.v1.NVMfRemoteControllerLis" + - "tResponse\"\000\022\204\001\n\027NVMfRemoteControllerGet\022" + - "2.opi_api.storage.v1.NVMfRemoteControlle" + - "rGetRequest\0323.opi_api.storage.v1.NVMfRem" + - "oteControllerGetResponse\"\000\022\212\001\n\031NVMfRemot" + - "eControllerStats\0224.opi_api.storage.v1.NV" + - "MfRemoteControllerStatsRequest\0325.opi_api" + - ".storage.v1.NVMfRemoteControllerStatsRes" + - "ponse\"\000Bb\n\022opi_api.storage.v1B\023BackendNv" + - "meTcpProtoP\001Z5github.com/opiproject/opi-" + - "api/storage/v1alpha1/gen/gob\006proto3" + "path\022\027\n\017io_queues_count\030\n \001(\003\022\022\n\nqueue_s" + + "ize\030\013 \001(\003\"\\\n\"NVMfRemoteControllerConnect" + + "Request\0226\n\004ctrl\030\001 \001(\0132(.opi_api.storage." + + "v1.NVMfRemoteController\"%\n#NVMfRemoteCon" + + "trollerConnectResponse\"3\n%NVMfRemoteCont" + + "rollerDisconnectRequest\022\n\n\002id\030\001 \001(\003\"(\n&N" + + "VMfRemoteControllerDisconnectResponse\".\n" + + " NVMfRemoteControllerResetRequest\022\n\n\002id\030" + + "\001 \001(\003\"#\n!NVMfRemoteControllerResetRespon" + + "se\"-\n\037NVMfRemoteControllerListRequest\022\n\n" + + "\002id\030\001 \001(\003\"Z\n NVMfRemoteControllerListRes" + + "ponse\0226\n\004ctrl\030\001 \003(\0132(.opi_api.storage.v1" + + ".NVMfRemoteController\",\n\036NVMfRemoteContr" + + "ollerGetRequest\022\n\n\002id\030\001 \001(\003\"Y\n\037NVMfRemot" + + "eControllerGetResponse\0226\n\004ctrl\030\001 \001(\0132(.o" + + "pi_api.storage.v1.NVMfRemoteController\"." + + "\n NVMfRemoteControllerStatsRequest\022\n\n\002id" + + "\030\001 \001(\003\">\n!NVMfRemoteControllerStatsRespo" + + "nse\022\n\n\002id\030\001 \001(\003\022\r\n\005stats\030\002 \001(\t*\264\001\n\021NvmeT" + + "ransportType\022#\n\037NVME_TRANSPORT_TYPE_UNSP" + + "ECIFIED\020\000\022\025\n\021NVME_TRANSPORT_FC\020\001\022\027\n\023NVME" + + "_TRANSPORT_PCIE\020\002\022\027\n\023NVME_TRANSPORT_RDMA" + + "\020\003\022\026\n\022NVME_TRANSPORT_TCP\020\004\022\031\n\025NVME_TRANS" + + "PORT_CUSTOM\020\005*\250\001\n\021NvmeAddressFamily\022#\n\037N" + + "VME_ADDRESS_FAMILY_UNSPECIFIED\020\000\022\024\n\020NVMF" + + "_ADRFAM_IPV4\020\001\022\024\n\020NVMF_ADRFAM_IPV6\020\002\022\022\n\016" + + "NVMF_ADRFAM_IB\020\003\022\022\n\016NVMF_ADRFAM_FC\020\004\022\032\n\026" + + "NVMF_ADRFAM_INTRA_HOST\020\005*\206\001\n\rNvmeMultipa" + + "th\022\036\n\032NVME_MULTIPATH_UNSPECIFIED\020\000\022\032\n\026NV" + + "ME_MULTIPATH_DISABLE\020\001\022\033\n\027NVME_MULTIPATH" + + "_FAILOVER\020\002\022\034\n\030NVME_MULTIPATH_MULTIPATH\020" + + "\0032\367\006\n\033NVMfRemoteControllerService\022\220\001\n\033NV" + + "MfRemoteControllerConnect\0226.opi_api.stor" + + "age.v1.NVMfRemoteControllerConnectReques" + + "t\0327.opi_api.storage.v1.NVMfRemoteControl" + + "lerConnectResponse\"\000\022\231\001\n\036NVMfRemoteContr" + + "ollerDisconnect\0229.opi_api.storage.v1.NVM" + + "fRemoteControllerDisconnectRequest\032:.opi" + + "_api.storage.v1.NVMfRemoteControllerDisc" + + "onnectResponse\"\000\022\212\001\n\031NVMfRemoteControlle" + + "rReset\0224.opi_api.storage.v1.NVMfRemoteCo" + + "ntrollerResetRequest\0325.opi_api.storage.v" + + "1.NVMfRemoteControllerResetResponse\"\000\022\207\001" + + "\n\030NVMfRemoteControllerList\0223.opi_api.sto" + + "rage.v1.NVMfRemoteControllerListRequest\032" + + "4.opi_api.storage.v1.NVMfRemoteControlle" + + "rListResponse\"\000\022\204\001\n\027NVMfRemoteController" + + "Get\0222.opi_api.storage.v1.NVMfRemoteContr" + + "ollerGetRequest\0323.opi_api.storage.v1.NVM" + + "fRemoteControllerGetResponse\"\000\022\212\001\n\031NVMfR" + + "emoteControllerStats\0224.opi_api.storage.v" + + "1.NVMfRemoteControllerStatsRequest\0325.opi" + + "_api.storage.v1.NVMfRemoteControllerStat" + + "sResponse\"\000Bb\n\022opi_api.storage.v1B\023Backe" + + "ndNvmeTcpProtoP\001Z5github.com/opiproject/" + + "opi-api/storage/v1alpha1/gen/gob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -159,7 +162,7 @@ public static void registerAllExtensions( internal_static_opi_api_storage_v1_NVMfRemoteController_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_opi_api_storage_v1_NVMfRemoteController_descriptor, - new java.lang.String[] { "Id", "Trtype", "Adrfam", "Traddr", "Trsvcid", "Subnqn", "Hdgst", "Ddgst", "Multipath", "NumIoQueues", "QueueSize", }); + new java.lang.String[] { "Id", "Trtype", "Adrfam", "Traddr", "Trsvcid", "Subnqn", "Hdgst", "Ddgst", "Multipath", "IoQueuesCount", "QueueSize", }); internal_static_opi_api_storage_v1_NVMfRemoteControllerConnectRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_opi_api_storage_v1_NVMfRemoteControllerConnectRequest_fieldAccessorTable = new diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/CommonProto.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/CommonProto.java index 290c21b2..ed21dd79 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/CommonProto.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/CommonProto.java @@ -28,12 +28,12 @@ public static void registerAllExtensions( descriptor; static { java.lang.String[] descriptorData = { - "\n\014common.proto\022\022opi_api.storage.v1\"^\n\023Nv" + + "\n\014common.proto\022\022opi_api.storage.v1\"Z\n\023Nv" + "meControllerPciId\022\013\n\003bus\030\001 \001(\005\022\016\n\006device" + - "\030\002 \001(\005\022\020\n\010function\030\003 \001(\005\022\030\n\020virtual_func" + - "tion\030\004 \001(\005BZ\n\022opi_api.storage.v1B\013Common" + - "ProtoP\001Z5github.com/opiproject/opi-api/s" + - "torage/v1alpha1/gen/gob\006proto3" + "\030\002 \001(\005\022\014\n\004func\030\003 \001(\005\022\030\n\020virtual_function" + + "\030\004 \001(\005BZ\n\022opi_api.storage.v1B\013CommonProt" + + "oP\001Z5github.com/opiproject/opi-api/stora" + + "ge/v1alpha1/gen/gob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -44,7 +44,7 @@ public static void registerAllExtensions( internal_static_opi_api_storage_v1_NvmeControllerPciId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_opi_api_storage_v1_NvmeControllerPciId_descriptor, - new java.lang.String[] { "Bus", "Device", "Function", "VirtualFunction", }); + new java.lang.String[] { "Bus", "Device", "Func", "VirtualFunction", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteController.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteController.java index a887a8da..d2f5b6df 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteController.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteController.java @@ -105,7 +105,7 @@ private NVMfRemoteController( } case 80: { - numIoQueues_ = input.readInt64(); + ioQueuesCount_ = input.readInt64(); break; } case 88: { @@ -322,15 +322,15 @@ public boolean getDdgst() { return result == null ? opi_api.storage.v1.NvmeMultipath.UNRECOGNIZED : result; } - public static final int NUM_IO_QUEUES_FIELD_NUMBER = 10; - private long numIoQueues_; + public static final int IO_QUEUES_COUNT_FIELD_NUMBER = 10; + private long ioQueuesCount_; /** - * int64 num_io_queues = 10; - * @return The numIoQueues. + * int64 io_queues_count = 10; + * @return The ioQueuesCount. */ @java.lang.Override - public long getNumIoQueues() { - return numIoQueues_; + public long getIoQueuesCount() { + return ioQueuesCount_; } public static final int QUEUE_SIZE_FIELD_NUMBER = 11; @@ -361,10 +361,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (id_ != 0L) { output.writeInt64(1, id_); } - if (trtype_ != opi_api.storage.v1.NvmeTransportType.NVME_TRANSPORT_FC.getNumber()) { + if (trtype_ != opi_api.storage.v1.NvmeTransportType.NVME_TRANSPORT_TYPE_UNSPECIFIED.getNumber()) { output.writeEnum(2, trtype_); } - if (adrfam_ != opi_api.storage.v1.NvmeAddressFamily.NVMF_ADRFAM_IPV4.getNumber()) { + if (adrfam_ != opi_api.storage.v1.NvmeAddressFamily.NVME_ADDRESS_FAMILY_UNSPECIFIED.getNumber()) { output.writeEnum(3, adrfam_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(traddr_)) { @@ -382,11 +382,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (ddgst_ != false) { output.writeBool(8, ddgst_); } - if (multipath_ != opi_api.storage.v1.NvmeMultipath.NVME_MPIO_DISABLE.getNumber()) { + if (multipath_ != opi_api.storage.v1.NvmeMultipath.NVME_MULTIPATH_UNSPECIFIED.getNumber()) { output.writeEnum(9, multipath_); } - if (numIoQueues_ != 0L) { - output.writeInt64(10, numIoQueues_); + if (ioQueuesCount_ != 0L) { + output.writeInt64(10, ioQueuesCount_); } if (queueSize_ != 0L) { output.writeInt64(11, queueSize_); @@ -404,11 +404,11 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt64Size(1, id_); } - if (trtype_ != opi_api.storage.v1.NvmeTransportType.NVME_TRANSPORT_FC.getNumber()) { + if (trtype_ != opi_api.storage.v1.NvmeTransportType.NVME_TRANSPORT_TYPE_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(2, trtype_); } - if (adrfam_ != opi_api.storage.v1.NvmeAddressFamily.NVMF_ADRFAM_IPV4.getNumber()) { + if (adrfam_ != opi_api.storage.v1.NvmeAddressFamily.NVME_ADDRESS_FAMILY_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(3, adrfam_); } @@ -430,13 +430,13 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(8, ddgst_); } - if (multipath_ != opi_api.storage.v1.NvmeMultipath.NVME_MPIO_DISABLE.getNumber()) { + if (multipath_ != opi_api.storage.v1.NvmeMultipath.NVME_MULTIPATH_UNSPECIFIED.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(9, multipath_); } - if (numIoQueues_ != 0L) { + if (ioQueuesCount_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(10, numIoQueues_); + .computeInt64Size(10, ioQueuesCount_); } if (queueSize_ != 0L) { size += com.google.protobuf.CodedOutputStream @@ -472,8 +472,8 @@ public boolean equals(final java.lang.Object obj) { if (getDdgst() != other.getDdgst()) return false; if (multipath_ != other.multipath_) return false; - if (getNumIoQueues() - != other.getNumIoQueues()) return false; + if (getIoQueuesCount() + != other.getIoQueuesCount()) return false; if (getQueueSize() != other.getQueueSize()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -509,9 +509,9 @@ public int hashCode() { getDdgst()); hash = (37 * hash) + MULTIPATH_FIELD_NUMBER; hash = (53 * hash) + multipath_; - hash = (37 * hash) + NUM_IO_QUEUES_FIELD_NUMBER; + hash = (37 * hash) + IO_QUEUES_COUNT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getNumIoQueues()); + getIoQueuesCount()); hash = (37 * hash) + QUEUE_SIZE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getQueueSize()); @@ -666,7 +666,7 @@ public Builder clear() { multipath_ = 0; - numIoQueues_ = 0L; + ioQueuesCount_ = 0L; queueSize_ = 0L; @@ -705,7 +705,7 @@ public opi_api.storage.v1.NVMfRemoteController buildPartial() { result.hdgst_ = hdgst_; result.ddgst_ = ddgst_; result.multipath_ = multipath_; - result.numIoQueues_ = numIoQueues_; + result.ioQueuesCount_ = ioQueuesCount_; result.queueSize_ = queueSize_; onBuilt(); return result; @@ -784,8 +784,8 @@ public Builder mergeFrom(opi_api.storage.v1.NVMfRemoteController other) { if (other.multipath_ != 0) { setMultipathValue(other.getMultipathValue()); } - if (other.getNumIoQueues() != 0L) { - setNumIoQueues(other.getNumIoQueues()); + if (other.getIoQueuesCount() != 0L) { + setIoQueuesCount(other.getIoQueuesCount()); } if (other.getQueueSize() != 0L) { setQueueSize(other.getQueueSize()); @@ -1257,33 +1257,33 @@ public Builder clearMultipath() { return this; } - private long numIoQueues_ ; + private long ioQueuesCount_ ; /** - * int64 num_io_queues = 10; - * @return The numIoQueues. + * int64 io_queues_count = 10; + * @return The ioQueuesCount. */ @java.lang.Override - public long getNumIoQueues() { - return numIoQueues_; + public long getIoQueuesCount() { + return ioQueuesCount_; } /** - * int64 num_io_queues = 10; - * @param value The numIoQueues to set. + * int64 io_queues_count = 10; + * @param value The ioQueuesCount to set. * @return This builder for chaining. */ - public Builder setNumIoQueues(long value) { + public Builder setIoQueuesCount(long value) { - numIoQueues_ = value; + ioQueuesCount_ = value; onChanged(); return this; } /** - * int64 num_io_queues = 10; + * int64 io_queues_count = 10; * @return This builder for chaining. */ - public Builder clearNumIoQueues() { + public Builder clearIoQueuesCount() { - numIoQueues_ = 0L; + ioQueuesCount_ = 0L; onChanged(); return this; } diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerOrBuilder.java index 307307dc..a4e50d46 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerOrBuilder.java @@ -89,10 +89,10 @@ public interface NVMfRemoteControllerOrBuilder extends opi_api.storage.v1.NvmeMultipath getMultipath(); /** - * int64 num_io_queues = 10; - * @return The numIoQueues. + * int64 io_queues_count = 10; + * @return The ioQueuesCount. */ - long getNumIoQueues(); + long getIoQueuesCount(); /** * int64 queue_size = 11; diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerServiceGrpc.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerServiceGrpc.java index 30a0ae31..7badf202 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerServiceGrpc.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NVMfRemoteControllerServiceGrpc.java @@ -3,6 +3,9 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; /** + *
+ * Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
+ * 
*/ @javax.annotation.Generated( value = "by gRPC proto compiler", @@ -246,6 +249,9 @@ public NVMfRemoteControllerServiceFutureStub newStub(io.grpc.Channel channel, io } /** + *
+   * Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
+   * 
*/ public static abstract class NVMfRemoteControllerServiceImplBase implements io.grpc.BindableService { @@ -340,6 +346,9 @@ public void nVMfRemoteControllerStats(opi_api.storage.v1.NVMfRemoteControllerSta } /** + *
+   * Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
+   * 
*/ public static final class NVMfRemoteControllerServiceStub extends io.grpc.stub.AbstractAsyncStub { private NVMfRemoteControllerServiceStub( @@ -403,6 +412,9 @@ public void nVMfRemoteControllerStats(opi_api.storage.v1.NVMfRemoteControllerSta } /** + *
+   * Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
+   * 
*/ public static final class NVMfRemoteControllerServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { private NVMfRemoteControllerServiceBlockingStub( @@ -460,6 +472,9 @@ public opi_api.storage.v1.NVMfRemoteControllerStatsResponse nVMfRemoteController } /** + *
+   * Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
+   * 
*/ public static final class NVMfRemoteControllerServiceFutureStub extends io.grpc.stub.AbstractFutureStub { private NVMfRemoteControllerServiceFutureStub( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebug.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebug.java index a61c195a..a1f8d219 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebug.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebug.java @@ -16,7 +16,6 @@ private NullDebug(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private NullDebug() { - name_ = ""; } @java.lang.Override @@ -54,23 +53,17 @@ private NullDebug( id_ = input.readInt64(); break; } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 24: { + case 16: { blockSize_ = input.readInt64(); break; } - case 32: { + case 24: { - numBlocks_ = input.readInt64(); + blocksCount_ = input.readInt64(); break; } - case 42: { + case 34: { opi_api.common.v1.Uuid.Builder subBuilder = null; if (uuid_ != null) { subBuilder = uuid_.toBuilder(); @@ -126,48 +119,10 @@ public long getId() { return id_; } - public static final int NAME_FIELD_NUMBER = 2; - private volatile java.lang.Object name_; - /** - * string name = 2; - * @return The name. - */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int BLOCK_SIZE_FIELD_NUMBER = 3; + public static final int BLOCK_SIZE_FIELD_NUMBER = 2; private long blockSize_; /** - * int64 block_size = 3; + * int64 block_size = 2; * @return The blockSize. */ @java.lang.Override @@ -175,21 +130,21 @@ public long getBlockSize() { return blockSize_; } - public static final int NUM_BLOCKS_FIELD_NUMBER = 4; - private long numBlocks_; + public static final int BLOCKS_COUNT_FIELD_NUMBER = 3; + private long blocksCount_; /** - * int64 num_blocks = 4; - * @return The numBlocks. + * int64 blocks_count = 3; + * @return The blocksCount. */ @java.lang.Override - public long getNumBlocks() { - return numBlocks_; + public long getBlocksCount() { + return blocksCount_; } - public static final int UUID_FIELD_NUMBER = 5; + public static final int UUID_FIELD_NUMBER = 4; private opi_api.common.v1.Uuid uuid_; /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return Whether the uuid field is set. */ @java.lang.Override @@ -197,7 +152,7 @@ public boolean hasUuid() { return uuid_ != null; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return The uuid. */ @java.lang.Override @@ -205,7 +160,7 @@ public opi_api.common.v1.Uuid getUuid() { return uuid_ == null ? opi_api.common.v1.Uuid.getDefaultInstance() : uuid_; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ @java.lang.Override public opi_api.common.v1.UuidOrBuilder getUuidOrBuilder() { @@ -229,17 +184,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (id_ != 0L) { output.writeInt64(1, id_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, name_); - } if (blockSize_ != 0L) { - output.writeInt64(3, blockSize_); + output.writeInt64(2, blockSize_); } - if (numBlocks_ != 0L) { - output.writeInt64(4, numBlocks_); + if (blocksCount_ != 0L) { + output.writeInt64(3, blocksCount_); } if (uuid_ != null) { - output.writeMessage(5, getUuid()); + output.writeMessage(4, getUuid()); } unknownFields.writeTo(output); } @@ -254,20 +206,17 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt64Size(1, id_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, name_); - } if (blockSize_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(3, blockSize_); + .computeInt64Size(2, blockSize_); } - if (numBlocks_ != 0L) { + if (blocksCount_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeInt64Size(4, numBlocks_); + .computeInt64Size(3, blocksCount_); } if (uuid_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getUuid()); + .computeMessageSize(4, getUuid()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -286,12 +235,10 @@ public boolean equals(final java.lang.Object obj) { if (getId() != other.getId()) return false; - if (!getName() - .equals(other.getName())) return false; if (getBlockSize() != other.getBlockSize()) return false; - if (getNumBlocks() - != other.getNumBlocks()) return false; + if (getBlocksCount() + != other.getBlocksCount()) return false; if (hasUuid() != other.hasUuid()) return false; if (hasUuid()) { if (!getUuid() @@ -311,14 +258,12 @@ public int hashCode() { hash = (37 * hash) + ID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getId()); - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getName().hashCode(); hash = (37 * hash) + BLOCK_SIZE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getBlockSize()); - hash = (37 * hash) + NUM_BLOCKS_FIELD_NUMBER; + hash = (37 * hash) + BLOCKS_COUNT_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getNumBlocks()); + getBlocksCount()); if (hasUuid()) { hash = (37 * hash) + UUID_FIELD_NUMBER; hash = (53 * hash) + getUuid().hashCode(); @@ -458,11 +403,9 @@ public Builder clear() { super.clear(); id_ = 0L; - name_ = ""; - blockSize_ = 0L; - numBlocks_ = 0L; + blocksCount_ = 0L; if (uuidBuilder_ == null) { uuid_ = null; @@ -497,9 +440,8 @@ public opi_api.storage.v1.NullDebug build() { public opi_api.storage.v1.NullDebug buildPartial() { opi_api.storage.v1.NullDebug result = new opi_api.storage.v1.NullDebug(this); result.id_ = id_; - result.name_ = name_; result.blockSize_ = blockSize_; - result.numBlocks_ = numBlocks_; + result.blocksCount_ = blocksCount_; if (uuidBuilder_ == null) { result.uuid_ = uuid_; } else { @@ -556,15 +498,11 @@ public Builder mergeFrom(opi_api.storage.v1.NullDebug other) { if (other.getId() != 0L) { setId(other.getId()); } - if (!other.getName().isEmpty()) { - name_ = other.name_; - onChanged(); - } if (other.getBlockSize() != 0L) { setBlockSize(other.getBlockSize()); } - if (other.getNumBlocks() != 0L) { - setNumBlocks(other.getNumBlocks()); + if (other.getBlocksCount() != 0L) { + setBlocksCount(other.getBlocksCount()); } if (other.hasUuid()) { mergeUuid(other.getUuid()); @@ -629,85 +567,9 @@ public Builder clearId() { return this; } - private java.lang.Object name_ = ""; - /** - * string name = 2; - * @return The name. - */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - name_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * string name = 2; - * @return The bytes for name. - */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * string name = 2; - * @param value The name to set. - * @return This builder for chaining. - */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - name_ = value; - onChanged(); - return this; - } - /** - * string name = 2; - * @return This builder for chaining. - */ - public Builder clearName() { - - name_ = getDefaultInstance().getName(); - onChanged(); - return this; - } - /** - * string name = 2; - * @param value The bytes for name to set. - * @return This builder for chaining. - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - name_ = value; - onChanged(); - return this; - } - private long blockSize_ ; /** - * int64 block_size = 3; + * int64 block_size = 2; * @return The blockSize. */ @java.lang.Override @@ -715,7 +577,7 @@ public long getBlockSize() { return blockSize_; } /** - * int64 block_size = 3; + * int64 block_size = 2; * @param value The blockSize to set. * @return This builder for chaining. */ @@ -726,7 +588,7 @@ public Builder setBlockSize(long value) { return this; } /** - * int64 block_size = 3; + * int64 block_size = 2; * @return This builder for chaining. */ public Builder clearBlockSize() { @@ -736,33 +598,33 @@ public Builder clearBlockSize() { return this; } - private long numBlocks_ ; + private long blocksCount_ ; /** - * int64 num_blocks = 4; - * @return The numBlocks. + * int64 blocks_count = 3; + * @return The blocksCount. */ @java.lang.Override - public long getNumBlocks() { - return numBlocks_; + public long getBlocksCount() { + return blocksCount_; } /** - * int64 num_blocks = 4; - * @param value The numBlocks to set. + * int64 blocks_count = 3; + * @param value The blocksCount to set. * @return This builder for chaining. */ - public Builder setNumBlocks(long value) { + public Builder setBlocksCount(long value) { - numBlocks_ = value; + blocksCount_ = value; onChanged(); return this; } /** - * int64 num_blocks = 4; + * int64 blocks_count = 3; * @return This builder for chaining. */ - public Builder clearNumBlocks() { + public Builder clearBlocksCount() { - numBlocks_ = 0L; + blocksCount_ = 0L; onChanged(); return this; } @@ -771,14 +633,14 @@ public Builder clearNumBlocks() { private com.google.protobuf.SingleFieldBuilderV3< opi_api.common.v1.Uuid, opi_api.common.v1.Uuid.Builder, opi_api.common.v1.UuidOrBuilder> uuidBuilder_; /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return Whether the uuid field is set. */ public boolean hasUuid() { return uuidBuilder_ != null || uuid_ != null; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return The uuid. */ public opi_api.common.v1.Uuid getUuid() { @@ -789,7 +651,7 @@ public opi_api.common.v1.Uuid getUuid() { } } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder setUuid(opi_api.common.v1.Uuid value) { if (uuidBuilder_ == null) { @@ -805,7 +667,7 @@ public Builder setUuid(opi_api.common.v1.Uuid value) { return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder setUuid( opi_api.common.v1.Uuid.Builder builderForValue) { @@ -819,7 +681,7 @@ public Builder setUuid( return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder mergeUuid(opi_api.common.v1.Uuid value) { if (uuidBuilder_ == null) { @@ -837,7 +699,7 @@ public Builder mergeUuid(opi_api.common.v1.Uuid value) { return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public Builder clearUuid() { if (uuidBuilder_ == null) { @@ -851,7 +713,7 @@ public Builder clearUuid() { return this; } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public opi_api.common.v1.Uuid.Builder getUuidBuilder() { @@ -859,7 +721,7 @@ public opi_api.common.v1.Uuid.Builder getUuidBuilder() { return getUuidFieldBuilder().getBuilder(); } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ public opi_api.common.v1.UuidOrBuilder getUuidOrBuilder() { if (uuidBuilder_ != null) { @@ -870,7 +732,7 @@ public opi_api.common.v1.UuidOrBuilder getUuidOrBuilder() { } } /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ private com.google.protobuf.SingleFieldBuilderV3< opi_api.common.v1.Uuid, opi_api.common.v1.Uuid.Builder, opi_api.common.v1.UuidOrBuilder> diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugOrBuilder.java index 1abdbd7f..36e680b5 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugOrBuilder.java @@ -14,41 +14,29 @@ public interface NullDebugOrBuilder extends long getId(); /** - * string name = 2; - * @return The name. - */ - java.lang.String getName(); - /** - * string name = 2; - * @return The bytes for name. - */ - com.google.protobuf.ByteString - getNameBytes(); - - /** - * int64 block_size = 3; + * int64 block_size = 2; * @return The blockSize. */ long getBlockSize(); /** - * int64 num_blocks = 4; - * @return The numBlocks. + * int64 blocks_count = 3; + * @return The blocksCount. */ - long getNumBlocks(); + long getBlocksCount(); /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return Whether the uuid field is set. */ boolean hasUuid(); /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; * @return The uuid. */ opi_api.common.v1.Uuid getUuid(); /** - * .opi_api.common.v1.Uuid uuid = 5; + * .opi_api.common.v1.Uuid uuid = 4; */ opi_api.common.v1.UuidOrBuilder getUuidOrBuilder(); } diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugServiceGrpc.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugServiceGrpc.java index c7593c47..52bbf4e3 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugServiceGrpc.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NullDebugServiceGrpc.java @@ -3,6 +3,9 @@ import static io.grpc.MethodDescriptor.generateFullMethodName; /** + *
+ * Back End (network-facing) APIs. This is debug interface for null block devices.
+ * 
*/ @javax.annotation.Generated( value = "by gRPC proto compiler", @@ -246,6 +249,9 @@ public NullDebugServiceFutureStub newStub(io.grpc.Channel channel, io.grpc.CallO } /** + *
+   * Back End (network-facing) APIs. This is debug interface for null block devices.
+   * 
*/ public static abstract class NullDebugServiceImplBase implements io.grpc.BindableService { @@ -340,6 +346,9 @@ public void nullDebugStats(opi_api.storage.v1.NullDebugStatsRequest request, } /** + *
+   * Back End (network-facing) APIs. This is debug interface for null block devices.
+   * 
*/ public static final class NullDebugServiceStub extends io.grpc.stub.AbstractAsyncStub { private NullDebugServiceStub( @@ -403,6 +412,9 @@ public void nullDebugStats(opi_api.storage.v1.NullDebugStatsRequest request, } /** + *
+   * Back End (network-facing) APIs. This is debug interface for null block devices.
+   * 
*/ public static final class NullDebugServiceBlockingStub extends io.grpc.stub.AbstractBlockingStub { private NullDebugServiceBlockingStub( @@ -460,6 +472,9 @@ public opi_api.storage.v1.NullDebugStatsResponse nullDebugStats(opi_api.storage. } /** + *
+   * Back End (network-facing) APIs. This is debug interface for null block devices.
+   * 
*/ public static final class NullDebugServiceFutureStub extends io.grpc.stub.AbstractFutureStub { private NullDebugServiceFutureStub( diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeAddressFamily.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeAddressFamily.java index 79de7be4..143928df 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeAddressFamily.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeAddressFamily.java @@ -9,48 +9,56 @@ public enum NvmeAddressFamily implements com.google.protobuf.ProtocolMessageEnum { /** - * NVMF_ADRFAM_IPV4 = 0; + * NVME_ADDRESS_FAMILY_UNSPECIFIED = 0; */ - NVMF_ADRFAM_IPV4(0), + NVME_ADDRESS_FAMILY_UNSPECIFIED(0), /** - * NVMF_ADRFAM_IPV6 = 1; + * NVMF_ADRFAM_IPV4 = 1; */ - NVMF_ADRFAM_IPV6(1), + NVMF_ADRFAM_IPV4(1), /** - * NVMF_ADRFAM_IB = 2; + * NVMF_ADRFAM_IPV6 = 2; */ - NVMF_ADRFAM_IB(2), + NVMF_ADRFAM_IPV6(2), /** - * NVMF_ADRFAM_FC = 3; + * NVMF_ADRFAM_IB = 3; */ - NVMF_ADRFAM_FC(3), + NVMF_ADRFAM_IB(3), /** - * NVMF_ADRFAM_INTRA_HOST = 4; + * NVMF_ADRFAM_FC = 4; */ - NVMF_ADRFAM_INTRA_HOST(4), + NVMF_ADRFAM_FC(4), + /** + * NVMF_ADRFAM_INTRA_HOST = 5; + */ + NVMF_ADRFAM_INTRA_HOST(5), UNRECOGNIZED(-1), ; /** - * NVMF_ADRFAM_IPV4 = 0; + * NVME_ADDRESS_FAMILY_UNSPECIFIED = 0; + */ + public static final int NVME_ADDRESS_FAMILY_UNSPECIFIED_VALUE = 0; + /** + * NVMF_ADRFAM_IPV4 = 1; */ - public static final int NVMF_ADRFAM_IPV4_VALUE = 0; + public static final int NVMF_ADRFAM_IPV4_VALUE = 1; /** - * NVMF_ADRFAM_IPV6 = 1; + * NVMF_ADRFAM_IPV6 = 2; */ - public static final int NVMF_ADRFAM_IPV6_VALUE = 1; + public static final int NVMF_ADRFAM_IPV6_VALUE = 2; /** - * NVMF_ADRFAM_IB = 2; + * NVMF_ADRFAM_IB = 3; */ - public static final int NVMF_ADRFAM_IB_VALUE = 2; + public static final int NVMF_ADRFAM_IB_VALUE = 3; /** - * NVMF_ADRFAM_FC = 3; + * NVMF_ADRFAM_FC = 4; */ - public static final int NVMF_ADRFAM_FC_VALUE = 3; + public static final int NVMF_ADRFAM_FC_VALUE = 4; /** - * NVMF_ADRFAM_INTRA_HOST = 4; + * NVMF_ADRFAM_INTRA_HOST = 5; */ - public static final int NVMF_ADRFAM_INTRA_HOST_VALUE = 4; + public static final int NVMF_ADRFAM_INTRA_HOST_VALUE = 5; public final int getNumber() { @@ -77,11 +85,12 @@ public static NvmeAddressFamily valueOf(int value) { */ public static NvmeAddressFamily forNumber(int value) { switch (value) { - case 0: return NVMF_ADRFAM_IPV4; - case 1: return NVMF_ADRFAM_IPV6; - case 2: return NVMF_ADRFAM_IB; - case 3: return NVMF_ADRFAM_FC; - case 4: return NVMF_ADRFAM_INTRA_HOST; + case 0: return NVME_ADDRESS_FAMILY_UNSPECIFIED; + case 1: return NVMF_ADRFAM_IPV4; + case 2: return NVMF_ADRFAM_IPV6; + case 3: return NVMF_ADRFAM_IB; + case 4: return NVMF_ADRFAM_FC; + case 5: return NVMF_ADRFAM_INTRA_HOST; default: return null; } } diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciId.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciId.java index 1248f686..0d70f3b6 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciId.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciId.java @@ -68,7 +68,7 @@ private NvmeControllerPciId( } case 24: { - function_ = input.readInt32(); + func_ = input.readInt32(); break; } case 32: { @@ -138,19 +138,19 @@ public int getDevice() { return device_; } - public static final int FUNCTION_FIELD_NUMBER = 3; - private int function_; + public static final int FUNC_FIELD_NUMBER = 3; + private int func_; /** *
    * Physical function, always set to 0 in current model
    * 
* - * int32 function = 3; - * @return The function. + * int32 func = 3; + * @return The func. */ @java.lang.Override - public int getFunction() { - return function_; + public int getFunc() { + return func_; } public static final int VIRTUAL_FUNCTION_FIELD_NUMBER = 4; @@ -189,8 +189,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (device_ != 0) { output.writeInt32(2, device_); } - if (function_ != 0) { - output.writeInt32(3, function_); + if (func_ != 0) { + output.writeInt32(3, func_); } if (virtualFunction_ != 0) { output.writeInt32(4, virtualFunction_); @@ -212,9 +212,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt32Size(2, device_); } - if (function_ != 0) { + if (func_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, function_); + .computeInt32Size(3, func_); } if (virtualFunction_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -239,8 +239,8 @@ public boolean equals(final java.lang.Object obj) { != other.getBus()) return false; if (getDevice() != other.getDevice()) return false; - if (getFunction() - != other.getFunction()) return false; + if (getFunc() + != other.getFunc()) return false; if (getVirtualFunction() != other.getVirtualFunction()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -258,8 +258,8 @@ public int hashCode() { hash = (53 * hash) + getBus(); hash = (37 * hash) + DEVICE_FIELD_NUMBER; hash = (53 * hash) + getDevice(); - hash = (37 * hash) + FUNCTION_FIELD_NUMBER; - hash = (53 * hash) + getFunction(); + hash = (37 * hash) + FUNC_FIELD_NUMBER; + hash = (53 * hash) + getFunc(); hash = (37 * hash) + VIRTUAL_FUNCTION_FIELD_NUMBER; hash = (53 * hash) + getVirtualFunction(); hash = (29 * hash) + unknownFields.hashCode(); @@ -407,7 +407,7 @@ public Builder clear() { device_ = 0; - function_ = 0; + func_ = 0; virtualFunction_ = 0; @@ -439,7 +439,7 @@ public opi_api.storage.v1.NvmeControllerPciId buildPartial() { opi_api.storage.v1.NvmeControllerPciId result = new opi_api.storage.v1.NvmeControllerPciId(this); result.bus_ = bus_; result.device_ = device_; - result.function_ = function_; + result.func_ = func_; result.virtualFunction_ = virtualFunction_; onBuilt(); return result; @@ -495,8 +495,8 @@ public Builder mergeFrom(opi_api.storage.v1.NvmeControllerPciId other) { if (other.getDevice() != 0) { setDevice(other.getDevice()); } - if (other.getFunction() != 0) { - setFunction(other.getFunction()); + if (other.getFunc() != 0) { + setFunc(other.getFunc()); } if (other.getVirtualFunction() != 0) { setVirtualFunction(other.getVirtualFunction()); @@ -616,31 +616,31 @@ public Builder clearDevice() { return this; } - private int function_ ; + private int func_ ; /** *
      * Physical function, always set to 0 in current model
      * 
* - * int32 function = 3; - * @return The function. + * int32 func = 3; + * @return The func. */ @java.lang.Override - public int getFunction() { - return function_; + public int getFunc() { + return func_; } /** *
      * Physical function, always set to 0 in current model
      * 
* - * int32 function = 3; - * @param value The function to set. + * int32 func = 3; + * @param value The func to set. * @return This builder for chaining. */ - public Builder setFunction(int value) { + public Builder setFunc(int value) { - function_ = value; + func_ = value; onChanged(); return this; } @@ -649,12 +649,12 @@ public Builder setFunction(int value) { * Physical function, always set to 0 in current model *
* - * int32 function = 3; + * int32 func = 3; * @return This builder for chaining. */ - public Builder clearFunction() { + public Builder clearFunc() { - function_ = 0; + func_ = 0; onChanged(); return this; } diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciIdOrBuilder.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciIdOrBuilder.java index c14e7639..a26d0624 100644 --- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciIdOrBuilder.java +++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeControllerPciIdOrBuilder.java @@ -32,10 +32,10 @@ public interface NvmeControllerPciIdOrBuilder extends * Physical function, always set to 0 in current model * * - * int32 function = 3; - * @return The function. + * int32 func = 3; + * @return The func. */ - int getFunction(); + int getFunc(); /** *
diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeMultipath.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeMultipath.java
index 1b423037..9c6f926f 100644
--- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeMultipath.java
+++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeMultipath.java
@@ -9,32 +9,40 @@
 public enum NvmeMultipath
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
-   * NVME_MPIO_DISABLE = 0;
+   * NVME_MULTIPATH_UNSPECIFIED = 0;
    */
-  NVME_MPIO_DISABLE(0),
+  NVME_MULTIPATH_UNSPECIFIED(0),
   /**
-   * NVME_MPIO_FAILOVER = 1;
+   * NVME_MULTIPATH_DISABLE = 1;
    */
-  NVME_MPIO_FAILOVER(1),
+  NVME_MULTIPATH_DISABLE(1),
   /**
-   * NVME_MPIO_MULTIPATH = 2;
+   * NVME_MULTIPATH_FAILOVER = 2;
    */
-  NVME_MPIO_MULTIPATH(2),
+  NVME_MULTIPATH_FAILOVER(2),
+  /**
+   * NVME_MULTIPATH_MULTIPATH = 3;
+   */
+  NVME_MULTIPATH_MULTIPATH(3),
   UNRECOGNIZED(-1),
   ;
 
   /**
-   * NVME_MPIO_DISABLE = 0;
+   * NVME_MULTIPATH_UNSPECIFIED = 0;
+   */
+  public static final int NVME_MULTIPATH_UNSPECIFIED_VALUE = 0;
+  /**
+   * NVME_MULTIPATH_DISABLE = 1;
    */
-  public static final int NVME_MPIO_DISABLE_VALUE = 0;
+  public static final int NVME_MULTIPATH_DISABLE_VALUE = 1;
   /**
-   * NVME_MPIO_FAILOVER = 1;
+   * NVME_MULTIPATH_FAILOVER = 2;
    */
-  public static final int NVME_MPIO_FAILOVER_VALUE = 1;
+  public static final int NVME_MULTIPATH_FAILOVER_VALUE = 2;
   /**
-   * NVME_MPIO_MULTIPATH = 2;
+   * NVME_MULTIPATH_MULTIPATH = 3;
    */
-  public static final int NVME_MPIO_MULTIPATH_VALUE = 2;
+  public static final int NVME_MULTIPATH_MULTIPATH_VALUE = 3;
 
 
   public final int getNumber() {
@@ -61,9 +69,10 @@ public static NvmeMultipath valueOf(int value) {
    */
   public static NvmeMultipath forNumber(int value) {
     switch (value) {
-      case 0: return NVME_MPIO_DISABLE;
-      case 1: return NVME_MPIO_FAILOVER;
-      case 2: return NVME_MPIO_MULTIPATH;
+      case 0: return NVME_MULTIPATH_UNSPECIFIED;
+      case 1: return NVME_MULTIPATH_DISABLE;
+      case 2: return NVME_MULTIPATH_FAILOVER;
+      case 3: return NVME_MULTIPATH_MULTIPATH;
       default: return null;
     }
   }
diff --git a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeTransportType.java b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeTransportType.java
index 9bc66e8d..f722cb15 100644
--- a/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeTransportType.java
+++ b/storage/v1alpha1/gen/java/opi_api/storage/v1/NvmeTransportType.java
@@ -9,48 +9,56 @@
 public enum NvmeTransportType
     implements com.google.protobuf.ProtocolMessageEnum {
   /**
-   * NVME_TRANSPORT_FC = 0;
+   * NVME_TRANSPORT_TYPE_UNSPECIFIED = 0;
    */
-  NVME_TRANSPORT_FC(0),
+  NVME_TRANSPORT_TYPE_UNSPECIFIED(0),
   /**
-   * NVME_TRANSPORT_PCIE = 1;
+   * NVME_TRANSPORT_FC = 1;
    */
-  NVME_TRANSPORT_PCIE(1),
+  NVME_TRANSPORT_FC(1),
   /**
-   * NVME_TRANSPORT_RDMA = 2;
+   * NVME_TRANSPORT_PCIE = 2;
    */
-  NVME_TRANSPORT_RDMA(2),
+  NVME_TRANSPORT_PCIE(2),
   /**
-   * NVME_TRANSPORT_TCP = 3;
+   * NVME_TRANSPORT_RDMA = 3;
    */
-  NVME_TRANSPORT_TCP(3),
+  NVME_TRANSPORT_RDMA(3),
   /**
-   * NVME_TRANSPORT_CUSTOM = 4;
+   * NVME_TRANSPORT_TCP = 4;
    */
-  NVME_TRANSPORT_CUSTOM(4),
+  NVME_TRANSPORT_TCP(4),
+  /**
+   * NVME_TRANSPORT_CUSTOM = 5;
+   */
+  NVME_TRANSPORT_CUSTOM(5),
   UNRECOGNIZED(-1),
   ;
 
   /**
-   * NVME_TRANSPORT_FC = 0;
+   * NVME_TRANSPORT_TYPE_UNSPECIFIED = 0;
+   */
+  public static final int NVME_TRANSPORT_TYPE_UNSPECIFIED_VALUE = 0;
+  /**
+   * NVME_TRANSPORT_FC = 1;
    */
-  public static final int NVME_TRANSPORT_FC_VALUE = 0;
+  public static final int NVME_TRANSPORT_FC_VALUE = 1;
   /**
-   * NVME_TRANSPORT_PCIE = 1;
+   * NVME_TRANSPORT_PCIE = 2;
    */
-  public static final int NVME_TRANSPORT_PCIE_VALUE = 1;
+  public static final int NVME_TRANSPORT_PCIE_VALUE = 2;
   /**
-   * NVME_TRANSPORT_RDMA = 2;
+   * NVME_TRANSPORT_RDMA = 3;
    */
-  public static final int NVME_TRANSPORT_RDMA_VALUE = 2;
+  public static final int NVME_TRANSPORT_RDMA_VALUE = 3;
   /**
-   * NVME_TRANSPORT_TCP = 3;
+   * NVME_TRANSPORT_TCP = 4;
    */
-  public static final int NVME_TRANSPORT_TCP_VALUE = 3;
+  public static final int NVME_TRANSPORT_TCP_VALUE = 4;
   /**
-   * NVME_TRANSPORT_CUSTOM = 4;
+   * NVME_TRANSPORT_CUSTOM = 5;
    */
-  public static final int NVME_TRANSPORT_CUSTOM_VALUE = 4;
+  public static final int NVME_TRANSPORT_CUSTOM_VALUE = 5;
 
 
   public final int getNumber() {
@@ -77,11 +85,12 @@ public static NvmeTransportType valueOf(int value) {
    */
   public static NvmeTransportType forNumber(int value) {
     switch (value) {
-      case 0: return NVME_TRANSPORT_FC;
-      case 1: return NVME_TRANSPORT_PCIE;
-      case 2: return NVME_TRANSPORT_RDMA;
-      case 3: return NVME_TRANSPORT_TCP;
-      case 4: return NVME_TRANSPORT_CUSTOM;
+      case 0: return NVME_TRANSPORT_TYPE_UNSPECIFIED;
+      case 1: return NVME_TRANSPORT_FC;
+      case 2: return NVME_TRANSPORT_PCIE;
+      case 3: return NVME_TRANSPORT_RDMA;
+      case 4: return NVME_TRANSPORT_TCP;
+      case 5: return NVME_TRANSPORT_CUSTOM;
       default: return null;
     }
   }
diff --git a/storage/v1alpha1/gen/python/backend_aio_pb2.py b/storage/v1alpha1/gen/python/backend_aio_pb2.py
index c1fe2398..25873c6d 100644
--- a/storage/v1alpha1/gen/python/backend_aio_pb2.py
+++ b/storage/v1alpha1/gen/python/backend_aio_pb2.py
@@ -17,7 +17,7 @@
 import uuid_pb2 as uuid__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11\x62\x61\x63kend_aio.proto\x12\x12opi_api.storage.v1\x1a\x1bgoogle/protobuf/empty.proto\x1a\x10object_key.proto\x1a\nuuid.proto\"\xac\x01\n\rAioController\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x12\n\nblock_size\x18\x03 \x01(\x03\x12\x12\n\nnum_blocks\x18\x04 \x01(\x03\x12%\n\x04uuid\x18\x05 \x01(\x0b\x32\x17.opi_api.common.v1.Uuid\x12\x10\n\x08\x66ilename\x18\x06 \x01(\t\"O\n\x1a\x41ioControllerCreateRequest\x12\x31\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.AioController\"J\n\x1a\x41ioControllerDeleteRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"O\n\x1a\x41ioControllerUpdateRequest\x12\x31\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.AioController\"F\n\x11\x41ioControllerList\x12\x31\n\x06\x64\x65vice\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.AioController\"G\n\x17\x41ioControllerGetRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"\x1d\n\x1b\x41ioControllerGetListRequest\"L\n\x1c\x41ioControllerGetStatsRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"I\n\x19\x41ioControllerStatsRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"Q\n\x12\x41ioControllerStats\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\r\n\x05stats\x18\x02 \x01(\t2\x9c\x05\n\x14\x41ioControllerService\x12j\n\x13\x41ioControllerCreate\x12..opi_api.storage.v1.AioControllerCreateRequest\x1a!.opi_api.storage.v1.AioController\"\x00\x12_\n\x13\x41ioControllerDelete\x12..opi_api.storage.v1.AioControllerDeleteRequest\x1a\x16.google.protobuf.Empty\"\x00\x12\x64\n\x10\x41ioControllerGet\x12+.opi_api.storage.v1.AioControllerGetRequest\x1a!.opi_api.storage.v1.AioController\"\x00\x12p\n\x14\x41ioControllerGetList\x12/.opi_api.storage.v1.AioControllerGetListRequest\x1a%.opi_api.storage.v1.AioControllerList\"\x00\x12s\n\x15\x41ioControllerGetStats\x12\x30.opi_api.storage.v1.AioControllerGetStatsRequest\x1a&.opi_api.storage.v1.AioControllerStats\"\x00\x12j\n\x13\x41ioControllerUpdate\x12..opi_api.storage.v1.AioControllerUpdateRequest\x1a!.opi_api.storage.v1.AioController\"\x00\x42^\n\x12opi_api.storage.v1B\x0f\x42\x61\x63kendAioProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11\x62\x61\x63kend_aio.proto\x12\x12opi_api.storage.v1\x1a\x1bgoogle/protobuf/empty.proto\x1a\x10object_key.proto\x1a\nuuid.proto\"\xa0\x01\n\rAioController\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\x12\n\nblock_size\x18\x02 \x01(\x03\x12\x14\n\x0c\x62locks_count\x18\x03 \x01(\x03\x12%\n\x04uuid\x18\x04 \x01(\x0b\x32\x17.opi_api.common.v1.Uuid\x12\x10\n\x08\x66ilename\x18\x05 \x01(\t\"O\n\x1a\x41ioControllerCreateRequest\x12\x31\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.AioController\"J\n\x1a\x41ioControllerDeleteRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"O\n\x1a\x41ioControllerUpdateRequest\x12\x31\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32!.opi_api.storage.v1.AioController\"F\n\x11\x41ioControllerList\x12\x31\n\x06\x64\x65vice\x18\x01 \x03(\x0b\x32!.opi_api.storage.v1.AioController\"G\n\x17\x41ioControllerGetRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"\x1d\n\x1b\x41ioControllerGetListRequest\"L\n\x1c\x41ioControllerGetStatsRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"I\n\x19\x41ioControllerStatsRequest\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\"Q\n\x12\x41ioControllerStats\x12,\n\x06handle\x18\x01 \x01(\x0b\x32\x1c.opi_api.common.v1.ObjectKey\x12\r\n\x05stats\x18\x02 \x01(\t2\x9c\x05\n\x14\x41ioControllerService\x12j\n\x13\x41ioControllerCreate\x12..opi_api.storage.v1.AioControllerCreateRequest\x1a!.opi_api.storage.v1.AioController\"\x00\x12_\n\x13\x41ioControllerDelete\x12..opi_api.storage.v1.AioControllerDeleteRequest\x1a\x16.google.protobuf.Empty\"\x00\x12\x64\n\x10\x41ioControllerGet\x12+.opi_api.storage.v1.AioControllerGetRequest\x1a!.opi_api.storage.v1.AioController\"\x00\x12p\n\x14\x41ioControllerGetList\x12/.opi_api.storage.v1.AioControllerGetListRequest\x1a%.opi_api.storage.v1.AioControllerList\"\x00\x12s\n\x15\x41ioControllerGetStats\x12\x30.opi_api.storage.v1.AioControllerGetStatsRequest\x1a&.opi_api.storage.v1.AioControllerStats\"\x00\x12j\n\x13\x41ioControllerUpdate\x12..opi_api.storage.v1.AioControllerUpdateRequest\x1a!.opi_api.storage.v1.AioController\"\x00\x42^\n\x12opi_api.storage.v1B\x0f\x42\x61\x63kendAioProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
 
 
 
@@ -107,25 +107,25 @@
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\022opi_api.storage.v1B\017BackendAioProtoP\001Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/go'
   _AIOCONTROLLER._serialized_start=101
-  _AIOCONTROLLER._serialized_end=273
-  _AIOCONTROLLERCREATEREQUEST._serialized_start=275
-  _AIOCONTROLLERCREATEREQUEST._serialized_end=354
-  _AIOCONTROLLERDELETEREQUEST._serialized_start=356
-  _AIOCONTROLLERDELETEREQUEST._serialized_end=430
-  _AIOCONTROLLERUPDATEREQUEST._serialized_start=432
-  _AIOCONTROLLERUPDATEREQUEST._serialized_end=511
-  _AIOCONTROLLERLIST._serialized_start=513
-  _AIOCONTROLLERLIST._serialized_end=583
-  _AIOCONTROLLERGETREQUEST._serialized_start=585
-  _AIOCONTROLLERGETREQUEST._serialized_end=656
-  _AIOCONTROLLERGETLISTREQUEST._serialized_start=658
-  _AIOCONTROLLERGETLISTREQUEST._serialized_end=687
-  _AIOCONTROLLERGETSTATSREQUEST._serialized_start=689
-  _AIOCONTROLLERGETSTATSREQUEST._serialized_end=765
-  _AIOCONTROLLERSTATSREQUEST._serialized_start=767
-  _AIOCONTROLLERSTATSREQUEST._serialized_end=840
-  _AIOCONTROLLERSTATS._serialized_start=842
-  _AIOCONTROLLERSTATS._serialized_end=923
-  _AIOCONTROLLERSERVICE._serialized_start=926
-  _AIOCONTROLLERSERVICE._serialized_end=1594
+  _AIOCONTROLLER._serialized_end=261
+  _AIOCONTROLLERCREATEREQUEST._serialized_start=263
+  _AIOCONTROLLERCREATEREQUEST._serialized_end=342
+  _AIOCONTROLLERDELETEREQUEST._serialized_start=344
+  _AIOCONTROLLERDELETEREQUEST._serialized_end=418
+  _AIOCONTROLLERUPDATEREQUEST._serialized_start=420
+  _AIOCONTROLLERUPDATEREQUEST._serialized_end=499
+  _AIOCONTROLLERLIST._serialized_start=501
+  _AIOCONTROLLERLIST._serialized_end=571
+  _AIOCONTROLLERGETREQUEST._serialized_start=573
+  _AIOCONTROLLERGETREQUEST._serialized_end=644
+  _AIOCONTROLLERGETLISTREQUEST._serialized_start=646
+  _AIOCONTROLLERGETLISTREQUEST._serialized_end=675
+  _AIOCONTROLLERGETSTATSREQUEST._serialized_start=677
+  _AIOCONTROLLERGETSTATSREQUEST._serialized_end=753
+  _AIOCONTROLLERSTATSREQUEST._serialized_start=755
+  _AIOCONTROLLERSTATSREQUEST._serialized_end=828
+  _AIOCONTROLLERSTATS._serialized_start=830
+  _AIOCONTROLLERSTATS._serialized_end=911
+  _AIOCONTROLLERSERVICE._serialized_start=914
+  _AIOCONTROLLERSERVICE._serialized_end=1582
 # @@protoc_insertion_point(module_scope)
diff --git a/storage/v1alpha1/gen/python/backend_aio_pb2_grpc.py b/storage/v1alpha1/gen/python/backend_aio_pb2_grpc.py
index e1947a56..1cfffffb 100644
--- a/storage/v1alpha1/gen/python/backend_aio_pb2_grpc.py
+++ b/storage/v1alpha1/gen/python/backend_aio_pb2_grpc.py
@@ -7,8 +7,7 @@
 
 
 class AioControllerServiceStub(object):
-    """Back End (network-facing) APIs.
-
+    """Back End (network-facing) APIs. This service is for AIO generic kernel block device.
     """
 
     def __init__(self, channel):
@@ -50,8 +49,7 @@ def __init__(self, channel):
 
 
 class AioControllerServiceServicer(object):
-    """Back End (network-facing) APIs.
-
+    """Back End (network-facing) APIs. This service is for AIO generic kernel block device.
     """
 
     def AioControllerCreate(self, request, context):
@@ -131,8 +129,7 @@ def add_AioControllerServiceServicer_to_server(servicer, server):
 
  # This class is part of an EXPERIMENTAL API.
 class AioControllerService(object):
-    """Back End (network-facing) APIs.
-
+    """Back End (network-facing) APIs. This service is for AIO generic kernel block device.
     """
 
     @staticmethod
diff --git a/storage/v1alpha1/gen/python/backend_null_pb2.py b/storage/v1alpha1/gen/python/backend_null_pb2.py
index 668a44a3..e411c95f 100644
--- a/storage/v1alpha1/gen/python/backend_null_pb2.py
+++ b/storage/v1alpha1/gen/python/backend_null_pb2.py
@@ -16,7 +16,7 @@
 import uuid_pb2 as uuid__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x62\x61\x63kend_null.proto\x12\x12opi_api.storage.v1\x1a\x10object_key.proto\x1a\nuuid.proto\"t\n\tNullDebug\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x12\n\nblock_size\x18\x03 \x01(\x03\x12\x12\n\nnum_blocks\x18\x04 \x01(\x03\x12%\n\x04uuid\x18\x05 \x01(\x0b\x32\x17.opi_api.common.v1.Uuid\"G\n\x16NullDebugCreateRequest\x12-\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"\x19\n\x17NullDebugCreateResponse\"$\n\x16NullDebugDeleteRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"\x19\n\x17NullDebugDeleteResponse\"G\n\x16NullDebugUpdateRequest\x12-\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"\x19\n\x17NullDebugUpdateResponse\"\x16\n\x14NullDebugListRequest\"F\n\x15NullDebugListResponse\x12-\n\x06\x64\x65vice\x18\x01 \x03(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"!\n\x13NullDebugGetRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"E\n\x14NullDebugGetResponse\x12-\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"#\n\x15NullDebugStatsRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"3\n\x16NullDebugStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t2\x94\x05\n\x10NullDebugService\x12l\n\x0fNullDebugCreate\x12*.opi_api.storage.v1.NullDebugCreateRequest\x1a+.opi_api.storage.v1.NullDebugCreateResponse\"\x00\x12l\n\x0fNullDebugDelete\x12*.opi_api.storage.v1.NullDebugDeleteRequest\x1a+.opi_api.storage.v1.NullDebugDeleteResponse\"\x00\x12l\n\x0fNullDebugUpdate\x12*.opi_api.storage.v1.NullDebugUpdateRequest\x1a+.opi_api.storage.v1.NullDebugUpdateResponse\"\x00\x12\x66\n\rNullDebugList\x12(.opi_api.storage.v1.NullDebugListRequest\x1a).opi_api.storage.v1.NullDebugListResponse\"\x00\x12\x63\n\x0cNullDebugGet\x12\'.opi_api.storage.v1.NullDebugGetRequest\x1a(.opi_api.storage.v1.NullDebugGetResponse\"\x00\x12i\n\x0eNullDebugStats\x12).opi_api.storage.v1.NullDebugStatsRequest\x1a*.opi_api.storage.v1.NullDebugStatsResponse\"\x00\x42_\n\x12opi_api.storage.v1B\x10\x42\x61\x63kendNullProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x62\x61\x63kend_null.proto\x12\x12opi_api.storage.v1\x1a\x10object_key.proto\x1a\nuuid.proto\"h\n\tNullDebug\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x12\n\nblock_size\x18\x02 \x01(\x03\x12\x14\n\x0c\x62locks_count\x18\x03 \x01(\x03\x12%\n\x04uuid\x18\x04 \x01(\x0b\x32\x17.opi_api.common.v1.Uuid\"G\n\x16NullDebugCreateRequest\x12-\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"\x19\n\x17NullDebugCreateResponse\"$\n\x16NullDebugDeleteRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"\x19\n\x17NullDebugDeleteResponse\"G\n\x16NullDebugUpdateRequest\x12-\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"\x19\n\x17NullDebugUpdateResponse\"\x16\n\x14NullDebugListRequest\"F\n\x15NullDebugListResponse\x12-\n\x06\x64\x65vice\x18\x01 \x03(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"!\n\x13NullDebugGetRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"E\n\x14NullDebugGetResponse\x12-\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1d.opi_api.storage.v1.NullDebug\"#\n\x15NullDebugStatsRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"3\n\x16NullDebugStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t2\x94\x05\n\x10NullDebugService\x12l\n\x0fNullDebugCreate\x12*.opi_api.storage.v1.NullDebugCreateRequest\x1a+.opi_api.storage.v1.NullDebugCreateResponse\"\x00\x12l\n\x0fNullDebugDelete\x12*.opi_api.storage.v1.NullDebugDeleteRequest\x1a+.opi_api.storage.v1.NullDebugDeleteResponse\"\x00\x12l\n\x0fNullDebugUpdate\x12*.opi_api.storage.v1.NullDebugUpdateRequest\x1a+.opi_api.storage.v1.NullDebugUpdateResponse\"\x00\x12\x66\n\rNullDebugList\x12(.opi_api.storage.v1.NullDebugListRequest\x1a).opi_api.storage.v1.NullDebugListResponse\"\x00\x12\x63\n\x0cNullDebugGet\x12\'.opi_api.storage.v1.NullDebugGetRequest\x1a(.opi_api.storage.v1.NullDebugGetResponse\"\x00\x12i\n\x0eNullDebugStats\x12).opi_api.storage.v1.NullDebugStatsRequest\x1a*.opi_api.storage.v1.NullDebugStatsResponse\"\x00\x42_\n\x12opi_api.storage.v1B\x10\x42\x61\x63kendNullProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
 
 
 
@@ -130,31 +130,31 @@
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\022opi_api.storage.v1B\020BackendNullProtoP\001Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/go'
   _NULLDEBUG._serialized_start=72
-  _NULLDEBUG._serialized_end=188
-  _NULLDEBUGCREATEREQUEST._serialized_start=190
-  _NULLDEBUGCREATEREQUEST._serialized_end=261
-  _NULLDEBUGCREATERESPONSE._serialized_start=263
-  _NULLDEBUGCREATERESPONSE._serialized_end=288
-  _NULLDEBUGDELETEREQUEST._serialized_start=290
-  _NULLDEBUGDELETEREQUEST._serialized_end=326
-  _NULLDEBUGDELETERESPONSE._serialized_start=328
-  _NULLDEBUGDELETERESPONSE._serialized_end=353
-  _NULLDEBUGUPDATEREQUEST._serialized_start=355
-  _NULLDEBUGUPDATEREQUEST._serialized_end=426
-  _NULLDEBUGUPDATERESPONSE._serialized_start=428
-  _NULLDEBUGUPDATERESPONSE._serialized_end=453
-  _NULLDEBUGLISTREQUEST._serialized_start=455
-  _NULLDEBUGLISTREQUEST._serialized_end=477
-  _NULLDEBUGLISTRESPONSE._serialized_start=479
-  _NULLDEBUGLISTRESPONSE._serialized_end=549
-  _NULLDEBUGGETREQUEST._serialized_start=551
-  _NULLDEBUGGETREQUEST._serialized_end=584
-  _NULLDEBUGGETRESPONSE._serialized_start=586
-  _NULLDEBUGGETRESPONSE._serialized_end=655
-  _NULLDEBUGSTATSREQUEST._serialized_start=657
-  _NULLDEBUGSTATSREQUEST._serialized_end=692
-  _NULLDEBUGSTATSRESPONSE._serialized_start=694
-  _NULLDEBUGSTATSRESPONSE._serialized_end=745
-  _NULLDEBUGSERVICE._serialized_start=748
-  _NULLDEBUGSERVICE._serialized_end=1408
+  _NULLDEBUG._serialized_end=176
+  _NULLDEBUGCREATEREQUEST._serialized_start=178
+  _NULLDEBUGCREATEREQUEST._serialized_end=249
+  _NULLDEBUGCREATERESPONSE._serialized_start=251
+  _NULLDEBUGCREATERESPONSE._serialized_end=276
+  _NULLDEBUGDELETEREQUEST._serialized_start=278
+  _NULLDEBUGDELETEREQUEST._serialized_end=314
+  _NULLDEBUGDELETERESPONSE._serialized_start=316
+  _NULLDEBUGDELETERESPONSE._serialized_end=341
+  _NULLDEBUGUPDATEREQUEST._serialized_start=343
+  _NULLDEBUGUPDATEREQUEST._serialized_end=414
+  _NULLDEBUGUPDATERESPONSE._serialized_start=416
+  _NULLDEBUGUPDATERESPONSE._serialized_end=441
+  _NULLDEBUGLISTREQUEST._serialized_start=443
+  _NULLDEBUGLISTREQUEST._serialized_end=465
+  _NULLDEBUGLISTRESPONSE._serialized_start=467
+  _NULLDEBUGLISTRESPONSE._serialized_end=537
+  _NULLDEBUGGETREQUEST._serialized_start=539
+  _NULLDEBUGGETREQUEST._serialized_end=572
+  _NULLDEBUGGETRESPONSE._serialized_start=574
+  _NULLDEBUGGETRESPONSE._serialized_end=643
+  _NULLDEBUGSTATSREQUEST._serialized_start=645
+  _NULLDEBUGSTATSREQUEST._serialized_end=680
+  _NULLDEBUGSTATSRESPONSE._serialized_start=682
+  _NULLDEBUGSTATSRESPONSE._serialized_end=733
+  _NULLDEBUGSERVICE._serialized_start=736
+  _NULLDEBUGSERVICE._serialized_end=1396
 # @@protoc_insertion_point(module_scope)
diff --git a/storage/v1alpha1/gen/python/backend_null_pb2_grpc.py b/storage/v1alpha1/gen/python/backend_null_pb2_grpc.py
index 5d82b440..fd89d12c 100644
--- a/storage/v1alpha1/gen/python/backend_null_pb2_grpc.py
+++ b/storage/v1alpha1/gen/python/backend_null_pb2_grpc.py
@@ -6,8 +6,7 @@
 
 
 class NullDebugServiceStub(object):
-    """Back End (network-facing) APIs.
-
+    """Back End (network-facing) APIs. This is debug interface for null block devices.
     """
 
     def __init__(self, channel):
@@ -49,8 +48,7 @@ def __init__(self, channel):
 
 
 class NullDebugServiceServicer(object):
-    """Back End (network-facing) APIs.
-
+    """Back End (network-facing) APIs. This is debug interface for null block devices.
     """
 
     def NullDebugCreate(self, request, context):
@@ -130,8 +128,7 @@ def add_NullDebugServiceServicer_to_server(servicer, server):
 
  # This class is part of an EXPERIMENTAL API.
 class NullDebugService(object):
-    """Back End (network-facing) APIs.
-
+    """Back End (network-facing) APIs. This is debug interface for null block devices.
     """
 
     @staticmethod
diff --git a/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2.py b/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2.py
index 01a58b97..abf2fefe 100644
--- a/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2.py
+++ b/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2.py
@@ -15,7 +15,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x62\x61\x63kend_nvme_tcp.proto\x12\x12opi_api.storage.v1\"\xc0\x02\n\x14NVMfRemoteController\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x35\n\x06trtype\x18\x02 \x01(\x0e\x32%.opi_api.storage.v1.NvmeTransportType\x12\x35\n\x06\x61\x64rfam\x18\x03 \x01(\x0e\x32%.opi_api.storage.v1.NvmeAddressFamily\x12\x0e\n\x06traddr\x18\x04 \x01(\t\x12\x0f\n\x07trsvcid\x18\x05 \x01(\x03\x12\x0e\n\x06subnqn\x18\x06 \x01(\t\x12\r\n\x05hdgst\x18\x07 \x01(\x08\x12\r\n\x05\x64\x64gst\x18\x08 \x01(\x08\x12\x34\n\tmultipath\x18\t \x01(\x0e\x32!.opi_api.storage.v1.NvmeMultipath\x12\x15\n\rnum_io_queues\x18\n \x01(\x03\x12\x12\n\nqueue_size\x18\x0b \x01(\x03\"\\\n\"NVMfRemoteControllerConnectRequest\x12\x36\n\x04\x63trl\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.NVMfRemoteController\"%\n#NVMfRemoteControllerConnectResponse\"3\n%NVMfRemoteControllerDisconnectRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"(\n&NVMfRemoteControllerDisconnectResponse\".\n NVMfRemoteControllerResetRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"#\n!NVMfRemoteControllerResetResponse\"-\n\x1fNVMfRemoteControllerListRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"Z\n NVMfRemoteControllerListResponse\x12\x36\n\x04\x63trl\x18\x01 \x03(\x0b\x32(.opi_api.storage.v1.NVMfRemoteController\",\n\x1eNVMfRemoteControllerGetRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"Y\n\x1fNVMfRemoteControllerGetResponse\x12\x36\n\x04\x63trl\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.NVMfRemoteController\".\n NVMfRemoteControllerStatsRequest\x12\n\n\x02id\x18\x01 \x01(\x03\">\n!NVMfRemoteControllerStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t*\x8f\x01\n\x11NvmeTransportType\x12\x15\n\x11NVME_TRANSPORT_FC\x10\x00\x12\x17\n\x13NVME_TRANSPORT_PCIE\x10\x01\x12\x17\n\x13NVME_TRANSPORT_RDMA\x10\x02\x12\x16\n\x12NVME_TRANSPORT_TCP\x10\x03\x12\x19\n\x15NVME_TRANSPORT_CUSTOM\x10\x04*\x83\x01\n\x11NvmeAddressFamily\x12\x14\n\x10NVMF_ADRFAM_IPV4\x10\x00\x12\x14\n\x10NVMF_ADRFAM_IPV6\x10\x01\x12\x12\n\x0eNVMF_ADRFAM_IB\x10\x02\x12\x12\n\x0eNVMF_ADRFAM_FC\x10\x03\x12\x1a\n\x16NVMF_ADRFAM_INTRA_HOST\x10\x04*W\n\rNvmeMultipath\x12\x15\n\x11NVME_MPIO_DISABLE\x10\x00\x12\x16\n\x12NVME_MPIO_FAILOVER\x10\x01\x12\x17\n\x13NVME_MPIO_MULTIPATH\x10\x02\x32\xf7\x06\n\x1bNVMfRemoteControllerService\x12\x90\x01\n\x1bNVMfRemoteControllerConnect\x12\x36.opi_api.storage.v1.NVMfRemoteControllerConnectRequest\x1a\x37.opi_api.storage.v1.NVMfRemoteControllerConnectResponse\"\x00\x12\x99\x01\n\x1eNVMfRemoteControllerDisconnect\x12\x39.opi_api.storage.v1.NVMfRemoteControllerDisconnectRequest\x1a:.opi_api.storage.v1.NVMfRemoteControllerDisconnectResponse\"\x00\x12\x8a\x01\n\x19NVMfRemoteControllerReset\x12\x34.opi_api.storage.v1.NVMfRemoteControllerResetRequest\x1a\x35.opi_api.storage.v1.NVMfRemoteControllerResetResponse\"\x00\x12\x87\x01\n\x18NVMfRemoteControllerList\x12\x33.opi_api.storage.v1.NVMfRemoteControllerListRequest\x1a\x34.opi_api.storage.v1.NVMfRemoteControllerListResponse\"\x00\x12\x84\x01\n\x17NVMfRemoteControllerGet\x12\x32.opi_api.storage.v1.NVMfRemoteControllerGetRequest\x1a\x33.opi_api.storage.v1.NVMfRemoteControllerGetResponse\"\x00\x12\x8a\x01\n\x19NVMfRemoteControllerStats\x12\x34.opi_api.storage.v1.NVMfRemoteControllerStatsRequest\x1a\x35.opi_api.storage.v1.NVMfRemoteControllerStatsResponse\"\x00\x42\x62\n\x12opi_api.storage.v1B\x13\x42\x61\x63kendNvmeTcpProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x62\x61\x63kend_nvme_tcp.proto\x12\x12opi_api.storage.v1\"\xc2\x02\n\x14NVMfRemoteController\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x35\n\x06trtype\x18\x02 \x01(\x0e\x32%.opi_api.storage.v1.NvmeTransportType\x12\x35\n\x06\x61\x64rfam\x18\x03 \x01(\x0e\x32%.opi_api.storage.v1.NvmeAddressFamily\x12\x0e\n\x06traddr\x18\x04 \x01(\t\x12\x0f\n\x07trsvcid\x18\x05 \x01(\x03\x12\x0e\n\x06subnqn\x18\x06 \x01(\t\x12\r\n\x05hdgst\x18\x07 \x01(\x08\x12\r\n\x05\x64\x64gst\x18\x08 \x01(\x08\x12\x34\n\tmultipath\x18\t \x01(\x0e\x32!.opi_api.storage.v1.NvmeMultipath\x12\x17\n\x0fio_queues_count\x18\n \x01(\x03\x12\x12\n\nqueue_size\x18\x0b \x01(\x03\"\\\n\"NVMfRemoteControllerConnectRequest\x12\x36\n\x04\x63trl\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.NVMfRemoteController\"%\n#NVMfRemoteControllerConnectResponse\"3\n%NVMfRemoteControllerDisconnectRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"(\n&NVMfRemoteControllerDisconnectResponse\".\n NVMfRemoteControllerResetRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"#\n!NVMfRemoteControllerResetResponse\"-\n\x1fNVMfRemoteControllerListRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"Z\n NVMfRemoteControllerListResponse\x12\x36\n\x04\x63trl\x18\x01 \x03(\x0b\x32(.opi_api.storage.v1.NVMfRemoteController\",\n\x1eNVMfRemoteControllerGetRequest\x12\n\n\x02id\x18\x01 \x01(\x03\"Y\n\x1fNVMfRemoteControllerGetResponse\x12\x36\n\x04\x63trl\x18\x01 \x01(\x0b\x32(.opi_api.storage.v1.NVMfRemoteController\".\n NVMfRemoteControllerStatsRequest\x12\n\n\x02id\x18\x01 \x01(\x03\">\n!NVMfRemoteControllerStatsResponse\x12\n\n\x02id\x18\x01 \x01(\x03\x12\r\n\x05stats\x18\x02 \x01(\t*\xb4\x01\n\x11NvmeTransportType\x12#\n\x1fNVME_TRANSPORT_TYPE_UNSPECIFIED\x10\x00\x12\x15\n\x11NVME_TRANSPORT_FC\x10\x01\x12\x17\n\x13NVME_TRANSPORT_PCIE\x10\x02\x12\x17\n\x13NVME_TRANSPORT_RDMA\x10\x03\x12\x16\n\x12NVME_TRANSPORT_TCP\x10\x04\x12\x19\n\x15NVME_TRANSPORT_CUSTOM\x10\x05*\xa8\x01\n\x11NvmeAddressFamily\x12#\n\x1fNVME_ADDRESS_FAMILY_UNSPECIFIED\x10\x00\x12\x14\n\x10NVMF_ADRFAM_IPV4\x10\x01\x12\x14\n\x10NVMF_ADRFAM_IPV6\x10\x02\x12\x12\n\x0eNVMF_ADRFAM_IB\x10\x03\x12\x12\n\x0eNVMF_ADRFAM_FC\x10\x04\x12\x1a\n\x16NVMF_ADRFAM_INTRA_HOST\x10\x05*\x86\x01\n\rNvmeMultipath\x12\x1e\n\x1aNVME_MULTIPATH_UNSPECIFIED\x10\x00\x12\x1a\n\x16NVME_MULTIPATH_DISABLE\x10\x01\x12\x1b\n\x17NVME_MULTIPATH_FAILOVER\x10\x02\x12\x1c\n\x18NVME_MULTIPATH_MULTIPATH\x10\x03\x32\xf7\x06\n\x1bNVMfRemoteControllerService\x12\x90\x01\n\x1bNVMfRemoteControllerConnect\x12\x36.opi_api.storage.v1.NVMfRemoteControllerConnectRequest\x1a\x37.opi_api.storage.v1.NVMfRemoteControllerConnectResponse\"\x00\x12\x99\x01\n\x1eNVMfRemoteControllerDisconnect\x12\x39.opi_api.storage.v1.NVMfRemoteControllerDisconnectRequest\x1a:.opi_api.storage.v1.NVMfRemoteControllerDisconnectResponse\"\x00\x12\x8a\x01\n\x19NVMfRemoteControllerReset\x12\x34.opi_api.storage.v1.NVMfRemoteControllerResetRequest\x1a\x35.opi_api.storage.v1.NVMfRemoteControllerResetResponse\"\x00\x12\x87\x01\n\x18NVMfRemoteControllerList\x12\x33.opi_api.storage.v1.NVMfRemoteControllerListRequest\x1a\x34.opi_api.storage.v1.NVMfRemoteControllerListResponse\"\x00\x12\x84\x01\n\x17NVMfRemoteControllerGet\x12\x32.opi_api.storage.v1.NVMfRemoteControllerGetRequest\x1a\x33.opi_api.storage.v1.NVMfRemoteControllerGetResponse\"\x00\x12\x8a\x01\n\x19NVMfRemoteControllerStats\x12\x34.opi_api.storage.v1.NVMfRemoteControllerStatsRequest\x1a\x35.opi_api.storage.v1.NVMfRemoteControllerStatsResponse\"\x00\x42\x62\n\x12opi_api.storage.v1B\x13\x42\x61\x63kendNvmeTcpProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
 
 _NVMETRANSPORTTYPE = DESCRIPTOR.enum_types_by_name['NvmeTransportType']
 NvmeTransportType = enum_type_wrapper.EnumTypeWrapper(_NVMETRANSPORTTYPE)
@@ -23,19 +23,22 @@
 NvmeAddressFamily = enum_type_wrapper.EnumTypeWrapper(_NVMEADDRESSFAMILY)
 _NVMEMULTIPATH = DESCRIPTOR.enum_types_by_name['NvmeMultipath']
 NvmeMultipath = enum_type_wrapper.EnumTypeWrapper(_NVMEMULTIPATH)
-NVME_TRANSPORT_FC = 0
-NVME_TRANSPORT_PCIE = 1
-NVME_TRANSPORT_RDMA = 2
-NVME_TRANSPORT_TCP = 3
-NVME_TRANSPORT_CUSTOM = 4
-NVMF_ADRFAM_IPV4 = 0
-NVMF_ADRFAM_IPV6 = 1
-NVMF_ADRFAM_IB = 2
-NVMF_ADRFAM_FC = 3
-NVMF_ADRFAM_INTRA_HOST = 4
-NVME_MPIO_DISABLE = 0
-NVME_MPIO_FAILOVER = 1
-NVME_MPIO_MULTIPATH = 2
+NVME_TRANSPORT_TYPE_UNSPECIFIED = 0
+NVME_TRANSPORT_FC = 1
+NVME_TRANSPORT_PCIE = 2
+NVME_TRANSPORT_RDMA = 3
+NVME_TRANSPORT_TCP = 4
+NVME_TRANSPORT_CUSTOM = 5
+NVME_ADDRESS_FAMILY_UNSPECIFIED = 0
+NVMF_ADRFAM_IPV4 = 1
+NVMF_ADRFAM_IPV6 = 2
+NVMF_ADRFAM_IB = 3
+NVMF_ADRFAM_FC = 4
+NVMF_ADRFAM_INTRA_HOST = 5
+NVME_MULTIPATH_UNSPECIFIED = 0
+NVME_MULTIPATH_DISABLE = 1
+NVME_MULTIPATH_FAILOVER = 2
+NVME_MULTIPATH_MULTIPATH = 3
 
 
 _NVMFREMOTECONTROLLER = DESCRIPTOR.message_types_by_name['NVMfRemoteController']
@@ -147,38 +150,38 @@
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\022opi_api.storage.v1B\023BackendNvmeTcpProtoP\001Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/go'
-  _NVMETRANSPORTTYPE._serialized_start=1071
-  _NVMETRANSPORTTYPE._serialized_end=1214
-  _NVMEADDRESSFAMILY._serialized_start=1217
-  _NVMEADDRESSFAMILY._serialized_end=1348
-  _NVMEMULTIPATH._serialized_start=1350
-  _NVMEMULTIPATH._serialized_end=1437
+  _NVMETRANSPORTTYPE._serialized_start=1073
+  _NVMETRANSPORTTYPE._serialized_end=1253
+  _NVMEADDRESSFAMILY._serialized_start=1256
+  _NVMEADDRESSFAMILY._serialized_end=1424
+  _NVMEMULTIPATH._serialized_start=1427
+  _NVMEMULTIPATH._serialized_end=1561
   _NVMFREMOTECONTROLLER._serialized_start=47
-  _NVMFREMOTECONTROLLER._serialized_end=367
-  _NVMFREMOTECONTROLLERCONNECTREQUEST._serialized_start=369
-  _NVMFREMOTECONTROLLERCONNECTREQUEST._serialized_end=461
-  _NVMFREMOTECONTROLLERCONNECTRESPONSE._serialized_start=463
-  _NVMFREMOTECONTROLLERCONNECTRESPONSE._serialized_end=500
-  _NVMFREMOTECONTROLLERDISCONNECTREQUEST._serialized_start=502
-  _NVMFREMOTECONTROLLERDISCONNECTREQUEST._serialized_end=553
-  _NVMFREMOTECONTROLLERDISCONNECTRESPONSE._serialized_start=555
-  _NVMFREMOTECONTROLLERDISCONNECTRESPONSE._serialized_end=595
-  _NVMFREMOTECONTROLLERRESETREQUEST._serialized_start=597
-  _NVMFREMOTECONTROLLERRESETREQUEST._serialized_end=643
-  _NVMFREMOTECONTROLLERRESETRESPONSE._serialized_start=645
-  _NVMFREMOTECONTROLLERRESETRESPONSE._serialized_end=680
-  _NVMFREMOTECONTROLLERLISTREQUEST._serialized_start=682
-  _NVMFREMOTECONTROLLERLISTREQUEST._serialized_end=727
-  _NVMFREMOTECONTROLLERLISTRESPONSE._serialized_start=729
-  _NVMFREMOTECONTROLLERLISTRESPONSE._serialized_end=819
-  _NVMFREMOTECONTROLLERGETREQUEST._serialized_start=821
-  _NVMFREMOTECONTROLLERGETREQUEST._serialized_end=865
-  _NVMFREMOTECONTROLLERGETRESPONSE._serialized_start=867
-  _NVMFREMOTECONTROLLERGETRESPONSE._serialized_end=956
-  _NVMFREMOTECONTROLLERSTATSREQUEST._serialized_start=958
-  _NVMFREMOTECONTROLLERSTATSREQUEST._serialized_end=1004
-  _NVMFREMOTECONTROLLERSTATSRESPONSE._serialized_start=1006
-  _NVMFREMOTECONTROLLERSTATSRESPONSE._serialized_end=1068
-  _NVMFREMOTECONTROLLERSERVICE._serialized_start=1440
-  _NVMFREMOTECONTROLLERSERVICE._serialized_end=2327
+  _NVMFREMOTECONTROLLER._serialized_end=369
+  _NVMFREMOTECONTROLLERCONNECTREQUEST._serialized_start=371
+  _NVMFREMOTECONTROLLERCONNECTREQUEST._serialized_end=463
+  _NVMFREMOTECONTROLLERCONNECTRESPONSE._serialized_start=465
+  _NVMFREMOTECONTROLLERCONNECTRESPONSE._serialized_end=502
+  _NVMFREMOTECONTROLLERDISCONNECTREQUEST._serialized_start=504
+  _NVMFREMOTECONTROLLERDISCONNECTREQUEST._serialized_end=555
+  _NVMFREMOTECONTROLLERDISCONNECTRESPONSE._serialized_start=557
+  _NVMFREMOTECONTROLLERDISCONNECTRESPONSE._serialized_end=597
+  _NVMFREMOTECONTROLLERRESETREQUEST._serialized_start=599
+  _NVMFREMOTECONTROLLERRESETREQUEST._serialized_end=645
+  _NVMFREMOTECONTROLLERRESETRESPONSE._serialized_start=647
+  _NVMFREMOTECONTROLLERRESETRESPONSE._serialized_end=682
+  _NVMFREMOTECONTROLLERLISTREQUEST._serialized_start=684
+  _NVMFREMOTECONTROLLERLISTREQUEST._serialized_end=729
+  _NVMFREMOTECONTROLLERLISTRESPONSE._serialized_start=731
+  _NVMFREMOTECONTROLLERLISTRESPONSE._serialized_end=821
+  _NVMFREMOTECONTROLLERGETREQUEST._serialized_start=823
+  _NVMFREMOTECONTROLLERGETREQUEST._serialized_end=867
+  _NVMFREMOTECONTROLLERGETRESPONSE._serialized_start=869
+  _NVMFREMOTECONTROLLERGETRESPONSE._serialized_end=958
+  _NVMFREMOTECONTROLLERSTATSREQUEST._serialized_start=960
+  _NVMFREMOTECONTROLLERSTATSREQUEST._serialized_end=1006
+  _NVMFREMOTECONTROLLERSTATSRESPONSE._serialized_start=1008
+  _NVMFREMOTECONTROLLERSTATSRESPONSE._serialized_end=1070
+  _NVMFREMOTECONTROLLERSERVICE._serialized_start=1564
+  _NVMFREMOTECONTROLLERSERVICE._serialized_end=2451
 # @@protoc_insertion_point(module_scope)
diff --git a/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2_grpc.py b/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2_grpc.py
index e8597950..b10f6408 100644
--- a/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2_grpc.py
+++ b/storage/v1alpha1/gen/python/backend_nvme_tcp_pb2_grpc.py
@@ -6,10 +6,7 @@
 
 
 class NVMfRemoteControllerServiceStub(object):
-    """Back End (network-facing) APIs.
-
-    NVMe/TCP and NVMe/RoCEv2
-
+    """Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
     """
 
     def __init__(self, channel):
@@ -51,10 +48,7 @@ def __init__(self, channel):
 
 
 class NVMfRemoteControllerServiceServicer(object):
-    """Back End (network-facing) APIs.
-
-    NVMe/TCP and NVMe/RoCEv2
-
+    """Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
     """
 
     def NVMfRemoteControllerConnect(self, request, context):
@@ -134,10 +128,7 @@ def add_NVMfRemoteControllerServiceServicer_to_server(servicer, server):
 
  # This class is part of an EXPERIMENTAL API.
 class NVMfRemoteControllerService(object):
-    """Back End (network-facing) APIs.
-
-    NVMe/TCP and NVMe/RoCEv2
-
+    """Back End (network-facing) APIs. NVMe/TCP and NVMe/RoCEv2 protocols are covered by this service.
     """
 
     @staticmethod
diff --git a/storage/v1alpha1/gen/python/common_pb2.py b/storage/v1alpha1/gen/python/common_pb2.py
index c8646319..13018642 100644
--- a/storage/v1alpha1/gen/python/common_pb2.py
+++ b/storage/v1alpha1/gen/python/common_pb2.py
@@ -14,7 +14,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63ommon.proto\x12\x12opi_api.storage.v1\"^\n\x13NvmeControllerPciId\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x64\x65vice\x18\x02 \x01(\x05\x12\x10\n\x08\x66unction\x18\x03 \x01(\x05\x12\x18\n\x10virtual_function\x18\x04 \x01(\x05\x42Z\n\x12opi_api.storage.v1B\x0b\x43ommonProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x63ommon.proto\x12\x12opi_api.storage.v1\"Z\n\x13NvmeControllerPciId\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x64\x65vice\x18\x02 \x01(\x05\x12\x0c\n\x04\x66unc\x18\x03 \x01(\x05\x12\x18\n\x10virtual_function\x18\x04 \x01(\x05\x42Z\n\x12opi_api.storage.v1B\x0b\x43ommonProtoP\x01Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/gob\x06proto3')
 
 
 
@@ -31,5 +31,5 @@
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\022opi_api.storage.v1B\013CommonProtoP\001Z5github.com/opiproject/opi-api/storage/v1alpha1/gen/go'
   _NVMECONTROLLERPCIID._serialized_start=36
-  _NVMECONTROLLERPCIID._serialized_end=130
+  _NVMECONTROLLERPCIID._serialized_end=126
 # @@protoc_insertion_point(module_scope)