Skip to content

Commit bd26bac

Browse files
committed
Improve audit log config testing
1 parent 832887d commit bd26bac

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

ci/nova-operator-tempest-multinode/control_plane_hook.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
- target:
2121
kind: OpenStackControlPlane
2222
patch: |-
23-
- op: replace
24-
path: /spec/nova/template/apiServiceTemplate/replicas
25-
value: 2
26-
2723
- op: add
2824
path: /spec/nova/template/apiMessageBusInstance
2925
value: ""
@@ -253,3 +249,7 @@
253249
254250
[service_endpoints]
255251
compute = service/compute
252+
253+
- op: replace
254+
path: /spec/nova/template/apiServiceTemplate/replicas
255+
value: 2

test/functional/nova/nova_controller_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ var _ = Describe("Nova controller - notifications", func() {
6666
Expect(configDataMap.Data).Should(HaveKey("01-nova.conf"))
6767
configData := string(configDataMap.Data["01-nova.conf"])
6868
AssertNotHaveNotificationTransportURL(configData)
69+
Expect(configData).Should(
70+
ContainSubstring(`[audit_middleware_notifications]
71+
use_oslo_messaging = false`))
6972

7073
// assert in sch conf
7174
configDataMap = th.GetSecret(novaNames.SchedulerConfigDataName)
@@ -118,6 +121,9 @@ var _ = Describe("Nova controller - notifications", func() {
118121
Expect(configDataMap.Data).Should(HaveKey("01-nova.conf"))
119122
configData := string(configDataMap.Data["01-nova.conf"])
120123
AssertHaveNotificationTransportURL(notificationsBus.TransportURLName.Name, configData)
124+
Expect(configData).Should(
125+
ContainSubstring(`[audit_middleware_notifications]
126+
use_oslo_messaging = true`))
121127

122128
// assert in sch conf
123129
configDataMap = th.GetSecret(novaNames.SchedulerConfigDataName)

test/functional/nova/novaapi_controller_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@ var _ = Describe("NovaAPI controller", func() {
272272
system_scope = all
273273
endpoint_interface = internal
274274
endpoint_service_type = compute`))
275-
Expect(configData).Should(
276-
ContainSubstring(`[audit_middleware_notifications]`))
277275
// test config override
278276
Expect(configDataMap.Data).Should(HaveKey("02-nova-override.conf"))
279277
extraData := string(configDataMap.Data["02-nova-override.conf"])

0 commit comments

Comments
 (0)