Skip to content

Commit

Permalink
Cisco NSO module migration (#142)
Browse files Browse the repository at this point in the history
* cisco nso module migration

* kill nso zombies and add doc_fragment redirect

* add redirect for doc_fragment to runtime.yml

* Update meta/runtime.yml

Co-authored-by: Felix Fontein <felix@fontein.de>
  • Loading branch information
mamullen13316 and felixfontein authored Dec 7, 2020
1 parent 1e55036 commit 8be55e2
Show file tree
Hide file tree
Showing 41 changed files with 33 additions and 3,671 deletions.
8 changes: 0 additions & 8 deletions .github/BOTMETA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ files:
$module_utils/network/nos/nos.py:
maintainers: $team_extreme
labels: networking
$module_utils/network/nso/nso.py:
maintainers: $team_nso
labels: cisco networking
$module_utils/network/ordnance/ordnance.py:
maintainers: alexanderturner djh00t
labels: networking
Expand Down Expand Up @@ -308,10 +305,6 @@ files:
$modules/network/nos/:
authors: LindsayHill
maintainers: bigmstone ujwalkomarla
$modules/network/nso/:
authors: cnasten
maintainers: cmoberg tbjurman
labels: cisco networking
$modules/network/nuage/nuage_vspk.py:
authors: pdellaert
$modules/network/opx/opx_cps.py:
Expand Down Expand Up @@ -393,5 +386,4 @@ macros:
team_netscaler: chiradeep giorgos-nikolopoulos
team_netvisor: Qalthos amitsi csharpe-pn pdam preetiparasar
team_networking: NilashishC Qalthos danielmellado ganeshrn justjais trishnaguha
team_nso: cmoberg cnasten tbjurman
team_scaleway: DenBeke QuentinBrosse abarbare jerome-quere kindermoumoute remyleo
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -396,4 +396,7 @@ $RECYCLE.BIN/
# Windows shortcuts
*.lnk

# MacOS folder metadata
.DS_Store

# End of https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv
14 changes: 14 additions & 0 deletions changelogs/fragments/nso-migration-removal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
removed_features:
- |
All ``nso`` modules have been removed from this collection.
They have been migrated to the `cisco.nso <https://galaxy.ansible.com/cisco/nso>`_ collection.
If you use ansible-base 2.10 or newer, redirections have been provided.
If you use Ansible 2.9 and installed this collection, you need to adjust the FQCNs (``community.network.nso_config`` → ``cisco.nso.nso_config``) and make sure to install the `cisco.nso` collection.
breaking_changes:
- |
If you use Ansible 2.9 and the ``nso`` modules from this collection, community.network 2.0.0 results in errors when trying to use the nso content by FQCN, like ``community.network.nso_config``.
Since Ansible 2.9 is not able to use redirections, you will have to adjust your playbooks and roles manually to use the new FQCNs (``cisco.nso.nso_config`` for the previous example) and to make sure that you have ``cisco.nso`` installed.
If you use ansible-base 2.10 or newer and did not install Ansible 3.0.0, but installed (and/or upgraded) community.network manually, you need to make sure to also install ``cisco.nso`` if you are using any of the ``nso`` modules.
While ansible-base 2.10 or newer can use the redirects that community.network 2.0.0 adds, the collection they point to (cisco.nso) must be installed for them to work.
16 changes: 16 additions & 0 deletions meta/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
requires_ansible: '>=2.9.10'
plugin_routing:
modules:
nso_config:
redirect: cisco.nso.nso_config
nso_action:
redirect: cisco.nso.nso_action
nso_verify:
redirect: cisco.nso.nso_verify
nso_query:
redirect: cisco.nso.nso_query
nso_show:
redirect: cisco.nso.nso_show
cp_publish:
redirect: check_point.mgmt.cp_mgmt_publish
pn_cluster:
Expand Down Expand Up @@ -145,6 +155,8 @@ plugin_routing:
module_utils:
network.routeros.routeros:
redirect: community.routeros.routeros
network.nso.nso:
redirect: cisco.nso.nso
cliconf:
routeros:
redirect: community.routeros.routeros
Expand All @@ -156,3 +168,7 @@ plugin_routing:
terminal:
routeros:
redirect: community.routeros.routeros
doc_fragments:
nso:
redirect: cisco.nso.nso

36 changes: 0 additions & 36 deletions plugins/doc_fragments/nso.py

This file was deleted.

Empty file.
Loading

0 comments on commit 8be55e2

Please sign in to comment.