apscanner 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b33cb59b6b8ec81b5980993dc67d4ea78cf7994e
-  data.tar.gz: d18e543c5ac23b6a7dc39ebcde258695e6344ebf
+  metadata.gz: ff7fe385aa5ee3fcc9511aff2202e711281cc4ff
+  data.tar.gz: 101e0587e6d965b4ce1614d94c271223921ec128
 SHA512:
-  metadata.gz: fc2bc9d0510fe82bdae6aabf99f780a5d695910150da244d9af474a5cfd309b959bc5a43ef618869b12482a610d6104f834854978a0c37ad474e517001914254
-  data.tar.gz: f28722c4d72b17c434d497597632aa34f2f97142748c4c526139d82e99e7a805b520425bd68c996bff0e82405b67876852fc821d0011e72f8b060cce9d818ddf
+  metadata.gz: aa8ac437df3d436ea63cf841a2a5ce574111a6426ca0aebe9e1884f839af37a4acdc89e06dd13e4298db8d4b73065a4e287b5c06b061acf8b2e691de5dc369b2
+  data.tar.gz: c9708e9a8a638c4030a75a8a9cba2aacf7953dedf164264737f57fb383ee7bf88257812c47a6192b3ed345ebfc07901e6ae31b65d632ad6e58e45187cfbb082d

data/lib/apscanner/entities/access_point.rb

@@ -1,9 +1,10 @@
 module Apscanner
   class AccessPoint
-    attr_reader :name, :mac_address
+    attr_reader :name, :mac_address, :clients
 
     def initialize(options = {})
       @name = options[:name]
+      @clients = options[:clients]
       @mac_address = options[:mac_address]
     end
 

data/lib/apscanner/entities/sensor.rb

@@ -8,7 +8,7 @@ module Apscanner
       @ip_address = options[:ip_address]
       @community = options[:community]
       @uuid = options[:uuid]
-      @type = options[:type]
+      @type = options[:type].to_sym
       @access_points = []
     end
 

data/lib/apscanner/entities/snmp_manager.rb

@@ -3,12 +3,15 @@ module Apscanner
     SNMP_OID = {
       wlc: {
         name: '1.3.6.1.4.1.9.9.513.1.1.1.1.5',
-        mac: '1.3.6.1.4.1.9.9.513.1.1.1.1.2'
+        mac: '1.3.6.1.4.1.9.9.513.1.1.1.1.2',
+        clients: '1.3.6.1.4.1.9.9.513.1.1.1.1.54'
       },
       meraki: {
         system: '1.3.6.1.4.1.29671.1.1.4.1',
         mac: '1.3.6.1.4.1.29671.1.1.4.1.1',
-        name: '1.3.6.1.4.1.29671.1.1.4.1.2'
+        name: '1.3.6.1.4.1.29671.1.1.4.1.2',
+        status: '1.3.6.1.4.1.29671.1.1.4.1.3',
+        clients: '1.3.6.1.4.1.29671.1.1.4.1.5'
       }
     }.freeze
 

data/lib/apscanner/entities/snmp_parser.rb

@@ -17,26 +17,49 @@ module Apscanner
     end
 
     def parse_meraki
-      parsed_response = {
-        @oids[:mac] => @response[@oids[:system]].select do |k, _|
-                         k.include?("#{@oids[:mac]}.")
-                       end,
-        @oids[:name] => @response[@oids[:system]].select do |k, _|
-                          k.include?("#{@oids[:name]}.")
-                        end
+      @response = {
+        @oids[:mac] => sys.select { |k, _| k.include?("#{@oids[:mac]}.") },
+        @oids[:name] => sys.select { |k, _| k.include?("#{@oids[:name]}.") },
+        @oids[:clients] => sys.select { |k, _| k.include?("#{@oids[:clients]}.") },
+        @oids[:status] => sys.select { |k, _| k.include?("#{@oids[:status]}.") }
       }
-      @response = parsed_response
       parse
     end
 
     def parse
-      @response[@oids[:mac]].map do |oid, value|
-        ap_oid = oid.gsub("#{@oids[:mac]}.", '')
+      macs.map do |oid, value|
+        ap_oid = parse_ap_oid(oid)
         AccessPoint.new(
-          name: @response[@oids[:name]][@oids[:name] + '.' + ap_oid],
-          mac_address: parse_mac(value)
-        )
-      end
+          name: names[@oids[:name] + '.' + ap_oid],
+          mac_address: parse_mac(value),
+          clients: clients[@oids[:clients] + '.' + ap_oid]
+        ) if status_up?(ap_oid)
+      end.compact
+    end
+
+    def parse_ap_oid(oid)
+      oid.gsub("#{@oids[:mac]}.", '')
+    end
+
+    def macs
+      @response[@oids[:mac]]
+    end
+
+    def names
+      @response[@oids[:name]]
+    end
+
+    def clients
+      @response[@oids[:clients]]
+    end
+
+    def sys
+      @response[@oids[:system]]
+    end
+
+    def status_up?(ap_oid)
+      return true if @response[@oids[:status]].nil?
+      @response[@oids[:status]][@oids[:status] + '.' + ap_oid] == 1
     end
 
     def parse_mac(mac)

data/lib/apscanner/version.rb

@@ -1,3 +1,3 @@
 module Apscanner
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apscanner
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Julio J Garcia Perez