vagrant-junos 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb4dad728643a6fb389e6f0bd626829c58ca157
-  data.tar.gz: d9d7fbb07568e587c1741c2a58094228f70ee226
+  metadata.gz: f72d17a04c64856719508d00372f21a3c0aab8fa
+  data.tar.gz: c94681cd514bcdbacecf4d9ede3f64bd673864fa
 SHA512:
-  metadata.gz: 950a39dbe62ba0c2efd7d40e2d9d7a2a288513d5ba9fc9f0f584be449ca225ec505bdb26fbe8aefd8412c93cba38959b20c0578aeb9d35fdbcafb4b1e02efe33
-  data.tar.gz: b495e7fbdc6d71f60753f1c11c5b8e78e7d18fb75a776b9af59e8e20c224c826f33f8ca0ef1b3746d2262b320ee9f10398142aaed1f22aa68b66eb6a6ff5de2d
+  metadata.gz: 9569b8b166cc1873ee64cb6b237f92fd84f671c61de68f11d7db99cb1f1ce9dee7044f0c1ae0ec17ccd0ce9cea82d5f84e7fb4e3134590dcf188d2f9e2a2a785
+  data.tar.gz: a7e99c05261a0c9aa12a5ef93c809302722558cac2bc0e53ce8488472a25e90a111e55e23e477434b6e84d6a1a52d2bdd8d2b6843c533537b16ac91f4d293db5

data/.rubocop.yml

@@ -2,3 +2,5 @@ Style/FileName:
   Enabled: false
 Style/LineLength:
   Enabled: false
+Style/StringLiterals:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p481
+2.0.0-p576

data/.travis.yml

@@ -2,11 +2,19 @@ language: ruby
 
 rvm:
   - 1.9.3
-  - 2.1.1
-  - 2.1.2
+  - 2.0.0
+  - 2.1.3
+
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
 before_install:
-  - gem install bundler -v '1.5.3'
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq -y bsdtar
+  - rvm @global do gem uninstall bundler --all --executables
+  - gem uninstall bundler --all --executables
+  - gem install bundler --version '< 1.7.0'
 
 script: bundle exec rake build
 

data/Gemfile

@@ -9,4 +9,11 @@ group :plugins do
   gem 'vagrant-junos', path: '.'
 end
 
+group 'test' do
+  gem 'rake'
+  gem 'chefspec'
+  gem 'foodcritic'
+  gem 'rubocop'
+end
+
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # [Vagrant Junos Guest](https://github.com/JNPRAutomate/vagrant-junos)
 
-[![Build Status](https://travis-ci.org/JNPRAutomate/vagrant-junos.svg?branch=master)](https://travis-ci.org/JNPRAutomate/vagrant-junos)[![Gem Version](https://badge.fury.io/rb/vagrant-junos.svg)](http://badge.fury.io/rb/vagrant-junos)[![Dependency Status](https://gemnasium.com/JNPRAutomate/vagrant-junos.svg)](https://gemnasium.com/JNPRAutomate/vagrant-junos)
+[![Build Status](https://travis-ci.org/JNPRAutomate/vagrant-junos.svg?branch=master)](https://travis-ci.org/JNPRAutomate/vagrant-junos)[![Gem Version](https://badge.fury.io/rb/vagrant-junos.svg)](http://badge.fury.io/rb/vagrant-junos)[![Code Climate](https://codeclimate.com/github/JNPRAutomate/vagrant-junos/badges/gpa.svg)](https://codeclimate.com/github/JNPRAutomate/vagrant-junos)[![Dependency Status](https://gemnasium.com/JNPRAutomate/vagrant-junos.svg)](https://gemnasium.com/JNPRAutomate/vagrant-junos)
 
 
 

data/lib/vagrant-junos/cap/change_host_name.rb

@@ -1,30 +1,40 @@
 require 'tempfile'
-# require 'vagrant/util/template_renderer'
+require 'vagrant-junos/version'
+require 'vagrant/util/template_renderer'
 
 module VagrantPlugins
   module GuestJunos
     module Cap
       # host name change capability - needs to be Junos-aware
       class ChangeHostName
+        include Vagrant::Util
+
         def self.change_host_name(machine, name)
           machine.communicate.tap do |comm|
             unless comm.test("hostname | grep '^#{name}$'")
-              commands = <<-EOS
-configure
-set system host-name #{name}
-commit and-quit
-EOS
-              Tempfile.open('vagrant') do |temp|
-                temp.binmode
-                temp.write(commands)
-                temp.close
-                comm.upload(temp.path, '/mfs/tmp/set_hostname')
-              end
+
+              # render template, based on Vagrantfile, and upload
+              hostname_module = TemplateRenderer.render('guest/junos/hostname',
+                                                        name: name,
+                                                        template_root: "#{Dir.home}/.vagrant.d/gems/gems/vagrant-junos-#{VagrantPlugins::GuestJunos::VERSION}/templates")
+              upload(machine, hostname_module, '/mfs/tmp/set_hostname')
+
+              # set up us the Junos interfaces
               comm.execute('cli -f /mfs/tmp/set_hostname')
               comm.execute('rm /mfs/tmp/set_hostname')
             end
           end
         end
+
+        # Upload a file.
+        def self.upload(machine, content, remote_temp)
+          local_temp = Tempfile.new('vagrant-upload')
+          local_temp.binmode
+          local_temp.write(content)
+          local_temp.close
+          machine.communicate.upload(local_temp.path, "#{remote_temp}")
+          local_temp.delete
+        end
       end
     end
   end

data/lib/vagrant-junos/cap/configure_networks.rb

@@ -0,0 +1,52 @@
+require 'ipaddr'
+require 'tempfile'
+require 'vagrant-junos/version'
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module GuestJunos
+    module Cap
+      # Configure Junos network interfaces
+      module ConfigureNetworks
+        include Vagrant::Util
+
+        def self.configure_networks(machine, networks)
+          # set the prefix length
+          networks.each do |network|
+            network[:prefix_length] = (network[:netmask] && netmask_to_cidr(network[:netmask]))
+          end
+
+          # render template, based on Vagrantfile, and upload
+          network_module = TemplateRenderer.render('guest/junos/network',
+                                                   options: networks,
+                                                   template_root: "#{Dir.home}/.vagrant.d/gems/gems/vagrant-junos-#{VagrantPlugins::GuestJunos::VERSION}/templates")
+          upload(machine, network_module, '/mfs/tmp/network')
+          deploy(machine)
+        end
+
+        # Upload a file.
+        def self.upload(machine, content, remote_temp)
+          local_temp = Tempfile.new('vagrant-upload')
+          local_temp.binmode
+          local_temp.write(content)
+          local_temp.close
+          machine.communicate.upload(local_temp.path, "#{remote_temp}")
+          local_temp.delete
+        end
+
+        # set up us the Junos interfaces
+        def self.deploy(machine)
+          machine.communicate.tap do |comm|
+            comm.execute('cli -f /mfs/tmp/network')
+            # comm.execute('rm /mfs/tmp/network')
+          end
+        end
+
+        # convert vagrant dotted-decimal notation to cidr
+        def self.netmask_to_cidr(mask)
+          IPAddr.new(mask).to_i.to_s(2).count('1')
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-junos/cap/insert_public_key.rb

@@ -1,30 +1,41 @@
-require 'vagrant/util/shell_quote'
 require 'tempfile'
+require 'vagrant-junos/version'
+require 'vagrant/util/shell_quote'
+require 'vagrant/util/template_renderer'
 
 module VagrantPlugins
   module GuestJunos
     module Cap
       # change root's public key
       class InsertPublicKey
+        include Vagrant::Util
+
         def self.insert_public_key(machine, contents)
           contents = Vagrant::Util::Shellquote.escape(contents, "'")
           contents = contents.gsub("\n", "\\n")
 
+          # render public key junos conf template, based on Vagrantfile, and upload
+          public_key_module = TemplateRenderer.render('guest/junos/public_key',
+                                                      contents,
+                                                      template_root: "#{Dir.home}/.vagrant.d/gems/gems/vagrant-junos-#{VagrantPlugins::GuestJunos::VERSION}/templates")
+          upload(machine, public_key_module, '/mfs/tmp/set_public_Key')
+
+          # set up us root's public key
           machine.communicate.tap do |comm|
-            commands = <<-EOS
-configure
-set system root-password ssh-rsa "#{contents}"
-commit and-quit
-EOS
-            temp = Tempfile.new('vagrant')
-            temp.binmode
-            temp.write(commands)
-            temp.close
-            comm.upload(temp.path '/mfs/tmp/set_root_key')
-            comm.execute('cli -f /mfs/tmp/set_root_key')
-            comm.execute('rm /mfs/tmp/set_root_key')
+            comm.execute('cli -f /mfs/tmp/set_public_key')
+            comm.execute('rm /mfs/tmp/set_public_key')
           end
         end
+
+        # Upload a file.
+        def self.upload(machine, content, remote_temp)
+          local_temp = Tempfile.new('vagrant-upload')
+          local_temp.binmode
+          local_temp.write(content)
+          local_temp.close
+          machine.communicate.upload(local_temp.path, "#{remote_temp}")
+          local_temp.delete
+        end
       end
     end
   end

data/lib/vagrant-junos/plugin.rb

@@ -1,13 +1,13 @@
 begin
   require 'vagrant'
 rescue LoadError
-  raise 'The Vagrant Junos plugin must be run within Vagrant'
+  raise 'The vagrant-junos plugin must be run within Vagrant'
 end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
 if Vagrant::VERSION < '1.6.0'
-  fail 'The Vagrant Junos plugin is only compatible with Vagrant 1.6+'
+  fail 'The vagrant-junos plugin is only compatible with Vagrant 1.6+'
 end
 
 module VagrantPlugins
@@ -30,20 +30,20 @@ module VagrantPlugins
         Cap::ChangeHostName
       end
 
-      # guest_capability('junos', 'configure_networks') do
-      #   require_relative 'cap/configure_networks'
-      #   Cap::ConfigureNetworks
-      # end
+      guest_capability('junos', 'configure_networks') do
+        require_relative 'cap/configure_networks'
+        Cap::ConfigureNetworks
+      end
 
       guest_capability('junos', 'halt') do
         require_relative 'cap/halt'
         Cap::Halt
       end
 
-      # guest_capability('junos', 'insert_public_key') do
-      #   require_relative 'cap/insert_public_key'
-      #   Cap::InsertPublicKey
-      # end
+      guest_capability('junos', 'insert_public_key') do
+        require_relative 'cap/insert_public_key'
+        Cap::InsertPublicKey
+      end
     end
   end
 end

data/lib/vagrant-junos/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Junos guest gem + plugin version
   module GuestJunos
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/templates/guest/junos/hostname.erb

@@ -0,0 +1,3 @@
+configure
+set system host-name <%= name %>
+commit and-quit

data/templates/guest/junos/network.erb

@@ -0,0 +1,6 @@
+configure
+wildcard range delete interfaces ge-0/0/[1-9]
+<% options.each do |options| -%>
+set interfaces ge-0/0/<%= options[:interface].to_i %> unit 0 family inet address <%= options[:ip] %>/<%= options[:prefix_length] %>
+<% end -%>
+commit and-quit

data/templates/guest/junos/public_key.erb

@@ -0,0 +1,3 @@
+configure
+set system root-password ssh-rsa <%= contents %>
+commit and-quit

data/vagrant-junos.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '< 1.7.0', '>= 1.5.2'
+  spec.add_development_dependency 'bundler', '~> 1.6.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec-core', '~> 2.14'
   spec.add_development_dependency 'rspec-expectations', '~> 2.14'

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-junos
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Deatherage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,11 +97,15 @@ files:
 - Rakefile
 - lib/vagrant-junos.rb
 - lib/vagrant-junos/cap/change_host_name.rb
+- lib/vagrant-junos/cap/configure_networks.rb
 - lib/vagrant-junos/cap/halt.rb
 - lib/vagrant-junos/cap/insert_public_key.rb
 - lib/vagrant-junos/guest.rb
 - lib/vagrant-junos/plugin.rb
 - lib/vagrant-junos/version.rb
+- templates/guest/junos/hostname.erb
+- templates/guest/junos/network.erb
+- templates/guest/junos/public_key.erb
 - vagrant-junos.gemspec
 homepage: https://github.com/JNPRAutomate/vagrant-junos
 licenses:
@@ -129,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin for Junos guests, e.g. Firefly Perimeter