Skip to content

Commit

Permalink
fix: ipam ut name conflicts (kubeovn#4489)
Browse files Browse the repository at this point in the history
Signed-off-by: bobz965 <[email protected]>
Signed-off-by: liyh <[email protected]>
  • Loading branch information
bobz965 authored and liyh-yusur committed Sep 10, 2024
1 parent 01fffe9 commit 5281173
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions pkg/ipam/ipam_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ func TestIPAMAddOrUpdateSubnet(t *testing.T) {
require.Error(t, err)
}

func TestAddOrUpdateIPPool(t *testing.T) {
func TestIPAMAddOrUpdateIPPool(t *testing.T) {
// test v4 subnet
ipam := NewIPAM()
v4ExcludeIps := []string{
Expand Down Expand Up @@ -780,7 +780,7 @@ func TestAddOrUpdateIPPool(t *testing.T) {
require.Error(t, err)
}

func TestRemoveIPPool(t *testing.T) {
func TestIPAMRemoveIPPool(t *testing.T) {
// test dual stack subnet
ipam := NewIPAM()
dualSubnetName := "dualSubnet"
Expand Down Expand Up @@ -813,7 +813,7 @@ func TestRemoveIPPool(t *testing.T) {
ipam.RemoveIPPool(dualSubnetName, nonExistPoolName)
}

func TestIPPoolStatistics(t *testing.T) {
func TestIPAMIPPoolStatistics(t *testing.T) {
// test dual stack subnet
ipam := NewIPAM()
dualSubnetName := "dualSubnet"
Expand Down
6 changes: 3 additions & 3 deletions pkg/ipam/subnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ func TestReleaseAddrForDualSubnet(t *testing.T) {
require.False(t, subnet.ContainAddress(v6))
}

func TestAddOrUpdateIPPool(t *testing.T) {
func TestSubnetAddOrUpdateIPPool(t *testing.T) {
excludeIps := []string{
"10.0.0.2", "10.0.0.4", "10.0.0.100",
"10.0.0.252", "10.0.0.253", "10.0.0.254",
Expand Down Expand Up @@ -807,7 +807,7 @@ func TestAddOrUpdateIPPool(t *testing.T) {
require.Equal(t, defaultPool.V6Using.String(), "")
}

func TestRemoveIPPool(t *testing.T) {
func TestSubnetRemoveIPPool(t *testing.T) {
excludeIps := []string{
"10.0.0.2", "10.0.0.4", "10.0.0.100",
"10.0.0.252", "10.0.0.253", "10.0.0.254",
Expand Down Expand Up @@ -895,7 +895,7 @@ func TestRemoveIPPool(t *testing.T) {
require.Equal(t, 1, len(subnet.IPPools))
}

func TestIPPoolStatistics(t *testing.T) {
func TestSubnetIPPoolStatistics(t *testing.T) {
excludeIps := []string{
"10.0.0.2", "10.0.0.4", "10.0.0.100",
"10.0.0.252", "10.0.0.253", "10.0.0.254",
Expand Down

0 comments on commit 5281173

Please sign in to comment.