From ece6c28667d533b15bc24ef4c3fb72733e7ee407 Mon Sep 17 00:00:00 2001 From: prasadapr <96160933+prasadapr@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:09:46 +0530 Subject: [PATCH] fix for Ansibe issue#149 (#153) * fix for Ansibe issue#149 * fix for ansible sanity --------- Co-authored-by: prasada.reddy --- .github/workflows/ansible-test.yml | 1 - changelogs/CHANGELOG.rst | 9 +++++++++ changelogs/changelog.yaml | 10 ++++++++++ galaxy.yml | 3 ++- plugins/modules/os10_command.py | 4 ++-- plugins/modules/os10_config.py | 4 ++-- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index c933349..c43c81d 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -9,7 +9,6 @@ jobs: matrix: ansible: - stable-2.10 - - stable-2.11 - stable-2.12 - stable-2.13 - stable-2.14 diff --git a/changelogs/CHANGELOG.rst b/changelogs/CHANGELOG.rst index 68a0577..c381487 100644 --- a/changelogs/CHANGELOG.rst +++ b/changelogs/CHANGELOG.rst @@ -4,6 +4,15 @@ Ansible Network Collection for Dell EMC SmartFabric OS10 Release Notes .. contents:: Topics +v1.2.2 +====== + +Bugfixes +-------- + +- Fixed issue in os10_command and os10_config modules to breaks prompt/answer (https://github.com/ansible-collections/dellemc.os10/issues/149) + + v1.2.1 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index d4b39bf..49010df 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -164,3 +164,13 @@ releases: that have been added after the release of ``dellemc.os10`` 1.2.0.' release_date: '2023-08-30' + 1.2.2: + changes: + bugfixes: + - Fixed issue in os10_command and os10_config modules to breaks prompt/answer (https://github.com/ansible-collections/dellemc.os10/issues/149) + release_summary: 'This is the bug fix of the ``dellemc.os10`` collection. + + This changelog contains all changes to the modules in this collection + + that have been added after the release of ``dellemc.os10`` 1.2.1.' + release_date: '2023-10-12' diff --git a/galaxy.yml b/galaxy.yml index 28c57d7..3ed6e65 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,6 +2,7 @@ authors: - Parameswaran Krishnamurthy - Senthil Ganesan Ganesan - Shreeja R +- Prasada Reddy dependencies: ansible.netcommon: '>=2.0.0,<3.0.0' description: Ansible Network Collection for Dell EMC SmartFabric OS10 @@ -10,7 +11,7 @@ name: os10 namespace: dellemc readme: README.md tags: [dell, dellemc, os10, emc, networking] -version: 1.2.1 +version: 1.2.2 repository: https://github.com/ansible-collections/dellemc.os10 documentation: https://github.com/ansible-collections/dellemc.os10/tree/master/docs homepage: https://github.com/ansible-collections/dellemc.os10 diff --git a/plugins/modules/os10_command.py b/plugins/modules/os10_command.py index a55a69d..39b84d3 100644 --- a/plugins/modules/os10_command.py +++ b/plugins/modules/os10_command.py @@ -36,7 +36,7 @@ module is not returned until the condition is satisfied or the number of retries has expired. type: list - elements: str + elements: raw required: true wait_for: description: @@ -169,7 +169,7 @@ def main(): argument_spec = dict( # { command: , prompt: , response: } # commands=dict(type='list', required=True), - commands=dict(type='list', required=True, elements='str'), + commands=dict(type='list', required=True, elements='raw'), wait_for=dict(type='list', elements='str'), match=dict(default='all', choices=['all', 'any']), diff --git a/plugins/modules/os10_config.py b/plugins/modules/os10_config.py index fa5e079..32c3e43 100644 --- a/plugins/modules/os10_config.py +++ b/plugins/modules/os10_config.py @@ -34,7 +34,7 @@ command syntax as some commands are automatically modified by the device config parser. This argument is mutually exclusive with I(src). type: list - elements: str + elements: raw aliases: ['commands'] parents: description: @@ -249,7 +249,7 @@ def main(): dir_path=dict(type='path') ) argument_spec = dict( - lines=dict(aliases=['commands'], type='list', elements='str'), + lines=dict(aliases=['commands'], type='list', elements='raw'), parents=dict(type='list', elements='str'), src=dict(type='path'),