RubyGems - cisco_node_utils - Versions diffs - 1.2.0 → 1.3.0 - Mend

cisco_node_utils 1.2.0 → 1.3.0

Files changed (255) hide show

checksums.yaml +4 -4
data/.gitignore +2 -0
data/.rspec +2 -0
data/.rubocop.yml +13 -0
data/.travis.yml +4 -1
data/CHANGELOG.md +81 -2
data/CONTRIBUTING.md +2 -17
data/Gemfile +5 -0
data/README.md +92 -47
data/Rakefile +23 -1
data/bin/git/hooks/hook_lib +7 -0
data/bin/git/hooks/pre-commit/check_unstaged_changes +18 -0
data/bin/git/hooks/pre-commit/rubocop +7 -2
data/bin/git/hooks/pre-commit/validate-diffs +18 -4
data/bin/git/hooks/pre-commit/validate-yaml +18 -0
data/bin/git/update-hooks +64 -6
data/cisco_node_utils.gemspec +9 -6
data/docs/README-develop-best-practices.md +149 -50
data/docs/README-develop-node-utils-APIs.md +92 -42
data/docs/README-maintainers.md +7 -4
data/docs/README-test-execution.md +57 -0
data/docs/cisco_node_utils.yaml.example +30 -0
data/docs/template-router.rb +4 -0
data/ext/mkrf_conf.rb +63 -0
data/lib/.rubocop.yml +2 -2
data/lib/cisco_node_utils.rb +5 -0
data/lib/cisco_node_utils/aaa_authentication_login.rb +5 -6
data/lib/cisco_node_utils/aaa_authorization_service.rb +1 -1
data/lib/cisco_node_utils/ace.rb +165 -12
data/lib/cisco_node_utils/acl.rb +2 -1
data/lib/cisco_node_utils/bgp.rb +184 -21
data/lib/cisco_node_utils/bgp_af.rb +94 -249
data/lib/cisco_node_utils/bgp_neighbor.rb +94 -14
data/lib/cisco_node_utils/bgp_neighbor_af.rb +75 -8
data/lib/cisco_node_utils/bridge_domain.rb +183 -0
data/lib/cisco_node_utils/bridge_domain_vni.rb +206 -0
data/lib/cisco_node_utils/cisco_cmn_utils.rb +85 -2
data/lib/cisco_node_utils/client.rb +35 -0
data/lib/cisco_node_utils/client/client.rb +234 -0
data/lib/cisco_node_utils/client/grpc.rb +33 -0
data/lib/cisco_node_utils/client/grpc/client.rb +311 -0
data/lib/cisco_node_utils/client/grpc/ems.proto +148 -0
data/lib/cisco_node_utils/client/grpc/ems.rb +111 -0
data/lib/cisco_node_utils/client/grpc/ems_services.rb +49 -0
data/lib/cisco_node_utils/client/nxapi.rb +31 -0
data/lib/cisco_node_utils/client/nxapi/client.rb +305 -0
data/lib/cisco_node_utils/client/utils.rb +164 -0
data/lib/cisco_node_utils/cmd_ref/README_YAML.md +222 -254
data/lib/cisco_node_utils/cmd_ref/aaa_auth_login_service.yaml +11 -8
data/lib/cisco_node_utils/cmd_ref/aaa_authentication_login.yaml +22 -15
data/lib/cisco_node_utils/cmd_ref/aaa_authorization_service.yaml +11 -8
data/lib/cisco_node_utils/cmd_ref/acl.yaml +21 -16
data/lib/cisco_node_utils/cmd_ref/bgp.yaml +239 -109
data/lib/cisco_node_utils/cmd_ref/bgp_af.yaml +114 -55
data/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml +76 -52
data/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml +106 -62
data/lib/cisco_node_utils/cmd_ref/bridge_domain.yaml +71 -0
data/lib/cisco_node_utils/cmd_ref/bridge_domain_vni.yaml +33 -0
data/lib/cisco_node_utils/cmd_ref/dnsclient.yaml +35 -14
data/lib/cisco_node_utils/cmd_ref/encapsulation.yaml +25 -0
data/lib/cisco_node_utils/cmd_ref/evpn_vni.yaml +23 -17
data/lib/cisco_node_utils/cmd_ref/fabricpath.yaml +94 -83
data/lib/cisco_node_utils/cmd_ref/fabricpath_topology.yaml +22 -17
data/lib/cisco_node_utils/cmd_ref/feature.yaml +76 -26
data/lib/cisco_node_utils/cmd_ref/images.yaml +3 -2
data/lib/cisco_node_utils/cmd_ref/interface.yaml +381 -153
data/lib/cisco_node_utils/cmd_ref/interface_channel_group.yaml +21 -11
data/lib/cisco_node_utils/cmd_ref/interface_ospf.yaml +21 -21
data/lib/cisco_node_utils/cmd_ref/interface_portchannel.yaml +30 -21
data/lib/cisco_node_utils/cmd_ref/interface_service_vni.yaml +18 -13
data/lib/cisco_node_utils/cmd_ref/inventory.yaml +26 -31
data/lib/cisco_node_utils/cmd_ref/itd_device_group.yaml +83 -0
data/lib/cisco_node_utils/cmd_ref/itd_service.yaml +119 -0
data/lib/cisco_node_utils/cmd_ref/memory.yaml +17 -6
data/lib/cisco_node_utils/cmd_ref/ntp_config.yaml +10 -3
data/lib/cisco_node_utils/cmd_ref/ntp_server.yaml +17 -5
data/lib/cisco_node_utils/cmd_ref/ospf.yaml +33 -29
data/lib/cisco_node_utils/cmd_ref/overlay_global.yaml +12 -10
data/lib/cisco_node_utils/cmd_ref/pim.yaml +16 -19
data/lib/cisco_node_utils/cmd_ref/portchannel_global.yaml +40 -25
data/lib/cisco_node_utils/cmd_ref/radius_global.yaml +17 -12
data/lib/cisco_node_utils/cmd_ref/radius_server.yaml +71 -35
data/lib/cisco_node_utils/cmd_ref/radius_server_group.yaml +10 -5
data/lib/cisco_node_utils/cmd_ref/show_system.yaml +6 -2
data/lib/cisco_node_utils/cmd_ref/show_version.yaml +47 -43
data/lib/cisco_node_utils/cmd_ref/snmp_community.yaml +13 -11
data/lib/cisco_node_utils/cmd_ref/snmp_group.yaml +4 -2
data/lib/cisco_node_utils/cmd_ref/snmp_notification_receiver.yaml +23 -21
data/lib/cisco_node_utils/cmd_ref/snmp_server.yaml +26 -22
data/lib/cisco_node_utils/cmd_ref/snmp_user.yaml +19 -17
data/lib/cisco_node_utils/cmd_ref/snmpnotification.yaml +18 -6
data/lib/cisco_node_utils/cmd_ref/stp_global.yaml +234 -0
data/lib/cisco_node_utils/cmd_ref/syslog_server.yaml +24 -9
data/lib/cisco_node_utils/cmd_ref/syslog_settings.yaml +5 -3
data/lib/cisco_node_utils/cmd_ref/system.yaml +4 -3
data/lib/cisco_node_utils/cmd_ref/tacacs_server.yaml +22 -20
data/lib/cisco_node_utils/cmd_ref/tacacs_server_group.yaml +27 -15
data/lib/cisco_node_utils/cmd_ref/tacacs_server_host.yaml +45 -16
data/lib/cisco_node_utils/cmd_ref/vdc.yaml +21 -11
data/lib/cisco_node_utils/cmd_ref/virtual_service.yaml +3 -2
data/lib/cisco_node_utils/cmd_ref/vlan.yaml +60 -32
data/lib/cisco_node_utils/cmd_ref/vpc.yaml +118 -101
data/lib/cisco_node_utils/cmd_ref/vrf.yaml +54 -58
data/lib/cisco_node_utils/cmd_ref/vrf_af.yaml +118 -0
data/lib/cisco_node_utils/cmd_ref/vtp.yaml +19 -25
data/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml +28 -18
data/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml +34 -17
data/lib/cisco_node_utils/cmd_ref/yum.yaml +6 -4
data/lib/cisco_node_utils/command_reference.rb +261 -142
data/lib/cisco_node_utils/constants.rb +33 -0
data/lib/cisco_node_utils/encapsulation.rb +112 -0
data/lib/cisco_node_utils/environment.rb +102 -0
data/lib/cisco_node_utils/evpn_vni.rb +5 -3
data/lib/cisco_node_utils/exceptions.rb +111 -0
data/lib/cisco_node_utils/fabricpath_global.rb +52 -35
data/lib/cisco_node_utils/fabricpath_topology.rb +44 -57
data/lib/cisco_node_utils/feature.rb +165 -3
data/lib/cisco_node_utils/interface.rb +1051 -260
data/lib/cisco_node_utils/interface_channel_group.rb +11 -10
data/lib/cisco_node_utils/interface_ospf.rb +1 -2
data/lib/cisco_node_utils/interface_portchannel.rb +4 -12
data/lib/cisco_node_utils/interface_service_vni.rb +7 -7
data/lib/cisco_node_utils/itd_device_group.rb +248 -0
data/lib/cisco_node_utils/itd_device_group_node.rb +144 -0
data/lib/cisco_node_utils/itd_service.rb +523 -0
data/lib/cisco_node_utils/logger.rb +75 -0
data/lib/cisco_node_utils/node.rb +62 -192
data/lib/cisco_node_utils/node_util.rb +56 -10
data/lib/cisco_node_utils/overlay_global.rb +2 -2
data/lib/cisco_node_utils/pim.rb +2 -13
data/lib/cisco_node_utils/pim_group_list.rb +1 -1
data/lib/cisco_node_utils/pim_rp_address.rb +1 -1
data/lib/cisco_node_utils/platform.rb +52 -21
data/lib/cisco_node_utils/portchannel_global.rb +89 -19
data/lib/cisco_node_utils/radius_server.rb +168 -37
data/lib/cisco_node_utils/router_ospf.rb +20 -35
data/lib/cisco_node_utils/router_ospf_vrf.rb +4 -4
data/lib/cisco_node_utils/snmpserver.rb +1 -6
data/lib/cisco_node_utils/snmpuser.rb +6 -4
data/lib/cisco_node_utils/stp_global.rb +676 -0
data/lib/cisco_node_utils/syslog_server.rb +77 -18
data/lib/cisco_node_utils/syslog_settings.rb +1 -1
data/lib/cisco_node_utils/tacacs_server_group.rb +8 -4
data/lib/cisco_node_utils/tacacs_server_host.rb +115 -25
data/lib/cisco_node_utils/vdc.rb +12 -0
data/lib/cisco_node_utils/version.rb +1 -1
data/lib/cisco_node_utils/vlan.rb +147 -29
data/lib/cisco_node_utils/vpc.rb +55 -3
data/lib/cisco_node_utils/vrf.rb +72 -11
data/lib/cisco_node_utils/vrf_af.rb +114 -29
data/lib/cisco_node_utils/vtp.rb +34 -52
data/lib/cisco_node_utils/vxlan_vtep.rb +34 -8
data/lib/cisco_node_utils/vxlan_vtep_vni.rb +36 -4
data/lib/minitest/environment_plugin.rb +31 -0
data/lib/minitest/log_level_plugin.rb +41 -0
data/spec/client_spec.rb +7 -0
data/spec/environment_spec.rb +263 -0
data/spec/grpc_client_spec.rb +23 -0
data/spec/isolate/all_clients_spec.rb +9 -0
data/spec/isolate/grpc_only_spec.rb +16 -0
data/spec/isolate/no_clients_spec.rb +26 -0
data/spec/isolate/nxapi_only_spec.rb +16 -0
data/spec/nxapi_client_spec.rb +42 -0
data/spec/schema.yaml +75 -0
data/spec/shared_examples_for_clients.rb +14 -0
data/spec/spec_helper.rb +91 -0
data/spec/whitespace_spec.rb +10 -0
data/spec/yaml_spec.rb +42 -0
data/tests/.rubocop.yml +2 -2
data/tests/CSCuxdublin-1.0.0-7.0.3.I3.1.lib32_n9000.rpm +0 -0
data/tests/basetest.rb +96 -36
data/tests/ciscotest.rb +220 -12
data/tests/cmd_config.yaml +71 -49
data/tests/cmd_config_invalid.yaml +1 -1
data/tests/test_aaa_authentication_login.rb +1 -0
data/tests/test_aaa_authentication_login_service.rb +9 -0
data/tests/test_aaa_authorization_service.rb +173 -367
data/tests/test_ace.rb +171 -100
data/tests/test_acl.rb +10 -1
data/tests/test_bgp_af.rb +395 -728
data/tests/test_bgp_neighbor.rb +274 -115
data/tests/test_bgp_neighbor_af.rb +178 -77
data/tests/test_bridge_domain.rb +191 -0
data/tests/test_bridge_domain_vni.rb +116 -0
data/tests/test_client_utils.rb +111 -0
data/tests/test_command_config.rb +9 -5
data/tests/test_command_reference.rb +380 -102
data/tests/test_dns_domain.rb +13 -3
data/tests/test_domain_name.rb +13 -3
data/tests/test_encapsulation.rb +77 -0
data/tests/test_evpn_vni.rb +25 -7
data/tests/test_fabricpath_global.rb +167 -163
data/tests/test_fabricpath_topology.rb +12 -33
data/tests/test_feature.rb +215 -0
data/tests/test_grpc.rb +166 -0
data/tests/test_interface.rb +585 -344
data/tests/test_interface_bdi.rb +80 -0
data/tests/test_interface_channel_group.rb +6 -3
data/tests/test_interface_ospf.rb +26 -24
data/tests/test_interface_portchannel.rb +1 -0
data/tests/test_interface_private_vlan.rb +724 -0
data/tests/test_interface_service_vni.rb +37 -66
data/tests/test_interface_svi.rb +98 -101
data/tests/test_interface_switchport.rb +419 -549
data/tests/test_itd_device_group.rb +145 -0
data/tests/test_itd_device_group_node.rb +199 -0
data/tests/test_itd_service.rb +298 -0
data/tests/test_logger.rb +43 -0
data/tests/test_name_server.rb +11 -2
data/tests/test_node.rb +16 -75
data/tests/test_node_ext.rb +174 -163
data/tests/test_node_util.rb +119 -0
data/tests/test_ntp_config.rb +5 -1
data/tests/test_ntp_server.rb +2 -2
data/tests/test_nxapi.rb +221 -0
data/tests/test_overlay_global.rb +47 -38
data/tests/test_pim.rb +2 -0
data/tests/test_pim_group_list.rb +2 -0
data/tests/test_pim_rp_address.rb +2 -0
data/tests/test_platform.rb +86 -39
data/tests/test_portchannel_global.rb +211 -135
data/tests/test_radius_global.rb +13 -5
data/tests/test_radius_server.rb +256 -104
data/tests/test_radius_server_group.rb +2 -0
data/tests/test_router_bgp.rb +781 -485
data/tests/test_router_ospf.rb +26 -103
data/tests/test_router_ospf_vrf.rb +52 -57
data/tests/test_snmp_notification_receiver.rb +2 -0
data/tests/test_snmpcommunity.rb +2 -0
data/tests/test_snmpgroup.rb +2 -0
data/tests/test_snmpnotification.rb +40 -21
data/tests/test_snmpserver.rb +2 -0
data/tests/test_snmpuser.rb +2 -0
data/tests/test_stp_global.rb +563 -0
data/tests/test_syslog_server.rb +32 -8
data/tests/test_syslog_settings.rb +22 -9
data/tests/test_tacacs_server.rb +32 -27
data/tests/test_tacacs_server_group.rb +100 -45
data/tests/test_tacacs_server_host.rb +135 -43
data/tests/test_vdc.rb +2 -16
data/tests/test_vlan.rb +106 -54
data/tests/test_vlan_mt_full.rb +11 -21
data/tests/test_vlan_private.rb +669 -0
data/tests/test_vpc.rb +312 -159
data/tests/test_vrf.rb +122 -113
data/tests/test_vrf_af.rb +238 -0
data/tests/test_vtp.rb +58 -102
data/tests/test_vxlan_vtep.rb +38 -17
data/tests/test_vxlan_vtep_vni.rb +61 -9
data/tests/test_yum.rb +49 -25
metadata +122 -36
data/lib/cisco_node_utils/cmd_ref/fex.yaml +0 -9
data/lib/cisco_node_utils/cmd_ref/vni.yaml +0 -76
data/lib/cisco_node_utils/vni.rb +0 -227
data/tests/test_vni.rb +0 -106

data/tests/test_radius_global.rb CHANGED Viewed

@@ -20,6 +20,8 @@ require_relative '../lib/cisco_node_utils/radius_global'
 # TestRadiusGlobal - Minitest for RadiusGlobal node utility.
 class TestRadiusGlobal < CiscoTestCase
+  @skip_unless_supported = 'radius_global'
   def setup
     # setup runs at the beginning of each test
     super
@@ -63,11 +65,17 @@ class TestRadiusGlobal < CiscoTestCase
     assert_equal(global.timeout,
                  2)
-    global.key_set('44444444', nil)
-    assert_equal(Cisco::RadiusGlobal.radius_global[id].key,
-                 '44444444')
-    assert_equal(global.key,
-                 '44444444')
+    if platform == :nexus
+      global.key_set('44444444', nil)
+      assert_equal(global.key,
+                   '44444444')
+      assert_equal(Cisco::RadiusGlobal.radius_global[id].key,
+                   '44444444')
+    elsif platform == :ios_xr
+      global.key_set('QsEfThUkO', nil)
+      assert(!global.key.nil?)
+      assert(!Cisco::RadiusGlobal.radius_global[id].key.nil?)
+    end
     # Setting back to default and re-checking
     global.timeout = global.default_timeout

data/tests/test_radius_server.rb CHANGED Viewed

@@ -20,6 +20,8 @@ require_relative '../lib/cisco_node_utils/radius_server'
 # TestRadiusServer - Minitest for RadiusServer node utility.
 class TestRadiusServer < CiscoTestCase
+  @skip_unless_supported = 'radius_server'
   def setup
     # setup runs at the beginning of each test
     super
@@ -32,11 +34,32 @@ class TestRadiusServer < CiscoTestCase
     super
   end
+  def setup_duplicates
+    return if platform != :ios_xr
+    config('radius-server host 8.8.8.8 auth-port 11 acct-port 44',
+           'radius-server host 8.8.8.8 auth-port 22 acct-port 55',
+           'radius-server host 8.8.8.8 auth-port 33 acct-port 66')
+  end
+  def no_duplicates
+    return if platform != :ios_xr
+    config('no radius-server host 8.8.8.8 auth-port 11 acct-port 44',
+           'no radius-server host 8.8.8.8 auth-port 22 acct-port 55',
+           'no radius-server host 8.8.8.8 auth-port 33 acct-port 66')
+  end
   def no_radiusserver
     # Turn the feature off for a clean test.
-    config('no radius-server host 8.8.8.8',
-           'no radius-server host 2004::3',
-           'no radius-server host 2005::7')
+    if platform == :ios_xr
+      config('no radius-server host 8.8.8.8 auth-port 55 acct-port 44',
+             'no radius-server host 2004::3 auth-port 55 acct-port 44',
+             'no radius-server host 2005::7 auth-port 55 acct-port 44')
+    else
+      config('no radius-server host 8.8.8.8',
+             'no radius-server host 2004::3',
+             'no radius-server host 2005::7')
+    end
   end
   # TESTS
@@ -45,89 +68,189 @@ class TestRadiusServer < CiscoTestCase
     id = '8.8.8.8'
     refute_includes(Cisco::RadiusServer.radiusservers, id)
-    server = Cisco::RadiusServer.new(id, true)
+    server = Cisco::RadiusServer.new(id, true, 55, 44)
     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)
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
+    if platform != :ios_xr
+      # Default checking
+      assert_equal(server.default_accounting, server.accounting)
+      assert_equal(server.default_authentication, server.authentication)
-    server.accounting = true
-    assert(Cisco::RadiusServer.radiusservers[id].accounting)
+      server.accounting = true
+      assert(Cisco::RadiusServer.radiusservers[id].accounting)
-    server.authentication = true
-    assert(Cisco::RadiusServer.radiusservers[id].authentication)
+      server.authentication = true
+      assert(Cisco::RadiusServer.radiusservers[id].authentication)
-    server.acct_port = 44
-    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+      server.acct_port = 66
+      assert_equal(66, Cisco::RadiusServer.radiusservers[id].acct_port)
-    server.auth_port = 55
-    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
+      server.auth_port = 77
+      assert_equal(77, Cisco::RadiusServer.radiusservers[id].auth_port)
+      server.key_set(nil, nil)
+      assert_equal(nil, Cisco::RadiusServer.radiusservers[id].key)
+      server.key_set('44444444', nil)
+      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+    else
+      assert_nil(server.accounting)
+      assert_raises(Cisco::UnsupportedError) do
+        server.accounting = true
+      end
+      assert_nil(server.authentication)
+      assert_raises(Cisco::UnsupportedError) do
+        server.authentication = true
+      end
+    end
     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)
+    if platform != :ios_xr
+      # 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)
+    end
+    server.destroy
+    refute_includes(Cisco::RadiusServer.radiusservers, id)
+  end
+  def test_create_destroy_single_with_duplicates
+    setup_duplicates
+    id = '8.8.8.8'
+    server = Cisco::RadiusServer.new(id, true, 55, 44)
+    assert_includes(Cisco::RadiusServer.radiusservers, id)
+    assert_equal(server, Cisco::RadiusServer.radiusservers[id])
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
+    if platform != :ios_xr
+      # Default checking
+      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)
-    # 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.acct_port = 66
+      assert_equal(66, Cisco::RadiusServer.radiusservers[id].acct_port)
+      server.auth_port = 77
+      assert_equal(77, Cisco::RadiusServer.radiusservers[id].auth_port)
+      server.key_set('44444444', nil)
+      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+    else
+      assert_nil(server.accounting)
+      assert_raises(Cisco::UnsupportedError) do
+        server.accounting = true
+      end
+      assert_nil(server.authentication)
+      assert_raises(Cisco::UnsupportedError) do
+        server.authentication = true
+      end
+    end
+    server.retransmit_count = 3
+    assert_equal(3, Cisco::RadiusServer.radiusservers[id].retransmit_count)
+    if platform != :ios_xr
+      # 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)
+    end
     server.destroy
     refute_includes(Cisco::RadiusServer.radiusservers, id)
+    no_duplicates
   end
   def test_create_destroy_single_ipv6
     id = '2004::3'
     refute_includes(Cisco::RadiusServer.radiusservers, id)
-    server = Cisco::RadiusServer.new(id, true)
+    server = Cisco::RadiusServer.new(id, true, 55, 44)
     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)
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
-    server.accounting = true
-    assert(Cisco::RadiusServer.radiusservers[id].accounting)
+    if platform != :ios_xr
+      # Default checking
+      assert_equal(server.default_accounting, server.accounting)
+      assert_equal(server.default_authentication, server.authentication)
-    server.authentication = true
-    assert(Cisco::RadiusServer.radiusservers[id].authentication)
+      server.accounting = true
+      assert(Cisco::RadiusServer.radiusservers[id].accounting)
-    server.acct_port = 44
-    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+      server.authentication = true
+      assert(Cisco::RadiusServer.radiusservers[id].authentication)
-    server.auth_port = 55
-    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
+      server.acct_port = 66
+      assert_equal(66, Cisco::RadiusServer.radiusservers[id].acct_port)
+      server.auth_port = 77
+      assert_equal(77, Cisco::RadiusServer.radiusservers[id].auth_port)
+      server.key_set('44444444', nil)
+      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+    else
+      assert_nil(server.accounting)
+      assert_raises(Cisco::UnsupportedError) do
+        server.accounting = true
+      end
+      assert_nil(server.authentication)
+      assert_raises(Cisco::UnsupportedError) do
+        server.authentication = true
+      end
+    end
     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)
+    if platform != :ios_xr
+      # 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)
+    end
     server.destroy
     refute_includes(Cisco::RadiusServer.radiusservers, id)
@@ -140,77 +263,106 @@ class TestRadiusServer < CiscoTestCase
     refute_includes(Cisco::RadiusServer.radiusservers, id)
     refute_includes(Cisco::RadiusServer.radiusservers, id2)
-    server = Cisco::RadiusServer.new(id, true)
-    server2 = Cisco::RadiusServer.new(id2, true)
+    server = Cisco::RadiusServer.new(id, true, 55, 44)
+    server2 = Cisco::RadiusServer.new(id2, true, 55, 44)
     assert_includes(Cisco::RadiusServer.radiusservers, id)
     assert_equal(server, Cisco::RadiusServer.radiusservers[id])
     assert_includes(Cisco::RadiusServer.radiusservers, id2)
     assert_equal(server2, Cisco::RadiusServer.radiusservers[id2])
-    # 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)
-    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)
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
+    if platform != :ios_xr
+      # Default checking
+      assert_equal(server.default_accounting, server.accounting)
+      assert_equal(server.default_authentication, server.authentication)
+      assert_equal(server2.default_accounting, server2.accounting)
+      assert_equal(server2.default_authentication, server2.authentication)
-    server.accounting = true
-    assert(Cisco::RadiusServer.radiusservers[id].accounting)
+      server.accounting = true
+      assert(Cisco::RadiusServer.radiusservers[id].accounting)
-    server.authentication = true
-    assert(Cisco::RadiusServer.radiusservers[id].authentication)
+      server.authentication = true
+      assert(Cisco::RadiusServer.radiusservers[id].authentication)
-    server.acct_port = 44
-    assert_equal(44, Cisco::RadiusServer.radiusservers[id].acct_port)
+      server.acct_port = 66
+      assert_equal(66, Cisco::RadiusServer.radiusservers[id].acct_port)
-    server.auth_port = 55
-    assert_equal(55, Cisco::RadiusServer.radiusservers[id].auth_port)
+      server.auth_port = 77
+      assert_equal(77, Cisco::RadiusServer.radiusservers[id].auth_port)
+      server.key_set('44444444', nil)
+      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id].key)
+      assert_equal('44444444', server.key)
+    else
+      assert_nil(server.accounting)
+      assert_raises(Cisco::UnsupportedError) do
+        server.accounting = true
+      end
+      assert_nil(server.authentication)
+      assert_raises(Cisco::UnsupportedError) do
+        server.authentication = true
+      end
+    end
     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)
-    assert_equal('44444444', server.key)
+    assert_equal(44, Cisco::RadiusServer.radiusservers[id2].acct_port)
+    assert_equal(55, Cisco::RadiusServer.radiusservers[id2].auth_port)
-    server2.accounting = true
-    assert(Cisco::RadiusServer.radiusservers[id2].accounting)
+    if platform != :ios_xr
+      server2.accounting = true
+      assert(Cisco::RadiusServer.radiusservers[id2].accounting)
-    server2.authentication = true
-    assert(Cisco::RadiusServer.radiusservers[id2].authentication)
+      server2.authentication = true
+      assert(Cisco::RadiusServer.radiusservers[id2].authentication)
-    server2.acct_port = 44
-    assert_equal(44, Cisco::RadiusServer.radiusservers[id2].acct_port)
+      server2.acct_port = 66
+      assert_equal(66, Cisco::RadiusServer.radiusservers[id2].acct_port)
-    server2.auth_port = 55
-    assert_equal(55, Cisco::RadiusServer.radiusservers[id2].auth_port)
+      server2.auth_port = 77
+      assert_equal(77, Cisco::RadiusServer.radiusservers[id2].auth_port)
+      server2.key_set('44444444', nil)
+      assert_equal('44444444', Cisco::RadiusServer.radiusservers[id2].key)
+    else
+      assert_nil(server.accounting)
+      assert_raises(Cisco::UnsupportedError) do
+        server2.accounting = true
+      end
+      assert_nil(server.authentication)
+      assert_raises(Cisco::UnsupportedError) do
+        server2.authentication = true
+      end
+    end
     server2.retransmit_count = 3
     assert_equal(3, Cisco::RadiusServer.radiusservers[id2].retransmit_count)
-    server2.key_set('44444444', nil)
-    assert_equal('44444444', Cisco::RadiusServer.radiusservers[id2].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
-    server2.acct_port = server2.default_acct_port
-    server2.auth_port = server2.default_auth_port
-    server2.accounting = server2.default_accounting
-    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)
+    if platform != :ios_xr
+      # 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
+      server2.acct_port = server2.default_acct_port
+      server2.auth_port = server2.default_auth_port
+      server2.accounting = server2.default_accounting
+      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)
+    end
     server.destroy
     server2.destroy