From 86be5cf9308988f0a3fac3e9212c70a726cfa5a2 Mon Sep 17 00:00:00 2001 From: Alaa Bishtawi Date: Tue, 7 Nov 2023 09:09:38 +0200 Subject: [PATCH 1/3] Revert "Bug/issue#383 (#411)" This reverts commit d1a0016b2954d0f7e89834bccb5de5eb8c392116. --- .../ntnx_ndb_databases_sanity/tasks/tests.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml index f6229a43..6e8240cf 100644 --- a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml +++ b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml @@ -274,22 +274,12 @@ - set_fact: db_uuid: "{{result.db_uuid}}" -- name: Ensure properties is defined - set_fact: - properties: "{}" - when: properties is undefined - -- name: Combine properties - block: - - set_fact: - temp_dict: "{ '{{' }} item['name']: item['value'] {{ '}}' }}" - - set_fact: - properties: "{{ properties | combine(temp_dict) }}" - loop: "{{ result.response.properties }}" +- name: create properties map + set_fact: + properties: "{{ properties | default({}) | combine ({ item['name'] : item['value'] }) }}" + loop: "{{result.response.properties}}" no_log: true - - - name: Creation Status assert: that: From a27dd35f938bf102516f15b6130a8e7001d45278 Mon Sep 17 00:00:00 2001 From: Alaa Bishtawi Date: Tue, 7 Nov 2023 09:17:57 +0200 Subject: [PATCH 2/3] Fix Properties map --- .../targets/ntnx_ndb_databases_sanity/tasks/tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml index 6e8240cf..409c08dd 100644 --- a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml +++ b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml @@ -274,9 +274,14 @@ - set_fact: db_uuid: "{{result.db_uuid}}" +- name: Ensure properties is defined + set_fact: + properties: "{}" + when: properties is undefined + - name: create properties map set_fact: - properties: "{{ properties | default({}) | combine ({ item['name'] : item['value'] }) }}" + properties: "{{ properties | combine ({ item['name'] : item['value'] }) }}" loop: "{{result.response.properties}}" no_log: true From 038b0d57477036c33d52c0db309f95651cd6575b Mon Sep 17 00:00:00 2001 From: Pradeepsingh Bhati Date: Tue, 7 Nov 2023 12:57:25 +0530 Subject: [PATCH 3/3] Skip jelkyll check on database sanity test build issue --- .../targets/ntnx_ndb_databases_sanity/tasks/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml index 409c08dd..504ee6d5 100644 --- a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml +++ b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml @@ -279,11 +279,14 @@ properties: "{}" when: properties is undefined +# skip jekyll/Liquid syntax check +# - name: create properties map set_fact: properties: "{{ properties | combine ({ item['name'] : item['value'] }) }}" loop: "{{result.response.properties}}" no_log: true +# - name: Creation Status assert: