Skip to content

Commit e314aae

Browse files
author
Joshua Reed
committed
Re-add back in affinity group test. Was commented out because it was slow.
1 parent 37d6643 commit e314aae

File tree

2 files changed

+22
-273
lines changed

2 files changed

+22
-273
lines changed

acs.yaml

Lines changed: 0 additions & 251 deletions
This file was deleted.

test/unit/cloud/affinity_groups_test.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,28 +79,28 @@ var _ = Describe("The AffinityGroup interface", func() {
7979
It("creates an affinity group.", func() {
8080
Ω(client.GetOrCreateAffinityGroup(dummies.AffinityGroup)).Should(Succeed())
8181
})
82-
// Context("with an existing VM", func() {
83-
// BeforeEach(func() {
84-
// Ω(client.ResolveZone(dummies.CSZone1)).Should(Succeed())
85-
// Ω(dummies.CSZone1.Spec.ID).ShouldNot(BeEmpty())
86-
// dummies.CSMachine1.Status.ZoneID = dummies.CSZone1.Spec.ID
87-
// dummies.CSMachine1.Spec.DiskOffering.Name = ""
88-
// dummies.CSCluster.Spec.ControlPlaneEndpoint.Host = ""
89-
// Ω(client.GetOrCreateIsolatedNetwork(dummies.CSZone1, dummies.CSISONet1, dummies.CSCluster)).Should(Succeed())
90-
// dummies.CSZone1.Spec.Network.ID = dummies.CSISONet1.Spec.ID
91-
// Ω(client.GetOrCreateVMInstance(
92-
// dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSZone1, dummies.CSAffinityGroup, "",
93-
// )).Should(Succeed())
94-
// })
95-
// AfterEach(func() {
96-
// Ω(client.DestroyVMInstance(dummies.CSMachine1)).Should(MatchError("VM deletion in progress"))
97-
// })
98-
// It("associates an affinity group and disassociates it", func() {
99-
// Ω(client.GetOrCreateAffinityGroup(dummies.AffinityGroup)).Should(Succeed())
100-
// Ω(client.AssociateAffinityGroup(dummies.CSMachine1, *dummies.AffinityGroup)).Should(Succeed())
101-
// Ω(client.DisassociateAffinityGroup(dummies.CSMachine1, *dummies.AffinityGroup)).Should(Succeed())
102-
// })
103-
// })
82+
Context("with an existing VM", func() {
83+
BeforeEach(func() {
84+
Ω(client.ResolveZone(dummies.CSZone1)).Should(Succeed())
85+
Ω(dummies.CSZone1.Spec.ID).ShouldNot(BeEmpty())
86+
dummies.CSMachine1.Status.ZoneID = dummies.CSZone1.Spec.ID
87+
dummies.CSMachine1.Spec.DiskOffering.Name = ""
88+
dummies.CSCluster.Spec.ControlPlaneEndpoint.Host = ""
89+
Ω(client.GetOrCreateIsolatedNetwork(dummies.CSZone1, dummies.CSISONet1, dummies.CSCluster)).Should(Succeed())
90+
dummies.CSZone1.Spec.Network.ID = dummies.CSISONet1.Spec.ID
91+
Ω(client.GetOrCreateVMInstance(
92+
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSZone1, dummies.CSAffinityGroup, "",
93+
)).Should(Succeed())
94+
})
95+
AfterEach(func() {
96+
Ω(client.DestroyVMInstance(dummies.CSMachine1)).Should(MatchError("VM deletion in progress"))
97+
})
98+
It("associates an affinity group and disassociates it", func() {
99+
Ω(client.GetOrCreateAffinityGroup(dummies.AffinityGroup)).Should(Succeed())
100+
Ω(client.AssociateAffinityGroup(dummies.CSMachine1, *dummies.AffinityGroup)).Should(Succeed())
101+
Ω(client.DisassociateAffinityGroup(dummies.CSMachine1, *dummies.AffinityGroup)).Should(Succeed())
102+
})
103+
})
104104
It("deletes an affinity group.", func() {
105105
Ω(client.DeleteAffinityGroup(dummies.AffinityGroup)).Should(Succeed())
106106
Ω(client.FetchAffinityGroup(dummies.AffinityGroup)).ShouldNot(Succeed())

0 commit comments

Comments
 (0)