-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge release_1.3.1 --> develop (#454)
* Add 8K to BGP wait_for_process_initialized() * Add 8K to OSPF wait_for_process_initialized() * Fix for n8k vrf context * fix comment * Remove skip for CSCuz44696 * fix vni for all supported platforms * Fix minitest for aaa feature * yaml fix * Update version.rb * Utils.normalize_range_array * The motivation for this change was finding yet another array normalizer in the private vlan code so these changes are initially meant to address fixes there. IMO our range summarize methods were getting a bit long and difficult to maintain; these new methods will hopefully simplify things somewhat. * The main problem these methods are trying to solve is reconciling manifest inputs with getter results when there are overlapping ranges; e.g.: * '2-5, 9, 4-6' needs to be ['2-6', '9'] * ['2', '3', '4-6'] needs to be ['2-6'] * ['2', '3', '4'] needs to be ['2-4'] * It's fairly easy to merge the ranges if they are actual ruby ranges instead of the dash-syntax ranges, so the new methods just convert to ruby ranges, merge, and convert back. * There's also a method that breaks the ranges down into individual elements so that delta_add_remove can add or remove specific elements on the switch. * I have a related commit for Puppet on the way. * Tested on n9k * Property mapped_vni fix for n5|6k * private_vlan_association minitest fix * Updated result values to reflect that API now uses Utils.normalize_range_array, which summarizes the ranges. * The rest is just cleanup, ie removed the else clause since the if block does a return. * Tested on n3,n5,n6,n7,n8,n9-I3 * comment updates only * Refactor yaml to use default_only * Error condition for l2vpn added * Minor test code cleanups * Add basic filter to Interface.filter * Get rid of interfaces_id method * shorten test method names in test_interface_private_vlan * tested on n9 * Simplified yaml entry * process_initialized is included for n8k * Fix negotiate auto invalid skips (#404) * Condense negoitate test code and fix invalid skips * Remove debug code * Update aaa_authentication_login_service.rb * interface: private_vlan refactor * There were a few errors with the original implementation. As I worked through this I found that it made sense to rewrite many of the methods to use the new range conversion utilities, and with so many functional changes we decided to take the opportunity to shorten the property names. Since the original code was already released with 1.3.0 we decided to just deprecate them. * Created `DEPRECATED.yaml` and `interface_DEPRECATED.rb` for the original code. The setters will raise a warning if used, which includes the name of the new property to use. I ran the original test_interface_private_vlan tests against the deprecated code and they still pass, but then updated the test file to use the new methods. This means that going forward the deprecated methods will not have any tests run, and any issues found will not be fixed. * Related puppet fixes are in the works. * Tested on n3-I4,n5,n6,n7,n8,n9-I2,n9-I3 * switchport_pvlan_mapping_trunk needs to be a multiple * My first pass at this code missed that this property supported multiple occurrences * Added a delta_hash method for trunk * Changed `pvlan_range_delta` to a single-caller method for `switchport_pvlan_mapping` since it's no longer shared with the trunk method * Fixed the minitest * Passes on n3-I4,n5,n6,n7,n8,n9-I2,n9-I3 * Move svi pvlan test into test_interface_svi.rb * Tests pass on all NX platforms * Move deprecated keys into own hash * This is just a minor cleanup to make this simpler to remove later on * Update comments in DEPRECATED.yaml * change private_vlan to pvlan * changelog * fix for context * Change deprecation warning msg * Change deprecation warning msg * pvlan_mapping should always return array * This property allows input as string or array. The getter was returning default as [] and non-default as String - which forces special handling in puppet's insync? method - so I changed it to always return an array. This way we don't need to override insync? at all. * Also moved the pvlan_mapping test out of the svi file. While it does only apply to svi interfaces it seems to fit better with the other interface-related private-vlan tests. * Tested on n5,n7,n9-I3 * Add requires for DEPRECATED providers * Symptom: Noticed a corner case where changing a deprecated file on the device but not changing the inheriting file (I updated interface_DEPRECATED.rb but not interface.rb) caused the following error: ``` Linux# puppet agent -t Info: Using configured environment 'production' Info: Retrieving pluginfacts Info: Retrieving plugin Info: Loading facts Error: Facter: error while resolving custom fact "cisco_node_utils": uninitialized constant Cisco::NodeUtil /opt/puppetlabs/puppet/lib/ruby/gems/2.1.0/gems/cisco_node_utils-1.3.1/lib/cisco_node_utils/interface_DEPRECATED.rb:29: warning: already initialized constant Cisco::PVLAN_PROPERTY /opt/puppetlabs/puppet/lib/ruby/gems/2.1.0/gems/cisco_node_utils-1.3.1/lib/cisco_node_utils/interface_DEPRECATED.rb:29: warning: previous definition of PVLAN_PROPERTY was here ``` * Analysis: Looks like facter caches the provider files. I found that making a whitespace change in interface.rb was enough to trigger the cache clear for that file and it avoided the error. But the real problem is that the deprecated providers do not have a require for 'node_utils', so just needed to add those to avoid this problem. * Also moved PVLAN_PROPERTY hash within the class to avoid the re-definition warning. This is probably not necessary but it's cleaner. * Also found that `set_value` didn't get included for `switchport_mode_private_vlan_trunk_promiscuous` when I copied the file contents over to DEPRECATED.yaml, so it's there now. * Tested on n9k-i3 * Update interface_DEPRECATED.rb * Update vlan_DEPRECATED.rb * virtual_service and system_image yaml fix * Fix yaml validation error * Addressed PR comments * Remove hardcoded tacacs server reference * Interface shutdown property fix * Update test_interface.rb * switchport disable is broken * Broken by #406 * Tested on n9-i3 * test_interface_private_vlan.rb: /private_vlan/pvlan/ * The vlan object still referenced the old names * Tested on n9-I3 * test_interface* minor cleanups * method name changes only for the most part * tested on n3-I4 * yum package manager fixes * Removed debug * Remove trailing whitespace * Do not track tacacs server info * Add full relative path to tacacs server info * Test if tacacs server is valid * Add relative path of yaml file * Refined the error message for invalid server * Pim.pims fix for feature disabled * The global nature of the pim resource means that an object will be created for each vrf regardless of state; however, this meant that objects were getting created even when feature pim was disabled, causing puppet agent/resource to to raise an error whenever the getter was called. * Tested on n7 * Add N8k references * Handle no virtual-services installed case * vxlan and pvlan fix * Remove delta check for cpu utilization (#421) * Add 8k support to CHANGELOG * Switchport trunk allowed vlan now accepts 'vlan add' lines (#423) (#441) * Fix regexp to only accept vlan ranges * Trunk allowed vlan now handles 'vlan add' lines * test_evpn_vni:route_target_both: I2 vs I3,I4,I4+ (#442) Badcodefix: #287 * The previous fix should have limited route_target_both testing to just I2 images; instead it did the reverse. * Tested on n9-i2,n9-i3,n9-i4,n9-i4+ * Fix error due to time zone difference (#443) * Fix suppress-fib-pending lib and test code (#445) * Remove testing of vrf context and fix default test * Fix broken yaml * Merge default test code into main testcase * Snmp packet_size fixes (#446) * Snmp packet_size fixes * Add n8k * Fix last_reset check for platform (#444) * Fix cannot disable local issue (#447) * New default for vxlan_vtep: holddown (#448) * Tested on n9k-e_dev * Minitest passes * Beaker passes * Fix auth method local cleanup (#449) * Refactor aaa local auth removal (#450) * Refactor aaa local auth removal * Remove whitespace * Remove unneeded test steps (#452) * New overlay_global behaviors (#451) * DME changes for l2rib properties resulted in removal of the 'default' keyword from the cli: `l2rib dup-host-mac-detection default` * Prior to this change, 'default' was the only way to reset the host_moves & timeout properties back to default; there was/is no 'no' command, so the only way to reset it now is to re-enter the command with the default values. * This change necessitates changes to the setter, minitest, and beaker. I also changed the default values to actual integer values instead of empty strings. * Tested minitest & beaker for: n9-edev,n9-I4,n5,n6. Skips for n3 (normal) and n7 (requires F3 card). * Prevent removal of method local on unsupported platforms (#453) * Missed merge conflict
- Loading branch information
1 parent
c323268
commit 3305a1f
Showing
31 changed files
with
211 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ pkg/* | |
vendor/* | ||
coverage | ||
ext/Rakefile | ||
tests/tacacs_server.yaml | ||
Gemfile.lock | ||
*.gem | ||
*.swp | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# Tacacs server configuration for test_aaa_authorization_service.rb | ||
# Tacacs server must be set up with external access for test to run | ||
host: '10.122.197.197' | ||
key: 'testing123' | ||
vrf: 'management' | ||
intf: 'mgmt0' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.