From 5c181adae8df5a4ecf92bfeb4285c9a513ea3f3a Mon Sep 17 00:00:00 2001 From: Marc Charlebois <105758144+MarcCharlebois@users.noreply.github.com> Date: Tue, 15 Aug 2023 12:22:25 -0700 Subject: [PATCH] Remove testbed port check for binding file (#2015) * Remove testbed port check for binding file * removed unit test check for binding port in testbed file --- topologies/binding/binding.go | 19 ++++++++----------- topologies/binding/binding_test.go | 1 - 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/topologies/binding/binding.go b/topologies/binding/binding.go index 98cea5205c7..692d5f4e6be 100644 --- a/topologies/binding/binding.go +++ b/topologies/binding/binding.go @@ -375,18 +375,15 @@ func ports(tports []*opb.Port, bports []*bindpb.Port) (map[string]*binding.Port, } } for _, bport := range bports { - p, ok := portmap[bport.Id] - if !ok { - errs = append(errs, fmt.Errorf("binding port %q not found in testbed", bport.Id)) - continue - } - p.Name = bport.Name - // If port speed is empty populate from testbed ports. - if bport.Speed != opb.Port_SPEED_UNSPECIFIED { - if p.Speed != opb.Port_SPEED_UNSPECIFIED && p.Speed != bport.Speed { - return nil, fmt.Errorf("binding port speed %v and testbed port speed %v do not match", bport.Speed, p.Speed) + if p, ok := portmap[bport.Id]; ok { + p.Name = bport.Name + // If port speed is empty populate from testbed ports. + if bport.Speed != opb.Port_SPEED_UNSPECIFIED { + if p.Speed != opb.Port_SPEED_UNSPECIFIED && p.Speed != bport.Speed { + return nil, fmt.Errorf("binding port speed %v and testbed port speed %v do not match", bport.Speed, p.Speed) + } + p.Speed = bport.Speed } - p.Speed = bport.Speed } } for id, p := range portmap { diff --git a/topologies/binding/binding_test.go b/topologies/binding/binding_test.go index 562e7ade681..88294349fc4 100644 --- a/topologies/binding/binding_test.go +++ b/topologies/binding/binding_test.go @@ -208,7 +208,6 @@ func TestReservation_Error(t *testing.T) { `binding DUT "dut.b" not found in testbed`, `missing binding for ATE "ate.tb"`, `error binding ATE "ate.both"`, - `binding port "port3" not found in testbed`, `testbed port "port1" is missing in binding`, } errText := err.Error()