Skip to content

Commit

Permalink
chore: bump tonic to v0.10
Browse files Browse the repository at this point in the history 
Signed-off-by: Renato Westphal <[email protected]>
  • Loading branch information
@rwestphal
rwestphal committed Jan 24, 2024
1 parent 08a3f49 commit 3af24f3
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 31 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ netlink-sys = "0.8"
num-derive = "0.3"
num-traits = "0.2"
pickledb = "0.5"
prost = "0.11"
prost = "0.12"
rand = "0.8.5"
rtnetlink = "0.13"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand All @@ -63,8 +63,8 @@ similar = "2.0"
smallvec = { version = "1.11", features = ["serde"] }
socket2 = { version = "0.4", features = ["all"] }
tokio = { version = "1.0", features = ["full"] }
tonic = { version = "0.9", features = ["tls"] }
tonic-build = "0.9"
tonic = { version = "0.10", features = ["tls"] }
tonic-build = "0.10"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
yang2 = { version = "0.8", features = ["bundled"] }
Expand Down
2 changes: 1 addition & 1 deletion holo-daemon/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition.workspace = true

[dependencies]
console-subscriber = "0.1.8"
prost-types = "0.11"
prost-types = "0.12"
toml = "0.5"
tokio-uring = { version = "0.4", optional = true }
tokio-stream = "0.1"
Expand Down
16 changes: 8 additions & 8 deletions holo-daemon/src/northbound/client/gnmi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,24 +101,24 @@ impl proto::GNmi for GNmiService {

// Get data type.
let data_type =
match proto::get_request::DataType::from_i32(grpc_request.r#type) {
Some(proto::get_request::DataType::All) => api::DataType::All,
Some(proto::get_request::DataType::Config) => {
match proto::get_request::DataType::try_from(grpc_request.r#type) {
Ok(proto::get_request::DataType::All) => api::DataType::All,
Ok(proto::get_request::DataType::Config) => {
api::DataType::Configuration
}
Some(
Ok(
proto::get_request::DataType::State
| proto::get_request::DataType::Operational,
) => api::DataType::State,
None => {
Err(_) => {
return Err(Status::invalid_argument("Invalid data type"))
}
};

// Get encoding type.
let encoding = match proto::Encoding::from_i32(grpc_request.encoding) {
Some(proto::Encoding::Proto) => proto::Encoding::Proto,
Some(proto::Encoding::JsonIetf) => proto::Encoding::JsonIetf,
let encoding = match proto::Encoding::try_from(grpc_request.encoding) {
Ok(proto::Encoding::Proto) => proto::Encoding::Proto,
Ok(proto::Encoding::JsonIetf) => proto::Encoding::JsonIetf,
_ => return Err(Status::invalid_argument("Invalid data encoding")),
};

Expand Down
38 changes: 19 additions & 19 deletions holo-daemon/src/northbound/client/grpc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ impl proto::Northbound for NorthboundService {

// Convert and relay gRPC request to the northbound.
let data_type = api::DataType::try_from(grpc_request.r#type)?;
let encoding = proto::Encoding::from_i32(grpc_request.encoding)
.ok_or_else(|| Status::invalid_argument("Invalid data encoding"))?;
let encoding = proto::Encoding::try_from(grpc_request.encoding)
.map_err(|_| Status::invalid_argument("Invalid data encoding"))?;
let path = (!grpc_request.path.is_empty()).then_some(grpc_request.path);
let nb_request = api::client::Request::Get(api::client::GetRequest {
data_type,
Expand Down Expand Up @@ -149,8 +149,8 @@ impl proto::Northbound for NorthboundService {
let config_tree = grpc_request.config.ok_or_else(|| {
Status::invalid_argument("Missing 'config' field")
})?;
let encoding = proto::Encoding::from_i32(config_tree.encoding)
.ok_or_else(|| Status::invalid_argument("Invalid data encoding"))?;
let encoding = proto::Encoding::try_from(config_tree.encoding)
.map_err(|_| Status::invalid_argument("Invalid data encoding"))?;
let config = DataTree::parse_string(
yang_ctx,
&config_tree.data,
Expand Down Expand Up @@ -194,11 +194,13 @@ impl proto::Northbound for NorthboundService {
let config_tree = grpc_request.config.ok_or_else(|| {
Status::invalid_argument("Missing 'config' field")
})?;
let encoding = proto::Encoding::from_i32(config_tree.encoding)
.ok_or_else(|| Status::invalid_argument("Invalid data encoding"))?;
let encoding = proto::Encoding::try_from(config_tree.encoding)
.map_err(|_| Status::invalid_argument("Invalid data encoding"))?;
let operation =
proto::commit_request::Operation::from_i32(grpc_request.operation)
.ok_or(Status::invalid_argument("Invalid commit operation"))?;
proto::commit_request::Operation::try_from(grpc_request.operation)
.map_err(|_| {
Status::invalid_argument("Invalid commit operation")
})?;
let config = match operation {
proto::commit_request::Operation::Merge => {
let config = DataTree::parse_string(
Expand Down Expand Up @@ -275,8 +277,8 @@ impl proto::Northbound for NorthboundService {
let data = grpc_request
.data
.ok_or_else(|| Status::invalid_argument("Missing 'data' field"))?;
let encoding = proto::Encoding::from_i32(data.encoding)
.ok_or_else(|| Status::invalid_argument("Invalid data encoding"))?;
let encoding = proto::Encoding::try_from(data.encoding)
.map_err(|_| Status::invalid_argument("Invalid data encoding"))?;
let data = DataTree::parse_op_string(
yang_ctx,
&data.data,
Expand Down Expand Up @@ -386,8 +388,8 @@ impl proto::Northbound for NorthboundService {
let nb_response = responder_rx.await.unwrap()?;

// Convert and relay northbound response to the gRPC client.
let encoding = proto::Encoding::from_i32(grpc_request.encoding)
.ok_or_else(|| Status::invalid_argument("Invalid data encoding"))?;
let encoding = proto::Encoding::try_from(grpc_request.encoding)
.map_err(|_| Status::invalid_argument("Invalid data encoding"))?;
let config = nb_response
.dtree
.print_string(
Expand Down Expand Up @@ -460,15 +462,13 @@ impl TryFrom<i32> for api::DataType {
type Error = Status;

fn try_from(data_type: i32) -> Result<Self, Self::Error> {
match proto::get_request::DataType::from_i32(data_type) {
Some(proto::get_request::DataType::All) => Ok(api::DataType::All),
Some(proto::get_request::DataType::Config) => {
match proto::get_request::DataType::try_from(data_type) {
Ok(proto::get_request::DataType::All) => Ok(api::DataType::All),
Ok(proto::get_request::DataType::Config) => {
Ok(api::DataType::Configuration)
}
Some(proto::get_request::DataType::State) => {
Ok(api::DataType::State)
}
None => Err(Status::invalid_argument("Invalid data type")),
Ok(proto::get_request::DataType::State) => Ok(api::DataType::State),
Err(_) => Err(Status::invalid_argument("Invalid data type")),
}
}
}
Expand Down

0 comments on commit 3af24f3

Please sign in to comment.