Skip to content

Commit 0364c58

Browse files
teoteo
committed
[common] Improve hierarchical KV store test cases
1 parent bbdbda4 commit 0364c58

1 file changed

Lines changed: 59 additions & 22 deletions

File tree

‎common/gera/map_test.go‎

Lines changed: 59 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ pdp_workflow_parameters: !public
6565
index: 603
6666
user: flp
6767
extra_env_vars: ""
68-
`
69-
testPayloadVarsYAML1 = `
70-
auto_stop_enabled: "{{ auto_stop_timeout != 'none' }}"
71-
ddsched_enabled: "{{ epn_enabled == 'true' && dd_enabled == 'true' }}"
72-
odc_enabled: "{{ epn_enabled }}"
73-
odc_topology_fullname: '{{ epn_enabled == "true" ? odc.GenerateEPNTopologyFullname() : "" }}'
74-
`
75-
testPayloadUserVarsYAML1 = `
76-
ccdb_enabled: "true"
77-
ccdb_host: ""
78-
dd_enabled: "false"
79-
pdp_workflow_parameters: ""
8068
`
8169
testPayloadDefaultsYAML2 = `
8270
detector: ""
@@ -85,13 +73,25 @@ dpl_command: "{{ util.PrefixedOverride( 'dpl_command', 'ctp' ) }}"
8573
stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
8674
it: "{{ ctp_readout_host }}"
8775
user: "epn"
76+
`
77+
testPayloadVarsYAML1 = `
78+
auto_stop_enabled: "{{ auto_stop_timeout != 'none' }}"
79+
ddsched_enabled: "{{ epn_enabled == 'true' && dd_enabled == 'true' }}"
80+
odc_enabled: "{{ epn_enabled }}"
81+
odc_topology_fullname: '{{ epn_enabled == "true" ? odc.GenerateEPNTopologyFullname() : "" }}'
8882
`
8983
testPayloadVarsYAML2 = `
9084
detector: "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}"
9185
# dpl_workflow is set to ctp_dpl_workflow
92-
dpl_workflow: "{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}"
86+
dpl_workflow: "12345"
9387
dpl_command: ""
9488
stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
89+
`
90+
testPayloadUserVarsYAML1 = `
91+
ccdb_enabled: "true"
92+
ccdb_host: ""
93+
dd_enabled: "false"
94+
pdp_workflow_parameters: ""
9595
`
9696
)
9797

@@ -330,18 +330,40 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
330330
Expect(unwrapped).NotTo(BeNil())
331331
Expect(unwrapped).To(Equal(vars1))
332332

333-
rewrapped := vars2.Wrap(vars1)
334-
Expect(rewrapped).NotTo(BeNil())
333+
wrappedVars = vars2.Wrap(vars1)
334+
Expect(wrappedVars).NotTo(BeNil())
335335
})
336336

337337
var flattenedDefaults, flattenedVars, flattenedUserVars, flattenedAll map[string]string
338338

339339
It("should flatten correctly", func() {
340340
flattenedDefaults, err = wrappedDefaults.Flattened()
341341
Expect(err).NotTo(HaveOccurred())
342+
Expect(flattenedDefaults).To(Equal(map[string]string{
343+
"detector": "",
344+
"dpl_workflow": "{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}",
345+
"dpl_command": "{{ util.PrefixedOverride( 'dpl_command', 'ctp' ) }}",
346+
"stfs_shm_segment_size": "{{ ctp_stfs_shm_segment_size }}",
347+
"it": "{{ ctp_readout_host }}",
348+
"dcs_enabled": "false",
349+
"dd_enabled": "true",
350+
"pdp_workflow_parameters": "QC,CALIB,GPU,CTF,EVENT_DISPLAY",
351+
"user": "epn",
352+
"extra_env_vars": "",
353+
}))
342354

343355
flattenedVars, err = wrappedVars.Flattened()
344356
Expect(err).NotTo(HaveOccurred())
357+
Expect(flattenedVars).To(Equal(map[string]string{
358+
"detector": "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}",
359+
"dpl_workflow": "12345",
360+
"dpl_command": "",
361+
"stfs_shm_segment_size": "{{ ctp_stfs_shm_segment_size }}",
362+
"auto_stop_enabled": "{{ auto_stop_timeout != 'none' }}",
363+
"ddsched_enabled": "{{ epn_enabled == 'true' && dd_enabled == 'true' }}",
364+
"odc_enabled": "{{ epn_enabled }}",
365+
"odc_topology_fullname": "{{ epn_enabled == \"true\" ? odc.GenerateEPNTopologyFullname() : \"\" }}",
366+
}))
345367

346368
flattenedUserVars, err = wrappedUserVars.Flattened()
347369
Expect(err).NotTo(HaveOccurred())
@@ -352,6 +374,25 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
352374
Expect(wrappedAll).NotTo(BeNil())
353375
flattenedAll, err = wrappedAll.Flattened()
354376
Expect(err).NotTo(HaveOccurred())
377+
378+
Expect(flattenedAll).To(Equal(map[string]string{
379+
"detector": "{{ctp_readout_enabled == 'true' ? inventory.DetectorForHost( ctp_readout_host ) : \"\" }}",
380+
"dpl_workflow": "12345",
381+
"dpl_command": "",
382+
"stfs_shm_segment_size": "{{ ctp_stfs_shm_segment_size }}",
383+
"it": "{{ ctp_readout_host }}",
384+
"auto_stop_enabled": "{{ auto_stop_timeout != 'none' }}",
385+
"ddsched_enabled": "{{ epn_enabled == 'true' && dd_enabled == 'true' }}",
386+
"odc_enabled": "{{ epn_enabled }}",
387+
"odc_topology_fullname": "{{ epn_enabled == \"true\" ? odc.GenerateEPNTopologyFullname() : \"\" }}",
388+
"dcs_enabled": "false",
389+
"dd_enabled": "false",
390+
"pdp_workflow_parameters": "",
391+
"user": "epn",
392+
"extra_env_vars": "",
393+
"ccdb_enabled": "true",
394+
"ccdb_host": "",
395+
}))
355396
})
356397

357398
It("should flatten stack correctly", func() {
@@ -403,7 +444,6 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
403444
})
404445

405446
It("should correctly perform KV Has operation", func() {
406-
// Has
407447
Expect(wrappedAll.Has("odc_enabled")).To(BeTrue())
408448
Expect(wrappedAll.Has("ccdb_host")).To(BeTrue())
409449
Expect(wrappedAll.Has("detector")).To(BeTrue())
@@ -422,7 +462,6 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
422462
})
423463

424464
It("should correctly perform KV Get operations", func() {
425-
// Get
426465
value, ok := wrappedAll.Get("odc_enabled")
427466
Expect(ok).To(BeTrue())
428467
Expect(value).To(Equal("{{ epn_enabled }}"))
@@ -433,7 +472,7 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
433472

434473
value, ok = wrappedAll.Get("dpl_workflow")
435474
Expect(ok).To(BeTrue())
436-
Expect(value).To(Equal("{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}"))
475+
Expect(value).To(Equal("12345"))
437476

438477
value, ok = wrappedAll.Get("ccdb_enabled")
439478
Expect(ok).To(BeTrue())
@@ -457,7 +496,6 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
457496
})
458497

459498
It("should correctly perform KV Set operations", func() {
460-
// Set
461499
ok := userVars1.Set("detector", "")
462500
Expect(ok).To(BeTrue())
463501

@@ -520,7 +558,6 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
520558
})
521559

522560
It("should correctly perform KV Del operations", func() {
523-
// Del
524561
ok := userVars1.Del("detector")
525562
Expect(ok).To(BeTrue())
526563

@@ -551,7 +588,7 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
551588

552589
value, ok = wrappedAll.Get("dpl_workflow")
553590
Expect(ok).To(BeTrue())
554-
Expect(value).To(Equal("{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}"))
591+
Expect(value).To(Equal("12345"))
555592

556593
value, ok = wrappedAll.Get("user")
557594
Expect(ok).To(BeTrue())
@@ -570,7 +607,7 @@ stfs_shm_segment_size: "{{ ctp_stfs_shm_segment_size }}"
570607

571608
value, ok = flattenedStack["dpl_workflow"]
572609
Expect(ok).To(BeTrue())
573-
Expect(value).To(Equal("{{ util.PrefixedOverride( 'dpl_workflow', 'ctp' ) }}"))
610+
Expect(value).To(Equal("12345"))
574611

575612
value, ok = flattenedStack["user"]
576613
Expect(ok).To(BeTrue())

0 commit comments

Comments
 (0)