[traffic-gen-in-vm] Refactor VMI creation #147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, the `vmi.go` file in the `vmi` package, contains code that does mostly VMI spec building. Follow-up commits will move all non-spec building logic away from this file. Its test file was renamed as well. Signed-off-by: Orel Misan <[email protected]>
Currently, the code that creates the two custom VMIs is located in `checkup.go`. Add a new `vmi.go` file in the `checkup` package, that will contain all the logic related to creating customized VMIs. Signed-off-by: Orel Misan <[email protected]>
Currently, both VMI under test and traffic-gen are built by the shared `NewDPDKVMI` function. In an effort to move all checkup-specific logic away from `spec.go`, Move the `NewDPDKVMI` function and its accompanying DPDKVMIConfig struct, to the `vmi.go` file in the `checkup` package. Also move the `CloudInit` and `RandomizeName` functions. Signed-off-by: Orel Misan <[email protected]>
In order to move the `Affinity` function in the following commit, Export the `newRequiredNodeAffinity` and `newPreferredPodAntiAffinity` functions. Signed-off-by: Orel Misan <[email protected]>
Currently, the affinity calculation is located under the `vmi` package. The above code is checkup-specific, and could be moved to the `checkup` package, along with the other check-specific code. Signed-off-by: Orel Misan <[email protected]>
The DPDKCheckupUIDLabelKey constant is checkup-specific, move it to the `checkup` package. Signed-off-by: Orel Misan <[email protected]>
In order to separate the build of the two VMIs in a follow-up commit, move the shared constants to a higher scope. Signed-off-by: Orel Misan <[email protected]>
|
Tested against an OpenShift Virtualization 4.14 cluster. |
orelmisan
force-pushed
the
refactor_vmi_creation
branch
from
7f28215
to
1b631cb
Compare
|
Change: Updated commit message. |
orelmisan
force-pushed
the
refactor_vmi_creation
branch
from
1b631cb
to
b2c76d2
Compare
|
Change: Refactored last commit so it will be better suited for the follow-up PR. |
RamLavi
reviewed
Jul 19, 2023
RamLavi
requested changes
Jul 19, 2023
.golangci.yml
Outdated
| @@ -3,8 +3,6 @@ | |||
| linters-settings: | |||
| gofmt: | |||
| simplify: false | |||
| dupl: | |||
There was a problem hiding this comment.
Can you insert this in a separate PR?
There was a problem hiding this comment.
After implementing your suggestion, this change is no longer needed.
pkg/internal/checkup/vmi.go
Outdated
| Username: config.VMIUsername, | ||
| Password: config.VMIPassword, | ||
| } | ||
| vmiUnderTest := newBaseVMI(checkupConfig) |
There was a problem hiding this comment.
It seems redundant to iterate over the options in two places (vmi.New and applyOptionsToVMI).
How about creating a function baseVMIOptions and then something like this?
baseOptions := baseVMIOptions(checkupConfig)
vmiunderTestCustomOptions := []vmi.Option{
vmi.WithAffinity(Affinity(checkupConfig.DPDKNodeLabelSelector, checkupConfig.PodUID)),
vmi.WithSRIOVInterface(eastNetworkName, checkupConfig.DPDKEastMacAddress.String(), config.VMIEastNICPCIAddress),
vmi.WithSRIOVInterface(westNetworkName, checkupConfig.DPDKWestMacAddress.String(), config.VMIWestNICPCIAddress),
vmi.WithContainerDisk(rootDiskName, checkupConfig.VMContainerDiskImage),
vmi.WithCloudInitNoCloudVolume(cloudInitDiskName, CloudInit(config.VMIUsername, config.VMIPassword)
}
return vmi.New(RandomizeName(VMIUnderTestNamePrefix),baseOptions, vmiunderTestCustomOptions)
There was a problem hiding this comment.
Done.
It really improved the code.
Thank you.
It is already under the A name that I don't like is |
Currently, the two VMIs are built using the same basic spec, but with
different parameters:
1. VMI name.
2. Affinity settings.
3. ContainerDisk image name.
4. NIC{1..2} MAC and PCI addresses.
The traffic gen VMI, needs to have additional configuration
in order to receive the TRex configuration using a ConfigMap object.
Separate the build of the two VMIs.
Use a base spec that is identical between the VMIs.
Signed-off-by: Orel Misan <[email protected]>
Currently, the two VMIs are given a different random suffix. Also, the traffic gen ConfigMap object has no suffix, which prevents running more than one instance of the checkup in a single namespace. Give the two VMIs and the traffic gen ConfigMap the same random suffix, so it will be easier to identify then in a glance. Signed-off-by: Orel Misan <[email protected]>
orelmisan
force-pushed
the
refactor_vmi_creation
branch
from
b2c76d2
to
a086020
Compare
|
Change: Answered review comments. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the two VMIs are built using the same basic spec, but with different parameters, such as:
In order to enable the traffic gen VMI to receive TRex configuration files using a ConfigMap, the traffic gen VMI spec
should receive additional parameters (and be independent from the VMI under test).
Move all high-level VMI building logic to the
vmi.gofile under thecheckuppackage.Keep the low-level VMI spec building logic under the
checkup/vmipackage.Add an identical random suffix to all created objects: