Skip to content

Commit 28f7169

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1250 from rabi/no_infra_api
Drop infra-operator API usage in dataplane functional tests
2 parents 3fb4708 + 3005174 commit 28f7169

1 file changed

Lines changed: 65 additions & 90 deletions

File tree

‎tests/functional/dataplane/openstackdataplanenodeset_controller_test.go‎

Lines changed: 65 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/apis/dataplane/v1beta1"
2929

3030
//revive:disable-next-line:dot-imports
31-
infrav1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
3231
. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
3332
"gopkg.in/yaml.v3"
3433
corev1 "k8s.io/api/core/v1"
@@ -291,29 +290,21 @@ var _ = Describe("Dataplane NodeSet Test", func() {
291290
})
292291
It("should have the Spec fields initialized", func() {
293292
dataplaneNodeSetInstance := GetDataplaneNodeSet(dataplaneNodeSetName)
294-
nodeTemplate := dataplanev1.NodeTemplate{
295-
AnsibleSSHPrivateKeySecret: "dataplane-ansible-ssh-private-key-secret",
296-
ManagementNetwork: "ctlplane",
297-
Ansible: dataplanev1.AnsibleOpts{
298-
AnsibleUser: "cloud-admin",
299-
AnsibleHost: "",
300-
AnsiblePort: 0,
301-
AnsibleVars: nil,
302-
},
303-
ExtraMounts: nil,
304-
Networks: []infrav1.IPSetNetwork{
305-
{
306-
Name: "networkinternal",
307-
SubnetName: "subnet1",
308-
},
309-
{
310-
Name: "ctlplane",
311-
SubnetName: "subnet1",
312-
},
313-
},
293+
ansibleOpts := dataplanev1.AnsibleOpts{
294+
AnsibleUser: "cloud-admin",
295+
AnsibleHost: "",
296+
AnsiblePort: 0,
297+
AnsibleVars: nil,
314298
}
315-
316-
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate).Should(Equal(nodeTemplate))
299+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.AnsibleSSHPrivateKeySecret).Should(
300+
Equal("dataplane-ansible-ssh-private-key-secret"))
301+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.ManagementNetwork).Should(
302+
Equal("ctlplane"))
303+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Ansible).Should(Equal(ansibleOpts))
304+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Networks[0].Name).Should(
305+
BeEquivalentTo("networkinternal"))
306+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Networks[1].Name).Should(
307+
BeEquivalentTo("ctlplane"))
317308
Expect(dataplaneNodeSetInstance.Spec.PreProvisioned).Should(BeTrue())
318309
Expect(dataplaneNodeSetInstance.Spec.TLSEnabled).Should(Equal(tlsEnabled))
319310
nodes := map[string]dataplanev1.NodeSection{
@@ -339,8 +330,8 @@ var _ = Describe("Dataplane NodeSet Test", func() {
339330
"nova",
340331
"telemetry"}
341332

342-
Expect(dataplaneNodeSetInstance.Spec.BaremetalSetTemplate.BaremetalHosts).Should(BeEmpty())
343333
Expect(dataplaneNodeSetInstance.Spec.Services).Should(Equal(services))
334+
Expect(dataplaneNodeSetInstance.Spec.BaremetalSetTemplate.BaremetalHosts).Should(BeEmpty())
344335
})
345336

346337
It("should have input not ready and unknown Conditions initialized", func() {
@@ -400,29 +391,21 @@ var _ = Describe("Dataplane NodeSet Test", func() {
400391
})
401392
It("should have the Spec fields initialized", func() {
402393
dataplaneNodeSetInstance := GetDataplaneNodeSet(dataplaneNodeSetName)
403-
nodeTemplate := dataplanev1.NodeTemplate{
404-
AnsibleSSHPrivateKeySecret: "dataplane-ansible-ssh-private-key-secret",
405-
ManagementNetwork: "ctlplane",
406-
Ansible: dataplanev1.AnsibleOpts{
407-
AnsibleUser: "cloud-admin",
408-
AnsibleHost: "",
409-
AnsiblePort: 0,
410-
AnsibleVars: nil,
411-
},
412-
ExtraMounts: nil,
413-
Networks: []infrav1.IPSetNetwork{
414-
{
415-
Name: "networkinternal",
416-
SubnetName: "subnet1",
417-
},
418-
{
419-
Name: "ctlplane",
420-
SubnetName: "subnet1",
421-
},
422-
},
394+
ansibleOpts := dataplanev1.AnsibleOpts{
395+
AnsibleUser: "cloud-admin",
396+
AnsibleHost: "",
397+
AnsiblePort: 0,
398+
AnsibleVars: nil,
423399
}
424-
425-
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate).Should(Equal(nodeTemplate))
400+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.AnsibleSSHPrivateKeySecret).Should(
401+
Equal("dataplane-ansible-ssh-private-key-secret"))
402+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.ManagementNetwork).Should(
403+
Equal("ctlplane"))
404+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Ansible).Should(Equal(ansibleOpts))
405+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Networks[0].Name).Should(
406+
BeEquivalentTo("networkinternal"))
407+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Networks[1].Name).Should(
408+
BeEquivalentTo("ctlplane"))
426409
Expect(dataplaneNodeSetInstance.Spec.PreProvisioned).Should(BeTrue())
427410
Expect(dataplaneNodeSetInstance.Spec.TLSEnabled).Should(Equal(tlsEnabled))
428411
nodes := map[string]dataplanev1.NodeSection{
@@ -448,8 +431,8 @@ var _ = Describe("Dataplane NodeSet Test", func() {
448431
"telemetry",
449432
"global-service"}
450433

451-
Expect(dataplaneNodeSetInstance.Spec.BaremetalSetTemplate.BaremetalHosts).Should(BeEmpty())
452434
Expect(dataplaneNodeSetInstance.Spec.Services).Should(Equal(services))
435+
Expect(dataplaneNodeSetInstance.Spec.BaremetalSetTemplate.BaremetalHosts).Should(BeEmpty())
453436
})
454437

455438
It("should have input not ready and unknown Conditions initialized", func() {
@@ -712,20 +695,20 @@ var _ = Describe("Dataplane NodeSet Test", func() {
712695
When("The individual node has a AnsibleUser override", func() {
713696
BeforeEach(func() {
714697
DeferCleanup(th.DeleteInstance, CreateNetConfig(dataplaneNetConfigName, DefaultNetConfigSpec()))
715-
nodeOverrideSpec := dataplanev1.NodeSection{
716-
HostName: dataplaneNodeName.Name,
717-
Networks: []infrav1.IPSetNetwork{
698+
nodeOverrideSpec := map[string]interface{}{
699+
"hostName": dataplaneNodeName.Name,
700+
"networks": []map[string]interface{}{
718701
{
719-
Name: "networkinternal",
720-
SubnetName: "subnet1",
702+
"name": "networkinternal",
703+
"subnetName": "subnet1",
721704
},
722705
{
723-
Name: "ctlplane",
724-
SubnetName: "subnet1",
706+
"name": "ctlplane",
707+
"subnetName": "subnet1",
725708
},
726709
},
727-
Ansible: dataplanev1.AnsibleOpts{
728-
AnsibleUser: "test-user",
710+
"ansible": map[string]interface{}{
711+
"ansibleUser": "test-user",
729712
},
730713
}
731714

@@ -737,7 +720,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
737720
}
738721

739722
nodeSetSpec := DefaultDataPlaneNoNodeSetSpec(tlsEnabled)
740-
nodeSetSpec["nodes"].(map[string]dataplanev1.NodeSection)[dataplaneNodeName.Name] = nodeOverrideSpec
723+
nodeSetSpec["nodes"] = map[string]interface{}{dataplaneNodeName.Name: nodeOverrideSpec}
741724
nodeSetSpec["nodeTemplate"] = nodeTemplateOverrideSpec
742725

743726
DeferCleanup(th.DeleteInstance, CreateDNSMasq(dnsMasqName, DefaultDNSMasqSpec()))
@@ -822,29 +805,21 @@ var _ = Describe("Dataplane NodeSet Test", func() {
822805
})
823806
It("should have the Spec fields initialized", func() {
824807
dataplaneNodeSetInstance := GetDataplaneNodeSet(dataplaneNodeSetName)
825-
nodeTemplate := dataplanev1.NodeTemplate{
826-
AnsibleSSHPrivateKeySecret: "dataplane-ansible-ssh-private-key-secret",
827-
ManagementNetwork: "ctlplane",
828-
Ansible: dataplanev1.AnsibleOpts{
829-
AnsibleUser: "cloud-admin",
830-
AnsibleHost: "",
831-
AnsiblePort: 0,
832-
AnsibleVars: nil,
833-
},
834-
ExtraMounts: nil,
835-
Networks: []infrav1.IPSetNetwork{
836-
{
837-
Name: "networkinternal",
838-
SubnetName: "subnet1",
839-
},
840-
{
841-
Name: "ctlplane",
842-
SubnetName: "subnet1",
843-
},
844-
},
808+
ansibleOpts := dataplanev1.AnsibleOpts{
809+
AnsibleUser: "cloud-admin",
810+
AnsibleHost: "",
811+
AnsiblePort: 0,
812+
AnsibleVars: nil,
845813
}
846-
847-
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate).Should(Equal(nodeTemplate))
814+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.AnsibleSSHPrivateKeySecret).Should(
815+
Equal("dataplane-ansible-ssh-private-key-secret"))
816+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.ManagementNetwork).Should(
817+
Equal("ctlplane"))
818+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Ansible).Should(Equal(ansibleOpts))
819+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Networks[0].Name).Should(
820+
BeEquivalentTo("networkinternal"))
821+
Expect(dataplaneNodeSetInstance.Spec.NodeTemplate.Networks[1].Name).Should(
822+
BeEquivalentTo("ctlplane"))
848823
Expect(dataplaneNodeSetInstance.Spec.PreProvisioned).Should(BeTrue())
849824
Expect(dataplaneNodeSetInstance.Spec.TLSEnabled).Should(Equal(tlsEnabled))
850825
nodes := map[string]dataplanev1.NodeSection{
@@ -870,8 +845,8 @@ var _ = Describe("Dataplane NodeSet Test", func() {
870845
"nova",
871846
"telemetry"}
872847

873-
Expect(dataplaneNodeSetInstance.Spec.BaremetalSetTemplate.BaremetalHosts).Should(BeEmpty())
874848
Expect(dataplaneNodeSetInstance.Spec.Services).Should(Equal(services))
849+
Expect(dataplaneNodeSetInstance.Spec.BaremetalSetTemplate.BaremetalHosts).Should(BeEmpty())
875850
})
876851
It("should have input not ready and unknown Conditions initialized", func() {
877852
th.ExpectCondition(
@@ -1129,20 +1104,20 @@ var _ = Describe("Dataplane NodeSet Test", func() {
11291104
BeforeEach(func() {
11301105
DeferCleanup(th.DeleteInstance, CreateNetConfig(dataplaneNetConfigName, DefaultNetConfigSpec()))
11311106
DeferCleanup(th.DeleteInstance, CreateDNSMasq(dnsMasqName, DefaultDNSMasqSpec()))
1132-
nodeOverrideSpec := dataplanev1.NodeSection{
1133-
HostName: dataplaneNodeName.Name,
1134-
Networks: []infrav1.IPSetNetwork{
1107+
nodeOverrideSpec := map[string]interface{}{
1108+
"hostName": dataplaneNodeName.Name,
1109+
"networks": []map[string]interface{}{
11351110
{
1136-
Name: "networkinternal",
1137-
SubnetName: "subnet1",
1111+
"name": "networkinternal",
1112+
"subnetName": "subnet1",
11381113
},
11391114
{
1140-
Name: "ctlplane",
1141-
SubnetName: "subnet1",
1115+
"name": "ctlplane",
1116+
"subnetName": "subnet1",
11421117
},
11431118
},
1144-
Ansible: dataplanev1.AnsibleOpts{
1145-
AnsibleUser: "test-user",
1119+
"ansible": map[string]interface{}{
1120+
"ansibleUser": "test-user",
11461121
},
11471122
}
11481123

@@ -1154,7 +1129,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
11541129
}
11551130

11561131
nodeSetSpec := DefaultDataPlaneNoNodeSetSpec(tlsEnabled)
1157-
nodeSetSpec["nodes"].(map[string]dataplanev1.NodeSection)[dataplaneNodeName.Name] = nodeOverrideSpec
1132+
nodeSetSpec["nodes"] = map[string]interface{}{dataplaneNodeName.Name: nodeOverrideSpec}
11581133
nodeSetSpec["nodeTemplate"] = nodeTemplateOverrideSpec
11591134

11601135
DeferCleanup(th.DeleteInstance, CreateDataplaneNodeSet(dataplaneNodeSetName, nodeSetSpec))

0 commit comments

Comments
 (0)