Merge pull request #2140 from cyclinder/spidermultusconfig/sriov

spidermultusconfig: remove redundant field "resourceName"
spidernet-io · Aug 8, 2023 · e343da4 · e343da4
2 parents cdcb75d + e139119
commit e343da4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/pkg/multuscniconfig/utils.go b/pkg/multuscniconfig/utils.go
@@ -53,11 +53,10 @@ type IPvlanNetConf struct {
 }
 
 type SRIOVNetConf struct {
-	Type         string                   `json:"type"`
-	ResourceName string                   `json:"resourceName"` // required
-	IPAM         spiderpoolcmd.IPAMConfig `json:"ipam"`
-	Vlan         *int32                   `json:"vlan,omitempty"`
-	DeviceID     string                   `json:"deviceID,omitempty"`
+	Type     string                   `json:"type"`
+	IPAM     spiderpoolcmd.IPAMConfig `json:"ipam"`
+	Vlan     *int32                   `json:"vlan,omitempty"`
+	DeviceID string                   `json:"deviceID,omitempty"`
 }
 
 type IfacerNetConf = ifacercmd.Ifacer

diff --git a/test/doc/spidermultus.md b/test/doc/spidermultus.md
@@ -2,10 +2,15 @@
 
 | Case ID | Title                                                        | Priority | Smoke | Status | Other |
 | ------- | ------------------------------------------------------------ | -------- | ----- | ------ | ----- |
-| M00001  | After creating spiderMultusConfig, a corresponding multus net-attach-conf will be created  | p1       |   smoke    | done   |       |
-| M00002  | After deleting spiderMultusConfig, the corresponding net-attach-conf will also be deleted  | p1      |  smoke  | done   |       |
-| M00003  | Update spidermultusConfig, the corresponding multus net-attach-conf will also be updated   | p1      |  smoke  |    |       |
-| M00004  | Manually delete the net-attach-conf of multus, it will be created automatically | p1      |  smoke  |  done  |       |
-| M00005  | Customize net-attach-conf name via annotation multus.spidernet.io/cr-name | p2       |       |  done  |       |
-| M00006  | Change net-attach-conf version via annotation multus.spidernet.io/cni-version | p2     |       |  done  |       |
-| M00007  | spidermultusconfig webhook verification, including vlan, cnitype and other fields | p3     |       |    |       |
+| M00001  | testing creating spiderMultusConfig with cniType: macvlan and checking the net-attach-conf config if works | p1       |   smoke    | done   |       |
+| M00002  | testing creating spiderMultusConfig with cniType: ipvlan and checking the net-attach-conf config if works | p1       |   smoke    |    |       |
+| M00003  | testing creating spiderMultusConfig with cniType: sriov and checking the net-attach-conf config if works | p1       |   smoke    |    |       |
+| M00004  | testing creating spiderMultusConfig with cniType: custom and checking the net-attach-conf config if works | p1       |   smoke    |    |       |
+| M00005  | testing creating spiderMultusConfig with cniType: macvlan with vlanId with one master and checking the net-attach-conf config if works | p1       |   smoke    |    |       |
+| M00006  | testing creating spiderMultusConfig with cniType: macvlan with vlanId with two master with bond config and checking the net-attach-conf config if works | p1       |   smoke    |    |       |
+| M00007  | After deleting spiderMultusConfig, the corresponding net-attach-conf will also be deleted  | p1      |  smoke  |    |       |
+| M00008  | Update spidermultusConfig, the corresponding multus net-attach-conf will also be updated   | p1      |  smoke  |    |       |
+| M00009  | Update spidermultusConfig: add new bond config  | p1      |  smoke  |    |       |
+| M000010  | Manually delete the net-attach-conf of multus, it will be created automatically | p1      |  smoke  |    |       |
+| M000011  | Customize net-attach-conf name via annotation multus.spidernet.io/cr-name | p2       |       |    |       |
+| M000012 | Change net-attach-conf version via annotation multus.spidernet.io/cni-version | p2     |       |    |       |