rbeapi 0.3.0 → 0.4.0

data/lib/rbeapi/client.rb

@@ -268,6 +268,7 @@ module Rbeapi
     # for handling both enable mode and config mode commands
     class Node
       attr_reader :connection
+      attr_accessor :dry_run
 
       ##
       # Save the connection and set autorefresh to true.
@@ -277,6 +278,7 @@ module Rbeapi
       def initialize(connection)
         @connection = connection
         @autorefresh = true
+        @dry_run = false
       end
 
       ##
@@ -331,12 +333,18 @@ module Rbeapi
         commands = [*commands] unless commands.respond_to?('each')
 
         commands.insert(0, 'configure')
-        response = run_commands(commands, opts)
 
-        refresh if @autorefresh
+        if @dry_run
+          puts '[rbeapi dry-run commands]'
+          puts commands
+        else
+          response = run_commands(commands, opts)
 
-        response.shift
-        response
+          refresh if @autorefresh
+
+          response.shift
+          response
+        end
       end
 
       ##

data/lib/rbeapi/eapilib.rb

@@ -301,7 +301,7 @@ module Rbeapi
       #   adds the list of commands to the exception message
       def execute(commands, opts = {})
         @error = nil
-        request = request(commands,  opts)
+        request = request(commands, opts)
         response = send(request, opts)
         return response['result']
       rescue ConnectionError, CommandError => exc

data/lib/rbeapi/version.rb

@@ -33,5 +33,5 @@
 # #
 # Rbeapi toplevel namespace
 module Rbeapi
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/rbeapi.spec.tmpl

@@ -11,31 +11,10 @@ License:    New BSD
 URL:		https://github.com/arista-eosplus/rbeapi
 Source0:	%{gem_name}-%{version}.gem
 
-%if 0%{?enterprise:1} == 1
-# Use these settings for Puppet Enterprise
-%global gem /opt/puppet/bin/gem
-Requires: pe-rubygems
-Requires: pe-ruby
-Requires: pe-rubygem(net-http-unix)
-Requires: pe-rubygem(inifile)
-Requires: pe-rubygem(netaddr)
-Provides: pe-rubygem(%{gem_name}) = %{version}
-Provides: pe-rubygem-%{gem_name} = %{version}
-%else
-# Use these settings for all other installs
-%global gem gem
-Requires: ruby(abi) = %{rubyabi}
-Requires: ruby(net-http-unix)
-Requires: ruby(inifile)
-Requires: ruby(netaddr)
-Provides: ruby(%{gem_name}) = %{version}-%{release}
-%endif
-
-
 BuildArch: noarch
 
 %description
-The Ruby Cliet for eAPI provides a native Ruby implementation for programming
+The Ruby Client for eAPI provides a native Ruby implementation for programming
 Arista EOS network devices using Ruby. The Ruby client provides the ability
 to build native applications in Ruby that can communicate with EOS either
 locally via Unix domain sockets (on-box) or remotely over a HTTP/S transport
@@ -52,6 +31,31 @@ The library is freely provided to the open source community for building robust
 applications using Arista EOS eAPI. Support is provided as best effort through
 Github iusses.
 
+%package puppet3
+Summary:	Arista eAPI Ruby Library Puppet Enterprise 3.x agents
+Group:		Development/Languages
+# Use these settings for Puppet Enterprise
+Requires: pe-rubygems
+Requires: pe-ruby
+Requires: pe-rubygem(net-http-unix)
+Requires: pe-rubygem(inifile)
+Requires: pe-rubygem(netaddr)
+Provides: pe-rubygem(%{gem_name}) = %{version}
+Provides: pe-rubygem-%{gem_name} = %{version}
+%description puppet3
+The Ruby eAPI Client for Puppet Enterprise 3.x agents
+
+%package puppet-aio
+Summary:	Arista eAPI Ruby Library for Puppet All-In-One (4.x) agents
+Group:		Development/Languages
+Requires: puppet >= 4.0.0
+Requires: rubygem-net_http_unix
+Requires: rubygem-inifile
+Requires: rubygem-netaddr
+Provides: rubygem-%{gem_name} = %{version}
+%description puppet-aio
+The Ruby eAPI Client for Puppet All-In-One (4.x) agents
+
 %prep
 %setup -q -D -T -n  .
 
@@ -62,14 +66,42 @@ install %{SOURCE0} %{buildroot}/
 %files
 /%{gem_name}-%{version}.gem
 
+%files puppet3
+/%{gem_name}-%{version}.gem
+
+%files puppet-aio
+/%{gem_name}-%{version}.gem
+
 %post
-%{gem} install --local /%{gem_name}-%{version}.gem > /dev/null 2>&1
+GEM_OPTS="--no-document --local"
+gem install ${GEM_OPTS} /%{gem_name}-%{version}.gem > /dev/null 2>&1
 
 %preun
-%{gem} uninstall %{gem_name} --version '= %{version}' > /dev/null 2>&1
+gem uninstall %{gem_name} --version '= %{version}' > /dev/null 2>&1
+
+%post puppet3
+GEM=/opt/puppet/bin/gem
+GEM_OPTS="--no-document --local"
+${GEM} install ${GEM_OPTS} /%{gem_name}-%{version}.gem > /dev/null 2>&1
+
+%preun puppet3
+GEM=/opt/puppet/bin/gem
+${GEM} uninstall %{gem_name} --version '= %{version}' > /dev/null 2>&1
+
+%post puppet-aio
+GEM=/opt/puppetlabs/puppet/bin/gem
+GEM_OPTS="--no-document --local"
+${GEM} install ${GEM_OPTS} /%{gem_name}-%{version}.gem > /dev/null 2>&1
+
+%preun puppet-aio
+GEM=/opt/puppetlabs/puppet/bin/gem
+${GEM} uninstall %{gem_name} --version '= %{version}' > /dev/null 2>&1
 
 %changelog
-* Tue May 21 2015 Jere Julian - 0.1.0-2
+* Fri Oct 30 2015 Jere Julian - 0.4.0-1
+- Detect the location of the puppet-agent's gem install
+
+* Thu May 21 2015 Jere Julian - 0.1.0-2
 - Ubuntu requires we manually create the buildroot
 
 * Tue Mar 17 2015 Jere Julian - 0.1.0-1

data/spec/system/rbeapi/api/dns_spec.rb

@@ -44,7 +44,7 @@ describe Rbeapi::Api::Dns do
   end
 
   describe '#set_name_servers' do
-    let(:servers) {  %w(1.2.3.4 5.6.7.8 9.10.11.12) }
+    let(:servers) { %w(1.2.3.4 5.6.7.8 9.10.11.12) }
 
     before { node.config('no ip name-server') }
 
@@ -94,7 +94,7 @@ describe Rbeapi::Api::Dns do
   end
 
   describe '#set_domain_list' do
-    let(:servers) {  %w(foo bar baz) }
+    let(:servers) { %w(foo bar baz) }
 
     before do
       node.config(['no ip domain-list foo',

data/spec/system/rbeapi/api/routemaps_spec.rb

@@ -0,0 +1,344 @@
+require 'spec_helper'
+
+require 'rbeapi/client'
+require 'rbeapi/api/routemaps'
+
+describe Rbeapi::Api::Routemaps do
+  subject { described_class.new(node) }
+
+  let(:node) do
+    Rbeapi::Client.config.read(fixture_file('dut.conf'))
+    Rbeapi::Client.connect_to('dut')
+  end
+
+  describe '#get' do
+    let(:resource) { subject.get }
+
+    before do
+      node.config(['no route-map test', 'no route-map test1',
+                   'no route-map test2', 'no route-map test3',
+                   'route-map test permit 10',
+                   'route-map test permit 20', 'description descript',
+                   'match ip address prefix-list MYLOOPBACK',
+                   'match interface Loopback0',
+                   'set community internet 5555:5555', 'continue 99'])
+    end
+
+    it 'returns a routemap resource instance' do
+      expect(subject.get('test')).to be_a_kind_of(Hash)
+    end
+
+    it 'has a key for description' do
+      expect(subject.get('test').assoc('permit')[1].assoc(20)[1])
+        .to include(:description)
+    end
+
+    it 'has a key for continue' do
+      expect(subject.get('test').assoc('permit')[1].assoc(20)[1])
+        .to include(:continue)
+    end
+
+    it 'has a key for match' do
+      expect(subject.get('test').assoc('permit')[1].assoc(20)[1])
+        .to include(:match)
+    end
+
+    it 'has a key for set' do
+      expect(subject.get('test').assoc('permit')[1].assoc(20)[1])
+        .to include(:set)
+    end
+  end
+
+  describe '#getall' do
+    let(:resource) { subject.getall }
+
+    before do
+      node.config(['no route-map test', 'no route-map test1',
+                   'route-map test1 permit 10', 'continue 99',
+                   'route-map test permit 10',
+                   'route-map test permit 20', 'description descript',
+                   'match ip address prefix-list MYLOOPBACK',
+                   'match interface Loopback0',
+                   'set community internet 5555:5555', 'continue 99'])
+    end
+
+    let(:test1_entries) do
+      {
+        'test1' => {
+          'permit' => {
+            10 => {
+              continue: 99
+            }
+          }
+        },
+        'test' => {
+          'permit' => {
+            10 => {},
+            20 => {
+              continue: 99,
+              description: 'descript',
+              match: ['ip address prefix-list MYLOOPBACK',
+                      'interface Loopback0'],
+              set: ['community internet 5555:5555']
+            }
+          }
+        }
+      }
+    end
+
+    it 'returns a routemap resource instance' do
+      expect(subject.getall).to be_a_kind_of(Hash)
+    end
+
+    it 'has a key for description' do
+      expect(subject.getall.count).to eq(2)
+    end
+
+    it 'returns the routemap collection' do
+      expect(subject.getall).to include(test1_entries)
+    end
+  end
+
+  describe '#create' do
+    let(:test_entry) do
+      {
+        'permit' => {
+          20 => {
+            continue: 99,
+            description: 'descript',
+            match: ['ip address prefix-list MYLOOPBACK',
+                    'interface Loopback0'],
+            set: ['community internet 5555:5555']
+          }
+        }
+      }
+    end
+
+    before do
+      node.config(['no route-map test', 'no route-map test1'])
+    end
+
+    it 'creates the routemap with all options' do
+      expect(subject.get('test')).to eq(nil)
+      expect(subject
+              .create('test', 'permit', 20,
+                      continue: 99, description: 'descript',
+                      match: ['ip address prefix-list MYLOOPBACK',
+                              'interface Loopback0'],
+                      set: ['community internet 5555:5555'])
+            ).to be_truthy
+      expect(subject.get('test')).to eq(test_entry)
+    end
+
+    it 'creates the routemap with no options' do
+      expect(subject.get('test1')).to eq(nil)
+      expect(subject.create('test1', 'permit', 10)).to be_truthy
+      expect(subject.get('test1')).to be_truthy
+      expect(subject.get('test1').assoc('permit')[0]).to eq('permit')
+      expect(
+        subject.get('test1').assoc('permit')[1].assoc(10)[0]).to eq(10)
+      expect(
+        subject.get('test1').assoc('permit')[1].assoc(10)[1][:continue]
+      ).to eq(nil)
+      expect(
+        subject.get('test1').assoc('permit')[1].assoc(10)[1][:description]
+      ).to eq(nil)
+      expect(
+        subject.get('test1').assoc('permit')[1].assoc(10)[1][:match]
+      ).to eq(nil)
+      expect(
+        subject.get('test1').assoc('permit')[1].assoc(10)[1][:set]
+      ).to eq(nil)
+    end
+  end
+
+  describe '#delete' do
+    before do
+      node.config(['route-map test',
+                   'route-map test1 permit 20',
+                   'route-map test1 permit 10',
+                   'route-map test2 permit 10',
+                   'route-map test2 permit 20'])
+    end
+
+    it 'removes the routemap' do
+      expect(subject.get('test')).to eq('permit' => { 10 => {} })
+      expect(subject.delete('test', 'permit', 10)).to be_truthy
+      expect(subject.get('test')).to eq(nil)
+    end
+
+    it 'removes multiple routemaps with same name' do
+      expect(subject.get('test1'))
+        .to eq('permit' => { 10 => {}, 20 => {} })
+      expect(subject.delete('test1', 'permit', 20)).to be_truthy
+      expect(subject.get('test1')).to eq('permit' => { 10 => {} })
+    end
+  end
+
+  describe '#delete' do
+    before do
+      node.config(['route-map test',
+                   'route-map test1 permit 20',
+                   'route-map test1 permit 10',
+                   'route-map test2 permit 10',
+                   'route-map test2 permit 20'])
+    end
+
+    it 'removes the routemap' do
+      expect(subject.get('test')).to eq('permit' => { 10 => {} })
+      expect(subject.delete('test', 'permit', 10)).to be_truthy
+      expect(subject.get('test')).to eq(nil)
+    end
+
+    it 'removes multiple routemaps with same name' do
+      expect(subject.get('test1'))
+        .to eq('permit' => { 10 => {}, 20 => {} })
+      expect(subject.delete('test1', 'permit', 20)).to be_truthy
+      expect(subject.get('test1')).to eq('permit' => { 10 => {} })
+    end
+  end
+
+  describe '#set_match_statements' do
+    before do
+      node.config(['route-map test permit 10',
+                   'no match ip address prefix-list MYLOOPBACK',
+                   'no match interface Vlan100',
+                   'no match interface Loopback1',
+                   'match interface Loopback1',
+                   'no route-map test1'])
+    end
+
+    it 'sets match statements on an existing routemap' do
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { match: ['interface Loopback1'] } })
+      expect(
+        subject.set_match_statements('test', 'permit', 10,
+                                     ['ip address prefix-list MYLOOPBACK',
+                                      'interface Loopback0'])).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => {
+                 match: ['ip address prefix-list MYLOOPBACK',
+                         'interface Loopback0'] } })
+    end
+
+    it 'adds more match statements' do
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { match: ['interface Loopback1'] } })
+      expect(subject.set_match_statements('test', 'permit', 10,
+                                          ['interface Vlan100'])).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { match: ['interface Vlan100'] } })
+      expect(subject
+        .set_match_statements('test', 'permit', 10,
+                              ['interface Vlan100',
+                               'ip address prefix-list MYLOOPBACK'])
+            ).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => {
+                 match: ['ip address prefix-list MYLOOPBACK',
+                         'interface Vlan100'] } })
+      expect(subject
+        .set_match_statements('test', 'permit', 10,
+                              ['interface Vlan100'])).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { match: ['interface Vlan100'] } })
+    end
+
+    it 'adds match statements to a new seqno' do
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { match: ['interface Loopback1'] } })
+      expect(subject.set_match_statements('test', 'permit', 20,
+                                          ['interface Vlan100'])).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { match: ['interface Loopback1'] },
+                             20 => { match: ['interface Vlan100'] } })
+    end
+
+    it 'set match statements on a new routemap' do
+      expect(subject.get('test1')).to eq(nil)
+      expect(subject.set_match_statements('test1', 'permit', 10,
+                                          ['ip address prefix-list MYLOOPBACK',
+                                           'interface Loopback0'])).to be_truthy
+      expect(subject.get('test1'))
+        .to eq('permit' => { 10 => {
+                 match: ['ip address prefix-list MYLOOPBACK',
+                         'interface Loopback0'] } })
+    end
+  end
+
+  describe '#set_set_statements' do
+    before do
+      node.config(['no route-map test', 'no route-map test1',
+                   'route-map test permit 10',
+                   'set community internet 3333:3333'])
+    end
+
+    it 'set set statements on an existing routemap' do
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { set: ['community internet 3333:3333'] } })
+      expect(subject
+          .set_set_statements('test', 'permit', 10,
+                              ['origin igp'])).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { set: ['origin igp'] } })
+    end
+
+    it 'set set statements on a new routemap' do
+      expect(subject.get('test1')).to eq(nil)
+      expect(subject
+        .set_set_statements('test1', 'permit', 10,
+                            ['community internet 5555:5555',
+                             'community internet 4444:4444'])).to be_truthy
+      expect(subject.get('test1'))
+        .to eq('permit' => { 10 => {
+                 set: ['community internet 4444:4444 5555:5555'] } })
+    end
+  end
+
+  describe '#set_continue' do
+    before do
+      node.config(['no route-map test', 'no route-map test1',
+                   'route-map test permit 10', 'continue 50'])
+    end
+
+    it 'set continue on an existing routemap' do
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { continue: 50 } })
+      expect(subject.set_continue('test', 'permit', 10, 99)).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { continue: 99 } })
+    end
+
+    it 'set continue on a new routemap' do
+      expect(subject.get('test1')).to eq(nil)
+      expect(subject.set_continue('test1', 'permit', 10, 99)).to be_truthy
+      expect(subject.get('test1'))
+        .to eq('permit' => { 10 => { continue: 99 } })
+    end
+  end
+
+  describe '#set_description' do
+    before do
+      node.config(['no route-map test', 'no route-map test1',
+                   'route-map test permit 10', 'description temp'])
+    end
+
+    it 'set description on an existing routemap' do
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { description: 'temp' } })
+      expect(subject
+        .set_description('test', 'permit', 10, 'descript')).to be_truthy
+      expect(subject.get('test'))
+        .to eq('permit' => { 10 => { description: 'descript' } })
+    end
+
+    it 'set description on a new routemap' do
+      expect(subject.get('test1')).to eq(nil)
+      expect(subject
+        .set_description('test1', 'permit', 10,
+                         'descript')).to be_truthy
+      expect(subject.get('test1'))
+        .to eq('permit' => { 10 => { description: 'descript' } })
+    end
+  end
+end

data/spec/system/rbeapi/api/switchports_spec.rb

@@ -112,7 +112,7 @@ describe Rbeapi::Api::Switchports do
   end
 
   describe '#set_access_vlan' do
-    before { node.config(['default interface Ethernet1', 'vlan 100'])  }
+    before { node.config(['default interface Ethernet1', 'vlan 100']) }
 
     it 'sets the access vlan value to 100' do
       expect(subject.get('Ethernet1')[:access_vlan]).to eq('1')

data/spec/system/rbeapi/api/system_spec.rb

@@ -13,18 +13,18 @@ describe Rbeapi::Api::System do
 
   describe '#get' do
     let(:entity) do
-      { hostname: 'localhost' }
+      { hostname: 'localhost', iprouting: true }
     end
 
-    before { node.config('hostname localhost') }
+    before { node.config(['hostname localhost', 'ip routing']) }
 
     it 'returns the snmp resource' do
       expect(subject.get).to eq(entity)
     end
   end
 
-  describe '#set_system' do
-    before { node.config('hostname localhost') }
+  describe '#set_hostname' do
+    before { node.config(['hostname localhost']) }
 
     it 'configures the system hostname value' do
       expect(subject.get[:hostname]).to eq('localhost')
@@ -47,5 +47,45 @@ describe Rbeapi::Api::System do
       expect(subject.set_hostname(default: true)).to be_truthy
       expect(subject.get[:hostname]).to be_empty
     end
+
+    it 'configures the system hostname value' do
+      expect(subject.get[:iprouting]).to eq(true)
+      expect(subject.set_iprouting(enable: true)).to be_truthy
+      expect(subject.get[:iprouting]).to eq(true)
+    end
+  end
+
+  describe '#set_iprouting' do
+    describe 'negates ip routing' do
+      before { node.config(['ip routing']) }
+
+      it 'negates ip routing' do
+        expect(subject.get[:iprouting]).to eq(true)
+        expect(subject.set_iprouting(enable: false)).to be_truthy
+        expect(subject.get[:iprouting]).to eq(false)
+      end
+
+      it 'defaults ip routing' do
+        expect(subject.get[:iprouting]).to eq(true)
+        expect(subject.set_iprouting(default: true)).to be_truthy
+        expect(subject.get[:iprouting]).to eq(false)
+      end
+    end
+
+    describe 'enables ip routing' do
+      before { node.config(['no ip routing']) }
+
+      it 'negates ip routing' do
+        expect(subject.get[:iprouting]).to eq(false)
+        expect(subject.set_iprouting(enable: true)).to be_truthy
+        expect(subject.get[:iprouting]).to eq(true)
+      end
+
+      it 'defaults ip routing' do
+        expect(subject.get[:iprouting]).to eq(false)
+        expect(subject.set_iprouting(default: false)).to be_truthy
+        expect(subject.get[:iprouting]).to eq(true)
+      end
+    end
   end
 end