cisco_node_utils 1.1.0 → 1.2.0

data/tests/test_pim_rp_address.rb

@@ -0,0 +1,153 @@
+# Copyright (c) 2013-2016 Cisco and/or its affiliates.
+#
+# Smitha Gopalan, November 2015
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------
+# Cli: <afi> pim rp-address <rp-address> (under different VRFs)
+# ---------------------------------------------------------------------
+# Testcases: All Tests create and destroy all instances within a test
+#
+# 1. test_all_rp_addrs
+#
+# 2. test_single_invalid_rpaddr_single_vrf:
+#         vrf default, ip pim rp-address 256.256.256.256
+# ---------------------------------------------------------------------
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/pim_rp_address'
+
+include Cisco
+
+# TestPimRpAddress - Minitest for PimRpAddress
+class TestPimRpAddress < CiscoTestCase
+  # Enables feature pim
+  #--------------------
+  def setup
+    super
+    config('no feature pim')
+  end
+
+  # Test PimRpAddress.rp_addresses
+  # - multiple vrfs, rp_addrs
+  # - same rp_addr, different vrf
+  #--------------------------------------------
+  def all_rp_addrs(afi)
+    rp_addr1 = '11.11.11.11'
+    rp_addr2 = '22.22.22.22'
+
+    # Basic setup
+    vrf = 'default'
+    pd1 = PimRpAddress.new(afi, vrf, rp_addr1)
+    pd2 = PimRpAddress.new(afi, vrf, rp_addr2)
+    hash = PimRpAddress.rp_addresses
+    assert(hash.key?(afi))
+    assert(hash[afi].key?(vrf))
+    assert_equal(2, hash[afi][vrf].keys.count,
+                 "hash[#{afi}][#{vrf}] should have 2 rp-address")
+    assert(hash[afi][vrf].key?(rp_addr1),
+           "hash[#{afi}][#{vrf}] does not contain #{rp_addr1}")
+    assert(hash[afi][vrf].key?(rp_addr2),
+           "hash[#{afi}][#{vrf}] does not contain #{rp_addr2}")
+
+    # vrf with same rp_addrs as in default
+    vrf = 'red'
+    pd3 = PimRpAddress.new(afi, vrf, rp_addr1)
+    pd4 = PimRpAddress.new(afi, vrf, rp_addr2)
+    hash = PimRpAddress.rp_addresses
+    assert_equal(2, hash[afi].keys.count,
+                 "hash[#{afi}] does not have 2 vrfs")
+    assert(hash[afi].key?(vrf))
+    assert_equal(2, hash[afi][vrf].keys.count,
+                 "hash[#{afi}][#{vrf}] should have 2 rp-address")
+    assert(hash[afi][vrf].key?(rp_addr1),
+           "hash[#{afi}][#{vrf}] does not contain #{rp_addr1}")
+    assert(hash[afi][vrf].key?(rp_addr2),
+           "hash[#{afi}][#{vrf}] does not contain #{rp_addr2}")
+
+    # different vrf, same/diff rps
+    vrf = 'black'
+    rp_addr7 = '7.7.7.7'
+    pd5 = PimRpAddress.new(afi, vrf, rp_addr1)
+    pd6 = PimRpAddress.new(afi, vrf, rp_addr2)
+    pd7 = PimRpAddress.new(afi, vrf, rp_addr7)
+    hash = PimRpAddress.rp_addresses
+    assert_equal(3, hash[afi].keys.count,
+                 "hash[#{afi}] does not have 3 vrfs")
+    assert(hash[afi].key?(vrf))
+    assert_equal(3, hash[afi][vrf].keys.count,
+                 "hash[#{afi}][#{vrf}] should have 3 rp-address")
+    assert(hash[afi][vrf].key?(rp_addr1),
+           "hash[#{afi}][#{vrf}] does not contain #{rp_addr1}")
+    assert(hash[afi][vrf].key?(rp_addr1),
+           "hash[#{afi}][#{vrf}] does not contain #{rp_addr2}")
+    assert(hash[afi][vrf].key?(rp_addr7),
+           "hash[#{afi}][#{vrf}] does not contain #{rp_addr7}")
+
+    # Test removal
+    vrf = 'default'
+    pd1.destroy
+    hash = PimRpAddress.rp_addresses
+    assert_equal(1, hash[afi][vrf].keys.count,
+                 "hash[#{afi}][#{vrf}] should have 1 rp-address")
+    refute(hash[afi][vrf].key?(rp_addr1),
+           "hash[#{afi}][#{vrf}] should not contain #{rp_addr1}")
+
+    vrf = 'red'
+    pd3.destroy
+    hash = PimRpAddress.rp_addresses
+    assert_equal(1, hash[afi][vrf].keys.count,
+                 "hash[#{afi}][#{vrf}] should have 1 rp-address")
+    refute(hash[afi][vrf].key?(rp_addr1),
+           "hash[#{afi}][#{vrf}] should not contain #{rp_addr1}")
+
+    vrf = 'black'
+    pd5.destroy
+    pd7.destroy
+    hash = PimRpAddress.rp_addresses
+    assert_equal(1, hash[afi][vrf].keys.count,
+                 "hash[#{afi}][#{vrf}] should have 1 rp-address")
+    refute(hash[afi][vrf].key?([rp_addr1]),
+           "hash[#{afi}][#{vrf}] should not contain [#{rp_addr1}]")
+    pd2.destroy
+    pd4.destroy
+    pd6.destroy
+    hash = PimRpAddress.rp_addresses
+    assert_empty(hash[afi], 'hash[#{afi}] is not empty')
+  end
+
+  # Tests PimRpAddress.rp_addresses
+  #------------------------------------------
+  def test_all_rp_addrs
+    %w(ipv4).each do |afi|
+      all_rp_addrs(afi)
+    end
+  end
+
+  # Creates single invalid rp address under vrf default
+  #---------------------------------------------------
+  def create_single_invalid_rpaddr_single_vrf(afi)
+    rp_addr = '256.256.256.256'
+    assert_raises(CliError) do
+      PimRpAddress.new(afi, 'default', rp_addr)
+    end
+  end
+
+  # Tests single invalid rp address under vrf default
+  #---------------------------------------------------
+  def test_single_invalid_rpaddr_single_vrf
+    %w(ipv4).each do |afi|
+      create_single_invalid_rpaddr_single_vrf(afi)
+    end
+  end
+end

data/tests/test_platform.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 Cisco and/or its affiliates.
+# Copyright (c) 2015-2016 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -181,7 +181,7 @@ class TestPlatform < CiscoTestCase
     vir_hsh_hsh = {}
     unless vir_arr.nil?
       vir_arr.each do |serv|
-        # rubocop:disable Style/AlignHash, Style/ExtraSpacing
+        # rubocop:disable Style/AlignHash
         vir_hsh_hsh[serv['name']] = {
           'package_info' => { 'name'     => serv['package_name'],
                               'path'     => serv['ova_path'],
@@ -201,7 +201,7 @@ class TestPlatform < CiscoTestCase
                               'cpu'      => serv['cpu_reservation'],
           },
         }
-        # rubocop:enable Style/AlignHash, Style/ExtraSpacing
+        # rubocop:enable Style/AlignHash
       end
     end
     assert_equal(vir_hsh_hsh, Platform.virtual_services)

data/tests/test_portchannel_global.rb

@@ -0,0 +1,202 @@
+# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/portchannel_global'
+
+# TestX__CLASS_NAME__X - Minitest for X__CLASS_NAME__X node utility class
+class TestPortchannelGlobal < CiscoTestCase
+  # TESTS
+
+  DEFAULT_NAME = 'default'
+
+  def setup
+    super
+    config 'no port-channel load-balance' unless n6k_platform?
+    config 'no port-channel load-balance ethernet' unless
+    n9k_platform? || n7k_platform?
+  end
+
+  def teardown
+    config 'no port-channel load-balance' unless n6k_platform?
+    config 'no port-channel load-balance ethernet' unless
+    n9k_platform? || n7k_platform?
+    super
+  end
+
+  def n3k_in_n3k_mode?
+    return unless /N3/ =~ node.product_id
+    mode = config('show system switch-mode')
+    # note: an n3k in n9k mode displays: 'system switch-mode n9k'
+    patterns = ['system switch-mode n3k',
+                'Switch mode configuration is not not applicable']
+    mode[Regexp.union(patterns)] ? true : false
+  end
+
+  def n7k_platform?
+    /N7/ =~ node.product_id
+  end
+
+  def n9k_platform?
+    /N(3|9)/ =~ node.product_id
+  end
+
+  def n6k_platform?
+    /N(5|6)/ =~ node.product_id
+  end
+
+  def create_portchannel_global(name=DEFAULT_NAME)
+    PortChannelGlobal.new(name)
+  end
+
+  def test_get_hash_distribution
+    skip('Platform does not support this property') if n6k_platform? ||
+                                                       n9k_platform?
+    @global = create_portchannel_global
+    @global.hash_distribution = 'fixed'
+    assert_equal('fixed', @global.hash_distribution)
+    @global.hash_distribution =
+      @global.default_hash_distribution
+    assert_equal(@global.default_hash_distribution,
+                 @global.hash_distribution)
+  end
+
+  def test_get_set_load_defer
+    skip('Platform does not support this property') if n6k_platform? ||
+                                                       n9k_platform?
+    @global = create_portchannel_global
+    @global.load_defer = 1000
+    assert_equal(1000, @global.load_defer)
+    @global.load_defer =
+      @global.default_load_defer
+    assert_equal(@global.default_load_defer,
+                 @global.load_defer)
+  end
+
+  def test_get_set_resilient
+    skip('Platform does not support this property') if n6k_platform? ||
+                                                       n7k_platform?
+    @global = create_portchannel_global
+    @global.resilient = true
+    assert_equal(true, @global.resilient)
+    @global.resilient = @global.default_resilient
+    assert_equal(@global.default_resilient, @global.resilient)
+  end
+
+  def test_get_set_port_channel_load_balance_sym_concat_rot
+    skip('Platform does not support this property') if
+      n6k_platform? || n7k_platform? || n3k_in_n3k_mode?
+    @global = create_portchannel_global
+    @global.send(:port_channel_load_balance=,
+                 'src-dst', 'ip-l4port', nil, nil, true, true, 4)
+    assert_equal('src-dst',
+                 @global.bundle_select)
+    assert_equal('ip-l4port',
+                 @global.bundle_hash)
+    assert_equal(true, @global.symmetry)
+    assert_equal(true, @global.concatenation)
+    assert_equal(4, @global.rotate)
+    @global.send(
+      :port_channel_load_balance=,
+      @global.default_bundle_select,
+      @global.default_bundle_hash,
+      nil,
+      nil,
+      @global.default_symmetry,
+      @global.default_concatenation,
+      @global.default_rotate)
+    assert_equal(
+      @global.default_bundle_select,
+      @global.bundle_select)
+    assert_equal(
+      @global.default_bundle_hash,
+      @global.bundle_hash)
+    assert_equal(
+      @global.default_symmetry,
+      @global.symmetry)
+    assert_equal(
+      @global.default_concatenation,
+      @global.concatenation)
+    assert_equal(@global.default_rotate,
+                 @global.rotate)
+  end
+
+  def test_get_set_port_channel_load_balance_hash_poly
+    skip('Platform does not support this property') if n7k_platform? ||
+                                                       n9k_platform?
+    @global = create_portchannel_global
+    @global.send(:port_channel_load_balance=,
+                 'src-dst', 'ip-only', 'CRC10c', nil, nil, nil, nil)
+    assert_equal('src-dst',
+                 @global.bundle_select)
+    assert_equal('ip-only',
+                 @global.bundle_hash)
+    assert_equal('CRC10c', @global.hash_poly)
+    @global.send(:port_channel_load_balance=,
+                 'dst', 'mac', 'CRC10a', nil, nil, nil, nil)
+    assert_equal('dst',
+                 @global.bundle_select)
+    assert_equal('mac',
+                 @global.bundle_hash)
+    assert_equal('CRC10a', @global.hash_poly)
+    @global.send(
+      :port_channel_load_balance=,
+      @global.default_bundle_select,
+      @global.default_bundle_hash,
+      @global.default_hash_poly,
+      nil, nil, nil, nil)
+    assert_equal(
+      @global.default_bundle_select,
+      @global.bundle_select)
+    assert_equal(
+      @global.default_bundle_hash,
+      @global.bundle_hash)
+    assert_equal(@global.default_hash_poly,
+                 @global.hash_poly)
+  end
+
+  def test_get_set_port_channel_load_balance_asym_rot
+    skip('Platform does not support this property') if n6k_platform? ||
+                                                       n9k_platform?
+    @global = create_portchannel_global
+    @global.send(:port_channel_load_balance=,
+                 'src-dst', 'ip-vlan', nil, true, nil, nil, 4)
+    assert_equal('src-dst',
+                 @global.bundle_select)
+    assert_equal('ip-vlan',
+                 @global.bundle_hash)
+    assert_equal(true, @global.asymmetric)
+    assert_equal(4, @global.rotate)
+    @global.send(
+      :port_channel_load_balance=,
+      @global.default_bundle_select,
+      @global.default_bundle_hash,
+      nil,
+      @global.default_asymmetric,
+      nil,
+      nil,
+      @global.default_rotate)
+    assert_equal(
+      @global.default_bundle_select,
+      @global.bundle_select)
+    assert_equal(
+      @global.default_bundle_hash,
+      @global.bundle_hash)
+    assert_equal(
+      @global.default_asymmetric,
+      @global.asymmetric)
+    assert_equal(@global.default_rotate,
+                 @global.rotate)
+  end
+end

data/tests/test_radius_global.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for RadiusGlobal class
 #
-# Copyright (c) 2014-2015 Cisco and/or its affiliates.
+# Copyright (c) 2014-2016 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/tests/test_radius_server.rb

@@ -1,7 +1,7 @@
 #
 # Minitest for RadiusServer class
 #
-# Copyright (c) 2014-2015 Cisco and/or its affiliates.
+# Copyright (c) 2014-2016 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,24 +35,25 @@ class TestRadiusServer < CiscoTestCase
   def no_radiusserver
     # Turn the feature off for a clean test.
     config('no radius-server host 8.8.8.8',
-           'no radius-server host 9.9.9.9')
+           'no radius-server host 2004::3',
+           'no radius-server host 2005::7')
   end
 
   # TESTS
 
-  def test_radiusserver_create_destroy_single
+  def test_create_destroy_single
     id = '8.8.8.8'
     refute_includes(Cisco::RadiusServer.radiusservers, id)
 
     server = Cisco::RadiusServer.new(id, true)
     assert_includes(Cisco::RadiusServer.radiusservers, id)
-    assert_equal(Cisco::RadiusServer.radiusservers[id], server)
+    assert_equal(server, Cisco::RadiusServer.radiusservers[id])
 
     # Default checking
-    assert_equal(server.acct_port, server.default_acct_port)
-    assert_equal(server.auth_port, server.default_auth_port)
-    assert_equal(server.accounting, server.default_accounting)
-    assert_equal(server.authentication, server.default_authentication)
+    assert_equal(server.default_acct_port, server.acct_port)
+    assert_equal(server.default_auth_port, server.auth_port)
+    assert_equal(server.default_accounting, server.accounting)
+    assert_equal(server.default_authentication, server.authentication)
 
     server.accounting = true
     assert(Cisco::RadiusServer.radiusservers[id].accounting)
@@ -61,30 +62,72 @@ class TestRadiusServer < CiscoTestCase
     assert(Cisco::RadiusServer.radiusservers[id].authentication)
 
     server.acct_port = 44
-    assert_equal(Cisco::RadiusServer.radiusservers[id].acct_port,
-                 44)
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
 
     server.auth_port = 55
-    assert_equal(Cisco::RadiusServer.radiusservers[id].auth_port,
-                 55)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
 
     server.retransmit_count = 3
-    assert_equal(Cisco::RadiusServer.radiusservers[id].retransmit_count,
-                 3)
+    assert_equal(3, Cisco::RadiusServer.radiusservers[id].retransmit_count)
 
     server.key_set('44444444', nil)
-    assert_equal(Cisco::RadiusServer.radiusservers[id].key,
-                 '44444444')
+    assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
 
     # Setting back to default and re-checking
     server.acct_port = server.default_acct_port
     server.auth_port = server.default_auth_port
     server.accounting = server.default_accounting
     server.authentication = server.default_authentication
-    assert_equal(server.acct_port, server.default_acct_port)
-    assert_equal(server.auth_port, server.default_auth_port)
-    assert_equal(server.accounting, server.default_accounting)
-    assert_equal(server.authentication, server.default_authentication)
+    assert_equal(server.default_acct_port, server.acct_port)
+    assert_equal(server.default_auth_port, server.auth_port)
+    assert_equal(server.default_accounting, server.accounting)
+    assert_equal(server.default_authentication, server.authentication)
+
+    server.destroy
+    refute_includes(Cisco::RadiusServer.radiusservers, id)
+  end
+
+  def test_create_destroy_single_ipv6
+    id = '2004::3'
+    refute_includes(Cisco::RadiusServer.radiusservers, id)
+
+    server = Cisco::RadiusServer.new(id, true)
+    assert_includes(Cisco::RadiusServer.radiusservers, id)
+    assert_equal(server, Cisco::RadiusServer.radiusservers[id])
+
+    # Default checking
+    assert_equal(server.default_acct_port, server.acct_port)
+    assert_equal(server.default_auth_port, server.auth_port)
+    assert_equal(server.default_accounting, server.accounting)
+    assert_equal(server.default_authentication, server.authentication)
+
+    server.accounting = true
+    assert(Cisco::RadiusServer.radiusservers[id].accounting)
+
+    server.authentication = true
+    assert(Cisco::RadiusServer.radiusservers[id].authentication)
+
+    server.acct_port = 44
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+
+    server.auth_port = 55
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
+
+    server.retransmit_count = 3
+    assert_equal(3, Cisco::RadiusServer.radiusservers[id].retransmit_count)
+
+    server.key_set('44444444', nil)
+    assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+
+    # Setting back to default and re-checking
+    server.acct_port = server.default_acct_port
+    server.auth_port = server.default_auth_port
+    server.accounting = server.default_accounting
+    server.authentication = server.default_authentication
+    assert_equal(server.default_acct_port, server.acct_port)
+    assert_equal(server.default_auth_port, server.auth_port)
+    assert_equal(server.default_accounting, server.accounting)
+    assert_equal(server.default_authentication, server.authentication)
 
     server.destroy
     refute_includes(Cisco::RadiusServer.radiusservers, id)
@@ -92,26 +135,27 @@ class TestRadiusServer < CiscoTestCase
 
   def test_radiusserver_create_destroy_multiple
     id = '8.8.8.8'
-    id2 = '9.9.9.9'
+    id2 = '2005::7'
+
     refute_includes(Cisco::RadiusServer.radiusservers, id)
     refute_includes(Cisco::RadiusServer.radiusservers, id2)
 
     server = Cisco::RadiusServer.new(id, true)
     server2 = Cisco::RadiusServer.new(id2, true)
     assert_includes(Cisco::RadiusServer.radiusservers, id)
-    assert_equal(Cisco::RadiusServer.radiusservers[id], server)
+    assert_equal(server, Cisco::RadiusServer.radiusservers[id])
     assert_includes(Cisco::RadiusServer.radiusservers, id2)
-    assert_equal(Cisco::RadiusServer.radiusservers[id2], server2)
+    assert_equal(server2, Cisco::RadiusServer.radiusservers[id2])
 
     # Default checking
-    assert_equal(server.acct_port, server.default_acct_port)
-    assert_equal(server.auth_port, server.default_auth_port)
-    assert_equal(server.accounting, server.default_accounting)
-    assert_equal(server.authentication, server.default_authentication)
-    assert_equal(server2.acct_port, server2.default_acct_port)
-    assert_equal(server2.auth_port, server2.default_auth_port)
-    assert_equal(server2.accounting, server2.default_accounting)
-    assert_equal(server2.authentication, server2.default_authentication)
+    assert_equal(server.default_acct_port, server.acct_port)
+    assert_equal(server.default_auth_port, server.auth_port)
+    assert_equal(server.default_accounting, server.accounting)
+    assert_equal(server.default_authentication, server.authentication)
+    assert_equal(server2.default_acct_port, server2.acct_port)
+    assert_equal(server2.default_auth_port, server2.auth_port)
+    assert_equal(server2.default_accounting, server2.accounting)
+    assert_equal(server2.default_authentication, server2.authentication)
 
     server.accounting = true
     assert(Cisco::RadiusServer.radiusservers[id].accounting)
@@ -120,22 +164,17 @@ class TestRadiusServer < CiscoTestCase
     assert(Cisco::RadiusServer.radiusservers[id].authentication)
 
     server.acct_port = 44
-    assert_equal(Cisco::RadiusServer.radiusservers[id].acct_port,
-                 44)
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
 
     server.auth_port = 55
-    assert_equal(Cisco::RadiusServer.radiusservers[id].auth_port,
-                 55)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
 
     server.retransmit_count = 3
-    assert_equal(Cisco::RadiusServer.radiusservers[id].retransmit_count,
-                 3)
+    assert_equal(3, Cisco::RadiusServer.radiusservers[id].retransmit_count)
 
     server.key_set('44444444', nil)
-    assert_equal(Cisco::RadiusServer.radiusservers[id].key,
-                 '44444444')
-    assert_equal(server.key,
-                 '44444444')
+    assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+    assert_equal('44444444', server.key)
 
     server2.accounting = true
     assert(Cisco::RadiusServer.radiusservers[id2].accounting)
@@ -144,20 +183,16 @@ class TestRadiusServer < CiscoTestCase
     assert(Cisco::RadiusServer.radiusservers[id2].authentication)
 
     server2.acct_port = 44
-    assert_equal(Cisco::RadiusServer.radiusservers[id2].acct_port,
-                 44)
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id2].acct_port)
 
     server2.auth_port = 55
-    assert_equal(Cisco::RadiusServer.radiusservers[id2].auth_port,
-                 55)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id2].auth_port)
 
     server2.retransmit_count = 3
-    assert_equal(Cisco::RadiusServer.radiusservers[id2].retransmit_count,
-                 3)
+    assert_equal(3, Cisco::RadiusServer.radiusservers[id2].retransmit_count)
 
     server2.key_set('44444444', nil)
-    assert_equal(Cisco::RadiusServer.radiusservers[id2].key,
-                 '44444444')
+    assert_equal('44444444', Cisco::RadiusServer.radiusservers[id2].key)
 
     # Setting back to default and re-checking
     server.acct_port = server.default_acct_port
@@ -168,14 +203,14 @@ class TestRadiusServer < CiscoTestCase
     server2.auth_port = server2.default_auth_port
     server2.accounting = server2.default_accounting
     server2.authentication = server2.default_authentication
-    assert_equal(server.acct_port, server.default_acct_port)
-    assert_equal(server.auth_port, server.default_auth_port)
-    assert_equal(server.accounting, server.default_accounting)
-    assert_equal(server.authentication, server.default_authentication)
-    assert_equal(server2.acct_port, server2.default_acct_port)
-    assert_equal(server2.auth_port, server2.default_auth_port)
-    assert_equal(server2.accounting, server2.default_accounting)
-    assert_equal(server2.authentication, server2.default_authentication)
+    assert_equal(server.default_acct_port, server.acct_port)
+    assert_equal(server.default_auth_port, server.auth_port)
+    assert_equal(server.default_accounting, server.accounting)
+    assert_equal(server.default_authentication, server.authentication)
+    assert_equal(server2.default_acct_port, server2.acct_port)
+    assert_equal(server2.default_auth_port, server2.auth_port)
+    assert_equal(server2.default_accounting, server2.accounting)
+    assert_equal(server2.default_authentication, server2.authentication)
 
     server.destroy
     server2.destroy