Release 3.3.8

.github/workflows/main.yml

@@ -1,122 +1 @@
-# This is a basic workflow to help you get started with Actions
 
-name: CI
-
-# Controls when the action will run.
-on:
-  # Triggers the workflow on push or pull request events but only for the develop branch
-  push:
-    branches: [ develop, main ]
-  pull_request:
-    branches: [ develop, main ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    name: Build DCNM collection
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ansible: [2.9.26, 2.10.17, 2.11.12, 2.12.10, 2.13.8, 2.14.2]
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v2
-
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.9
-
-    - name: Install ansible-base (v${{ matrix.ansible }})
-      run: pip install https://github.com/ansible/ansible/archive/v${{ matrix.ansible }}.tar.gz --disable-pip-version-check
-
-    - name: Build a DCNM collection tarball
-      run: ansible-galaxy collection build --output-path "${GITHUB_WORKSPACE}/.cache/collection-tarballs"
-
-    - name: Store migrated collection artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: collection
-        path: .cache/collection-tarballs
-
-
-  sanity:
-    name: Run ansible-sanity tests
-    needs:
-    - build
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ansible: [2.9.26, 2.10.17, 2.11.12, 2.12.10, 2.13.8, 2.14.2]
-        python: [3.8, 3.9]
-        exclude:
-          - ansible: 2.9.26
-            python: 3.9
-    steps:
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.9
-
-    - name: Install ansible-base (v${{ matrix.ansible }})
-      run: pip install https://github.com/ansible/ansible/archive/v${{ matrix.ansible }}.tar.gz --disable-pip-version-check
-
-    - name: Download migrated collection artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: collection
-        path: .cache/collection-tarballs
-
-    - name: Install the collection tarball
-      run: ansible-galaxy collection install .cache/collection-tarballs/*.tar.gz
-
-    - name: Run sanity tests
-      run: ansible-test sanity --docker --python ${{matrix.python}} -v --color --truncate 0
-      working-directory: /home/runner/.ansible/collections/ansible_collections/cisco/dcnm
-
-
-  unit-tests:
-    name: Run DCNM Unit Tests
-    needs:
-    - build
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ansible: [2.9.26, 2.10.17, 2.11.12, 2.12.10, 2.13.8, 2.14.2]
-    steps:
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.9
-
-    - name: Install ansible-base (v${{ matrix.ansible }})
-      run: pip install https://github.com/ansible/ansible/archive/v${{ matrix.ansible }}.tar.gz --disable-pip-version-check
-
-    - name: Install coverage (v4.5.4)
-      run: pip install coverage==4.5.4
-
-    - name: Install pytest (v5.4.1)
-      run: pip install pytest==5.4.1
-
-    - name: Download migrated collection artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: collection
-        path: .cache/collection-tarballs
-
-    - name: Install the collection tarball
-      run: ansible-galaxy collection install .cache/collection-tarballs/*.tar.gz
-
-    - name: Run DCNM Unit tests
-      run: coverage run --source=. -m pytest tests/unit/modules/dcnm/. -vvvv
-      working-directory: /home/runner/.ansible/collections/ansible_collections/cisco/dcnm
-      env:
-        PYTHONPATH: /home/runner/.ansible/collections
-
-    - name: Generate coverage report
-      run: coverage report
-      working-directory: /home/runner/.ansible/collections/ansible_collections/cisco/dcnm

CHANGELOG.md

@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## [3.3.8] - 2023-07-25
+
+### Added
+* Support to configure multiple interfaces for vrf_lite on a vrf
+* Added support for more switch roles in inventory module.
+* Change 3
+
+### Fixed
+* https://github.com/CiscoDevNet/ansible-dcnm/issues/204
+* https://github.com/CiscoDevNet/ansible-dcnm/issues/205
+* https://github.com/CiscoDevNet/ansible-dcnm/issues/206
+* Removed the restriction on netcommon version supported by DCNM collection. The restriction was introduced as fix for CiscoDevNet#209. Netcommon versions >=2.6.1 is supported.
 
 ## [3.3.0] - 2023-05-23
 

README.md

@@ -63,7 +63,7 @@ You can also include it in a `requirements.yml` file and install it with `ansibl
 ---
 collections:
   - name: cisco.dcnm
-    version: 3.3.0
+    version: 3.3.8
 ```
 ## Using this collection
 

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: cisco
 name: dcnm
-version: 3.3.0
+version: 3.3.8
 readme: README.md
 authors:
   - Shrishail Kariyappanavar <nkshrishail>

plugins/action/dcnm_inventory.py

@@ -1,9 +1,7 @@
 # Copyright (c) 2020-2022 Cisco and/or its affiliates.
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software

plugins/modules/dcnm_network.py

@@ -1,7 +1,5 @@
 #!/usr/bin/python
-#
 # Copyright (c) 2020-2023 Cisco and/or its affiliates.
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -2453,7 +2451,12 @@ def validate_input(self):
 
         if state == "query":
 
-            if self.dcnm_version > 11:
+            # If ingress replication is enabled multicast group address should be set to "" as default.
+            # If ingress replication is not enabled, the default value for multicast group address
+            # is different for DCNM and NDFC.
+            if self.fabric_det.get("replicationMode") == "Ingress":
+                mcast_group_addr = ""
+            elif self.dcnm_version > 11:
                 mcast_group_addr = "239.1.1.1"
             else:
                 mcast_group_addr = "239.1.1.0"
@@ -2533,8 +2536,12 @@ def validate_input(self):
 
         else:
 
-            # The default value for multicast group address is different for DCNM and NDFC.
-            if self.dcnm_version > 11:
+            # If ingress replication is enabled multicast group address should be set to "" as default.
+            # If ingress replication is not enabled, the default value for multicast group address
+            # is different for DCNM and NDFC.
+            if self.fabric_det.get("replicationMode") == "Ingress":
+                mcast_group_addr = ""
+            elif self.dcnm_version > 11:
                 mcast_group_addr = "239.1.1.1"
             else:
                 mcast_group_addr = "239.1.1.0"

plugins/modules/dcnm_service_policy.py

@@ -1,11 +1,9 @@
 #!/usr/bin/python
-#
 # Copyright (c) 2021-2023 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software

plugins/modules/dcnm_vrf.py

@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# random comment
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type

releaseinfo.yaml

@@ -0,0 +1,15 @@
+version: "3.3.8"
+release_title: "Ansible ndfc 3.3.8"
+release_desc: "Cisco Ansible DCNM Collection"
+changes: 
+  added:
+    - "Support to configure multiple interfaces for vrf_lite on a vrf"
+    - "Added support for more switch roles in inventory module."
+    - "Change 3"
+
+  fixed: 
+    - "https://github.com/CiscoDevNet/ansible-dcnm/issues/204"
+    - "https://github.com/CiscoDevNet/ansible-dcnm/issues/205"
+    - "https://github.com/CiscoDevNet/ansible-dcnm/issues/206"
+    - "Removed the restriction on netcommon version supported by DCNM collection. The restriction was introduced as fix for CiscoDevNet#209. Netcommon versions >=2.6.1 is supported."
+

tests/integration/targets/dcnm_interface/tasks/dcnm.yaml

@@ -5,19 +5,23 @@
     patterns: "{{ testcase }}.yaml"
   connection: local
   register: dcnm_cases
+  tags: sanity
 
 - set_fact:
     test_cases:
       files: "{{ dcnm_cases.files }}"
+  tags: sanity    
 
 - name: set test_items
   set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+  tags: sanity 
 
 - name: run test cases (connection=httpapi)
   include: "{{ test_case_to_run }}"
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
+  tags: sanity   
 
 - name: Final Cleanup - delete feature_interface_vlan and hsrp policies that we created during init
   cisco.dcnm.dcnm_policy:
@@ -30,11 +34,13 @@
           - ip: "{{ ansible_switch1 }}"
           - ip: "{{ ansible_switch2 }}"
   register: result
+  tags: sanity 
 
 - assert:
     that:
       - 'item["RETURN_CODE"] == 200'
   loop: '{{ result.response }}'
+  tags: sanity 
 
 - name: Final Cleanup - delete all templates created during init
   cisco.dcnm.dcnm_template:
@@ -43,8 +49,10 @@
       - name: my_interface_vlan
       - name: my_hsrp
   register: result
+  tags: sanity 
 
 - assert:
     that:
       - 'item["RETURN_CODE"] == 200'
   loop: '{{ result.response }}'
+  tags: sanity 

tests/integration/targets/dcnm_interface/tasks/main.yaml

@@ -1,2 +1,2 @@
 ---
-- { include: dcnm.yaml, tags: ['dcnm'] }
+- { include: dcnm.yaml, tags: ['dcnm'] }