From e7c1167dece7cc56f43f619c17d065be2d7fcf35 Mon Sep 17 00:00:00 2001 From: Mohamed Javeed Date: Thu, 10 Oct 2019 17:12:38 +0530 Subject: [PATCH] Improve content score --- meta/main.yml | 10 ++-- tests/inventory.yaml | 2 - tests/main.os10.yaml | 59 +++++++++++++++++++ tests/main.os6.yaml | 28 +++++++++ tests/main.os9.yaml | 50 ++++++++++++++++ tests/main.yaml | 135 ------------------------------------------- vars/main.yml | 1 - 7 files changed, 141 insertions(+), 144 deletions(-) create mode 100644 tests/main.os10.yaml create mode 100644 tests/main.os6.yaml create mode 100644 tests/main.os9.yaml delete mode 100644 tests/main.yaml diff --git a/meta/main.yml b/meta/main.yml index 58d717d..2210b47 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -8,15 +8,13 @@ galaxy_info: min_ansible_version: 2.2 platforms: - - name: dell os6 - - name: dell os9 - - name: dell os10 + - name: DellOS galaxy_tags: - networking - dell - emc - dellemc - - os9 - - os6 - - os10 + - dellos9 + - dellos6 + - dellos10 diff --git a/tests/inventory.yaml b/tests/inventory.yaml index 5003f77..dad267f 100644 --- a/tests/inventory.yaml +++ b/tests/inventory.yaml @@ -19,5 +19,3 @@ leaf4 [datacenter:children] spine leaf -~ - diff --git a/tests/main.os10.yaml b/tests/main.os10.yaml new file mode 100644 index 0000000..64dbfc7 --- /dev/null +++ b/tests/main.os10.yaml @@ -0,0 +1,59 @@ +--- +# vars file for Dell-Networking.dellos-interface +# Sample variables for dellos10 device +dellos_interface: + ethernet 1/1/32: + desc: "Connected to Core 2" + mtu: 2500 + portmode: + admin: up + switchport: False + ip_and_mask: + ip_type_dynamic: True + ipv6_type_dynamic: True + ethernet 1/1/12: + desc: "ipv6 auto config" + mtu: 2500 + admin: up + ipv6_autoconfig: True + ethernet 1/1/14: + fanout: 10g-4x + ethernet 1/1/13: + desc: "set ipv6 address" + admin: up + ipv6_and_mask: 2001:4898:5809:faa2::10/126 + state_ipv6: present + ethernet 1/1/1: + desc: "Connected to Leaf1" + portmode: "trunk" + switchport: True + suppress_ra: present + admin: up + ethernet 1/1/3: + desc: site2-spine2 + ip_and_mask: 10.9.0.4/31 + mtu: 9216 + switchport: False + admin: up + flowcontrol: + mode: "receive" + enable: "on" + state: "present" + virtual-network 888: + desc: "virtual-network interface" + ip_and_mask: "172.17.17.251/24" + virtual_gateway_ip: "172.17.17.1" + admin: up + + vlan 100: + ip_and_mask: + ipv6_and_mask: 2001:4898:5808:ffaf::1/64 + state_ipv6: present + ip_helper: + - ip: 10.0.0.33 + state: present + admin: up + range ethernet 1/1/1-1/1/32: + mtu: 2500 + admin: up + switchport: False diff --git a/tests/main.os6.yaml b/tests/main.os6.yaml new file mode 100644 index 0000000..f38fa64 --- /dev/null +++ b/tests/main.os6.yaml @@ -0,0 +1,28 @@ +--- +# vars file for Dell-Networking.dellos-interface +# Sample variables for dellos6 device +dellos_interface: + Te1/0/2: + desc: "Connected to Spine1" + portmode: trunk + admin: up + Te1/0/1: + desc: "Connected to Access" + portmode: access + admin: up + vlan 100: + ip_type_dynamic: True + suppress_ra: present + ip_and_mask: 3.3.3.3 255.255.255.0 + ip_helper: + - ip: 10.0.0.36 + state: present + ipv6_reachabletime: 600000 + vlan 101: + ipv6_and_mask: 2001:db8:3c4d:15::/64 + suppress_ra: absent + vlan 102: + ip_type_dynamic: True + suppress_ra: + vlan 105: + ip_and_mask: 1.1.1.1 255.255.255.0 diff --git a/tests/main.os9.yaml b/tests/main.os9.yaml new file mode 100644 index 0000000..186bdc8 --- /dev/null +++ b/tests/main.os9.yaml @@ -0,0 +1,50 @@ +--- +# vars file for Dell-Networking.dellos-interface +# Sample variables for dellos9 device +dellos_interface: + TenGigabitEthernet 1/3: + desc: "Connected to Spine1" + portmode: + switchport: False + suppress_ra: present + mtu: 2500 + admin: up + auto_neg: true + keepalive: true + speed: auto + duplex: full + ipv6_and_mask: 2001:4898:5808:ffa2::5/126 + ip_type_dynamic: true + ip_and_mask: 192.168.23.22/24 + class_vendor_identifier: present + option82: true + remote_id: hostname + fortyGigE 1/9: + desc: "Connected to Spine2" + switchport: False + mtu: 2500 + admin: up + ip_and_mask: 192.168.234.20/31 + ip_and_mask_secondary: "192.168.14.1/24" + secondary_ip_state: present + cr4_auto_neg: true + keepalive: false + ip_type_dynamic: false + class_vendor_identifier: absent + option82: true + remote_id: hostname + ipv6_and_mask: 2001:4898:5808:ffa2::9/126 + fortyGigE 1/12: + fanout: single + fanout_speed: 40G + fanout_state: present + Vlan 100: + mtu: 4096 + admin: down + ip_and_mask: + ipv6_and_mask: 2002:4898:5408:faaf::1/64 + state_ipv6: absent + ip_helper: + - ip: 10.0.0.36 + state: absent + ipv6_reachabletime: 600000 diff --git a/tests/main.yaml b/tests/main.yaml deleted file mode 100644 index 17d953c..0000000 --- a/tests/main.yaml +++ /dev/null @@ -1,135 +0,0 @@ ---- -# vars file for Dell-Networking.dellos-interface -# Sample variables for dellos10 device -dellos_interface: - ethernet 1/1/32: - desc: "Connected to Core 2" - mtu: 2500 - portmode: - admin: up - switchport: False - ip_and_mask: - ip_type_dynamic: True - ipv6_type_dynamic: True - ethernet 1/1/12: - desc: "ipv6 auto config" - mtu: 2500 - admin: up - ipv6_autoconfig: True - ethernet 1/1/14: - fanout: 10g-4x - ethernet 1/1/13: - desc: "set ipv6 address" - admin: up - ipv6_and_mask: 2001:4898:5809:faa2::10/126 - state_ipv6: present - ethernet 1/1/1: - desc: "Connected to Leaf1" - portmode: "trunk" - switchport: True - suppress_ra: present - admin: up - ethernet 1/1/3: - desc: site2-spine2 - ip_and_mask: 10.9.0.4/31 - mtu: 9216 - switchport: False - admin: up - flowcontrol: - mode: "receive" - enable: "on" - state: "present" - virtual-network 888: - desc: "virtual-network interface" - ip_and_mask: "172.17.17.251/24" - virtual_gateway_ip: "172.17.17.1" - admin: up - - vlan 100: - ip_and_mask: - ipv6_and_mask: 2001:4898:5808:ffaf::1/64 - state_ipv6: present - ip_helper: - - ip: 10.0.0.33 - state: present - admin: up - range ethernet 1/1/1-1/1/32: - mtu: 2500 - admin: up - switchport: False - -# Sample variables for dellos9 device -dellos_interface: - TenGigabitEthernet 1/3: - desc: "Connected to Spine1" - portmode: - switchport: False - suppress_ra: present - mtu: 2500 - admin: up - auto_neg: true - keepalive: true - speed: auto - duplex: full - ipv6_and_mask: 2001:4898:5808:ffa2::5/126 - ip_type_dynamic: true - ip_and_mask: 192.168.23.22/24 - class_vendor_identifier: present - option82: true - remote_id: hostname - fortyGigE 1/9: - desc: "Connected to Spine2" - switchport: False - mtu: 2500 - admin: up - ip_and_mask: 192.168.234.20/31 - ip_and_mask_secondary: "192.168.14.1/24" - secondary_ip_state: present - cr4_auto_neg: true - keepalive: false - ip_type_dynamic: false - class_vendor_identifier: absent - option82: true - remote_id: hostname - ipv6_and_mask: 2001:4898:5808:ffa2::9/126 - fortyGigE 1/12: - fanout: single - fanout_speed: 40G - fanout_state: present - Vlan 100: - mtu: 4096 - admin: down - ip_and_mask: - ipv6_and_mask: 2002:4898:5408:faaf::1/64 - state_ipv6: absent - ip_helper: - - ip: 10.0.0.36 - state: absent - ipv6_reachabletime: 600000 - -# Sample variables for dellos6 device -dellos_interface: - Te1/0/2: - desc: "Connected to Spine1" - portmode: trunk - admin: up - Te1/0/1: - desc: "Connected to Access" - portmode: access - admin: up - vlan 100: - ip_type_dynamic: True - suppress_ra: present - ip_and_mask: 3.3.3.3 255.255.255.0 - ip_helper: - - ip: 10.0.0.36 - state: present - ipv6_reachabletime: 600000 - vlan 101: - ipv6_and_mask: 2001:db8:3c4d:15::/64 - suppress_ra: absent - vlan 102: - ip_type_dynamic: True - suppress_ra: - vlan 105: - ip_and_mask: 1.1.1.1 255.255.255.0 diff --git a/vars/main.yml b/vars/main.yml index 48f9678..521c5ea 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,2 @@ --- # vars file for Dell-Networking.dellos-interface -