arista-eapi 0.10.0 → 0.10.1

data/lib/arista/eapi.rb

@@ -13,6 +13,33 @@ require 'arista/eapi/version'
 
 module Arista
   module EAPI
+    JSON_COMMANDS = [
+      'show aliases',
+      'show interfaces',
+      'show interfaces counters',
+      'show interfaces counters discards',
+      'show interfaces status',
+      'show interfaces switchport vlan mapping',
+      'show ip interface',
+      'show ipv6 interface',
+      'show mac address-table',
+      'show mac address-table aging-time',
+      'show management api http-commands',
+      'show management api http-commands certificate',
+      'show monitor server-failure history',
+      'show monitor server-failure servers',
+      'show monitor session',
+      'show privilege',
+      'show sflow',
+      'show sflow interfaces',
+      'show spanning-tree topology status',
+      'show version',
+      'show version license',
+      'show vlan',
+      'show vlan trunk group',
+    ]
+
+
     # Public: Determine the eAPI supported format based on the commands. 
     #
     # options - List of commands to check format options for.
@@ -26,7 +53,7 @@ module Arista
     #
     # Returns json if all commands support JSON output, otherwise returns text.
     def self.format_for(*commands)
-      (commands.flatten - Arista::EAPI::Format::JSON_COMMANDS).size > 0 ? 'text' : 'json'
+      (commands.flatten - JSON_COMMANDS).size > 0 ? 'text' : 'json'
     end
   end
 end

data/lib/arista/eapi/parser.rb

@@ -1,16 +1,20 @@
-class Arista::EAPI::Parser
-  def self.parse(command, body)
-    parser_class = command.split.first.downcase.capitalize
-    parser_method = command.gsub(/\s/, '_')
+module Arista
+  module EAPI
+    class Parser
+      def self.parse(command, body)
+        parser_class = command.split.first.downcase.capitalize
+        parser_method = command.gsub(/\s/, '_')
 
-    parser = self.const_get(parser_class)
+        parser = self.const_get(parser_class)
 
-    if parser.respond_to?(parser_method.to_sym)
-      parser.send(parser_method, body)
-    else
-      body
+        if parser.respond_to?(parser_method.to_sym)
+          parser.send(parser_method, body)
+        else
+          body
+        end
+      rescue NameError
+        body
+      end
     end
-  rescue NameError
-    body
   end
 end

data/lib/arista/eapi/parser/show.rb

@@ -1,26 +1,30 @@
-class Arista::EAPI::Parser::Show
-  class << self
-    def show_lldp_neighbors(body)
-      lldp = { 
-        :last_update => nil,
-        :ports => {}
-      }
+module Arista
+  module EAPI
+    module Parser
+      class Show
+        def self.show_lldp_neighbors(body)
+          lldp = {
+            :last_update => nil,
+            :ports => {}
+          }
 
-      lldp[:last_update] = body.match(/^Last table change time\s+:\s(?<last_update>.*?)$/m)[:last_update]
-      ports = body.match(/.*Neighbor Port ID\s*TTL\s(?<ports>.*)/m)[:ports]
+          lldp[:last_update] = body.match(/^Last table change time\s+:\s(?<last_update>.*?)$/m)[:last_update]
+          ports = body.match(/.*Neighbor Port ID\s*TTL\s(?<ports>.*)/m)[:ports]
 
-      unless ports.nil?
-        ports.split("\n").each do |line|
-          name, neighbor_device_id, neighbor_port_id, ttl = line.split
-          lldp[:ports][name] = {
-            :neighbor_device_id => neighbor_device_id,
-            :neighbor_port_id   => neighbor_port_id,
-            :ttl                => ttl
-          }
+          unless ports.nil?
+            ports.split("\n").each do |line|
+              name, neighbor_device_id, neighbor_port_id, ttl = line.split
+              lldp[:ports][name] = {
+                :neighbor_device_id => neighbor_device_id,
+                :neighbor_port_id   => neighbor_port_id,
+                :ttl                => ttl
+              }
+            end
+          end
+
+          { :lldp_neighbors => lldp }
         end
       end
-
-      { :lldp_neighbors => lldp }
     end
   end
 end

data/lib/arista/eapi/request.rb

@@ -1,30 +1,34 @@
-class Arista::EAPI::Request
-  attr_accessor :switch, :commands
+module Arista
+  module EAPI
+    class Request
+      attr_accessor :switch, :commands
 
-  def initialize(switch, *commands)
-    self.switch = switch
-    self.commands = commands
-  end
+      def initialize(switch, *commands)
+        self.switch = switch
+        self.commands = commands
+      end
 
-  def payload
-    @payload ||= JSON.generate({
-      :jsonrpc => '2.0',
-      :method  => 'runCmds',
-      :id      => 1,
-      :params  => {
-        :version => 1,
-        :cmds    => commands,
-        :format  => Arista::EAPI.format_for(commands)
-      },
-    })
-  end
+      def payload
+        @payload ||= JSON.generate({
+          :jsonrpc => '2.0',
+          :method  => 'runCmds',
+          :id      => 1,
+          :params  => {
+            :version => 1,
+            :cmds    => commands,
+            :format  => Arista::EAPI.format_for(commands)
+          },
+        })
+      end
 
-  def execute
-    Arista::EAPI::Response.new(commands, RestClient.post(switch.url, payload))
-  end
+      def execute
+        Arista::EAPI::Response.new(commands, RestClient.post(switch.url, payload))
+      end
 
-  def self.execute!(switch, *commands)
-    req = self.new(switch, *commands)
-    req.execute
+      def self.execute!(switch, *commands)
+        req = self.new(switch, *commands)
+        req.execute
+      end
+    end
   end
 end

data/lib/arista/eapi/switch.rb

@@ -1,32 +1,36 @@
-class Arista::EAPI::Switch
-  attr_accessor :hostname, :user, :password, :protocol, :url, :attributes
+module Arista
+  module EAPI
+    class Switch
+      attr_accessor :hostname, :user, :password, :protocol, :url, :attributes
 
-  def initialize(hostname, user, password, protocol = 'https')
-    self.attributes = {}
-    self.hostname = hostname
-    self.user = user
-    self.password = password
-    self.protocol = protocol
+      def initialize(hostname, user, password, protocol = 'https')
+        self.attributes = {}
+        self.hostname = hostname
+        self.user = user
+        self.password = password
+        self.protocol = protocol
 
-    userpass = [ CGI.escape(user), CGI.escape(password) ].join(':')
-    self.url = "#{protocol}://#{userpass}@#{hostname}/command-api"
-  end
+        userpass = [ CGI.escape(user), CGI.escape(password) ].join(':')
+        self.url = "#{protocol}://#{userpass}@#{hostname}/command-api"
+      end
 
-  def interfaces
-    run('show interfaces')
-    attributes[:interfaces]
-  end
+      def interfaces
+        run('show interfaces')
+        attributes[:interfaces]
+      end
 
-  def version
-    run('show version').first
-  end
+      def version
+        run('show version').first
+      end
 
-  def update_attributes!(results)
-    results.each { |result| attributes.merge!(result) if result.is_a?(Hash) }
-  end
+      def update_attributes!(results)
+        results.each { |result| attributes.merge!(result) if result.is_a?(Hash) }
+      end
 
-  def run(*commands)
-    request = Arista::EAPI::Request.new(self, *commands)
-    self.update_attributes!(request.execute.results)
+      def run(*commands)
+        request = Arista::EAPI::Request.new(self, *commands)
+        self.update_attributes!(request.execute.results)
+      end
+    end
   end
 end

data/lib/arista/eapi/version.rb

@@ -1,5 +1,5 @@
 module Arista
   module EAPI
-    VERSION = "0.10.0"
+    VERSION = "0.10.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arista-eapi
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -90,7 +90,6 @@ files:
 - arista-eapi.gemspec
 - examples/save_config.rb
 - lib/arista/eapi.rb
-- lib/arista/eapi/format.rb
 - lib/arista/eapi/parser.rb
 - lib/arista/eapi/parser/show.rb
 - lib/arista/eapi/request.rb

data/lib/arista/eapi/format.rb

@@ -1,27 +0,0 @@
-class Arista::EAPI::Format
-  JSON_COMMANDS = [
-    'show aliases',
-    'show interfaces',
-    'show interfaces counters',
-    'show interfaces counters discards',
-    'show interfaces status',
-    'show interfaces switchport vlan mapping',
-    'show ip interface',
-    'show ipv6 interface',
-    'show mac address-table',
-    'show mac address-table aging-time',
-    'show management api http-commands',
-    'show management api http-commands certificate',
-    'show monitor server-failure history',
-    'show monitor server-failure servers',
-    'show monitor session',
-    'show privilege',
-    'show sflow',
-    'show sflow interfaces',
-    'show spanning-tree topology status',
-    'show version',
-    'show version license',
-    'show vlan',
-    'show vlan trunk group',
-  ]
-end