Add storm_control and dhcp relay props for interface

CHANGELOG.md

@@ -16,6 +16,17 @@ Changelog
 
 * Extend interface with attributes:
    * `bfd_echo`
+   * `ipv4_dhcp_relay_addr`
+   * `ipv4_dhcp_relay_info_trust`
+   * `ipv4_dhcp_relay_src_addr_hsrp`
+   * `ipv4_dhcp_relay_src_intf`
+   * `ipv4_dhcp_relay_subnet_broadcast`
+   * `ipv4_dhcp_smart_relay`
+   * `ipv6_dhcp_relay_addr`
+   * `ipv6_dhcp_relay_src_intf`
+   * `storm_control_broadcast`
+   * `storm_control_multicast`
+   * `storm_control_unicast`
 * Extend interface_ospf with attributes:
    * `bfd`
    * `mtu_ignore`

lib/cisco_node_utils/cmd_ref/feature.yaml

@@ -15,6 +15,11 @@ bgp:
   get_value: '/^feature bgp$/'
   set_value: "feature bgp"
 
+dhcp:
+  kind: boolean
+  get_value: '/^feature dhcp$/'
+  set_value: "feature dhcp"
+
 fabric:
   _exclude: [N3k, N8k, N9k]
   get_command: "show feature-set"

lib/cisco_node_utils/cmd_ref/interface.yaml

@@ -132,6 +132,47 @@ ipv4_arp_timeout:
 ipv4_arp_timeout_non_vlan_interfaces:
   default_only: ~
 
+ipv4_dhcp_relay_addr:
+  _exclude: [ios_xr]
+  multiple:
+  get_value: '/^ip dhcp relay address (.*) $/'
+  set_value: "<state> ip dhcp relay address <addr>"
+  default_value: []
+
+ipv4_dhcp_relay_info_trust:
+  _exclude: [ios_xr, N5k, N6k]
+  kind: boolean
+  get_value: '/^ip dhcp relay information trusted$/'
+  set_value: "<state> ip dhcp relay information trusted"
+  default_value: false
+
+ipv4_dhcp_relay_src_addr_hsrp:
+  _exclude: [ios_xr, N3k, N8k, N9k]
+  kind: boolean
+  get_value: '/^ip dhcp relay source-address hsrp$/'
+  set_value: "<state> ip dhcp relay source-address hsrp"
+  default_value: false
+
+ipv4_dhcp_relay_src_intf:
+  _exclude: [ios_xr]
+  get_value: '/^ip dhcp relay source-interface (.*)$/'
+  set_value: "<state> ip dhcp relay source-interface <intf>"
+  default_value: false
+
+ipv4_dhcp_relay_subnet_broadcast:
+  _exclude: [ios_xr]
+  kind: boolean
+  get_value: '/^ip dhcp relay subnet-broadcast$/'
+  set_value: "<state> ip dhcp relay subnet-broadcast"
+  default_value: false
+
+ipv4_dhcp_smart_relay:
+  _exclude: [ios_xr]
+  kind: boolean
+  get_value: '/^ip dhcp smart-relay$/'
+  set_value: "<state> ip dhcp smart-relay"
+  default_value: false
+
 ipv4_forwarding:
   _exclude: [ios_xr]
   kind: boolean
@@ -198,6 +239,19 @@ ipv6_acl_out:
     set_value: "<state> ipv6 traffic-filter <acl> out"
   default_value: ""
 
+ipv6_dhcp_relay_addr:
+  _exclude: [ios_xr]
+  multiple:
+  get_value: '/^ipv6 dhcp relay address (.*)$/'
+  set_value: "<state> ipv6 dhcp relay address <addr>"
+  default_value: []
+
+ipv6_dhcp_relay_src_intf:
+  _exclude: [ios_xr]
+  get_value: '/^ipv6 dhcp relay source-interface (.*)$/'
+  set_value: "<state> ipv6 dhcp relay source-interface <intf>"
+  default_value: false
+
 mtu_loopback:
   kind: boolean
   default_only: ~
@@ -289,6 +343,27 @@ speed:
   else:
     default_value: 'auto'
 
+storm_control_broadcast:
+  _exclude: [ios_xr, N7k]
+  kind: string
+  get_value: '/^storm-control broadcast level (.*)$/'
+  set_value: "<state> storm-control broadcast level <level>"
+  default_value: '100.00'
+
+storm_control_multicast:
+  _exclude: [ios_xr, N7k]
+  kind: string
+  get_value: '/^storm-control multicast level (.*)$/'
+  set_value: "<state> storm-control multicast level <level>"
+  default_value: '100.00'
+
+storm_control_unicast:
+  _exclude: [ios_xr]
+  kind: string
+  get_value: '/^storm-control unicast level (.*)$/'
+  set_value: "<state> storm-control unicast level <level>"
+  default_value: '100.00'
+
 stp_bpdufilter:
   kind: string
   get_value: '/^spanning-tree bpdufilter (.*)$/'

lib/cisco_node_utils/feature.rb

@@ -46,6 +46,20 @@ def self.bgp_enabled?
       config_get('feature', 'bgp')
     end
 
+    # ---------------------------
+    def self.dhcp_enable
+      return if dhcp_enabled?
+      config_set('feature', 'dhcp')
+    end
+
+    def self.dhcp_enabled?
+      config_get('feature', 'dhcp')
+    rescue Cisco::CliError => e
+      # cmd will syntax reject when feature is not enabled.
+      raise unless e.clierror =~ /Syntax error/
+      return false
+    end
+
     # ---------------------------
     def self.fabric_enable
       # install feature-set and enable it

lib/cisco_node_utils/interface.rb

@@ -420,6 +420,105 @@ def default_ipv4_arp_timeout
       config_get_default('interface', ipv4_arp_timeout_lookup_string)
     end
 
+    def ipv4_dhcp_relay_addr
+      config_get('interface', 'ipv4_dhcp_relay_addr', name: @name)
+    end
+
+    def ipv4_dhcp_relay_addr=(list)
+      cur_list = ipv4_dhcp_relay_addr
+      # remove the current addresses first
+      unless cur_list.empty?
+        cur_list.each do |addr|
+          config_set('interface', 'ipv4_dhcp_relay_addr',
+                     name:  @name, state: 'no', addr: addr)
+        end
+      end
+      Feature.dhcp_enable unless list.empty?
+      list.each do |addr|
+        config_set('interface', 'ipv4_dhcp_relay_addr',
+                   name:  @name, state: '', addr: addr)
+      end
+    end
+
+    def default_ipv4_dhcp_relay_addr
+      config_get_default('interface', 'ipv4_dhcp_relay_addr')
+    end
+
+    def ipv4_dhcp_relay_info_trust
+      config_get('interface', 'ipv4_dhcp_relay_info_trust', name: @name)
+    end
+
+    def ipv4_dhcp_relay_info_trust=(state)
+      Feature.dhcp_enable if state
+      config_set('interface', 'ipv4_dhcp_relay_info_trust',
+                 name:  @name, state: state ? '' : 'no')
+    end
+
+    def default_ipv4_dhcp_relay_info_trust
+      config_get_default('interface', 'ipv4_dhcp_relay_info_trust')
+    end
+
+    def ipv4_dhcp_relay_src_addr_hsrp
+      config_get('interface', 'ipv4_dhcp_relay_src_addr_hsrp', name: @name)
+    end
+
+    def ipv4_dhcp_relay_src_addr_hsrp=(state)
+      Feature.dhcp_enable if state
+      config_set('interface', 'ipv4_dhcp_relay_src_addr_hsrp',
+                 name:  @name, state: state ? '' : 'no')
+    end
+
+    def default_ipv4_dhcp_relay_src_addr_hsrp
+      config_get_default('interface', 'ipv4_dhcp_relay_src_addr_hsrp')
+    end
+
+    def ipv4_dhcp_relay_src_intf
+      intf = config_get('interface', 'ipv4_dhcp_relay_src_intf', name: @name)
+      return intf unless intf
+      # Normalize by downcasing and removing white space
+      intf.downcase.delete(' ')
+    end
+
+    def ipv4_dhcp_relay_src_intf=(val)
+      state = val == default_ipv4_dhcp_relay_src_intf ? 'no' : ''
+      intf = val == default_ipv4_dhcp_relay_src_intf ? '' : val
+      Feature.dhcp_enable if state.empty?
+      config_set('interface', 'ipv4_dhcp_relay_src_intf',
+                 name:  @name, state: state, intf: intf)
+    end
+
+    def default_ipv4_dhcp_relay_src_intf
+      config_get_default('interface', 'ipv4_dhcp_relay_src_intf')
+    end
+
+    def ipv4_dhcp_relay_subnet_broadcast
+      config_get('interface', 'ipv4_dhcp_relay_subnet_broadcast', name: @name)
+    end
+
+    def ipv4_dhcp_relay_subnet_broadcast=(state)
+      Feature.dhcp_enable if state
+      config_set('interface', 'ipv4_dhcp_relay_subnet_broadcast',
+                 name:  @name, state: state ? '' : 'no')
+    end
+
+    def default_ipv4_dhcp_relay_subnet_broadcast
+      config_get_default('interface', 'ipv4_dhcp_relay_subnet_broadcast')
+    end
+
+    def ipv4_dhcp_smart_relay
+      config_get('interface', 'ipv4_dhcp_smart_relay', name: @name)
+    end
+
+    def ipv4_dhcp_smart_relay=(state)
+      Feature.dhcp_enable if state
+      config_set('interface', 'ipv4_dhcp_smart_relay',
+                 name:  @name, state: state ? '' : 'no')
+    end
+
+    def default_ipv4_dhcp_smart_relay
+      config_get_default('interface', 'ipv4_dhcp_smart_relay')
+    end
+
     def ipv4_forwarding
       config_get('interface', 'ipv4_forwarding', name: @name)
     end
@@ -526,6 +625,49 @@ def default_ipv6_acl_out
       config_get_default('interface', 'ipv6_acl_out')
     end
 
+    def ipv6_dhcp_relay_addr
+      config_get('interface', 'ipv6_dhcp_relay_addr', name: @name)
+    end
+
+    def ipv6_dhcp_relay_addr=(list)
+      cur_list = ipv6_dhcp_relay_addr
+      # remove the current addresses first
+      unless cur_list.empty?
+        cur_list.each do |addr|
+          config_set('interface', 'ipv6_dhcp_relay_addr',
+                     name:  @name, state: 'no', addr: addr)
+        end
+      end
+      Feature.dhcp_enable unless list.empty?
+      list.each do |addr|
+        config_set('interface', 'ipv6_dhcp_relay_addr',
+                   name:  @name, state: '', addr: addr)
+      end
+    end
+
+    def default_ipv6_dhcp_relay_addr
+      config_get_default('interface', 'ipv6_dhcp_relay_addr')
+    end
+
+    def ipv6_dhcp_relay_src_intf
+      intf = config_get('interface', 'ipv6_dhcp_relay_src_intf', name: @name)
+      return intf unless intf
+      # Normalize by downcasing and removing white space
+      intf.downcase.delete(' ')
+    end
+
+    def ipv6_dhcp_relay_src_intf=(val)
+      state = val == default_ipv6_dhcp_relay_src_intf ? 'no' : ''
+      intf = val == default_ipv6_dhcp_relay_src_intf ? '' : val
+      Feature.dhcp_enable if state.empty?
+      config_set('interface', 'ipv6_dhcp_relay_src_intf',
+                 name:  @name, state: state, intf: intf)
+    end
+
+    def default_ipv6_dhcp_relay_src_intf
+      config_get_default('interface', 'ipv6_dhcp_relay_src_intf')
+    end
+
     def feature_lacp?
       config_get('interface', 'feature_lacp')
     end
@@ -649,6 +791,51 @@ def default_shutdown
       config_get_default('interface', lookup)
     end
 
+    def storm_control_broadcast
+      config_get('interface', 'storm_control_broadcast', name: @name)
+    end
+
+    def storm_control_broadcast=(val)
+      state = val == default_storm_control_broadcast ? 'no' : ''
+      level = val == default_storm_control_broadcast ? '' : val
+      config_set('interface', 'storm_control_broadcast',
+                 name: @name, state: state, level: level)
+    end
+
+    def default_storm_control_broadcast
+      config_get_default('interface', 'storm_control_broadcast')
+    end
+
+    def storm_control_multicast
+      config_get('interface', 'storm_control_multicast', name: @name)
+    end
+
+    def storm_control_multicast=(val)
+      state = val == default_storm_control_multicast ? 'no' : ''
+      level = val == default_storm_control_multicast ? '' : val
+      config_set('interface', 'storm_control_multicast',
+                 name: @name, state: state, level: level)
+    end
+
+    def default_storm_control_multicast
+      config_get_default('interface', 'storm_control_multicast')
+    end
+
+    def storm_control_unicast
+      config_get('interface', 'storm_control_unicast', name: @name)
+    end
+
+    def storm_control_unicast=(val)
+      state = val == default_storm_control_unicast ? 'no' : ''
+      level = val == default_storm_control_unicast ? '' : val
+      config_set('interface', 'storm_control_unicast',
+                 name: @name, state: state, level: level)
+    end
+
+    def default_storm_control_unicast
+      config_get_default('interface', 'storm_control_unicast')
+    end
+
     def stp_bpdufilter
       config_get('interface', 'stp_bpdufilter', name: @name)
     end

tests/test_feature.rb

@@ -29,6 +29,7 @@ def teardown
     ['no nv overlay evpn',
      'no feature bfd',
      'no feature bgp',
+     'no feature dhcp',
      'no feature fabric forwarding',
      'no feature-set fex',
      'no feature itd',
@@ -92,6 +93,10 @@ def test_bgp
     feature('bgp')
   end
 
+  def test_dhcp
+    feature('dhcp')
+  end
+
   def test_fabric_forwarding
     if node.product_id[/N(3)/]
       assert_nil(Feature.fabric_forwarding_enabled?)