Skip to content

[release-4.21] OCPBUGS-88564: fix CUDN status condition tests for new TransportAccepted condition #31300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.21
Choose a base branch
from
+21 −13
Open

[release-4.21] OCPBUGS-88564: fix CUDN status condition tests for new TransportAccepted condition #31300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions test/extended/networking/network_segmentation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,13 +1146,13 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
g.Expect(json.Unmarshal([]byte(conditionsJSON), &actualConditions)).To(Succeed())
return normalizeConditions(actualConditions)
}, 5*time.Second, 1*time.Second).Should(SatisfyAny(
ConsistOf(metav1.Condition{
ContainElement(metav1.Condition{
Type: "NetworkReady",
Status: metav1.ConditionFalse,
Reason: "NetworkAttachmentDefinitionSyncError",
Message: expectedMessage,
}),
ConsistOf(metav1.Condition{
ContainElement(metav1.Condition{
Type: "NetworkCreated",
Status: metav1.ConditionFalse,
Reason: "NetworkAttachmentDefinitionSyncError",
Expand Down Expand Up @@ -1655,23 +1655,31 @@ func validateClusterUDNStatusReportsActiveNamespacesFunc(client dynamic.Interfac
return fmt.Errorf("expected at least one condition in %v", cUDN)
}

c := conditions[0]
if c.Type != "NetworkCreated" && c.Type != "NetworkReady" {
return fmt.Errorf("expected NetworkCreated/NetworkReady type in %v", c)
// Find NetworkCreated/NetworkReady condition among all conditions
var networkCond *metav1.Condition
for i := range conditions {
if conditions[i].Type == "NetworkCreated" || conditions[i].Type == "NetworkReady" {
networkCond = &conditions[i]
break
}
}
if c.Status != metav1.ConditionTrue {
return fmt.Errorf("expected True status in %v", c)
if networkCond == nil {
return fmt.Errorf("NetworkCreated/NetworkReady condition not found in conditions: %v", conditions)
}

if networkCond.Status != metav1.ConditionTrue {
return fmt.Errorf("expected True status in %v", networkCond)
}
if c.Reason != "NetworkAttachmentDefinitionCreated" && c.Reason != "NetworkAttachmentDefinitionReady" {
return fmt.Errorf("expected NetworkAttachmentDefinitionCreated/NetworkAttachmentDefinitionReady reason in %v", c)
if networkCond.Reason != "NetworkAttachmentDefinitionCreated" && networkCond.Reason != "NetworkAttachmentDefinitionReady" {
return fmt.Errorf("expected NetworkAttachmentDefinitionCreated/NetworkAttachmentDefinitionReady reason in %v", networkCond)
}
if !strings.Contains(c.Message, "NetworkAttachmentDefinition has been created in following namespaces:") {
return fmt.Errorf("expected \"NetworkAttachmentDefinition has been created in following namespaces:\" in %s", c.Message)
if !strings.Contains(networkCond.Message, "NetworkAttachmentDefinition has been created in following namespaces:") {
return fmt.Errorf("expected \"NetworkAttachmentDefinition has been created in following namespaces:\" in %s", networkCond.Message)
}

for _, ns := range expectedActiveNsNames {
if !strings.Contains(c.Message, ns) {
return fmt.Errorf("expected to find %q namespace in %s", ns, c.Message)
if !strings.Contains(networkCond.Message, ns) {
return fmt.Errorf("expected to find %q namespace in %s", ns, networkCond.Message)
}
}
return nil
Expand Down