Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #152

Merged
merged 97 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
154cc16
Added new workflow modules and playbooks
Feb 6, 2024
a9ac86a
Added the sanity ignore and compile versions; changed the changed the…
Feb 6, 2024
da31779
API get_image_name_from_id was returning image_id instead of name whi…
Abhishek-121 Feb 6, 2024
d00b139
Fixes for SNMP issue and records to return value
abimishr Feb 6, 2024
b100826
Merge pull request #145 from Abhishek-121/main
madhansansel Feb 6, 2024
1461d1d
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 6, 2024
0e2f027
Fixes for SNMP issue and records to return value
abimishr Feb 6, 2024
64cfc22
Used name and description for identying the device credentials rather…
Feb 6, 2024
cedb2e7
Merge pull request #144 from MUTHU-RAKESH-27/main
madhansansel Feb 6, 2024
befa027
Merge pull request #143 from cisco-en-programmability/main
madhansansel Feb 6, 2024
90b95be
Make seperate file workflow_manager file for each module of Swim, Sit…
Abhishek-121 Feb 6, 2024
134ee1b
Fixes for SNMP issue and records to return value
abimishr Feb 6, 2024
1012c3d
Merge pull request #147 from Abhishek-121/main
madhansansel Feb 6, 2024
46b1c75
Removed the unnecessary comments from the playbooks
Feb 6, 2024
f6faf17
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 6, 2024
0cf3fe1
Merge pull request #148 from MUTHU-RAKESH-27/main
madhansansel Feb 6, 2024
1592b3b
remove commented line from the site, swim playbook and update comment…
Abhishek-121 Feb 7, 2024
77fdd89
Merge pull request #149 from Abhishek-121/main
madhansansel Feb 7, 2024
352e536
Added a global documentation file for all the workflow_manager modules
Feb 7, 2024
5234928
Changed the DNAC to Cisco Catalyst Center
Feb 7, 2024
d3df7d1
Changed DNAC to Cisco Catalyst Center
Feb 7, 2024
5000354
Addressed the PR comments
Feb 7, 2024
8f67fe2
Merge pull request #150 from MUTHU-RAKESH-27/main
madhansansel Feb 7, 2024
bd3d71f
Changed the global documentation from intent_params to workflow_manag…
Feb 7, 2024
954ef01
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 7, 2024
d5902a1
Merge pull request #146 from abimishr/PNP_Code_Abinash
madhansansel Feb 7, 2024
04b97b2
Merge pull request #151 from MUTHU-RAKESH-27/main
madhansansel Feb 7, 2024
0bcdd8f
Changed the term intent to workflow_manager in the class descripion a…
Feb 7, 2024
82d6650
Merge pull request #152 from MUTHU-RAKESH-27/main
madhansansel Feb 7, 2024
e582298
Changed the copyright year to 2024
Feb 7, 2024
0bbb744
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 7, 2024
29b591c
Merge pull request #153 from MUTHU-RAKESH-27/main
madhansansel Feb 7, 2024
10d4e8e
Adding workflow manager codes for Discovery and PnP
abimishr Feb 7, 2024
63e7613
Merge pull request #154 from abimishr/PNP_Code_Abinash
madhansansel Feb 7, 2024
b39b020
Adding Playbook and Code for Provision workflow manager
abimishr Feb 8, 2024
a8f69aa
Fixing naming conventions
abimishr Feb 8, 2024
254bddc
Merge pull request #155 from abimishr/PNP_Code_Abinash
madhansansel Feb 8, 2024
bcee95f
Remove snmp mode default value of AUTHPRIV while updating device and …
Abhishek-121 Feb 12, 2024
b78480d
Adding small changes post testing in Discovery
abimishr Feb 12, 2024
2a8b581
Merge pull request #157 from abimishr/PNP_Code_Abinash
madhansansel Feb 12, 2024
5218b8a
Merge pull request #156 from Abhishek-121/main
madhansansel Feb 12, 2024
6b5b7e7
Pushing the latest changes in Intent module
abimishr Feb 12, 2024
56babab
Merge pull request #158 from abimishr/PNP_Code_Abinash
madhansansel Feb 12, 2024
8d9c2d6
Replace device_type in swim module for tagging/un-tagging image with …
Abhishek-121 Feb 13, 2024
f4ee8b9
Changing the names of PnP type
abimishr Feb 13, 2024
1f0b308
Changing the names of PnP type
abimishr Feb 13, 2024
77a84e7
Changing the names of PnP type
abimishr Feb 13, 2024
eef6550
Changing the names of PnP type
abimishr Feb 13, 2024
1c59345
replace boolean false value to False in swim workflow manager playbook
Abhishek-121 Feb 14, 2024
e646929
Changing the names of PnP type
abimishr Feb 14, 2024
6f741a4
Changing the names of PnP type
abimishr Feb 14, 2024
70aac58
Added detailed description in the documentation, solved the ipv4 gate…
Feb 14, 2024
12b55c1
add brief description for each paramter in both intent module and wor…
Abhishek-121 Feb 14, 2024
3cc0ffb
Merge pull request #161 from abimishr/PNP_Code_Abinash
madhansansel Feb 14, 2024
ba03e4c
Merge branch 'madhansansel:main' into main
MUTHU-RAKESH-27 Feb 15, 2024
c10eaa6
Addressed the PR comments
Feb 15, 2024
759890f
Merge pull request #162 from MUTHU-RAKESH-27/main
madhansansel Feb 15, 2024
feec7cc
Merge pull request #160 from Abhishek-121/main
madhansansel Feb 15, 2024
6eed2c3
Give the brief description of each parameter in site intent and workf…
Abhishek-121 Feb 15, 2024
67b7a18
make site type description more clearer with examples
Abhishek-121 Feb 15, 2024
e09cac9
Making changes to incorporate discovery specific credentials
abimishr Feb 15, 2024
76380c4
Making changes to incorporate discovery specific credentials
abimishr Feb 15, 2024
281dd30
Making changes to incorporate discovery specific credentials
abimishr Feb 16, 2024
b45c5db
Making changes to incorporate discovery specific credentials
abimishr Feb 16, 2024
e6f62c3
Merge branch 'madhansansel:main' into main
Abhishek-121 Feb 16, 2024
a2f7c79
Making changes to incorporate discovery specific credentials
abimishr Feb 16, 2024
ed8a74b
Making changes to incorporate discovery specific credentials
abimishr Feb 16, 2024
5c2fcc8
Change type to site_type and write one API to convert it, also chnage…
Abhishek-121 Feb 16, 2024
3c8d3d2
Merge pull request #163 from Abhishek-121/main
madhansansel Feb 16, 2024
9550cd8
Making changes to incorporate discovery specific credentials
abimishr Feb 16, 2024
8ac540a
Merge pull request #164 from abimishr/PNP_Code_Abinash
madhansansel Feb 16, 2024
112b123
Fix the issue of updating snmp auth passphrase and snmp private passw…
Abhishek-121 Feb 16, 2024
26b1738
Merge pull request #165 from Abhishek-121/main
madhansansel Feb 16, 2024
c946e19
Adding workflow modules and updating the version
madhansansel Feb 16, 2024
237c56f
Adding fix for SWIM upgrade in PnP
abimishr Feb 20, 2024
34b4421
Adding fix for SWIM upgrade in PnP
abimishr Feb 20, 2024
2cb4adc
Adding fix for SWIM upgrade in PnP
abimishr Feb 20, 2024
41e3690
Adding fix for SWIM upgrade in PnP
abimishr Feb 20, 2024
1019df3
Adding fix for SWIM upgrade in PnP
abimishr Feb 20, 2024
9516186
Adding fix for SWIM upgrade in PnP
abimishr Feb 20, 2024
59587f3
Adding fix for SWIM upgrade in PnP
abimishr Feb 20, 2024
408ce69
Merge pull request #166 from abimishr/PNP_Code_Abinash
madhansansel Feb 20, 2024
2c67b0d
Add examples as playbook for each module SWIM, Site and Inventory, Fi…
Abhishek-121 Feb 20, 2024
1bf2648
revert the dnac debug log level to WARNING
Abhishek-121 Feb 20, 2024
cbb1ea5
revert dnac debug level from DEBUG to WARNING in site intent module
Abhishek-121 Feb 20, 2024
c8a766d
Add debug log messages
Abhishek-121 Feb 20, 2024
7e9b8d5
Merge pull request #167 from Abhishek-121/main
madhansansel Feb 20, 2024
0e299a0
Provide the support to update list of interfaces for a specific devic…
Abhishek-121 Feb 21, 2024
1b887e0
update the netconf port description in the documentation
Abhishek-121 Feb 21, 2024
e76a66c
Merge pull request #168 from Abhishek-121/main
madhansansel Feb 21, 2024
269d47f
Update swim module documentation
Abhishek-121 Feb 21, 2024
49dfe30
Add the documentation for third party application type and image fami…
Abhishek-121 Feb 21, 2024
698a581
Merge pull request #169 from Abhishek-121/main
madhansansel Feb 21, 2024
1068153
Added minor changes in changelog
madhansansel Feb 21, 2024
9d4904a
Merge pull request #151 from madhansansel/main
wastorga Feb 21, 2024
823a2ba
add smartquotes config to conf.py
wastorga Feb 21, 2024
72d11c3
Update reame
bvargasre Feb 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions plugins/modules/inventory_intent.py
Original file line number Diff line number Diff line change
Expand Up @@ -2789,11 +2789,12 @@ def get_diff_merged(self, config):
mapped_key = device_key_mapping[key]

if playbook_params[mapped_key] is None:
if playbook_params['snmpMode'] == "AUTHPRIV":
playbook_params['snmpAuthPassphrase'] = csv_data_dict['snmp_auth_passphrase']
playbook_params['snmpPrivPassphrase'] = csv_data_dict['snmp_priv_passphrase']
playbook_params[mapped_key] = csv_data_dict[key]

if playbook_params['snmpMode'] == "AUTHPRIV":
playbook_params['snmpAuthPassphrase'] = csv_data_dict['snmp_auth_passphrase']
playbook_params['snmpPrivPassphrase'] = csv_data_dict['snmp_priv_passphrase']

if playbook_params['snmpMode'] == "NOAUTHNOPRIV":
playbook_params.pop('snmpAuthPassphrase', None)
playbook_params.pop('snmpPrivPassphrase', None)
Expand Down
9 changes: 6 additions & 3 deletions plugins/modules/inventory_workflow_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2790,11 +2790,14 @@ def get_diff_merged(self, config):
mapped_key = device_key_mapping[key]

if playbook_params[mapped_key] is None:
if playbook_params['snmpMode'] == "AUTHPRIV":
playbook_params['snmpAuthPassphrase'] = csv_data_dict['snmp_auth_passphrase']
playbook_params['snmpPrivPassphrase'] = csv_data_dict['snmp_priv_passphrase']
playbook_params[mapped_key] = csv_data_dict[key]

if playbook_params['snmpMode'] == "AUTHPRIV":
if not playbook_params['snmpAuthPassphrase']:
playbook_params['snmpAuthPassphrase'] = csv_data_dict['snmp_auth_passphrase']
if not playbook_params['snmpPrivPassphrase']:
playbook_params['snmpPrivPassphrase'] = csv_data_dict['snmp_priv_passphrase']

if playbook_params['snmpMode'] == "NOAUTHNOPRIV":
playbook_params.pop('snmpAuthPassphrase', None)
playbook_params.pop('snmpPrivPassphrase', None)
Expand Down
Loading