diff --git a/pkg/multuscniconfig/multusconfig_validate.go b/pkg/multuscniconfig/multusconfig_validate.go index 4e4918a89..c6d8a7e08 100644 --- a/pkg/multuscniconfig/multusconfig_validate.go +++ b/pkg/multuscniconfig/multusconfig_validate.go @@ -117,7 +117,7 @@ func validateCNIConfig(multusConfig *spiderpoolv2beta1.SpiderMultusConfig) *fiel } if injectNetworkResource { - if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, multusConfig.Spec.MacvlanConfig.RdmaResourceName, multusConfig.Spec.MacvlanConfig.SpiderpoolConfigPools); err != nil { + if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, *multusConfig.Spec.MacvlanConfig.RdmaResourceName, multusConfig.Spec.MacvlanConfig.SpiderpoolConfigPools); err != nil { return field.Invalid(macvlanConfigField, *multusConfig.Spec.MacvlanConfig, err.Error()) } } @@ -148,7 +148,7 @@ func validateCNIConfig(multusConfig *spiderpoolv2beta1.SpiderMultusConfig) *fiel } if injectNetworkResource { - if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, multusConfig.Spec.IPVlanConfig.RdmaResourceName, multusConfig.Spec.IPVlanConfig.SpiderpoolConfigPools); err != nil { + if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, *multusConfig.Spec.IPVlanConfig.RdmaResourceName, multusConfig.Spec.IPVlanConfig.SpiderpoolConfigPools); err != nil { return field.Invalid(ipvlanConfigField, *multusConfig.Spec.IPVlanConfig, err.Error()) } } @@ -185,7 +185,7 @@ func validateCNIConfig(multusConfig *spiderpoolv2beta1.SpiderMultusConfig) *fiel } if injectNetworkResource { - if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, multusConfig.Spec.SriovConfig.ResourceName, multusConfig.Spec.SriovConfig.SpiderpoolConfigPools); err != nil { + if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, *multusConfig.Spec.SriovConfig.ResourceName, multusConfig.Spec.SriovConfig.SpiderpoolConfigPools); err != nil { return field.Invalid(sriovConfigField, *multusConfig.Spec.SriovConfig, err.Error()) } } @@ -210,7 +210,7 @@ func validateCNIConfig(multusConfig *spiderpoolv2beta1.SpiderMultusConfig) *fiel } if injectNetworkResource { - if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, multusConfig.Spec.IbSriovConfig.ResourceName, multusConfig.Spec.IbSriovConfig.SpiderpoolConfigPools); err != nil { + if err := ValidateNetworkResouce(multusConfig.Name, multusConfig.Namespace, *multusConfig.Spec.IbSriovConfig.ResourceName, multusConfig.Spec.IbSriovConfig.SpiderpoolConfigPools); err != nil { return field.Invalid(ibsriovConfigField, *multusConfig.Spec.IbSriovConfig, err.Error()) } } diff --git a/test/e2e/spidermultus/spidermultus_test.go b/test/e2e/spidermultus/spidermultus_test.go index a7d3dce93..3a47d56e8 100644 --- a/test/e2e/spidermultus/spidermultus_test.go +++ b/test/e2e/spidermultus/spidermultus_test.go @@ -805,7 +805,7 @@ var _ = Describe("test spidermultus", Label("SpiderMultusConfig"), func() { It("resoucename and ippools config must be both set when spidermutlus with annotation: cni.spidernet.io/network-resource-inject", Label("M00031"), func() { var smcName string = "ann-network-resource" + common.GenerateString(10, true) - smc := &spiderpoolv2beta1.SpiderMultusConfig{ + smc := &v2beta1.SpiderMultusConfig{ ObjectMeta: metav1.ObjectMeta{ Name: smcName, Namespace: namespace, @@ -813,18 +813,17 @@ var _ = Describe("test spidermultus", Label("SpiderMultusConfig"), func() { constant.AnnoNetworkResourceInject: "test", }, }, - Spec: spiderpoolv2beta1.MultusCNIConfigSpec{ + Spec: v2beta1.MultusCNIConfigSpec{ CniType: ptr.To(constant.MacvlanCNI), - MacvlanConfig: &spiderpoolv2beta1.SpiderMacvlanCniConfig{ + MacvlanConfig: &v2beta1.SpiderMacvlanCniConfig{ Master: []string{common.NIC1}, - EnableRdma: true, - RdmaResourceName: "test", - SpiderpoolConfigPools: &spiderpoolv2beta1.SpiderpoolPools{ + RdmaResourceName: ptr.To("test"), + SpiderpoolConfigPools: &v2beta1.SpiderpoolPools{ IPv4IPPool: []string{"test"}, }, }, EnableCoordinator: ptr.To(true), - CoordinatorConfig: &spiderpoolv2beta1.CoordinatorSpec{ + CoordinatorConfig: &v2beta1.CoordinatorSpec{ PodRPFilter: nil, }, }, @@ -836,7 +835,7 @@ var _ = Describe("test spidermultus", Label("SpiderMultusConfig"), func() { It("return an err if resoucename is set without ippools config when spidermutlus with annotation: cni.spidernet.io/network-resource-inject", Label("M00032"), func() { var smcName string = "ann-network-resource" + common.GenerateString(10, true) - smc := &spiderpoolv2beta1.SpiderMultusConfig{ + smc := &v2beta1.SpiderMultusConfig{ ObjectMeta: metav1.ObjectMeta{ Name: smcName, Namespace: namespace, @@ -844,15 +843,14 @@ var _ = Describe("test spidermultus", Label("SpiderMultusConfig"), func() { constant.AnnoNetworkResourceInject: "test", }, }, - Spec: spiderpoolv2beta1.MultusCNIConfigSpec{ + Spec: v2beta1.MultusCNIConfigSpec{ CniType: ptr.To(constant.MacvlanCNI), - MacvlanConfig: &spiderpoolv2beta1.SpiderMacvlanCniConfig{ + MacvlanConfig: &v2beta1.SpiderMacvlanCniConfig{ Master: []string{common.NIC1}, - EnableRdma: true, - RdmaResourceName: "test", + RdmaResourceName: ptr.To("test"), }, EnableCoordinator: ptr.To(true), - CoordinatorConfig: &spiderpoolv2beta1.CoordinatorSpec{ + CoordinatorConfig: &v2beta1.CoordinatorSpec{ PodRPFilter: nil, }, },