sloe 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70dbc4a381ed8fdeedc2880478b1505fd52ca7c7
-  data.tar.gz: b0569e9879ac1c7009b040334a382d659fe0a589
+  metadata.gz: 5397b01aa1ff0a4b4a6d0bed0c2c27b4bea22e19
+  data.tar.gz: e87368db3b45d1819a8251b577ff06f71345fd02
 SHA512:
-  metadata.gz: 3213a4ef90102fca971c467eba65efbb3c51f1c39955eaf95cd708fafed5f1d4195a6147d1ac75baf10a63a58b8d3bdbad15100cc4eb3a270d1ded306a77b9aa
-  data.tar.gz: 2cbba263c6c19e5b3b97cc46f21a8fafe7ea0bc781f273001a7ef72826dc853663b98035efcc8b1b25f2fd363fcd51dc25376b12ab1c32337156de4c8ebabf57
+  metadata.gz: a6132916732e57176a32d61858f4bf4ba7d492b27deb12ad13dc5e09b2c97a5905bb420ecd9c35aaacadeb4e2c6157d547e63fbbc3742537710842ce615be704
+  data.tar.gz: 5f869852abcdd0a2f32ba90924377ae95c5e8db48aeeebd0934d561a3c8ff7920a496fb7c513b17c5b86982bef84d0bb21e65fa33111750a62b734dbbdbd3678

data/Rakefile

@@ -1,8 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require 'ci/reporter/rake/rspec' 
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'ci/reporter/rake/rspec'
 
 RSpec::Core::RakeTask.new
 
-task :default => [ 'ci:setup:rspec', :spec ]
-task :test => [ 'ci:setup:rspec', :spec ]
+task default: ['ci:setup:rspec', :spec]
+task test: ['ci:setup:rspec', :spec]

data/lib/import-mibs.rb

@@ -1,33 +1,32 @@
 #!/usr/bin/env ruby
-
 require 'yaml'
 
 def eval_mib_data(mib_hash)
-  ruby_hash = mib_hash.
-    gsub(':', '=>').                  # fix hash syntax
-    gsub('(', '[').gsub(')', ']').    # fix tuple syntax
-    sub('FILENAME =', 'filename =').  # get rid of constants
-    sub('MIB =', 'mib =')
+  ruby_hash = mib_hash
+              .gsub(':', '=>')                  # fix hash syntax
+              .tr('(', '[').tr(')', ']')        # fix tuple syntax
+              .sub('FILENAME =', 'filename =')  # get rid of constants
+              .sub('MIB =', 'mib =')
   mib = nil
   eval(ruby_hash)
   mib
 end
 
 def module_file_name(module_name, mib_dir)
-  File.join(mib_dir, module_name + ".yaml")
+  File.join(mib_dir, module_name + '.yaml')
 end
 
-raise "smidump tool must be installed" unless `smidump --version` =~ /^smidump 0.4/  && $? == 0
+raise 'smidump tool must be installed' unless `smidump --version` =~ /^smidump 0.4/ && $CHILD_STATUS == 0
 mib_hash = `smidump -k -p mib-jnx-smi.txt -f python #{ARGV[0]}`
 mib = eval_mib_data(mib_hash)
 if mib
-  module_name = mib["moduleName"]
+  module_name = mib['moduleName']
   raise "#{module_file}: invalid file format; no module name" unless module_name
-  if mib["nodes"]
+  if mib['nodes']
     oid_hash = {}
-    mib["nodes"].each { |key, value| oid_hash[key] = value["oid"] }
-    if mib["notifications"]
-      mib["notifications"].each { |key, value| oid_hash[key] = value["oid"] }
+    mib['nodes'].each { |key, value| oid_hash[key] = value['oid'] }
+    if mib['notifications']
+      mib['notifications'].each { |key, value| oid_hash[key] = value['oid'] }
     end
     File.open(module_file_name(module_name, ARGV[1]), 'w') do |file|
       YAML.dump(oid_hash, file)

data/lib/sloe/version.rb

@@ -1,4 +1,4 @@
 module Sloe
   # Current version
-  VERSION = "0.8.6"
+  VERSION = '0.8.7'.freeze
 end

data/sloe.gemspec

@@ -4,27 +4,31 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sloe/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "sloe"
+  gem.name          = 'sloe'
   gem.version       = Sloe::VERSION
-  gem.authors       = ["David Gethings"]
-  gem.email         = ["dgjnpr@gmail.com"]
-  gem.description   = %q{Sloe uses NETCONF and/or SNMP to gather data regarding a network device. Designed to help with automated testing this gem can also be used with things like Ruby on Rails}
-  gem.summary       = %q{A one stop shop for collecting data from a network device using NETCONF or SNMP}
-  gem.homepage      = "https://github.com/dgjnpr/Sloe"
+  gem.authors       = ['David Gethings']
+  gem.email         = ['dgjnpr@gmail.com']
+  gem.homepage      = 'https://github.com/dgjnpr/Sloe'
+  gem.description   = <<-DESC
+Sloe uses NETCONF and/or SNMP to gather data regarding a network device. Designed to help with automated testing this gem can also be used with things like Ruby on Rails
+DESC
+  gem.summary       = <<-SUMM
+A one stop shop for collecting data from a network device using NETCONF or SNMP
+SUMM
 
-  gem.add_dependency('snmp', '~> 1.2')
-  gem.add_dependency('net-netconf', '~> 0.3')
-  gem.add_dependency('net-scp', '~> 1.2')
-  gem.add_development_dependency('rspec', '~> 3.4')
-  gem.add_development_dependency('yard', '~> 0.8')
-  gem.add_development_dependency('simplecov', '~> 0.11')
-  gem.add_development_dependency('ci_reporter', '~> 2.0')
-  gem.add_development_dependency('ci_reporter_rspec')
-  gem.add_development_dependency('rake', '>= 10')
-  gem.add_development_dependency('pry-byebug', '~> 3.3')
+  gem.add_dependency('snmp', '~> 1.1')
+  gem.add_dependency('netconf', '~> 0.3')
+  gem.add_dependency('net-scp', '~> 1.0')
+  gem.add_development_dependency('rspec', '~> 2.12')
+  gem.add_development_dependency('yard')
+  # gem.add_development_dependency('pry-debugger')
+  gem.add_development_dependency('simplecov')
+  gem.add_development_dependency('ci_reporter')
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('rubocop', '~> 0.39')
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 end

data/spec/blocks_spec.rb

@@ -1,31 +1,52 @@
 require 'spec_helper'
 
 describe Sloe do
-  let(:login) { {target: 'crtj-0dc1-0001', username: 'netadmin', password: 'pass123'} }
   context "invoked with block" do
+    before(:all) do
+      @login = {
+        :target => 'capella',
+        :username => 'netconf',
+        :password => 'netconf'
+      }
+      @hostname = ''
+    end
+
     it "calls Netconf RPC" do
-      hostname = ''
-      Sloe::Device.new(login) { |dut| 
-        hostname = dut.rpc.get_system_information.xpath('//host-name').text
+      Sloe::Device.new( @login ) { |dut| 
+        sw_info = dut.rpc.get_system_information
+        @hostname = sw_info.xpath('//host-name').text
       }
-      expect(hostname).to include login[:target]
+      @hostname.should include @login[:target]
     end
 
     it "calls SNMP RPC" do
-      hostname = ''
-      Sloe::Device.new (login) { |dut| 
-        hostname = dut.snmp.get_value( 'sysName.0' ).to_s
+      Sloe::Device.new ( @login ) { |dut| 
+        @hostname = dut.snmp.get_value( 'sysName.0' ).to_s
       }
-      expect(hostname).to include login[:target]
+      @hostname.should include @login[:target]
     end
+
   end
 
   context "Junos extensions" do
+    before(:all) do
+      @login = {
+        :target => 'capella',
+        :username => 'netconf',
+        :password => 'netconf'
+      }
+    end
+
     it "Sloe::Junos responds to Junos specific RPCs" do
-      expect( Sloe::Junos.new(login).rpc ).to respond_to(:lock_configuration)
+      Sloe::Junos.new ( @login ) { |dut|
+        dut.rpc.respond_to?(:lock_configuration).should be true
+      }
     end
     it "Sloe::Device does not respond to Junos specific RPCs" do
-      expect( Sloe::Device.new(login).rpc ).to_not respond_to(:lock_configuration)
+      Sloe::Device.new ( @login ) { |dut|
+        dut.rpc.respond_to?(:lock_configuration).should be false
+      }
     end
+
   end
 end

data/spec/methods_spec.rb

@@ -1,74 +1,107 @@
 require 'sloe/junos'
 
 describe Sloe do
-  let(:jnx_mibs) { Dir.glob("./mibs/JUNIPER-*.yaml").map { |f| File.basename(f, '.yaml') } }
-  let(:login) { {
-    target: 'crtj-0dc1-0001',
-    username: 'netadmin',
-    password: 'pass123',
-    mib_dir: './mibs',
-    mib_modules: ["SNMPv2-SMI", "SNMPv2-MIB", "IF-MIB", "IP-MIB", "TCP-MIB", "UDP-MIB"].concat(jnx_mibs) }
-  }
-  subject(:dut) { Sloe::Junos.new(login) }
+
+  before(:all) do
+    @jnx_mibs = Dir.glob("./mibs/JUNIPER-*.yaml").map { |f| File.basename(f, '.yaml') }
+    @args = {
+      :target => 'capella',
+      :username => 'netconf',
+      :password => 'netconf',
+      :mib_dir => './mibs',
+      :mib_modules => ["SNMPv2-SMI", "SNMPv2-MIB", "IF-MIB", "IP-MIB", "TCP-MIB", "UDP-MIB"].concat(@jnx_mibs)
+    }
+
+    @dut = Sloe::Junos.new(@args)
+  end
 
   context "SNMP API" do
     it "snmp.get_value() returns valid value" do
-      expect( dut.snmp.get_value('sysDescr.0') ).to =~ /^Juniper Networks,/
+      @dut.snmp.get_value('sysDescr.0').should =~ /^Juniper Networks,/
     end
     it "snmp.get() returns one PDU" do
-      expect( dut.snmp.get('sysDescr.0').varbind_list.size ).to eq(1)
+      @pdu = @dut.snmp.get('sysDescr.0')
+      @pdu.varbind_list.should have(1).item
     end
     it "snmp.get_bulk() returns a list of PDUs" do
-      expect( dut.snmp.get_bulk(0, 5, 'system').varbind_list.size ).to eq(5)
+      @pdu = @dut.snmp.get_bulk(0, 5, 'system')
+      @pdu.varbind_list.should have(5).items
     end
     it "snmp.get_next() returns one PDU" do
-      expect( dut.snmp.get_next('system').varbind_list.size ).to eq(1)
+      @pdu = @dut.snmp.get_next('system')
+      @pdu.varbind_list.should have(1).item
     end
     it "snmp.walk() returns a list of PDUs none of which are nil" do
-      expect { dut.snmp.walk('system') }.not_to eq(nil)
+      @dut.snmp.walk('system') { |vb| vb.should_not be_nil }
     end
   end
 
   context "JNX Enterprise MIBs" do
     it "jnxBoxDescr.0 has a valid value" do
-      expect( dut.snmp.get_value('jnxBoxDescr.0') ).to =~ /^Juniper/
+      @dut.snmp.get_value('jnxBoxDescr.0').should =~ /^Juniper/
     end
   end
 
   context "NETCONF API" do
     it "rpc.get_interface_information() functions without error" do
-      expect { dut.rpc.get_interface_information() }.not_to raise_error
+      lambda { @dut.rpc.get_interface_information() }.should_not raise_error
     end
     it "rpc.get_ospf_neighbor_information() functions without error" do
-      expect { dut.rpc.get_ospf_neighbor_information() }.not_to raise_error
+      lambda { @dut.rpc.get_ospf_neighbor_information() }.should_not raise_error
     end
   end
 
   context "SCP API" do
     it "scp.download() functions without error" do
-      expect { dut.scp.download!('/config/juniper.conf.gz', '/var/tmp/juniper.conf.gz') }.not_to raise_error
+      lambda { @dut.scp.download!('/config/juniper.conf.gz', '/var/tmp/juniper.conf.gz') }.should_not raise_error
       File.delete('/var/tmp/juniper.conf.gz')
     end
     it "scp.upload() functions without error" do
       File.new('/var/tmp/test', 'w+')
-      expect { dut.scp.upload!('/var/tmp/test', 'test') }.not_to raise_error
-      dut.rpc.file_delete(:path => 'test')
+      lambda { @dut.scp.upload!('/var/tmp/test', 'test') }.should_not raise_error
+      @dut.rpc.file_delete(:path => 'test')
       File.delete('/var/tmp/test')
     end
   end
 
   context "CLI API" do
     it "cli('show version') functions without error" do
-      expect { dut.cli("show version") }.not_to raise_error
+      lambda { @dut.cli("show version") }.should_not raise_error
     end
     it "cli('show version') contains OS information" do
-      expect( dut.cli("show version") ).to =~ /JUNOS Base OS/
+      @dut.cli("show version").should be_a(String)      
+      @dut.cli("show version").should =~ /JUNOS Base OS/
     end
     it "cli('show version', :foo => 'bar') still contains OS information" do
-      expect( dut.cli("show version", :foo => 'bar') ).to =~ /JUNOS Base OS/
+      @dut.cli("show version", :foo => 'bar').should be_a(String)
+      @dut.cli("show version", :foo => 'bar').should =~ /JUNOS Base OS/
     end
     it "cli('clear interface statistics') empty reply does not cause an error" do
-      expect { dut.cli('clear interface statistics fxp0') }.not_to raise_error
+      lambda { @dut.cli('clear interface statistics fxp0') }.should_not raise_error
+    end
+  end
+
+  context "Helper methods" do
+    before( :all ) do
+      Dir.mkdir( 'configs' )
+      @apply = File.open( "configs/capella-apply.set", "w" )
+      @apply.write( 'set system location building "In a galaxy far, far, away"' )
+      @apply.close
+
+      @delete = File.open( "configs/capella-delete.set", "w" )
+      @delete.write( 'delete system location')
+      @delete.close
+    end
+
+    it "setup() with default args updates the router config" do
+      lambda { @dut.setup() }.should_not raise_error
+    end
+    it "clearup() with default args updates the router config" do
+      lambda { @dut.clearup() }.should_not raise_error
+    end
+
+    after(:all) do
+      FileUtils.rm_rf( 'configs' )
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'sloe'
 require 'sloe/junos'
-require 'pry-byebug'
+# require 'pry-debugger'
 require 'simplecov'
 
 SimpleCov.start

data/test

@@ -0,0 +1 @@
+spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sloe
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - David Gethings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: net-netconf
+  name: netconf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -44,72 +44,58 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter_rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,31 +114,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-description: Sloe uses NETCONF and/or SNMP to gather data regarding a network device.
-  Designed to help with automated testing this gem can also be used with things like
-  Ruby on Rails
+        version: '0.39'
+description: |
+  Sloe uses NETCONF and/or SNMP to gather data regarding a network device. Designed to help with automated testing this gem can also be used with things like Ruby on Rails
 email:
 - dgjnpr@gmail.com
 executables: []
@@ -510,6 +495,7 @@ files:
 - spec/blocks_spec.rb
 - spec/methods_spec.rb
 - spec/spec_helper.rb
+- test
 homepage: https://github.com/dgjnpr/Sloe
 licenses: []
 metadata: {}
@@ -529,7 +515,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A one stop shop for collecting data from a network device using NETCONF or