Skip to content

Commit e94eda3

Browse files
mikewiebemikewiebe
committed
Merge branch 'develop' into fix_41_httpapi_plugin
2 parents 00247de + 8b604f5 commit e94eda3

37 files changed

+5494
-640
lines changed

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ This collection is intended for use with the following release versions:
1212
<!--start requires_ansible-->
1313
## Ansible version compatibility
1414

15-
This collection has been tested against following Ansible versions: **>=2.15.0**.
15+
This collection has been tested against the following Ansible versions: **>=2.15.0**.
1616

17-
For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
18-
fully qualified collection name (for example, `cisco.ios.ios`).
1917
Plugins and modules within a collection may be tested with only specific Ansible versions.
2018
A collection may contain metadata that identifies these versions.
2119
PEP440 is the schema used to describe the versions of Ansible.

‎docs/cisco.dcnm.dcnm_fabric_module.rst

Lines changed: 2973 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/cisco.dcnm.dcnm_interface_module.rst

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,69 @@ Parameters
562562
<div>Duplex of the interface. Speed must be set to use duplex.</div>
563563
</td>
564564
</tr>
565+
<tr>
566+
<td class="elbow-placeholder"></td>
567+
<td class="elbow-placeholder"></td>
568+
<td colspan="1">
569+
<div class="ansibleOptionAnchor" id="parameter-"></div>
570+
<b>enable_cdp</b>
571+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
572+
<div style="font-size: small">
573+
<span style="color: purple">boolean</span>
574+
</div>
575+
</td>
576+
<td>
577+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
578+
<li>no</li>
579+
<li><div style="color: blue"><b>yes</b>&nbsp;&larr;</div></li>
580+
</ul>
581+
</td>
582+
<td>
583+
<div>State of CDP protocol on the interface</div>
584+
</td>
585+
</tr>
586+
<tr>
587+
<td class="elbow-placeholder"></td>
588+
<td class="elbow-placeholder"></td>
589+
<td colspan="1">
590+
<div class="ansibleOptionAnchor" id="parameter-"></div>
591+
<b>enable_monitor</b>
592+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
593+
<div style="font-size: small">
594+
<span style="color: purple">boolean</span>
595+
</div>
596+
</td>
597+
<td>
598+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
599+
<li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
600+
<li>yes</li>
601+
</ul>
602+
</td>
603+
<td>
604+
<div>State of Switchport Monitor for SPAN/ERSPAN</div>
605+
</td>
606+
</tr>
607+
<tr>
608+
<td class="elbow-placeholder"></td>
609+
<td class="elbow-placeholder"></td>
610+
<td colspan="1">
611+
<div class="ansibleOptionAnchor" id="parameter-"></div>
612+
<b>enable_pfc</b>
613+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
614+
<div style="font-size: small">
615+
<span style="color: purple">boolean</span>
616+
</div>
617+
</td>
618+
<td>
619+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
620+
<li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
621+
<li>yes</li>
622+
</ul>
623+
</td>
624+
<td>
625+
<div>State of Priority Flow Control (PFC) on the interface</div>
626+
</td>
627+
</tr>
565628
<tr>
566629
<td class="elbow-placeholder"></td>
567630
<td class="elbow-placeholder"></td>
@@ -1105,6 +1168,69 @@ Parameters
11051168
<div>Duplex of the interface. Speed must be set to use duplex.</div>
11061169
</td>
11071170
</tr>
1171+
<tr>
1172+
<td class="elbow-placeholder"></td>
1173+
<td class="elbow-placeholder"></td>
1174+
<td colspan="1">
1175+
<div class="ansibleOptionAnchor" id="parameter-"></div>
1176+
<b>enable_cdp</b>
1177+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
1178+
<div style="font-size: small">
1179+
<span style="color: purple">boolean</span>
1180+
</div>
1181+
</td>
1182+
<td>
1183+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
1184+
<li>no</li>
1185+
<li><div style="color: blue"><b>yes</b>&nbsp;&larr;</div></li>
1186+
</ul>
1187+
</td>
1188+
<td>
1189+
<div>State of CDP protocol on the interface</div>
1190+
</td>
1191+
</tr>
1192+
<tr>
1193+
<td class="elbow-placeholder"></td>
1194+
<td class="elbow-placeholder"></td>
1195+
<td colspan="1">
1196+
<div class="ansibleOptionAnchor" id="parameter-"></div>
1197+
<b>enable_monitor</b>
1198+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
1199+
<div style="font-size: small">
1200+
<span style="color: purple">boolean</span>
1201+
</div>
1202+
</td>
1203+
<td>
1204+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
1205+
<li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
1206+
<li>yes</li>
1207+
</ul>
1208+
</td>
1209+
<td>
1210+
<div>State of Switchport Monitor for SPAN/ERSPAN</div>
1211+
</td>
1212+
</tr>
1213+
<tr>
1214+
<td class="elbow-placeholder"></td>
1215+
<td class="elbow-placeholder"></td>
1216+
<td colspan="1">
1217+
<div class="ansibleOptionAnchor" id="parameter-"></div>
1218+
<b>enable_pfc</b>
1219+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
1220+
<div style="font-size: small">
1221+
<span style="color: purple">boolean</span>
1222+
</div>
1223+
</td>
1224+
<td>
1225+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
1226+
<li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
1227+
<li>yes</li>
1228+
</ul>
1229+
</td>
1230+
<td>
1231+
<div>State of Priority Flow Control (PFC) on the interface</div>
1232+
</td>
1233+
</tr>
11081234
<tr>
11091235
<td class="elbow-placeholder"></td>
11101236
<td class="elbow-placeholder"></td>
@@ -2273,6 +2399,48 @@ Parameters
22732399
<div>Spanning-tree bpduguard</div>
22742400
</td>
22752401
</tr>
2402+
<tr>
2403+
<td class="elbow-placeholder"></td>
2404+
<td class="elbow-placeholder"></td>
2405+
<td colspan="1">
2406+
<div class="ansibleOptionAnchor" id="parameter-"></div>
2407+
<b>disable_lacp_suspend_individual</b>
2408+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
2409+
<div style="font-size: small">
2410+
<span style="color: purple">boolean</span>
2411+
</div>
2412+
</td>
2413+
<td>
2414+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
2415+
<li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
2416+
<li>yes</li>
2417+
</ul>
2418+
</td>
2419+
<td>
2420+
<div>If disabled, lacp will put the port to individual state and not suspend the port in case the port does not get LACP BPDU from the peer ports in the port-channel</div>
2421+
</td>
2422+
</tr>
2423+
<tr>
2424+
<td class="elbow-placeholder"></td>
2425+
<td class="elbow-placeholder"></td>
2426+
<td colspan="1">
2427+
<div class="ansibleOptionAnchor" id="parameter-"></div>
2428+
<b>enable_lacp_vpc_convergence</b>
2429+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
2430+
<div style="font-size: small">
2431+
<span style="color: purple">boolean</span>
2432+
</div>
2433+
</td>
2434+
<td>
2435+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
2436+
<li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
2437+
<li>yes</li>
2438+
</ul>
2439+
</td>
2440+
<td>
2441+
<div>Enable lacp convergence for vPC port-channels</div>
2442+
</td>
2443+
</tr>
22762444
<tr>
22772445
<td class="elbow-placeholder"></td>
22782446
<td class="elbow-placeholder"></td>

‎docs/cisco.dcnm.dcnm_vrf_module.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,26 @@ Parameters
555555
<div>Enable IPv6 link-local Option</div>
556556
</td>
557557
</tr>
558+
<tr>
559+
<td class="elbow-placeholder"></td>
560+
<td colspan="4">
561+
<div class="ansibleOptionAnchor" id="parameter-"></div>
562+
<b>l3vni_wo_vlan</b>
563+
<a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
564+
<div style="font-size: small">
565+
<span style="color: purple">boolean</span>
566+
</div>
567+
</td>
568+
<td>
569+
<ul style="margin: 0; padding: 0"><b>Choices:</b>
570+
<li><div style="color: blue"><b>no</b>&nbsp;&larr;</div></li>
571+
<li>yes</li>
572+
</ul>
573+
</td>
574+
<td>
575+
<div>Enable L3 VNI without VLAN</div>
576+
</td>
577+
</tr>
558578
<tr>
559579
<td class="elbow-placeholder"></td>
560580
<td colspan="4">

‎playbooks/roles/dcnm_vpc_pair/dcnm_hosts.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
all:
2+
vars:
3+
ansible_user: "admin"
4+
ansible_password: "password-secret"
5+
ansible_python_interpreter: python
6+
ansible_httpapi_validate_certs: False
7+
ansible_httpapi_use_ssl: True
8+
children:
9+
dcnm:
10+
vars:
11+
ansible_it_fabric: fabric-stage
12+
ansible_connection: ansible.netcommon.httpapi
13+
ansible_network_os: cisco.dcnm.dcnm
14+
ansible_httpapi_validate_certs: no
15+
hosts:
16+
nac-ndfc1:
17+
ansible_host: 10.10.5.1
18+

‎playbooks/roles/dcnm_vpc_pair/dcnm_tests.yaml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
---
2+
# This playbook can be used to execute integration tests for
3+
# the role located in:
4+
#
5+
# tests/integration/targets/dcnm_image_policy
6+
#
7+
# Modify the hosts and vars sections with details for your testing
8+
# setup and uncomment the testcase you want to run.
9+
#
10+
- hosts: dcnm
11+
gather_facts: no
12+
connection: ansible.netcommon.httpapi
13+
14+
vars:
15+
switch_username: admin
16+
switch_password: "password-secret"
17+
ansible_it_fabric: fabric-stage
18+
ansible_switch1: 192.168.1.1
19+
ansible_switch2: 192.168.1.2
20+
ansible_peer1_ip: 192.168.1.1
21+
ansible_peer2_ip: 192.168.1.2
22+
ansible_vxlan_vpc_domain_id: 1000
23+
24+
config:
25+
- peerOneId: "{{ ansible_switch1 }}"
26+
peerTwoId: "{{ ansible_switch2 }}"
27+
templateName: "vpc_pair" # Using the correct template name
28+
profile:
29+
# Required fields for VPC template
30+
ADMIN_STATE: true
31+
ALLOWED_VLANS: "all"
32+
DOMAIN_ID: "{{ ansible_vxlan_vpc_domain_id }}"
33+
FABRIC_NAME: "{{ ansible_it_fabric }}"
34+
KEEP_ALIVE_HOLD_TIMEOUT: 3
35+
KEEP_ALIVE_VRF: "management"
36+
PC_MODE: "active"
37+
PEER1_KEEP_ALIVE_LOCAL_IP: "{{ ansible_peer1_ip }}"
38+
PEER1_MEMBER_INTERFACES: "eth1/1"
39+
PEER1_PCID: 1
40+
PEER2_KEEP_ALIVE_LOCAL_IP: "{{ ansible_peer2_ip }}"
41+
PEER2_MEMBER_INTERFACES: "eth1/1"
42+
PEER2_PCID: 2
43+
44+
# Additional required fields
45+
peer1Ip: "{{ ansible_peer1_ip }}"
46+
peer2Ip: "{{ ansible_peer2_ip }}"
47+
vpcDomainId: "{{ ansible_vxlan_vpc_domain_id }}"
48+
adminState: true
49+
keepAliveVrf: "management"
50+
keepAliveHoldTimeout: 3
51+
keepAliveLocalIp: "{{ ansible_peer1_ip }}"
52+
keepAliveRemoteIp: "{{ ansible_peer2_ip }}"
53+
54+
# Template specific fields
55+
templateName: "vpc_pair"
56+
templatePropId: ""
57+
templatePropName: "vpc_pair"
58+
templatePropDescription: "VPC Template"
59+
templatePropDataType: "JSON"
60+
templatePropDefaultValue: ""
61+
templatePropDisplayName: "VPC Configuration"
62+
templatePropIsMandatory: true
63+
templatePropIsMultiSelect: false
64+
templatePropIsPassword: false
65+
templatePropIsReadOnly: false
66+
templatePropIsRequired: true
67+
templatePropIsSecure: false
68+
templatePropIsSortable: false
69+
templatePropIsVisible: true
70+
templatePropOptions: []
71+
templatePropRange: []
72+
templatePropValue: ""
73+
templatePropValueType: "STRING"
74+
templateIPAddress: "{{ ansible_peer1_ip }}"
75+
76+
77+
roles:
78+
- dcnm_vpc_pair

0 commit comments

Comments
 (0)