diff --git a/changelogs/fragments/395-comment-out-pfc-pg-test-cases.yaml b/changelogs/fragments/395-comment-out-pfc-pg-test-cases.yaml new file mode 100644 index 000000000..ae97f3640 --- /dev/null +++ b/changelogs/fragments/395-comment-out-pfc-pg-test-cases.yaml @@ -0,0 +1,2 @@ +minor_changes: + - sonic_qos_maps - Comment out PFC priority group map tests cases (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/395). diff --git a/plugins/module_utils/network/sonic/facts/qos_maps/qos_maps.py b/plugins/module_utils/network/sonic/facts/qos_maps/qos_maps.py index 3a8c00cb6..f27687c61 100644 --- a/plugins/module_utils/network/sonic/facts/qos_maps/qos_maps.py +++ b/plugins/module_utils/network/sonic/facts/qos_maps/qos_maps.py @@ -62,8 +62,8 @@ def populate_facts(self, connection, ansible_facts, data=None): objs = data facts = {} if objs: - params = utils.validate_config(self.argument_spec, {'config': remove_empties(objs)}) - facts['qos_maps'] = params['config'] + params = utils.validate_config(self.argument_spec, {'config': objs}) + facts['qos_maps'] = remove_empties(params['config']) ansible_facts['ansible_network_resources'].update(facts) return ansible_facts diff --git a/tests/regression/roles/sonic_qos_maps/defaults/main.yml b/tests/regression/roles/sonic_qos_maps/defaults/main.yml index 66f862f9c..3206a3551 100644 --- a/tests/regression/roles/sonic_qos_maps/defaults/main.yml +++ b/tests/regression/roles/sonic_qos_maps/defaults/main.yml @@ -1,7 +1,7 @@ --- ansible_connection: httpapi module_name: qos_maps - +# PFC priority group map configuration only supported on Z9664, Z9432 and Z9864 platforms tests: - name: test_case_01 description: Configure QoS maps @@ -42,11 +42,11 @@ tests: entries: - dot1p: 0 queue_index: 0 - pfc_priority_pg_maps: - - name: pfc_pg_map1 - entries: - - dot1p: 0 - pg_index: 0 + # pfc_priority_pg_maps: + # - name: pfc_pg_map1 + # entries: + # - dot1p: 0 + # pg_index: 0 - name: test_case_02 description: Add entries and maps to existing QoS maps configuration @@ -111,11 +111,11 @@ tests: entries: - dot1p: 4 queue_index: 5 - pfc_priority_pg_maps: - - name: pfc_pg_map1 - entries: - - dot1p: 3 - pg_index: 5 + # pfc_priority_pg_maps: + # - name: pfc_pg_map1 + # entries: + # - dot1p: 3 + # pg_index: 5 - name: test_case_03 description: Modify existing QoS maps configuration state: merged @@ -155,11 +155,11 @@ tests: entries: - dot1p: 0 queue_index: 7 - pfc_priority_pg_maps: - - name: pfc_pg_map1 - entries: - - dot1p: 0 - pg_index: 1 + # pfc_priority_pg_maps: + # - name: pfc_pg_map1 + # entries: + # - dot1p: 0 + # pg_index: 1 - name: test_case_04 description: Replace QoS maps configuration @@ -255,13 +255,13 @@ tests: queue_index: 0 - dot1p: 1 queue_index: 1 - pfc_priority_pg_maps: - - name: pfc_pg_map1 - entries: - - dot1p: 0 - pg_index: 0 - - dot1p: 1 - pg_index: 1 + # pfc_priority_pg_maps: + # - name: pfc_pg_map1 + # entries: + # - dot1p: 0 + # pg_index: 0 + # - dot1p: 1 + # pg_index: 1 - name: test_case_06 description: Testing QoS maps deletion by map name, entries key, and entries non-key attribute @@ -315,12 +315,12 @@ tests: - dot1p: 0 - dot1p: 1 queue_index: 1 - pfc_priority_pg_maps: - - name: pfc_pg_map1 - entries: - - dot1p: 0 - - dot1p: 1 - pg_index: 1 + # pfc_priority_pg_maps: + # - name: pfc_pg_map1 + # entries: + # - dot1p: 0 + # - dot1p: 1 + # pg_index: 1 - name: test_case_07 description: Delete all QoS maps configuration