Skip to content

Commit 29bc3a0

Browse files
OlivierHecartfuzzypixelz
OlivierHecart
authored and
fuzzypixelz
committed
Update scenario2 to new conf
1 parent 4f3365b commit 29bc3a0

File tree

2 files changed

+52
-24
lines changed

2 files changed

+52
-24
lines changed

‎zenoh/tests/regions/main.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ impl Node {
7575
self.insert("gateway", conf)
7676
}
7777

78+
pub fn region(self, name: &str) -> Self {
79+
self.insert("region_name", &format!("{name:?}"))
80+
}
81+
7882
pub async fn open(self) -> Session {
7983
ztimeout!(zenoh::open(self.c)).unwrap()
8084
}

‎zenoh/tests/regions/scenario2.rs‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,20 @@ async fn test_regions_scenario2_order1_putsub() {
4545

4646
let _z9100 = ztimeout!(Node::new(Peer, "21aa9100")
4747
.multicast("224.2.1.1:9100")
48-
.gateway("{north:{filters:[{zids:[\"21aa9100\",\"21aa9200\",\"21aa9300\"]}]},south:[]}")
48+
.region("main")
49+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
4950
.open());
5051
let _z9200 = ztimeout!(Node::new(Peer, "21aa9200")
5152
.connect(&[loc!(_z9100)])
5253
.multicast("224.2.1.1:9200")
53-
.gateway("{north:{filters:[{zids:[\"21aa9100\",\"21aa9200\",\"21aa9300\"]}]},south:[]}")
54+
.region("main")
55+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
5456
.open());
5557
let _z9300 = ztimeout!(Node::new(Peer, "21aa9300")
5658
.connect(&[loc!(_z9100), loc!(_z9200)])
5759
.multicast("224.2.1.1:9300")
58-
.gateway("{north:{filters:[{zids:[\"21aa9100\",\"21aa9200\",\"21aa9300\"]}]},south:[]}")
60+
.region("main")
61+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
5962
.open());
6063

6164
let _z9110 = ztimeout!(Node::new(Peer, "21aa9110")
@@ -141,17 +144,20 @@ async fn test_regions_scenario2_order1_pubsub() {
141144

142145
let _z9100 = ztimeout!(Node::new(Peer, "21ab9100")
143146
.multicast("224.2.1.2:9100")
144-
.gateway("{north:{filters:[{zids:[\"21ab9100\",\"21ab9200\",\"21ab9300\"]}]},south:[]}")
147+
.region("main")
148+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
145149
.open());
146150
let _z9200 = ztimeout!(Node::new(Peer, "21ab9200")
147151
.connect(&[loc!(_z9100)])
148152
.multicast("224.2.1.2:9200")
149-
.gateway("{north:{filters:[{zids:[\"21ab9100\",\"21ab9200\",\"21ab9300\"]}]},south:[]}")
153+
.region("main")
154+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
150155
.open());
151156
let _z9300 = ztimeout!(Node::new(Peer, "21ab9300")
152157
.connect(&[loc!(_z9100), loc!(_z9200)])
153158
.multicast("224.2.1.2:9300")
154-
.gateway("{north:{filters:[{zids:[\"21ab9100\",\"21ab9200\",\"21ab9300\"]}]},south:[]}")
159+
.region("main")
160+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
155161
.open());
156162

157163
let _z9110 = ztimeout!(Node::new(Peer, "21ab9110")
@@ -287,17 +293,20 @@ async fn test_regions_scenario2_order2_putsub() {
287293

288294
let _z9100 = ztimeout!(Node::new(Peer, "22aa9100")
289295
.multicast("224.2.2.1:9100")
290-
.gateway("{north:{filters:[{zids:[\"22aa9100\",\"22aa9200\",\"22aa9300\"]}]},south:[]}")
296+
.region("main")
297+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
291298
.open());
292299
let _z9200 = ztimeout!(Node::new(Peer, "22aa9200")
293300
.connect(&[loc!(_z9100)])
294301
.multicast("224.2.2.1:9200")
295-
.gateway("{north:{filters:[{zids:[\"22aa9100\",\"22aa9200\",\"22aa9300\"]}]},south:[]}")
302+
.region("main")
303+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
296304
.open());
297305
let _z9300 = ztimeout!(Node::new(Peer, "22aa9300")
298306
.connect(&[loc!(_z9100), loc!(_z9200)])
299307
.multicast("224.2.2.1:9300")
300-
.gateway("{north:{filters:[{zids:[\"22aa9100\",\"22aa9200\",\"22aa9300\"]}]},south:[]}")
308+
.region("main")
309+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
301310
.open());
302311

303312
tokio::time::sleep(Duration::from_secs(8)).await;
@@ -393,17 +402,20 @@ async fn test_regions_scenario2_order2_pubsub() {
393402

394403
let _z9100 = ztimeout!(Node::new(Peer, "22ab9100")
395404
.multicast("224.2.2.2:9100")
396-
.gateway("{north:{filters:[{zids:[\"22ab9100\",\"22ab9200\",\"22ab9300\"]}]},south:[]}")
405+
.region("main")
406+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
397407
.open());
398408
let _z9200 = ztimeout!(Node::new(Peer, "22ab9200")
399409
.connect(&[loc!(_z9100)])
400410
.multicast("224.2.2.2:9200")
401-
.gateway("{north:{filters:[{zids:[\"22ab9100\",\"22ab9200\",\"22ab9300\"]}]},south:[]}")
411+
.region("main")
412+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
402413
.open());
403414
let _z9300 = ztimeout!(Node::new(Peer, "22ab9300")
404415
.connect(&[loc!(_z9100), loc!(_z9200)])
405416
.multicast("224.2.2.2:9300")
406-
.gateway("{north:{filters:[{zids:[\"22ab9100\",\"22ab9200\",\"22ab9300\"]}]},south:[]}")
417+
.region("main")
418+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
407419
.open());
408420

409421
tokio::time::sleep(Duration::from_secs(8)).await;
@@ -449,12 +461,14 @@ async fn test_regions_scenario2_order3_putsub() {
449461

450462
let _z9100 = ztimeout!(Node::new(Peer, "23aa9100")
451463
.multicast("224.2.3.1:9100")
452-
.gateway("{north:{filters:[{zids:[\"23aa9100\",\"23aa9200\",\"23aa9300\"]}]},south:[]}")
464+
.region("main")
465+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
453466
.open());
454467
let _z9200 = ztimeout!(Node::new(Peer, "23aa9200")
455468
.connect(&[loc!(_z9100)])
456469
.multicast("224.2.3.1:9200")
457-
.gateway("{north:{filters:[{zids:[\"23aa9100\",\"23aa9200\",\"23aa9300\"]}]},south:[]}")
470+
.region("main")
471+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
458472
.open());
459473

460474
let _z9110 = ztimeout!(Node::new(Peer, "23aa9110")
@@ -500,7 +514,8 @@ async fn test_regions_scenario2_order3_putsub() {
500514
let _z9300 = ztimeout!(Node::new(Peer, "23aa9300")
501515
.connect(&[loc!(_z9100), loc!(_z9200)])
502516
.multicast("224.2.3.1:9300")
503-
.gateway("{north:{filters:[{zids:[\"23aa9100\",\"23aa9200\",\"23aa9300\"]}]},south:[]}")
517+
.region("main")
518+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
504519
.open());
505520

506521
tokio::time::sleep(SLEEP).await;
@@ -546,12 +561,14 @@ async fn test_regions_scenario2_order3_pubsub() {
546561

547562
let _z9100 = ztimeout!(Node::new(Peer, "23ab9100")
548563
.multicast("224.2.3.2:9100")
549-
.gateway("{north:{filters:[{zids:[\"23ab9100\",\"23ab9200\",\"23ab9300\"]}]},south:[{filters:[]}]}")
564+
.region("main")
565+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
550566
.open());
551567
let _z9200 = ztimeout!(Node::new(Peer, "23ab9200")
552568
.connect(&[loc!(_z9100)])
553569
.multicast("224.2.3.2:9200")
554-
.gateway("{north:{filters:[{zids:[\"23ab9100\",\"23ab9200\",\"23ab9300\"]}]},south:[{filters:[]}]}")
570+
.region("main")
571+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
555572
.open());
556573

557574
let _z9110 = ztimeout!(Node::new(Peer, "23ab9110")
@@ -607,7 +624,8 @@ async fn test_regions_scenario2_order3_pubsub() {
607624
let _z9300 = ztimeout!(Node::new(Peer, "23ab9300")
608625
.connect(&[loc!(_z9100), loc!(_z9200)])
609626
.multicast("224.2.3.2:9300")
610-
.gateway("{north:{filters:[{zids:[\"23ab9100\",\"23ab9200\",\"23ab9300\"]}]},south:[{filters:[]}]}")
627+
.region("main")
628+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
611629
.open());
612630

613631
tokio::time::sleep(SLEEP).await;
@@ -653,12 +671,14 @@ async fn test_regions_scenario2_order4_putsub() {
653671

654672
let _z9100 = ztimeout!(Node::new(Peer, "24aa9100")
655673
.multicast("224.2.4.1:9100")
656-
.gateway("{north:{filters:[{zids:[\"24aa9100\",\"24aa9200\",\"24aa9300\"]}]},south:[]}")
674+
.region("main")
675+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
657676
.open());
658677
let _z9200 = ztimeout!(Node::new(Peer, "24aa9200")
659678
.connect(&[loc!(_z9100)])
660679
.multicast("224.2.4.1:9200")
661-
.gateway("{north:{filters:[{zids:[\"24aa9100\",\"24aa9200\",\"24aa9300\"]}]},south:[]}")
680+
.region("main")
681+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
662682
.open());
663683

664684
let _z9110 = ztimeout!(Node::new(Peer, "24aa9110")
@@ -691,7 +711,8 @@ async fn test_regions_scenario2_order4_putsub() {
691711
let _z9300 = ztimeout!(Node::new(Peer, "24aa9300")
692712
.connect(&[loc!(_z9100), loc!(_z9200)])
693713
.multicast("224.2.4.1:9300")
694-
.gateway("{north:{filters:[{zids:[\"24aa9100\",\"24aa9200\",\"24aa9300\"]}]},south:[]}")
714+
.region("main")
715+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
695716
.open());
696717

697718
let _z9310 = ztimeout!(Node::new(Peer, "24aa9310")
@@ -751,12 +772,14 @@ async fn test_regions_scenario2_order4_pubsub() {
751772

752773
let _z9100 = ztimeout!(Node::new(Peer, "24ab9100")
753774
.multicast("224.2.4.2:9100")
754-
.gateway("{north:{filters:[{zids:[\"24ab9100\",\"24ab9200\",\"24ab9300\"]}]},south:[{filters:[]}]}")
775+
.region("main")
776+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
755777
.open());
756778
let _z9200 = ztimeout!(Node::new(Peer, "24ab9200")
757779
.connect(&[loc!(_z9100)])
758780
.multicast("224.2.4.2:9200")
759-
.gateway("{north:{filters:[{zids:[\"24ab9100\",\"24ab9200\",\"24ab9300\"]}]},south:[{filters:[]}]}")
781+
.region("main")
782+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
760783
.open());
761784

762785
let _z9110 = ztimeout!(Node::new(Peer, "24ab9110")
@@ -796,7 +819,8 @@ async fn test_regions_scenario2_order4_pubsub() {
796819
let _z9300 = ztimeout!(Node::new(Peer, "24ab9300")
797820
.connect(&[loc!(_z9100), loc!(_z9200)])
798821
.multicast("224.2.4.2:9300")
799-
.gateway("{north:{filters:[{zids:[\"24ab9100\",\"24ab9200\",\"24ab9300\"]}]},south:[{filters:[]}]}")
822+
.region("main")
823+
.gateway("{south:[{filters:[{negated:true,region_names:[\"main\"]}]}]}")
800824
.open());
801825

802826
let _z9310 = ztimeout!(Node::new(Peer, "24ab9310")

0 commit comments

Comments
 (0)