cnf network: Add Rdma Metrics Test Cases #202
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
evgenLevin
reviewed
Sep 16, 2024
| @@ -15,4 +15,6 @@ const ( | |||
| LabelExposeMTUTestCases = "exposemtu" | |||
| // LabelSriovMetricsTestCases represents Sriov Metrics Exporter label that can be used for test cases selection. | |||
| LabelSriovMetricsTestCases = "sriovmetrics" | |||
| // LabelRdmaMetricsTestCases represents Sriov Metrics Exporter label that can be used for test cases selection. | |||
| var ( | ||
| workerNodeList []*nodes.Builder | ||
| sriovInterfacesUnderTest []string | ||
| sriovDeviceID string |
| ) | ||
|
|
||
| BeforeAll(func() { | ||
| By("Verifying if Sriov Metrics Exporter tests can be executed on given cluster") |
| By("Verifying if Sriov Metrics Exporter tests can be executed on given cluster") | ||
| err := netenv.DoesClusterHasEnoughNodes(APIClient, NetConfig, 1, 1) | ||
| Expect(err).ToNot(HaveOccurred(), | ||
| "Cluster doesn't support Sriov Metrics Exporter test cases as it doesn't have enough nodes") |
| By("Fetch PCI Address and Rdma device from Pod Annotations") | ||
| pciAddress, rdmaDevice, err := getInterfacePci(testPod, "net1") | ||
| Expect(err).ToNot(HaveOccurred(), | ||
| fmt.Sprintf("Could not get PCI Address and/or Rdma device from Pod Annotations with Error: %s", err)) |
There was a problem hiding this comment.
no need err in the descriotion, It'll be shown in any way
| Expect(err).ToNot(HaveOccurred(), "Failed to serialize ignition config") | ||
|
|
||
| createdMC, err := mco.NewMCBuilder(APIClient, "02-rdma-netns-exclusive-mode"). | ||
| WithLabel("machineconfiguration.openshift.io/role", "workercnf"). |
There was a problem hiding this comment.
| CreateAndWaitUntilRunning(2 * time.Minute) | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to create Pod %s") | ||
|
|
||
| tPod.Exists() |
There was a problem hiding this comment.
CreateAndWaitUntilRunning() returns the pod builder which is still in Pending status. So it does not have network-status annotations set. Exists() updates the builder with all fields, so we can see the annotations.
Ideally this should be part of CreateAndWaitUntilRunning method.
|
|
||
| pciAddress, rdmaDevice, err := getInterfacePci(inputPod, iName) | ||
| Expect(err).ToNot(HaveOccurred(), | ||
| fmt.Sprintf("Could not get PCI Address and/or Rdma device from Pod Annotations with Error: %s", err)) |
There was a problem hiding this comment.
no need err in the description
evgenLevin
previously approved these changes
Sep 18, 2024
|
|
||
| tPol := defineAndCreateNodePolicy("rdmapolicy1", "sriovpf1", sriovInterfacesUnderTest[0], 1, 0) | ||
| tNet := defineAndCreateSriovNetworkWithRdma("sriovnet1", tPol.Object.Spec.ResourceName, false) | ||
| testPod := defineAndCreatePod(tNet.Object.Name, "") |
There was a problem hiding this comment.
Suggested change
| testPod := defineAndCreatePod(tNet.Object.Name, "") | |
| testPod := defineAndCreatePod(tNet.Object.Name) |
| By("Define and Create Test Resources") | ||
| tPol := defineAndCreateNodePolicy("rdmapolicy1", "sriovpf1", sriovInterfacesUnderTest[0], 1, 0) | ||
| tNet := defineAndCreateSriovNetworkWithRdma("sriovnet1", tPol.Object.Spec.ResourceName, true) | ||
| testPod := defineAndCreatePod(tNet.Object.Name, "") |
There was a problem hiding this comment.
Suggested change
| testPod := defineAndCreatePod(tNet.Object.Name, "") | |
| testPod := defineAndCreatePod(tNet.Object.Name) |
SchSeba
reviewed
Sep 19, 2024
Comment on lines
+8
to
+25
| ignition "github.com/coreos/ignition/v2/config/v3_1/types" | ||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| "github.com/openshift-kni/eco-goinfra/pkg/mco" | ||
| "github.com/openshift-kni/eco-goinfra/pkg/namespace" | ||
| "github.com/openshift-kni/eco-goinfra/pkg/nodes" | ||
| "github.com/openshift-kni/eco-goinfra/pkg/pod" | ||
| "github.com/openshift-kni/eco-goinfra/pkg/reportxml" | ||
| "github.com/openshift-kni/eco-goinfra/pkg/sriov" | ||
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netenv" | ||
| . "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netinittools" | ||
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netparam" | ||
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/sriov/internal/sriovenv" | ||
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/sriov/internal/tsparams" | ||
| "github.com/openshift-kni/eco-gotests/tests/internal/cluster" | ||
| "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/labels" |
There was a problem hiding this comment.
Suggested change
| ignition "github.com/coreos/ignition/v2/config/v3_1/types" | |
| . "github.com/onsi/ginkgo/v2" | |
| . "github.com/onsi/gomega" | |
| "github.com/openshift-kni/eco-goinfra/pkg/mco" | |
| "github.com/openshift-kni/eco-goinfra/pkg/namespace" | |
| "github.com/openshift-kni/eco-goinfra/pkg/nodes" | |
| "github.com/openshift-kni/eco-goinfra/pkg/pod" | |
| "github.com/openshift-kni/eco-goinfra/pkg/reportxml" | |
| "github.com/openshift-kni/eco-goinfra/pkg/sriov" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netenv" | |
| . "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netinittools" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netparam" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/sriov/internal/sriovenv" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/sriov/internal/tsparams" | |
| "github.com/openshift-kni/eco-gotests/tests/internal/cluster" | |
| "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" | |
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | |
| "k8s.io/apimachinery/pkg/labels" | |
| . "github.com/onsi/ginkgo/v2" | |
| . "github.com/onsi/gomega" | |
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | |
| "k8s.io/apimachinery/pkg/labels" | |
| ignition "github.com/coreos/ignition/v2/config/v3_1/types" | |
| "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" | |
| "github.com/openshift-kni/eco-goinfra/pkg/mco" | |
| "github.com/openshift-kni/eco-goinfra/pkg/namespace" | |
| "github.com/openshift-kni/eco-goinfra/pkg/nodes" | |
| "github.com/openshift-kni/eco-goinfra/pkg/pod" | |
| "github.com/openshift-kni/eco-goinfra/pkg/reportxml" | |
| "github.com/openshift-kni/eco-goinfra/pkg/sriov" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netenv" | |
| . "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netinittools" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/internal/netparam" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/sriov/internal/sriovenv" | |
| "github.com/openshift-kni/eco-gotests/tests/cnf/core/network/sriov/internal/tsparams" | |
| "github.com/openshift-kni/eco-gotests/tests/internal/cluster" | |
There was a problem hiding this comment.
Updated as mentioned.
| Expect(sriovDeviceID).ToNot(BeEmpty(), "Expected sriovDeviceID not to be empty") | ||
|
|
||
| By("Skipping test cases if the Sriov device is not of Mellanox") | ||
| if !(sriovDeviceID == netparam.MlxDeviceID || sriovDeviceID == netparam.MlxBFDeviceID) { |
There was a problem hiding this comment.
can can check the vendorID as any of the mlx devices support RDMA
There was a problem hiding this comment.
Ok. I updated it to use Vendor ID now.
|
lgtm |
gkopels
approved these changes
Sep 24, 2024
evgenLevin
approved these changes
Sep 26, 2024
josclark42
pushed a commit
to josclark42/eco-gotests
that referenced
this pull request
Oct 3, 2024
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.
No description provided.