Skip to content

fix-nmstate-ip-check-4-18 #1196

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
gkopels wants to merge 1 commit into
base: release-4.18
Choose a base branch
from
Open

fix-nmstate-ip-check-4-18 #1196

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
29 changes: 21 additions & 8 deletions tests/cnf/core/network/metallb/tests/frrk8-tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,10 @@ var _ = Describe("FRR", Ordered, Label(tsparams.LabelFRRTestCases), ContinueOnFa

By("Verify secondary interfaces are UP with IP addresses on worker nodes")
for _, workerNode := range workerNodeList {
checkInterfaceExistsOnNode(workerNode.Definition.Name, secondaryInterfaceName)
Eventually(func() error {
return checkInterfaceExistsOnNode(workerNode.Definition.Name, secondaryInterfaceName)
}, time.Minute, 5*time.Second).Should(Succeed(),
"Interface %s not ready on node %s", secondaryInterfaceName, workerNode.Definition.Name)
}

By("Adding static routes to the speakers")
Expand Down Expand Up @@ -871,21 +874,31 @@ func removeSecondaryIPsFromWorkerNodes(workerNodeList []*nodes.Builder, ipv4Addr
}
}

func checkInterfaceExistsOnNode(nodeName, interfaceName string) {
func checkInterfaceExistsOnNode(nodeName, interfaceName string) error {
nodeNetworkState, err := nmstate.PullNodeNetworkState(APIClient, nodeName)
Expect(err).ToNot(HaveOccurred(), "Failed to pull NodeNetworkState for node %s", nodeName)
if err != nil {
return fmt.Errorf("failed to pull NodeNetworkState for node %s: %w", nodeName, err)
}

netInterface, err := nodeNetworkState.GetInterfaceType(interfaceName, "ethernet")
Expect(err).ToNot(HaveOccurred(), "Interface %s not found on node %s", interfaceName, nodeName)
if err != nil {
return fmt.Errorf("interface %s not found on node %s: %w", interfaceName, nodeName, err)
}

Expect(netInterface.State).To(Equal("up"),
"Interface %s is not UP on node %s (current state: %s)", interfaceName, nodeName, netInterface.State)
if netInterface.State != "up" {
return fmt.Errorf("interface %s is not UP on node %s (current state: %s)",
interfaceName, nodeName, netInterface.State)
}

hasIPv4 := netInterface.Ipv4.Enabled && len(netInterface.Ipv4.Address) > 0
hasIPv6 := netInterface.Ipv6.Enabled && len(netInterface.Ipv6.Address) > 0

Expect(hasIPv4 || hasIPv6).To(BeTrue(),
"Interface %s does not have an IP address assigned on node %s", interfaceName, nodeName)
if !hasIPv4 && !hasIPv6 {
return fmt.Errorf("interface %s does not have an IP address assigned on node %s",
interfaceName, nodeName)
}

return nil
}

func createStaticIPAnnotations(internalNADName, externalNADName string, internalIPAddresses,
Expand Down