Skip to content

Commit

Permalink
Try #1789:
Browse files Browse the repository at this point in the history
  • Loading branch information
mayastor-bors committed Dec 19, 2024
2 parents 17488f4 + 1edcd10 commit 4e8d8b9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions io-engine/src/subsys/nvmf/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ impl Display for TransportId {
// trstring for uri scheme to explicitly indicate the tcp support
// also by default when there is rdma available.
let trstring = match self.0.trstring.as_str() {
"RDMA" => "rdma+tcp".to_string(),
_else => _else.to_lowercase(),
"RDMA" => "+rdma+tcp".to_string(),
_else => "".to_string(),
};

write!(
f,
"nvmf+{}://{}:{}",
"nvmf{}://{}:{}",
trstring,
self.0.traddr.as_str(),
self.0.trsvcid.as_str()
Expand Down
2 changes: 1 addition & 1 deletion io-engine/tests/nvmf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ async fn nvmf_set_target_interface() {
.into_inner()
.uri;

let re = Regex::new(r"^nvmf(\+rdma\+tcp|\+tcp)://([0-9.]+):[0-9]+/.*$").unwrap();
let re = Regex::new(r"^nvmf(\+rdma\+tcp|\+tcp)?://([0-9.]+):[0-9]+/.*$").unwrap();
let cap = re.captures(&bdev_uri).unwrap();
let shared_ip = cap.get(2).unwrap().as_str();

Expand Down

0 comments on commit 4e8d8b9

Please sign in to comment.