Set ifAlias, ifDescr in intel drivers

Use explicit configuration of the ifAlias and ifDescr objects. In particular, ifAlias is not derived from the PCI address (except as fallback) to allow for future naming schemes.
snabbco · Aug 11, 2016 · 53e930b · 53e930b
1 parent 57848e7
commit 53e930b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/apps/intel/intel10g.lua b/src/apps/intel/intel10g.lua
@@ -198,7 +198,7 @@ function M_sf:init_snmp ()
                              filename = self.pciaddress })
    self.snmp.ifTable = ifTable
    -- ifTable
-   ifTable:register('ifDescr', 'OctetStr', self.pciaddress)
+   ifTable:register('ifDescr', 'OctetStr', self.snmp.ifDescr or self.pciaddress)
    ifTable:register('ifType', 'Integer32', 6) -- ethernetCsmacd
    ifTable:register('ifMtu', 'Integer32', self.mtu)
    ifTable:register('ifSpeed', 'Gauge32', 4294967295) -- RFC 3635 sec. 3.2.8
@@ -246,7 +246,7 @@ function M_sf:init_snmp ()
    ifTable:register('ifPromiscuousMode', 'Integer32', 2) -- false
    ifTable:register('ifConnectorPresent', 'Integer32', 1) -- true
    ifTable:register('ifAlias', { type = 'OctetStr', length = 64 },
-                    self.pciaddress) -- TBD add description
+                    self.snmp.ifAlias or '')
    ifTable:register('ifCounterDiscontinuityTime', 'TimeTicks', 0) -- TBD
    ifTable:register('_X_ifCounterDiscontinuityTime', 'Counter64', 0) -- TBD
 

diff --git a/src/apps/intel/intel1g.lua b/src/apps/intel/intel1g.lua
@@ -238,7 +238,7 @@ function Intel1g:new(conf)
                                filename = pciaddress })
      self.snmp.ifTable = ifTable
      -- ifTable
-     ifTable:register('ifDescr', 'OctetStr', pciaddress)
+     ifTable:register('ifDescr', 'OctetStr', self.snmp.ifDescr or pciaddress)
      ifTable:register('ifType', 'Integer32', 6) -- ethernetCsmacd
      ifTable:register('ifMtu', 'Integer32', conf.mtu)
      ifTable:register('ifSpeed', 'Gauge32', 1000000000)
@@ -285,7 +285,7 @@ function Intel1g:new(conf)
      ifTable:register('ifPromiscuousMode', 'Integer32', 2) -- false
      ifTable:register('ifConnectorPresent', 'Integer32', 1) -- true
      ifTable:register('ifAlias', { type = 'OctetStr', length = 64 },
-                      pciaddress) -- TBD add description
+                      self.snmp.ifAlias or '') -- TBD add description
      ifTable:register('ifCounterDiscontinuityTime', 'TimeTicks', 0) -- TBD
      ifTable:register('_X_ifCounterDiscontinuityTime', 'Counter64', 0) -- TBD