Skip to content

Commit cc2fc12

Browse files
authored
Os6 collection (#24)
* adding version changes in galaxy.yaml file * adding changelogs for version 1.0.5 * update ignore-2.10 for sanity test * config module fix to handle issues faced while parsing running config and fixing idempotency issue for banner config * command module change to keep similar changes across all dell networking OSs * terminal plugin fix to send "terminal length 0" command * updated ignore-2.11.txt to handle sanity errors * fixing ansible sanity errors * changes for interface names * fix for issue faced while fetching interface facts * vlan role fix to support vlan append for tagged members * exit handling for multilevel parent * fix for multiline banners * regex fix for handling management acl error in terminal plugin * terminal error regex added for snmp-server user related command * fix for banners * regex fix for sublevel commands * fixed sanity errors found in REDHAT automation hub and interface role readme update
1 parent 4788f93 commit cc2fc12

File tree

28 files changed

+82
-91
lines changed

28 files changed

+82
-91
lines changed

.ansible-lint

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
skip_list:
2+
- '208'

changelogs/CHANGELOG.rst

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Ansible Network Collection for Dell EMC OS6 Release Notes
44

55
.. contents:: Topics
66

7+
v1.0.7
8+
======
9+
10+
Release Summary
11+
---------------
12+
13+
- Fixed sanity error found during the sanity tst of automation hub upload
14+
- os6 interface role readme updated
15+
716
v1.0.6
817
======
918

changelogs/changelog.yaml

+14-6
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,31 @@ releases:
8282
- Fix issue in using list of strings for `commands` argument for `os6_command` module
8383
- Fix issue in using "os6_facts" module for non-legacy n-series platofrms
8484
fragments:
85-
- 1.0.4.yaml
86-
release_date: "2020-11-17"
85+
- 1.0.4.yaml
86+
release_date: '2020-11-17'
8787
1.0.5:
8888
changes:
8989
bugfixes:
9090
- config module fix to handle issues faced while parsing running config and fixing idempotency issue for banner config
9191
- command module change to keep similar changes across all dell networking OSs
9292
- terminal plugin fix to send "terminal length 0" command
9393
fragments:
94-
- 1.0.5.yaml
95-
release_date: "2020-12-09"
94+
- 1.0.5.yaml
95+
release_date: '2020-12-09'
9696
1.0.6:
9797
changes:
9898
bugfixes:
9999
- module utils fix for exit handling in multilevel parent commands
100100
- config module fix to handle multiline banner
101101
- terminal plugin fix to handle error reported by management access lists
102102
fragments:
103-
- 1.0.6.yaml
104-
release_date: "2020-12-18"
103+
- 1.0.6.yaml
104+
release_date: '2020-12-18'
105+
1.0.7:
106+
changes:
107+
release_summary:
108+
- Fixed sanity error found during the sanity tst of automation hub upload
109+
- os6 interface role readme updated for proper syntax of ip address and mask
110+
fragments:
111+
- 1.0.7.yaml
112+
release_date: '2021-02-15'

galaxy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace: dellemc
22
name: os6
3-
version: 1.0.6
3+
version: 1.0.7
44
readme: README.md
55
authors:
66
- Komal Patil <[email protected]>

roles/os6_aaa/meta/main.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Copyright (c) 2020 Dell Inc.
22
---
33
galaxy_info:
4-
author: Dell EMC Networking Engineering
5-
description: The os6_aaa role facilitates the configuration of Authentication Authorization Acccounting (AAA) attributes in devices running Dell EMC Networking Operating Systems.
4+
author: Dell EMC Networking Engineering
5+
description: >
6+
The os6_aaa role facilitates the configuration of Authentication Authorization Acccounting (AAA) attributes
7+
in devices running Dell EMC Networking Operating Systems.
68
license: GPLv3
79
min_ansible_version: 2.9.6
810

@@ -11,7 +13,7 @@ galaxy_info:
1113

1214
galaxy_tags:
1315
- networking
14-
- dell
16+
- dell
1517
- emc
1618
- dellemc
1719
- os6

roles/os6_aaa/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating AAA configuration for os6"
55
template:
66
src: os6_aaa.j2
7-
dest: "{{ build_dir }}/aaa6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/aaa6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning AAA configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_aaa.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_acl/meta/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2017-2020 Dell Inc.
22
---
33
galaxy_info:
4-
author: Dell EMC Networking Engineering
5-
description: The os6_acl role facilitates the configuration of access control list (ACL) attributes in devices running Dell EMC Networking Operating Systems.
4+
author: Dell EMC Networking Engineering
5+
description: The os6_acl role facilitates the configuration of access control list (ACL) attributes in devices running Dell EMC Networking Operating Systems.
66
license: GPLv3
77
min_ansible_version: 2.9.6
88

@@ -11,7 +11,7 @@ galaxy_info:
1111

1212
galaxy_tags:
1313
- networking
14-
- dell
14+
- dell
1515
- emc
1616
- dellemc
1717
- os6

roles/os6_acl/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating ACL configuration for os6"
55
template:
66
src: os6_acl.j2
7-
dest: "{{ build_dir }}/acl6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/acl6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning ACL configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_acl.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_bgp/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating BGP configuration for os6"
55
template:
66
src: os6_bgp.j2
7-
dest: "{{ build_dir }}/bgp6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/bgp6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning BGP configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_bgp.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_interface/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Role variables
3030
| ``admin`` | string: up,down\* | Configures the administrative state for the interface; configuring the value as administratively "up" enables the interface; configuring the value as administratively "down" disables the interface | os6 |
3131
| ``suppress_ra`` | string; present,absent | Configures IPv6 router advertisements if set to present | os6 |
3232
| ``ip_type_dynamic`` | boolean: true,false | Configures IP address DHCP if set to true (*ip_and_mask* is ignored if set to true) | os6 |
33-
| ``ip_and_mask`` | string | configures the specified IP address to the interface VLAN on os6 devices (192.168.11.1/24 format) | os6 |
33+
| ``ip_and_mask`` | string | configures the specified IP address to the interface VLAN on os6 devices (192.168.11.1 255.255.255.0 format) | os6 |
3434
| ``ipv6_and_mask`` | string | configures a specified IP address to the interface VLAN on os6 devices (2001:4898:5808:ffa2::1/126 format) | os6 |
3535
| ``ipv6_reachabletime`` | integer | Configures the reachability time for IPv6 neighbor discovery (0 to 3600000), field needs to be left blank to remove the reachability time | os6 |
3636
| ``ip_helper`` | list | Configures DHCP server address objects (see ``ip_helper.*``) | os6 |
@@ -86,7 +86,7 @@ When `os6_cfg_generate` is set to true, the variable generates the configuration
8686
admin: up
8787
vlan 100:
8888
admin: down
89-
ip_and_mask:
89+
ip_and_mask: 3.3.3.3 255.255.255.0
9090
ipv6_and_mask: 2002:4898:5408:faaf::1/64
9191
suppress_ra: present
9292
ip_helper:

roles/os6_interface/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating interface configuration for os6"
55
template:
66
src: os6_interface.j2
7-
dest: "{{ build_dir }}/intf6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/intf6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning interface configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_interface.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_lag/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating LAG configuration for os6"
55
template:
66
src: os6_lag.j2
7-
dest: "{{ build_dir }}/lag6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/lag6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning LAG configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_lag.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_lldp/meta/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Copyright (c) 2017-2020 Dell Inc. or its subsidiaries. All Rights Reserved.
22
---
33
galaxy_info:
4-
author: Dell EMC Networking Engineering
4+
author: Dell EMC Networking Engineering
55
description: >
6-
The os6_lldp role facilitates the configuration of Link Layer Discovery Protocol(LLDP) attributes in devices
7-
running Dell EMC Networking Operating Systems.
6+
The os6_lldp role facilitates the configuration of Link Layer Discovery Protocol(LLDP) attributes in devices
7+
running Dell EMC Networking Operating Systems.
88
license: GPLv3
99
min_ansible_version: 2.9.6
1010

@@ -13,7 +13,7 @@ galaxy_info:
1313

1414
galaxy_tags:
1515
- networking
16-
- dell
16+
- dell
1717
- emc
1818
- dellemc
1919
- os6

roles/os6_lldp/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
register: generate_output
1111

1212
- name: "Provisioning LLDP configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_lldp.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_logging/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating logging configuration for os6"
55
template:
66
src: os6_logging.j2
7-
dest: "{{ build_dir }}/logging6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/logging6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning logging configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_logging.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_ntp/meta/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright (c) 2020 Dell Inc.
22
---
33
galaxy_info:
4-
author: Dell EMC Networking Engineering
4+
author: Dell EMC Networking Engineering
55
description: The os6_ntp role facilitates the configuration of NTP attributes in devices running Dell EMC Networking Operating Systems.
6-
company: Dell Inc
6+
company: Dell Inc
77
license: GPLv3
88
min_ansible_version: 2.9.6
99

@@ -12,7 +12,7 @@ galaxy_info:
1212

1313
galaxy_tags:
1414
- networking
15-
- dell
15+
- dell
1616
- emc
1717
- dellemc
1818
- os6

roles/os6_ntp/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating NTP configuration for os6"
55
template:
66
src: os6_ntp.j2
7-
dest: "{{ build_dir }}/ntp6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/ntp6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False'))| bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning NTP configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_ntp.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_qos/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# tasks file for os6
33

44
- name: "Provisioning Qos configuration for os6"
5-
os6_config:
5+
dellemc.os6.os6_config:
66
src: os6_qos.j2
77
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
88
# notify: save config os6
@@ -11,7 +11,7 @@
1111
- name: "Generating Qos configuration for os6"
1212
template:
1313
src: os6_qos.j2
14-
dest: "{{ build_dir }}/qos6_{{hostname}}.conf.part"
14+
dest: "{{ build_dir }}/qos6_{{ hostname }}.conf.part"
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
1616
# notify: save config os6
1717
register: generate_output

roles/os6_snmp/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating SNMP configuration for os6"
55
template:
66
src: os6_snmp.j2
7-
dest: "{{ build_dir }}/snmp6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/snmp6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning SNMP configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_snmp.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_system/meta/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright (c) 2020 Dell Inc.
22
---
33
galaxy_info:
4-
author: Dell EMC Networking Engineering
4+
author: Dell EMC Networking Engineering
55
description: The os6_system role facilitates the configuration of system attributes in devices running Dell EMC Networking Operating Systems.
6-
company: Dell Inc
6+
company: Dell Inc
77
license: GPLv3
88
min_ansible_version: 2.9.6
99

@@ -12,7 +12,7 @@ galaxy_info:
1212

1313
galaxy_tags:
1414
- networking
15-
- dell
15+
- dell
1616
- emc
1717
- dellemc
1818
- os6

roles/os6_system/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating system configuration for os6"
55
template:
66
src: os6_system.j2
7-
dest: "{{ build_dir }}/system6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/system6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning system configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_system.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_users/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating users configuration for os6"
55
template:
66
src: os6_users.j2
7-
dest: "{{ build_dir }}/users6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/users6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning users configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_users.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

roles/os6_vlan/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
- name: "Generating VLAN configuration for os6"
55
template:
66
src: os6_vlan.j2
7-
dest: "{{ build_dir }}/vlan6_{{hostname}}.conf.part"
7+
dest: "{{ build_dir }}/vlan6_{{ hostname }}.conf.part"
88
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6") and ((os6_cfg_generate | default('False')) | bool)
99
# notify: save config os6
1010
register: generate_output
1111

1212
- name: "Provisioning VLAN configuration for os6"
13-
os6_config:
13+
dellemc.os6.os6_config:
1414
src: os6_vlan.j2
1515
when: (ansible_network_os is defined and ansible_network_os == "dellemc.os6.os6")
1616
# notify: save config os6

0 commit comments

Comments
 (0)