Skip to content

Commit

Permalink
version 3.0.0 prep (#255)
Browse files Browse the repository at this point in the history
* bumped version to '3.0.0'

* removed netconf sros

* removed 'forward_enp_slot' parameter from 'community.network.ce_sflow' module

* removed 'rate_limit_slot' parameter from 'community.network.ce_sflow' module

* removed 'rate_limit' parameter from 'community.network.ce_sflow' module

* added 3.0.0 deprecation removals

* Apply suggestions from code review

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
  • Loading branch information
dericcrago and felixfontein committed Apr 22, 2021
1 parent e895b8b commit 1840b1c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 166 deletions.
4 changes: 4 additions & 0 deletions changelogs/fragments/255-3.0.0-deprecations.yml
@@ -0,0 +1,4 @@
---
removed_features:
- "The deprecated ``community.network.sros`` netconf plugin has been removed. Use ``nokia.sros.md`` instead (https://github.com/ansible-collections/community.network/pull/255)."
- "The deprecated ``community.network.ce_sflow`` parameters: ``rate_limit``, ``rate_limit_slot``, and ``forward_enp_slot`` have been removed (https://github.com/ansible-collections/community.network/pull/255)."
2 changes: 1 addition & 1 deletion galaxy.yml
@@ -1,6 +1,6 @@
namespace: community
name: network
version: 2.2.0
version: 3.0.0
readme: README.md
authors:
- Ansible (https://github.com/ansible)
Expand Down
5 changes: 2 additions & 3 deletions meta/runtime.yml
Expand Up @@ -227,13 +227,12 @@ plugin_routing:
redirect: community.routeros.routeros
netconf:
sros:
deprecation:
tombstone:
removal_version: 3.0.0
warning_text: see plugin documentation for details
warning_text: Use nokia.sros.md instead.
terminal:
routeros:
redirect: community.routeros.routeros
doc_fragments:
nso:
redirect: cisco.nso.nso

42 changes: 0 additions & 42 deletions plugins/modules/network/cloudengine/ce_sflow.py
Expand Up @@ -106,30 +106,6 @@
description:
- Configures the sFlow packets sent by the switch not to carry routing information.
choices: ['enable', 'disable']
rate_limit:
description:
- Specifies the rate of sFlow packets sent from a card to the control plane.
The value is an integer that ranges from 100 to 1500, in pps.
type: str
version_added: '0.2.0'
rate_limit_slot:
description:
- Specifies the slot where the rate of output sFlow packets is limited.
If this parameter is not specified, the rate of sFlow packets sent from
all cards to the control plane is limited.
The value is an integer or a string of characters.
type: str
version_added: '0.2.0'
forward_enp_slot:
description:
- Enable the Embedded Network Processor (ENP) chip function.
The switch uses the ENP chip to perform sFlow sampling,
and the maximum sFlow sampling interval is 65535.
If you set the sampling interval to be larger than 65535,
the switch automatically restores it to 65535.
The value is an integer or 'all'.
type: str
version_added: '0.2.0'
state:
description:
- Determines whether the config should be present or not
Expand Down Expand Up @@ -371,9 +347,6 @@ def __init__(self, argument_spec):
self.source_ip = self.module.params['source_ip']
self.source_version = None
self.export_route = self.module.params['export_route']
self.rate_limit = self.module.params['rate_limit']
self.rate_limit_slot = self.module.params['rate_limit_slot']
self.forward_enp_slot = self.module.params['forward_enp_slot']
self.collector_id = self.module.params['collector_id']
self.collector_ip = self.module.params['collector_ip']
self.collector_version = None
Expand Down Expand Up @@ -985,10 +958,6 @@ def check_params(self):
self.module.fail_json(
msg="Error: sample_length is not ranges from 10 to 4294967295.")

if self.rate_limit or self.rate_limit_slot or self.forward_enp_slot:
self.module.fail_json(msg="Error: The following parameters cannot be configured"
"because XML mode is not supported:rate_limit,rate_limit_slot,forward_enp_slot.")

def get_proposed(self):
"""get proposed info"""

Expand All @@ -999,11 +968,6 @@ def get_proposed(self):
self.proposed["source_ip"] = self.source_ip
if self.export_route:
self.proposed["export_route"] = self.export_route
if self.rate_limit:
self.proposed["rate_limit"] = self.rate_limit
self.proposed["rate_limit_slot"] = self.rate_limit_slot
if self.forward_enp_slot:
self.proposed["forward_enp_slot"] = self.forward_enp_slot
if self.collector_id:
self.proposed["collector_id"] = self.collector_id
if self.collector_ip:
Expand Down Expand Up @@ -1134,12 +1098,6 @@ def main():
source_ip=dict(required=False, type='str'),
export_route=dict(required=False, type='str',
choices=['enable', 'disable']),
rate_limit=dict(required=False, removed_in_version='3.0.0', # was Ansible 2.13
removed_from_collection='community.network', type='str'),
rate_limit_slot=dict(required=False, removed_in_version='3.0.0', # was Ansible 2.13
removed_from_collection='community.network', type='str'),
forward_enp_slot=dict(required=False, removed_in_version='3.0.0', # was Ansible 2.13
removed_from_collection='community.network', type='str'),
collector_id=dict(required=False, type='str', choices=['1', '2']),
collector_ip=dict(required=False, type='str'),
collector_ip_vpn=dict(required=False, type='str'),
Expand Down
120 changes: 0 additions & 120 deletions plugins/netconf/sros.py

This file was deleted.

0 comments on commit 1840b1c

Please sign in to comment.