@@ -124,7 +124,7 @@ var _ = Describe("Service", func() {
124124 genericPlugin = plugins_mock .NewMockVendorPlugin (testCtrl )
125125 virtualPlugin = plugins_mock .NewMockVendorPlugin (testCtrl )
126126
127- newPlatformFunc = func (hostHelpers helper.HostHelpersInterface ) (platform.Interface , error ) {
127+ newPlatformFunc = func (platformType consts. PlatformTypes , hostHelpers helper.HostHelpersInterface ) (platform.Interface , error ) {
128128 return platformMock , nil
129129 }
130130 newHostHelpersFunc = func () (helper.HostHelpersInterface , error ) {
@@ -146,15 +146,15 @@ var _ = Describe("Service", func() {
146146 hostHelpers .EXPECT ().CheckRDMAEnabled ().Return (true , nil )
147147 hostHelpers .EXPECT ().TryEnableTun ().Return ()
148148 hostHelpers .EXPECT ().TryEnableVhostNet ().Return ()
149- hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (0 ), nil )
149+ hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (consts . Baremetal ), nil )
150150 hostHelpers .EXPECT ().ReadSriovSupportedNics ().Return (testSriovSupportedNicIDs , nil )
151151 hostHelpers .EXPECT ().RemoveSriovResult ().Return (nil )
152152 hostHelpers .EXPECT ().WriteSriovResult (& hosttypes.SriovResult {SyncStatus : consts .SyncStatusInProgress })
153153
154154 genericPlugin .EXPECT ().OnNodeStateChange (newNodeStateContainsDeviceMatcher ("enp216s0f0np0" )).Return (true , false , nil )
155155 genericPlugin .EXPECT ().Apply ().Return (nil )
156156
157- platformMock .EXPECT ().SystemdGetPlugin (phaseArg ).Return (genericPlugin , nil )
157+ platformMock .EXPECT ().SystemdGetVendorPlugin (phaseArg ).Return (genericPlugin , nil )
158158 platformMock .EXPECT ().DiscoverSriovDevices ().Return ([]sriovnetworkv1.InterfaceExt {{
159159 Name : "enp216s0f0np0" ,
160160 }}, nil )
@@ -168,12 +168,12 @@ var _ = Describe("Service", func() {
168168 hostHelpers .EXPECT ().CheckRDMAEnabled ().Return (true , nil )
169169 hostHelpers .EXPECT ().TryEnableTun ().Return ()
170170 hostHelpers .EXPECT ().TryEnableVhostNet ().Return ()
171- hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (1 ), nil )
171+ hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (consts . VirtualOpenStack ), nil )
172172 hostHelpers .EXPECT ().ReadSriovSupportedNics ().Return (testSriovSupportedNicIDs , nil )
173173 hostHelpers .EXPECT ().RemoveSriovResult ().Return (nil )
174174 hostHelpers .EXPECT ().WriteSriovResult (& hosttypes.SriovResult {SyncStatus : consts .SyncStatusInProgress })
175175
176- platformMock .EXPECT ().SystemdGetPlugin (phaseArg ).Return (virtualPlugin , nil )
176+ platformMock .EXPECT ().SystemdGetVendorPlugin (phaseArg ).Return (virtualPlugin , nil )
177177 platformMock .EXPECT ().DiscoverSriovDevices ().Return ([]sriovnetworkv1.InterfaceExt {{
178178 Name : "enp216s0f0np0" ,
179179 }}, nil )
@@ -192,15 +192,15 @@ var _ = Describe("Service", func() {
192192 hostHelpers .EXPECT ().CheckRDMAEnabled ().Return (true , nil )
193193 hostHelpers .EXPECT ().TryEnableTun ().Return ()
194194 hostHelpers .EXPECT ().TryEnableVhostNet ().Return ()
195- hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (0 ), nil )
195+ hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (consts . Baremetal ), nil )
196196 hostHelpers .EXPECT ().ReadSriovSupportedNics ().Return (testSriovSupportedNicIDs , nil )
197197 hostHelpers .EXPECT ().RemoveSriovResult ().Return (nil )
198198 hostHelpers .EXPECT ().WriteSriovResult (& hosttypes.SriovResult {SyncStatus : consts .SyncStatusFailed , LastSyncError : "pre: failed to apply configuration: test" })
199199
200200 genericPlugin .EXPECT ().OnNodeStateChange (newNodeStateContainsDeviceMatcher ("enp216s0f0np0" )).Return (true , false , nil ).AnyTimes ()
201201 genericPlugin .EXPECT ().Apply ().Return (testError )
202202
203- platformMock .EXPECT ().SystemdGetPlugin (phaseArg ).Return (genericPlugin , nil )
203+ platformMock .EXPECT ().SystemdGetVendorPlugin (phaseArg ).Return (genericPlugin , nil )
204204 platformMock .EXPECT ().DiscoverSriovDevices ().Return ([]sriovnetworkv1.InterfaceExt {{
205205 Name : "enp216s0f0np0" ,
206206 }}, nil )
@@ -214,14 +214,14 @@ var _ = Describe("Service", func() {
214214 hostHelpers .EXPECT ().TryGetInterfaceName ("0000:d8:00.0" ).Return ("enp216s0f0np0" )
215215 hostHelpers .EXPECT ().WaitUdevEventsProcessed (60 ).Return (nil )
216216 hostHelpers .EXPECT ().ReadSriovResult ().Return (getTestResultFileContent ("InProgress" , "" ), nil )
217- hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (0 ), nil )
217+ hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (consts . Baremetal ), nil )
218218 hostHelpers .EXPECT ().ReadSriovSupportedNics ().Return (testSriovSupportedNicIDs , nil )
219219 hostHelpers .EXPECT ().WriteSriovResult (& hosttypes.SriovResult {SyncStatus : consts .SyncStatusSucceeded })
220220
221221 genericPlugin .EXPECT ().OnNodeStateChange (newNodeStateContainsDeviceMatcher ("enp216s0f0np0" )).Return (true , false , nil )
222222 genericPlugin .EXPECT ().Apply ().Return (nil )
223223
224- platformMock .EXPECT ().SystemdGetPlugin (phaseArg ).Return (genericPlugin , nil )
224+ platformMock .EXPECT ().SystemdGetVendorPlugin (phaseArg ).Return (genericPlugin , nil )
225225 platformMock .EXPECT ().DiscoverSriovDevices ().Return ([]sriovnetworkv1.InterfaceExt {{
226226 Name : "enp216s0f0np0" ,
227227 }}, nil )
@@ -233,15 +233,15 @@ var _ = Describe("Service", func() {
233233
234234 It ("Post phase - virtual cluster" , func () {
235235 phaseArg = consts .PhasePost
236- hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (1 ), nil )
236+ hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (consts . VirtualOpenStack ), nil )
237237 hostHelpers .EXPECT ().ReadSriovSupportedNics ().Return (testSriovSupportedNicIDs , nil )
238238 hostHelpers .EXPECT ().ReadSriovResult ().Return (getTestResultFileContent ("InProgress" , "" ), nil )
239239 hostHelpers .EXPECT ().WriteSriovResult (& hosttypes.SriovResult {SyncStatus : consts .SyncStatusSucceeded })
240240
241241 virtualPlugin .EXPECT ().OnNodeStateChange (newNodeStateContainsDeviceMatcher ("enp216s0f0np0" )).Return (true , false , nil )
242242 virtualPlugin .EXPECT ().Apply ().Return (nil )
243243
244- platformMock .EXPECT ().SystemdGetPlugin (phaseArg ).Return (virtualPlugin , nil )
244+ platformMock .EXPECT ().SystemdGetVendorPlugin (phaseArg ).Return (virtualPlugin , nil )
245245 platformMock .EXPECT ().DiscoverSriovDevices ().Return ([]sriovnetworkv1.InterfaceExt {{
246246 Name : "enp216s0f0np0" ,
247247 }}, nil )
@@ -253,25 +253,26 @@ var _ = Describe("Service", func() {
253253
254254 It ("Post phase - wrong result of the pre phase" , func () {
255255 phaseArg = consts .PhasePost
256- hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (1 ), nil )
256+ hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig (consts . VirtualOpenStack ), nil )
257257 hostHelpers .EXPECT ().ReadSriovSupportedNics ().Return (testSriovSupportedNicIDs , nil )
258258 hostHelpers .EXPECT ().ReadSriovResult ().Return (getTestResultFileContent ("Failed" , "pretest" ), nil )
259259 hostHelpers .EXPECT ().WriteSriovResult (& hosttypes.SriovResult {SyncStatus : consts .SyncStatusFailed , LastSyncError : "post: unexpected result of the pre phase: Failed, syncError: pretest" })
260260
261261 Expect (runServiceCmd (& cobra.Command {}, []string {})).To (HaveOccurred ())
262262 })
263263 It ("waitForDevicesInitialization" , func () {
264- cfg := & hosttypes.SriovConfig {Spec : sriovnetworkv1.SriovNetworkNodeStateSpec {
265- Interfaces : []sriovnetworkv1.Interface {
266- {Name : "name1" , PciAddress : "0000:d8:00.0" },
267- {Name : "name2" , PciAddress : "0000:d8:00.1" }}}}
264+ cfg := getTestSriovInterfaceConfig (consts .Baremetal )
265+ cfg .Spec .Interfaces = []sriovnetworkv1.Interface {
266+ {Name : "name1" , PciAddress : "0000:d8:00.0" },
267+ {Name : "name2" , PciAddress : "0000:d8:00.1" },
268+ }
268269 hostHelpers .EXPECT ().TryGetInterfaceName ("0000:d8:00.0" ).Return ("other" )
269270 hostHelpers .EXPECT ().TryGetInterfaceName ("0000:d8:00.1" ).Return ("" )
270271 hostHelpers .EXPECT ().TryGetInterfaceName ("0000:d8:00.0" ).Return ("name1" )
271272 hostHelpers .EXPECT ().TryGetInterfaceName ("0000:d8:00.1" ).Return ("" )
272273 hostHelpers .EXPECT ().TryGetInterfaceName ("0000:d8:00.1" ).Return ("name2" )
273274 hostHelpers .EXPECT ().WaitUdevEventsProcessed (60 ).Return (nil )
274- hostHelpers .EXPECT ().ReadConfFile ().Return (getTestSriovInterfaceConfig ( 0 ) , nil )
275+ hostHelpers .EXPECT ().ReadConfFile ().Return (cfg , nil )
275276 sc , err := newServiceConfig (logr .Discard ())
276277 Expect (err ).ToNot (HaveOccurred ())
277278 sc .sriovConfig = cfg
0 commit comments