Skip to content

Commit

Permalink
Merge pull request #23 from arista-eosplus/release-1.0
Browse files Browse the repository at this point in the history
Release 1.0
  • Loading branch information
privateip committed Jun 5, 2015
2 parents 73a1ad5 + f88738c commit 00190e0
Show file tree
Hide file tree
Showing 46 changed files with 624 additions and 321 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ to the device.
### Beginning with netdev_stdlib_eos

1. Install the module on the Puppet master.
2. Install the rbeapi gem on the switch [See Ruby Client for eAPI] (rbeap)
2. Install the rbeapi gem on the switch See the [Ruby Client for eAPI][rbeapi]
3. Run the puppet agent on the switch to synchronize the types and providers.
4. Verify the providers by running `puppet resource network_interface` using
the bash command on the EOS device.
Expand Down Expand Up @@ -133,4 +133,4 @@ together:
bundle exec rspec spec

[netdev]: https://github.com/puppetlabs/netdev_stdlib
[rbeapi]: https://gitub.com/arista-eos/rbeapi
[rbeapi]: https://github.com/arista-eosplus/rbeapi
2 changes: 1 addition & 1 deletion lib/puppet/provider/port_channel/eos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def force=(val)
end

def speed=(val)
not_supported 'spped'
not_supported 'speed'
end

def duplex=(val)
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/provider/radius/eos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
mk_resource_methods

# Mix in the api as instance methods
include PuppetX::Eos::EapiProviderMixin
include PuppetX::NetDev::EosApi

# Mix in the api as class methods
extend PuppetX::Eos::EapiProviderMixin
extend PuppetX::NetDev::EosApi

def self.instances
result = node.api('radius').get
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/provider/syslog_server/eos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ def source_interface=(val)

def create
node.api('logging').add_host(resource[:name])
@provider_hash = { name: resource[:name], ensure: :present }
@property_hash = { name: resource[:name], ensure: :present }
end

def destroy
node.api('logging').remove_host(resource[:name])
@provider_hash = { name: resource[:name], ensure: :absent }
@property_hash = { name: resource[:name], ensure: :absent }
end
end
4 changes: 2 additions & 2 deletions lib/puppet/provider/tacacs/eos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
mk_resource_methods

# Mix in the api as instance methods
include PuppetX::Eos::EapiProviderMixin
include PuppetX::NetDev::EosApi

# Mix in the api as class methods
extend PuppetX::Eos::EapiProviderMixin
extend PuppetX::NetDev::EosApi

def self.instances
result = node.api('tacacs').get
Expand Down
14 changes: 12 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aristanetworks-netdev_stdlib_eos",
"version": "0.2.0",
"author": "aristanetworks",
"version": "1.0.0",
"author": "Arista Networks, EOS+",
"summary": "NetDev Providers for Arista EOS",
"license": "BSD-3-Clause",
"source": "https://github.com/arista-eosplus/puppet-netdev",
Expand All @@ -17,6 +17,16 @@
"version_range": ">= 0.10.0"
}
],
"operatingsystem_support": [
{
"operatingsystem":"AristaEOS",
"operatingsystemrelease":[
"4.13.7+",
"4.14.x",
"4.15.x"
]
}
],
"tags": ["network", "netdev", "arista", "eos"]
}

5 changes: 5 additions & 0 deletions spec/fixtures/fixture_api_logging.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
:enable: true
:hosts:
- 1.2.3.4

File renamed without changes.
10 changes: 7 additions & 3 deletions spec/fixtures/fixture_eapi_radius_server_groups.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
---
- !ruby/sym name: RAD-SV1
:groups:
:RAD-SV1:
!ruby/sym type: "radius"
!ruby/sym servers:
- !ruby/sym hostname: "10.11.12.13"
!ruby/sym auth_port: "1024"
!ruby/sym acct_port: "2048"
- !ruby/sym hostname: "10.11.12.13"
!ruby/sym auth_port: 1812
!ruby/sym acct_port: "1814"
- !ruby/sym name: RAD-SV2
:RAD-SV2:
!ruby/sym type: "radius"
!ruby/sym servers:
- !ruby/sym hostname: "10.11.12.13"
!ruby/sym auth_port: "1024"
Expand All @@ -18,7 +21,8 @@
- !ruby/sym hostname: "10.11.12.14"
!ruby/sym auth_port: 1812
!ruby/sym acct_port: 1813
- !ruby/sym name: RAD-SV3
:RAD-SV3:
!ruby/sym type: "radius"
!ruby/sym servers:
- !ruby/sym hostname: "10.11.12.13"
!ruby/sym auth_port: "1024"
Expand Down
26 changes: 25 additions & 1 deletion spec/fixtures/fixture_eapi_radius_servers.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,49 @@
---
---
:global:
:timeout: 10
:retransmit: 10
:key_format: 7
:key: 044B0A151C36435C0D
:servers:
- !ruby/sym auth_port: 1812
!ruby/sym acct_port: 1813
!ruby/sym hostname: "10.11.12.13"
!ruby/sym key_format: 7
!ruby/sym key: "1513090F557878"
!ruby/sym timeout: 0
!ruby/sym retransmit: 0
!ruby/sym vrf:
- !ruby/sym auth_port: 1811
!ruby/sym acct_port: 1813
!ruby/sym hostname: "10.11.12.13"
!ruby/sym timeout: 0
!ruby/sym retransmit: 0
!ruby/sym vrf:
- !ruby/sym auth_port: 1811
!ruby/sym acct_port: 1814
!ruby/sym hostname: "10.11.12.13"
!ruby/sym timeout: 0
!ruby/sym retransmit: 0
!ruby/sym vrf:
- !ruby/sym auth_port: 1812
!ruby/sym acct_port: 1814
!ruby/sym hostname: "10.11.12.13"
!ruby/sym timeout: 0
!ruby/sym retransmit: 0
!ruby/sym vrf:
- !ruby/sym auth_port: 1024
!ruby/sym acct_port: 2048
!ruby/sym hostname: "10.11.12.13"
!ruby/sym timeout: 30
!ruby/sym retransmit_count: 5
!ruby/sym key_format: 7
!ruby/sym key: "011204070A5955"
!ruby/sym timeout: 0
!ruby/sym retransmit: 0
!ruby/sym vrf:
- !ruby/sym auth_port: 1812
!ruby/sym acct_port: 1813
!ruby/sym hostname: "10.11.12.14"
!ruby/sym timeout: 0
!ruby/sym retransmit: 0
!ruby/sym vrf:
79 changes: 79 additions & 0 deletions spec/fixtures/fixture_eapi_snmp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
---
:location: 'data center'
:contact: 'network operations'
:chassis_id: '1234567890'
:source_interface: 'Loopback0'
:communities:
:public:
:access: ro
:acl: foo
:notifications:
- :name: bgp arista-backward-transition
:state: default
- :name: bgp arista-established
:state: default
- :name: bgp backward-transition
:state: default
- :name: bgp established
:state: default
- :name: entity
:state: default
- :name: entity arista-ent-sensor-alarm
:state: default
- :name: entity ent-config-change
:state: default
- :name: entity ent-state-oper-disabled
:state: default
- :name: entity ent-state-oper-enabled
:state: default
- :name: lldp
:state: default
- :name: lldp rem-tables-change
:state: default
- :name: msdp
:state: default
- :name: msdp backward-transition
:state: default
- :name: msdp established
:state: default
- :name: ospf
:state: default
- :name: ospf if-auth-failure
:state: default
- :name: ospf if-config-error
:state: default
- :name: ospf if-state-change
:state: default
- :name: ospf nbr-state-change
:state: default
- :name: pim
:state: default
- :name: pim neighbor-loss
:state: default
- :name: snmp
:state: default
- :name: snmp authentication
:state: default
- :name: snmp link-down
:state: default
- :name: snmp link-up
:state: default
- :name: snmpConfigManEvent
:state: default
- :name: snmpConfigManEvent arista-config-man-event
:state: default
- :name: switchover
:state: default
- :name: switchover arista-redundancy-switch-over-notif
:state: default
- :name: test
:state: default
- :name: test arista-test-notification
:state: default
- :name: vrrp
:state: default
- :name: vrrp trap-new-master
:state: default
- :name: all
:state: default

6 changes: 0 additions & 6 deletions spec/fixtures/fixture_eapi_tacacs_getall_configured.yaml

This file was deleted.

10 changes: 7 additions & 3 deletions spec/fixtures/fixture_eapi_tacacs_server_groups.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
---
- !ruby/sym name: TAC-GR
:groups:
:TAC-GR:
!ruby/sym type: "tacacs+"
!ruby/sym servers:
- !ruby/sym hostname: "1.2.3.4"
!ruby/sym port: 4949
- !ruby/sym hostname: "1.2.3.5"
!ruby/sym port: 49
- !ruby/sym name: TAC-GR-EMPTY
:TAC-GR-EMPTY:
!ruby/sym type: "tacacs+"
!ruby/sym servers: []
- !ruby/sym name: TAC-GR2
:TAC-GR2:
!ruby/sym type: "tacacs+"
!ruby/sym servers:
- !ruby/sym hostname: "1.2.3.5"
!ruby/sym port: 50
47 changes: 28 additions & 19 deletions spec/fixtures/fixture_eapi_tacacs_servers.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
---
- !ruby/sym port: 4949
!ruby/sym hostname: "1.2.3.4"
!ruby/sym timeout: 6
!ruby/sym key_format: 7
!ruby/sym key: "06070D221D1C5A"
!ruby/sym multiplex: true
- !ruby/sym port: 49
!ruby/sym hostname: "1.2.3.4"
!ruby/sym timeout: 10
!ruby/sym multiplex: false
- !ruby/sym port: 49
!ruby/sym hostname: "1.2.3.5"
!ruby/sym timeout: 10
!ruby/sym multiplex: false
- !ruby/sym port: 50
!ruby/sym hostname: "1.2.3.5"
!ruby/sym timeout: 10
!ruby/sym multiplex: false
---
:global:
:timeout: 7
:key: 070E234F1F5B4A
:key_format: 7
:servers:
- :port: 4949
:vrf:
:hostname: "1.2.3.4"
:timeout: 6
:key_format: 7
:key: "06070D221D1C5A"
:multiplex: true
- :port: 49
:vrf:
:hostname: "1.2.3.4"
:timeout: 10
:multiplex: false
- :port: 49
:vrf:
:hostname: "1.2.3.5"
:timeout: 10
:multiplex: false
- :port: 50
:vrf:
:hostname: "1.2.3.5"
:timeout: 10
:multiplex: false
File renamed without changes.
2 changes: 1 addition & 1 deletion spec/unit/puppet/provider/domain_name/eos_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
def dns
dns = Fixtures[:dns]
return dns if dns
fixture('dns', dir: File.dirname(__FILE__))
fixture('dns')
end

# Stub the Api method class to obtain all vlans.
Expand Down
4 changes: 0 additions & 4 deletions spec/unit/puppet/provider/domain_name/fixture_dns.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion spec/unit/puppet/provider/name_server/eos_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
def dns
dns = Fixtures[:dns]
return dns if dns
fixture('dns', dir: File.dirname(__FILE__))
fixture('dns')
end

# Stub the Api method class to obtain all vlans.
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/puppet/provider/network_dns/eos_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
def dns
dns = Fixtures[:dns]
return dns if dns
fixture('dns', dir: File.dirname(__FILE__))
fixture('dns')
end

# Stub the Api method class to obtain all vlans.
Expand Down
4 changes: 0 additions & 4 deletions spec/unit/puppet/provider/network_dns/fixture_dns.yaml

This file was deleted.

Loading

0 comments on commit 00190e0

Please sign in to comment.