Make on-ready inspect strict again

Signed-off-by: Sergei Lukianov <me@slukjanov.name>

Author: Frostman

pkg/hhfab/testing.go

@@ -1509,6 +1509,7 @@ func CollectN[E any](n int, seq iter.Seq[E]) []E {
 
 type InspectOpts struct {
 	WaitAppliedFor time.Duration
+	Strict         bool
 }
 
 func (c *Config) Inspect(ctx context.Context, vlab *VLAB, opts InspectOpts) error {
@@ -1544,7 +1545,7 @@ func (c *Config) Inspect(ctx context.Context, vlab *VLAB, opts InspectOpts) erro
 		Verbose: true,
 		Output:  inspect.OutputTypeText,
 	}, inspect.LLDPIn{
-		Strict:   false, // TODO make it strict
+		Strict:   opts.Strict,
 		Fabric:   true,
 		External: true,
 		Server:   true,
@@ -1557,7 +1558,7 @@ func (c *Config) Inspect(ctx context.Context, vlab *VLAB, opts InspectOpts) erro
 		Verbose: true,
 		Output:  inspect.OutputTypeText,
 	}, inspect.BGPIn{
-		Strict: false, // TODO make it strict
+		Strict: opts.Strict,
 	}, os.Stdout); err != nil {
 		slog.Error("Failed to inspect BGP", "err", err)
 		fail = true

pkg/hhfab/vlabrunner.go

@@ -541,12 +541,10 @@ func (c *Config) VLABRun(ctx context.Context, vlab *VLAB, opts VLABRunOpts) erro
 						return fmt.Errorf("waiting: %w", err)
 					}
 				case OnReadyInspect:
-					appliedFor := 2 * time.Minute
-					if opts.ControlUpgrade {
-						appliedFor = 4 * time.Minute
-					}
-
-					if err := c.Inspect(ctx, vlab, InspectOpts{WaitAppliedFor: appliedFor}); err != nil {
+					if err := c.Inspect(ctx, vlab, InspectOpts{
+						WaitAppliedFor: 2 * time.Minute,
+						Strict:         !opts.ControlUpgrade,
+					}); err != nil {
 						slog.Warn("Failed to inspect", "err", err)
 
 						if opts.CollectShowTech {