@@ -261,7 +261,6 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
261
261
// timestamp to the next NGINX configuration update. When it reaches the NGINX configuration update line,
262
262
// it will reset the reconciling log line and set it to the next reconciling log line.
263
263
for _ , line := range strings .Split (ngfLogs , "\n " ) {
264
- // can't just do this line, need to do gateway specific resources
265
264
if reconcilingLine == "" &&
266
265
strings .Contains (line , "Reconciling the resource\" ,\" controller\" " ) &&
267
266
strings .Contains (line , "\" controllerGroup\" :\" gateway.networking.k8s.io\" " ) {
@@ -359,7 +358,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
359
358
}
360
359
361
360
collectMetrics := func (
362
- testName string ,
361
+ testDescription string ,
363
362
resourceCount int ,
364
363
timeToReadyStartingLogSubstring string ,
365
364
ngfPodName string ,
@@ -431,7 +430,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
431
430
Expect (err ).ToNot (HaveOccurred ())
432
431
433
432
results := reconfigTestResults {
434
- Name : testName ,
433
+ TestDescription : testDescription ,
435
434
EventsBuckets : eventsBuckets ,
436
435
ReloadBuckets : reloadBuckets ,
437
436
NumResources : resourceCount ,
@@ -448,6 +447,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
448
447
}
449
448
450
449
When ("resources exist before startup" , func () {
450
+ testDescription := "Test 1: Resources exist before startup"
451
+
451
452
It ("gathers metrics after creating 30 resources" , func () {
452
453
resourceCount := 30
453
454
timeToReadyStartingLogSubstring := "Starting NGINX Gateway Fabric"
@@ -458,7 +459,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
458
459
459
460
ngfPodName , startTime := deployNGFReturnsNGFPodNameAndStartTime ()
460
461
461
- collectMetrics ("1" ,
462
+ collectMetrics (
463
+ testDescription ,
462
464
resourceCount ,
463
465
timeToReadyStartingLogSubstring ,
464
466
ngfPodName ,
@@ -476,7 +478,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
476
478
477
479
ngfPodName , startTime := deployNGFReturnsNGFPodNameAndStartTime ()
478
480
479
- collectMetrics ("1" ,
481
+ collectMetrics (
482
+ testDescription ,
480
483
resourceCount ,
481
484
timeToReadyStartingLogSubstring ,
482
485
ngfPodName ,
@@ -486,6 +489,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
486
489
})
487
490
488
491
When ("NGF and Gateway resource are deployed first" , func () {
492
+ testDescription := "Test 2: Start NGF, deploy Gateway, create many resources attached to GW"
493
+
489
494
It ("gathers metrics after creating 30 resources" , func () {
490
495
resourceCount := 30
491
496
timeToReadyStartingLogSubstring := "Reconciling the resource\" ,\" controller\" :\" httproute\" "
@@ -496,7 +501,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
496
501
Expect (test ).To (Succeed ())
497
502
Expect (checkResourceCreation (resourceCount )).To (Succeed ())
498
503
499
- collectMetrics ("2" ,
504
+ collectMetrics (
505
+ testDescription ,
500
506
resourceCount ,
501
507
timeToReadyStartingLogSubstring ,
502
508
ngfPodName ,
@@ -514,7 +520,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
514
520
Expect (test ).To (Succeed ())
515
521
Expect (checkResourceCreation (resourceCount )).To (Succeed ())
516
522
517
- collectMetrics ("2" ,
523
+ collectMetrics (
524
+ testDescription ,
518
525
resourceCount ,
519
526
timeToReadyStartingLogSubstring ,
520
527
ngfPodName ,
@@ -524,6 +531,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
524
531
})
525
532
526
533
When ("NGF and resources are deployed first" , func () {
534
+ testDescription := "Test 3: Start NGF, create many resources attached to a Gateway, deploy the Gateway"
535
+
527
536
It ("gathers metrics after creating 30 resources" , func () {
528
537
resourceCount := 30
529
538
timeToReadyStartingLogSubstring := "Reconciling the resource\" ,\" controller\" :\" gateway\" "
@@ -534,7 +543,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
534
543
Expect (test ).To (Succeed ())
535
544
Expect (checkResourceCreation (resourceCount )).To (Succeed ())
536
545
537
- collectMetrics ("3" ,
546
+ collectMetrics (
547
+ testDescription ,
538
548
resourceCount ,
539
549
timeToReadyStartingLogSubstring ,
540
550
ngfPodName ,
@@ -552,7 +562,8 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
552
562
Expect (test ).To (Succeed ())
553
563
Expect (checkResourceCreation (resourceCount )).To (Succeed ())
554
564
555
- collectMetrics ("3" ,
565
+ collectMetrics (
566
+ testDescription ,
556
567
resourceCount ,
557
568
timeToReadyStartingLogSubstring ,
558
569
ngfPodName ,
@@ -579,7 +590,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
579
590
})
580
591
581
592
type reconfigTestResults struct {
582
- Name string
593
+ TestDescription string
583
594
TimeToReadyTotal string
584
595
TimeToReadyAvgSingle string
585
596
EventsBuckets []framework.Bucket
@@ -592,7 +603,7 @@ type reconfigTestResults struct {
592
603
}
593
604
594
605
const reconfigResultTemplate = `
595
- ## Test {{ .Name }} NumResources {{ .NumResources }}
606
+ ## {{ .TestDescription }} - NumResources {{ .NumResources }}
596
607
597
608
### Reloads and Time to Ready
598
609
0 commit comments