Skip to content

Commit

Permalink
fix the silk controller integration tests
Browse files Browse the repository at this point in the history 
now that the overlay network is an array of cidrs
  • Loading branch information
@ameowlia
ameowlia committed Nov 14, 2024
1 parent 248e62f commit d809803
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/silk/controller/integration/helpers/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func DefaultTestConfig(dbConf db.Config, fixturesPath string) config.Config {
CACertFile: filepath.Join(fixturesPath, "ca.crt"),
ServerCertFile: filepath.Join(fixturesPath, "server.crt"),
ServerKeyFile: filepath.Join(fixturesPath, "server.key"),
Network: "10.255.0.0/16",
Network: []string{"10.255.0.0/16", "10.250.0.0/16"},
SubnetPrefixLength: 24,
Database: dbConf,
LeaseExpirationSeconds: 60,
Expand Down
46 changes: 31 additions & 15 deletions src/code.cloudfoundry.org/silk/controller/integration/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"code.cloudfoundry.org/silk/controller/config"
"code.cloudfoundry.org/silk/controller/integration/helpers"
"code.cloudfoundry.org/silk/controller/leaser"
"code.cloudfoundry.org/silk/daemon"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -83,14 +84,21 @@ var _ = Describe("Silk Controller", func() {

Describe("acquiring", func() {
It("provides an endpoint to acquire a subnet leases", func() {
By("acquiring a lease")
lease, err := testClient.AcquireSubnetLease("10.244.4.5")
Expect(err).NotTo(HaveOccurred())
Expect(lease.UnderlayIP).To(Equal("10.244.4.5"))

By("checking that the lease subnet is valid")
_, subnet, err := net.ParseCIDR(lease.OverlaySubnet)
Expect(err).NotTo(HaveOccurred())
_, network, err := net.ParseCIDR(conf.Network)

By("checking that the lease is contained in the overlay network")
overlayNetwork, err := daemon.NewMultipleCIDRNetwork(conf.Network)
Expect(err).NotTo(HaveOccurred())
Expect(network.Contains(subnet.IP)).To(BeTrue())
Expect(overlayNetwork.Contains(subnet.IP)).To(BeTrue())

By("checking the hardware attr")
expectedHardwareAddr, err := (&leaser.HardwareAddressGenerator{}).GenerateForVTEP(subnet.IP)
Expect(err).NotTo(HaveOccurred())
Expect(lease.OverlayHardwareAddr).To(Equal(expectedHardwareAddr.String()))
Expand All @@ -117,19 +125,24 @@ var _ = Describe("Silk Controller", func() {
Context("when the existing lease is in a different overlay network", func() {
BeforeEach(func() {
helpers.StopServer(session)
conf.Network = "10.254.0.0/16"
conf.Network = []string{"10.254.0.0/16", "10.253.0.0/16"}
session = helpers.StartAndWaitForServer(controllerBinaryPath, conf, testClient)
})

It("returns a new lease in the new network", func() {
By("acquiring a new lease after the overlay network has changed")
lease, err := testClient.AcquireSubnetLease("10.244.4.5")
Expect(err).NotTo(HaveOccurred())

Expect(lease).NotTo(Equal(existingLease))

By("checking that the new lease is a valid subnet")
_, subnet, err := net.ParseCIDR(lease.OverlaySubnet)
Expect(err).NotTo(HaveOccurred())
_, network, err := net.ParseCIDR(conf.Network)

By("checking that the new lease is in the new overlay network")
overlayNetwork, err := daemon.NewMultipleCIDRNetwork(conf.Network)
Expect(err).NotTo(HaveOccurred())
Expect(network.Contains(subnet.IP)).To(BeTrue())
Expect(overlayNetwork.Contains(subnet.IP)).To(BeTrue())
})
})
})
Expand Down Expand Up @@ -199,7 +212,7 @@ var _ = Describe("Silk Controller", func() {
Describe("lease expiration", func() {
BeforeEach(func() {
helpers.StopServer(session)
conf.Network = "10.255.0.0/29"
conf.Network = []string{"10.255.0.0/29"}
conf.SubnetPrefixLength = 30
conf.LeaseExpirationSeconds = 3
session = helpers.StartAndWaitForServer(controllerBinaryPath, conf, testClient)
Expand Down Expand Up @@ -302,7 +315,7 @@ var _ = Describe("Silk Controller", func() {
Context("when the existing lease is in a different overlay network", func() {
BeforeEach(func() {
helpers.StopServer(session)
conf.Network = "10.254.0.0/16"
conf.Network = []string{"10.254.0.0/16"}
session = helpers.StartAndWaitForServer(controllerBinaryPath, conf, testClient)
})
It("renews the same lease in the old network", func() {
Expand Down Expand Up @@ -399,7 +412,7 @@ var _ = Describe("Silk Controller", func() {
Expect(err).NotTo(HaveOccurred())

helpers.StopServer(session)
conf.Network = "10.254.0.0/16"
conf.Network = []string{"10.254.0.0/16"}
session = helpers.StartAndWaitForServer(controllerBinaryPath, conf, testClient)

newNetworkLease, err = testClient.AcquireSubnetLease("10.244.4.6")
Expand Down Expand Up @@ -437,13 +450,13 @@ var _ = Describe("Silk Controller", func() {

leaseIPs := make(map[string]struct{})
leaseSubnets := make(map[string]struct{})
_, network, err := net.ParseCIDR(conf.Network)
overlayNetwork, err := daemon.NewMultipleCIDRNetwork(conf.Network)
Expect(err).NotTo(HaveOccurred())

for lease := range leases {
_, subnet, err := net.ParseCIDR(lease.OverlaySubnet)
Expect(err).NotTo(HaveOccurred())
Expect(network.Contains(subnet.IP)).To(BeTrue())
Expect(overlayNetwork.Contains(subnet.IP)).To(BeTrue())

leaseIPs[lease.UnderlayIP] = struct{}{}
leaseSubnets[lease.OverlaySubnet] = struct{}{}
Expand Down Expand Up @@ -474,13 +487,13 @@ var _ = Describe("Silk Controller", func() {

leaseUnderlays := make(map[string]struct{})
leaseIPs := make(map[string]struct{})
_, network, err := net.ParseCIDR(conf.Network)
overlayNetwork, err := daemon.NewMultipleCIDRNetwork(conf.Network)
Expect(err).NotTo(HaveOccurred())

for lease := range leases {
_, subnet, err := net.ParseCIDR(lease.OverlaySubnet)
Expect(err).NotTo(HaveOccurred())
Expect(network.Contains(subnet.IP)).To(BeTrue())
Expect(overlayNetwork.Contains(subnet.IP)).To(BeTrue())
Expect(lease.OverlaySubnet).To(ContainSubstring("/32"))

leaseUnderlays[lease.UnderlayIP] = struct{}{}
Expand Down Expand Up @@ -531,14 +544,17 @@ var _ = Describe("Silk Controller", func() {
Eventually(fakeMetron.AllEvents, "10s").Should(ContainElement(hasMetricWithValue("totalLeases", 2)))
})
It("emits number of free leases", func() {
Eventually(fakeMetron.AllEvents, "10s").Should(ContainElement(hasMetricWithValue("freeLeases", 253)))
// 256 per /16
// 2 * /16 cidrs = 512
// 512 - 1 (for the single ip subnet) = 511
// 511 - 2 (for the two leases acquired in this test) = 209
Eventually(fakeMetron.AllEvents, "10s").Should(ContainElement(hasMetricWithValue("freeLeases", 509)))
})
It("emits number of stale leases", func() {
Eventually(fakeMetron.AllEvents, "2s").Should(ContainElement(hasMetricWithValue("staleLeases", 0)))
Consistently(fakeMetron.AllEvents, "2s").Should(ContainElement(hasMetricWithValue("staleLeases", 0)))
Eventually(fakeMetron.AllEvents, "10s").Should(ContainElement(hasMetricWithValue("staleLeases", 2)))
})
})

})
})

0 comments on commit d809803

Please sign in to comment.