apscanner 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b54660d1fd088dc9ce7842f06a72cae042836b9
-  data.tar.gz: f9e183125d770824637dc9b74e27ef10a679e4d1
+  metadata.gz: b33cb59b6b8ec81b5980993dc67d4ea78cf7994e
+  data.tar.gz: d18e543c5ac23b6a7dc39ebcde258695e6344ebf
 SHA512:
-  metadata.gz: 37b30665d129ed274792bfa9bb5c2f88efb01b26f01107b1b1d4fc058b8a9cb3098981954ea792e820fc340580b64876b813b71f15f3030fa7979d3f4ea903ff
-  data.tar.gz: 641a7a0c9c01b652347045d4cc78bc0a18b9e03e4abb074b72c8b6b1453dce141343ecd8f7bd02740aac54d113f3a46cf6aae45126be0c6b39f899daeae4ea29
+  metadata.gz: fc2bc9d0510fe82bdae6aabf99f780a5d695910150da244d9af474a5cfd309b959bc5a43ef618869b12482a610d6104f834854978a0c37ad474e517001914254
+  data.tar.gz: f28722c4d72b17c434d497597632aa34f2f97142748c4c526139d82e99e7a805b520425bd68c996bff0e82405b67876852fc821d0011e72f8b060cce9d818ddf

data/lib/apscanner.rb

@@ -1,12 +1,14 @@
 require 'apscanner/loggable'
 require 'apscanner/scanner'
 require 'apscanner/entities/snmp_manager'
+require 'apscanner/entities/snmp_parser'
 require 'apscanner/entities/sensor'
 require 'apscanner/entities/access_point'
 
 require 'snmp4em'
 require 'json'
 require 'logger'
+require 'pry'
 
 module Apscanner
   extend Loggable

data/lib/apscanner/entities/snmp_manager.rb

@@ -6,8 +6,9 @@ module Apscanner
         mac: '1.3.6.1.4.1.9.9.513.1.1.1.1.2'
       },
       meraki: {
-        name: '1.3.6.1.4.1.29671.1.1.4.1.1',
-        mac: '1.3.6.1.4.1.29671.1.1.4.1.2'
+        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'
       }
     }.freeze
 
@@ -17,12 +18,16 @@ module Apscanner
 
     def run
       response = request_by_type
-      return [] if response.empty?
-      parse(response, SNMP_OID[@sensor.type])
+      return [] if empty?(response)
+      SnmpParser.new(response, @sensor.type).run
     end
 
     private
 
+    def empty?(response)
+      response.empty? || response.values.uniq == [{}]
+    end
+
     def manager
       SNMP4EM::Manager.new(
         host: @sensor.ip_address,
@@ -33,11 +38,16 @@ module Apscanner
       )
     end
 
+    def oids(type)
+      oids = SNMP_OID[type].values
+      type == :wlc ? oids : [oids.first]
+    end
+
     def discover
       response = {}
-      SNMP_OID.each do |type, oids|
-        response = request(oids.values)
-        unless response.empty?
+      SNMP_OID.keys.each do |type|
+        response = request(oids(type))
+        unless empty?(response)
           @sensor.type = type
           break
         end
@@ -47,7 +57,7 @@ module Apscanner
 
     def request_by_type
       if SNMP_OID.keys.include?(@sensor.type)
-        request(SNMP_OID[@sensor.type].values)
+        request(oids(@sensor.type))
       else
         discover
       end
@@ -69,22 +79,6 @@ module Apscanner
         end
       end
       response
-    end
-
-    def parse(response, oids)
-      access_points = []
-      response[oids[:mac]].each do |oid, value|
-        ap_oid = oid.gsub("#{oids[:mac]}.", '')
-        access_points << AccessPoint.new(
-          name: response[oids[:name]][oids[:name] + '.' + ap_oid],
-          mac_address: parse_mac(value)
-        )
-      end
-      access_points
-    end
-
-    def parse_mac(mac)
-      mac.unpack('H2H2H2H2H2H2').join(':').upcase
-    end
+    end   
   end
 end

data/lib/apscanner/entities/snmp_parser.rb

@@ -1,7 +1,46 @@
 module Apscanner
   class SnmpParser
-    def initialize(sensor)
-      @sensor = sensor
+    def initialize(response, type)
+      @response = response
+      @type = type
+      @oids = SnmpManager::SNMP_OID[type]
+    end
+
+    def run
+      send("parse_#{@type}")
+    end
+
+    private
+
+    def parse_wlc
+      parse
+    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 = parsed_response
+      parse
+    end
+
+    def parse
+      @response[@oids[:mac]].map do |oid, value|
+        ap_oid = oid.gsub("#{@oids[:mac]}.", '')
+        AccessPoint.new(
+          name: @response[@oids[:name]][@oids[:name] + '.' + ap_oid],
+          mac_address: parse_mac(value)
+        )
+      end
+    end
+
+    def parse_mac(mac)
+      mac.unpack('H2H2H2H2H2H2').join(':').upcase
     end
   end
 end

data/lib/apscanner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apscanner
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Julio J Garcia Perez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: snmp4em
   requirement: !ruby/object:Gem::Requirement