Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
aronovic authored Oct 7, 2024
2 parents 209f818 + 0f5c591 commit b866631
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sonic_data_client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ func TestGetDpuAddress(t *testing.T) {
t.Errorf("get DPU address should failed: %v, but get %s", err, address)
}

midPlaneTable.Hset("GLOBAL", "bridge", "bridge_midplane")
midPlaneTable.Hset("GLOBAL", "bridge", "bridge-midplane")
dpusTable.Hset("dpu0", "midplane_interface", "dpu0")

// test get DPU address when DHCP_SERVER_IPV4_PORT table not ready
Expand All @@ -725,7 +725,7 @@ func TestGetDpuAddress(t *testing.T) {
t.Errorf("get DPU address should failed: %v, but get %s", err, address)
}

dhcpPortTable.Hset("bridge_midplane|dpu0", "invalidfield", "")
dhcpPortTable.Hset("bridge-midplane|dpu0", "invalidfield", "")

// test get DPU address when DHCP_SERVER_IPV4_PORT table broken
address, err = getDpuAddress("dpu0")
Expand Down Expand Up @@ -789,9 +789,9 @@ func TestGetZmqClient(t *testing.T) {
var dpusTable = swsscommon.NewTable(configDb, "DPUS")
var dhcpPortTable = swsscommon.NewTable(configDb, "DHCP_SERVER_IPV4_PORT")

midPlaneTable.Hset("GLOBAL", "bridge", "bridge_midplane")
midPlaneTable.Hset("GLOBAL", "bridge", "bridge-midplane")
dpusTable.Hset("dpu0", "midplane_interface", "dpu0")
dhcpPortTable.Hset("bridge_midplane|dpu0", "ips", "127.0.0.2,127.0.0.1")
dhcpPortTable.Hset("bridge-midplane|dpu0", "ips", "127.0.0.2,127.0.0.1")

client, err := getZmqClient("dpu0", "")
if client != nil || err != nil {
Expand Down

0 comments on commit b866631

Please sign in to comment.