Skip to content

Commit d73b68e

Browse files
mikewiebemikewiebe
authored
Merge pull request #302 from CiscoDevNet/3.5.1
Release 3.5.1
2 parents aeac617 + a473794 commit d73b68e

31 files changed

+86
-70
lines changed

‎.github/workflows/main.yml

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
runs-on: ubuntu-latest
2222
strategy:
2323
matrix:
24-
ansible: [2.9.26, 2.10.17, 2.11.12, 2.12.10, 2.13.8, 2.14.2]
24+
ansible: [2.15.12, 2.16.7]
2525
steps:
2626
- name: Check out code
2727
uses: actions/checkout@v2
2828

29-
- name: Set up Python 3.9
29+
- name: Set up Python "3.10"
3030
uses: actions/setup-python@v1
3131
with:
32-
python-version: 3.9
32+
python-version: "3.10"
3333

3434
- name: Install ansible-base (v${{ matrix.ansible }})
3535
run: pip install https://github.com/ansible/ansible/archive/v${{ matrix.ansible }}.tar.gz --disable-pip-version-check
@@ -51,16 +51,16 @@ jobs:
5151
runs-on: ubuntu-latest
5252
strategy:
5353
matrix:
54-
ansible: [2.9.26, 2.10.17, 2.11.12, 2.12.10, 2.13.8, 2.14.2]
55-
python: [3.8, 3.9]
54+
ansible: [2.15.12, 2.16.7]
55+
python: ["3.9", "3.10", "3.11"]
5656
exclude:
57-
- ansible: 2.9.26
58-
python: 3.9
57+
- ansible: 2.16.7
58+
python: "3.9"
5959
steps:
60-
- name: Set up Python 3.9
60+
- name: Set up Python (v${{ matrix.python }})
6161
uses: actions/setup-python@v1
6262
with:
63-
python-version: 3.9
63+
python-version: ${{ matrix.python }}
6464

6565
- name: Install ansible-base (v${{ matrix.ansible }})
6666
run: pip install https://github.com/ansible/ansible/archive/v${{ matrix.ansible }}.tar.gz --disable-pip-version-check
@@ -71,12 +71,6 @@ jobs:
7171
name: collection
7272
path: .cache/collection-tarballs
7373

74-
- name: Create ansible.cfg file
75-
run: |
76-
echo "[galaxy]" > ansible.cfg
77-
echo "server = https://old-galaxy.ansible.com/" >> ansible.cfg
78-
cat ansible.cfg
79-
8074
- name: Install the collection tarball
8175
run: ansible-galaxy collection install .cache/collection-tarballs/*.tar.gz
8276

@@ -92,34 +86,28 @@ jobs:
9286
runs-on: ubuntu-latest
9387
strategy:
9488
matrix:
95-
ansible: [2.9.26, 2.10.17, 2.11.12, 2.12.10, 2.13.8, 2.14.2]
89+
ansible: [2.15.12, 2.16.7]
9690
steps:
97-
- name: Set up Python 3.9
91+
- name: Set up Python "3.10"
9892
uses: actions/setup-python@v1
9993
with:
100-
python-version: 3.9
94+
python-version: "3.10"
10195

10296
- name: Install ansible-base (v${{ matrix.ansible }})
10397
run: pip install https://github.com/ansible/ansible/archive/v${{ matrix.ansible }}.tar.gz --disable-pip-version-check
10498

105-
- name: Install coverage (v4.5.4)
106-
run: pip install coverage==4.5.4
99+
- name: Install coverage (v7.3.4)
100+
run: pip install coverage==7.3.4
107101

108-
- name: Install pytest (v5.4.1)
109-
run: pip install pytest==5.4.1
102+
- name: Install pytest (v7.4.4)
103+
run: pip install pytest==7.4.4
110104

111105
- name: Download migrated collection artifacts
112106
uses: actions/download-artifact@v1
113107
with:
114108
name: collection
115109
path: .cache/collection-tarballs
116110

117-
- name: Create ansible.cfg file
118-
run: |
119-
echo "[galaxy]" > ansible.cfg
120-
echo "server = https://old-galaxy.ansible.com/" >> ansible.cfg
121-
cat ansible.cfg
122-
123111
- name: Install the collection tarball
124112
run: ansible-galaxy collection install .cache/collection-tarballs/*.tar.gz
125113

‎CHANGELOG.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.
88

99
.. contents:: ``Release Versions``
1010

11+
`3.5.1`_
12+
=====================
13+
14+
**Release Date:** ``2024-06-13``
15+
16+
Fixed
17+
-----
18+
19+
- Fix for ansible-sanity errors in code and documentation
20+
- Updates to supported ansible version
21+
1122
`3.5.0`_
1223
=====================
1324

@@ -471,6 +482,7 @@ The Ansible Cisco Data Center Network Manager (DCNM) collection includes modules
471482
- cisco.dcnm.dcnm_network - Add and remove Networks from a DCNM managed VXLAN fabric.
472483
- cisco.dcnm.dcnm_interface - DCNM Ansible Module for managing interfaces.
473484

485+
.. _3.5.1: https://github.com/CiscoDevNet/ansible-dcnm/compare/3.5.0...3.5.1
474486
.. _3.5.0: https://github.com/CiscoDevNet/ansible-dcnm/compare/3.4.3...3.5.0
475487
.. _3.4.3: https://github.com/CiscoDevNet/ansible-dcnm/compare/3.4.2...3.4.3
476488
.. _3.4.2: https://github.com/CiscoDevNet/ansible-dcnm/compare/3.4.1...3.4.2

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ You can also include it in a `requirements.yml` file and install it with `ansibl
6868
---
6969
collections:
7070
- name: cisco.dcnm
71-
version: 3.5.0
71+
version: 3.5.1
7272
```
7373
## Using this collection
7474

‎galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
namespace: cisco
33
name: dcnm
4-
version: 3.5.0
4+
version: 3.5.1
55
readme: README.md
66
authors:
77
- Shrishail Kariyappanavar <nkshrishail>

‎meta/runtime.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# will redirect to a common action plugin called cisco.dcnm.dcnm
44
#
55
#---
6-
requires_ansible: ">=2.9.10"
6+
requires_ansible: ">=2.15.0"
77
#plugin_routing:
88
# action:
99
# dcnm_inventory:

‎plugins/httpapi/dcnm.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@
4040
"""
4141

4242
import json
43-
import requests
43+
44+
# Any third party modules should be imported as below, if not sanity tests will fail
45+
try:
46+
import requests
47+
HAS_REQUESTS = True
48+
except ImportError:
49+
HAS_REQUESTS = False
4450

4551
from ansible.module_utils._text import to_text
4652
from ansible.module_utils.connection import ConnectionError

‎plugins/module_utils/fabric/param_info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def _build_info(self) -> None:
320320
self.info = {}
321321
for parameter in self.template.get("parameters", []):
322322
msg = f"{self.class_name}.{method_name}: "
323-
msg += f"parameter: {json.dumps(parameter, indent=4, sort_keys=True)}"
323+
msg += f"parameter: {json.dumps(parameter, indent=4, sort_keys=True)}"
324324
self.log.debug(msg)
325325
param_name = self._get_param_name(parameter)
326326
if param_name not in self.info:

‎plugins/module_utils/image_policy/delete.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import copy
2121
import inspect
22-
import json
2322
import logging
2423

2524
from ansible_collections.cisco.dcnm.plugins.module_utils.common.rest_send import \

‎plugins/module_utils/image_policy/payload.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import inspect
2121
import json
2222
import logging
23-
from typing import Any, Dict
2423

2524
from ansible_collections.cisco.dcnm.plugins.module_utils.image_policy.common import \
2625
ImagePolicyCommon

‎plugins/modules/dcnm_image_policy.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
- List of dictionaries containing image policy parameters
4646
type: list
4747
elements: dict
48+
default: []
4849
suboptions:
4950
name:
5051
description:

0 commit comments

Comments
 (0)