vagrant-junos 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3690c9bfb9fea7a58f1e55f8b5deba1bab84abde
-  data.tar.gz: acbb2731f09c4403bfc20d281c9b9376e57acda7
+  metadata.gz: 2e7491b0c4b2992dae7ade5f077601a535d1f6cc
+  data.tar.gz: 725e456d10915f66b61e001498f17e2eba9d35c2
 SHA512:
-  metadata.gz: 7b19eae76c4d1645d414140142e89a0be0fda06d1989bc39777b8ee5d40574eddf58dd805c7495c3e4ff74197eb1fa03662afc505d4033ed3f2674f7faaa2fda
-  data.tar.gz: 153c318ab24d73e2096bfdff7cb6c8dd8a22238aed233e082e34cc22cb92be1cf3f18afa67a2f47086d2c202cf8f7d7e65b1295ca3b02dee630780284d0e8d25
+  metadata.gz: f90b4f48a7edf6da19389c5597b4dbe9287ff4da25ed4fa45524871630ed52e13ff6d7cae14f909b40388e47f914d25368989fe1b97150076c183f88102b3858
+  data.tar.gz: cffa40c55024ccb1caeac2260f4866e2458ca1a3346b5e7e43cbc967edd6b8292581ea17216047c6bedb0568b15666943415945c19cc0a0a9937bd2d5af744b3

data/.gitignore

@@ -14,6 +14,7 @@
 mkmf.log
 *.gem
 .swp
+/.vagrant/
 
 # stupid Macs
 .DS_Store

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.3
+  - 2.1.5
 
 env:
   global:
@@ -16,7 +15,8 @@ before_install:
   - gem uninstall bundler --all --executables
   - gem install bundler --version '< 1.7.0'
 
-script: bundle exec rake build
+script:
+  - bundle exec rake build
 
 notifications:
   email:

data/README.md

@@ -13,19 +13,21 @@ This is a [Vagrant](http://www.vagrantup.com) 1.7+ plugin that adds a Junos gues
 * Detect [vSRX](http://www.juniper.net/us/en/products-services/security/srx-series/vsrx/) guest instances automatically, or via [Vagrantfile](https://docs.vagrantup.com/v2/vagrantfile/machine_settings.html).  The default boxes on [Juniper's Atlas site](http://atlas.hashicorp.com/Juniper) have `config.vm.guest` explicitly set to Junos.
 * Set the hostname via [Vagrantfile](https://docs.vagrantup.com/v2/vagrantfile/machine_settings.html) - `config.vm.hostname`
 * Support [Vagrantfile SSH settings](https://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html) -  `config.ssh.private_key_path`, etc.
-* Network configuration of ge-0/0/1.0 through ge-0/0/9.0
+* Network configuration of ge-0/0/1.0 through ge-0/0/9.0 (dhcp or static)
 * __TBD__: anything you request via [issues](https://github.com/JNPRAutomate/vagrant-junos/issues)
 
 
 ## Usage
 
-Install using standard Vagrant 1.6+ plugin installation methods.  The fastest way to get started is to use the standard Vagrant Cloud images:
+Install using standard Vagrant 1.7+ plugin installation methods.  The fastest way to get started is to use the standard Vagrant Cloud images:
 
 ```
 $ vagrant plugin install vagrant-junos
 ...
-$ vagrant up juniper/ffp-12.1X46-D20.5
+... (create a Vagrant environment in a directory):
+$ vagrant init juniper/ffp-12.1X46-D20.5
 ...
+$ vagrant up
 ```
 
 ## Quick Start
@@ -66,4 +68,4 @@ $ bundle exec vagrant up juniper/ffp-12.1X46-D20.5
 
 ## Notes
 
-> **NOTE:** post-bootstrap configuration in Vagrant will be carried out through the [vagrant-netconf](https://github.com/JNPRAutomate/vagrant-netconf) communicator plugin and [vagrant-jprovision](https://github.com/JNPRAutomate/vagrant-jprovision) provisioner plugin.  These may or may not be required in the premade boxes in the future.
+Other than installing this plugin, the next recommended step is to check out the boxes at [Juniper's Atlas site](http://atlas.hashicorp.com/Juniper).

data/Vagrantfile

@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# ge-0/0/0.0 defaults to NAT for SSH + management connectivity
+# over Vagrant's forwarded ports.  This should configure ge-0/0/1.0
+# through ge-0/0/7.0 on VirtualBox.
+
+######### WARNING: testing only! #########
+######### WARNING: testing only! #########
+######### WARNING: testing only! #########
+#
+# this Vagrantfile can and will wreak havoc on your VBox setup, so please
+# use the Vagrant boxes at https://atlas.hashicorp.com/juniper unless you're
+# attempting to extend this plugin (and can lose your VBox network config)
+# TODO: launch VMs from something other than travis to CI all features
+#
+# Note: VMware can't name interfaces, but also supports 10 interfaces
+# (through ge-0/0/9.0), so you should adjust accordingly to test
+#
+# Note: interface descriptions in Junos don't work yet, but you woud set them
+# here with 'description:'.
+
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "juniper/ffp-12.1X47-D15.4-packetmode"
+  config.vm.hostname = 'vagrant-junos-test'
+  config.vm.network "private_network",
+                    ip: "192.168.33.10",
+                    virtualbox__intnet: "teststatic"
+  config.vm.network "private_network",
+                    type: "dhcp",
+                    virtualbox__intnet: "testdhcp"
+  config.vm.network "private_network",
+                    ip: "192.168.34.10",
+                    virtualbox__intnet: "teststatic2"
+  config.vm.network "private_network",
+                    type: "dhcp",
+                    virtualbox__intnet: "testdhcp2"
+  config.vm.network "private_network",
+                    ip: "192.168.35.10",
+                    virtualbox__intnet: "teststatic3"
+  config.vm.network "private_network",
+                    type: "dhcp",
+                    virtualbox__intnet: "testdhcp3"
+  config.vm.network "private_network",
+                    ip: "192.168.36.10",
+                    virtualbox__intnet: "teststatic4"
+end

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

@@ -21,7 +21,6 @@ module VagrantPlugins
 
               # set up us the Junos interfaces
               comm.execute('cli -f /mfs/tmp/set_hostname')
-              comm.execute('rm /mfs/tmp/set_hostname')
             end
           end
         end

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

@@ -38,7 +38,6 @@ module VagrantPlugins
         def self.deploy(machine)
           machine.communicate.tap do |comm|
             comm.execute('cli -f /mfs/tmp/network')
-            comm.execute('rm /mfs/tmp/network')
           end
         end
 

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

@@ -35,7 +35,6 @@ module VagrantPlugins
           machine.communicate.upload(local_temp.path, "#{remote_temp}")
           local_temp.delete
         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.1.1'
+    VERSION = '0.2.0'
   end
 end

data/templates/guest/junos/network.erb

@@ -1,6 +1,10 @@
 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] %>
+  <% if options[:type].to_sym == :static -%>
+    set interfaces ge-0/0/<%= options[:interface].to_i %> unit 0 family inet address <%= options[:ip] %>/<%= options[:prefix_length] %>
+  <% elsif options[:type].to_sym == :dhcp -%>
+    set interfaces ge-0/0/<%= options[:interface].to_i %> unit 0 family inet dhcp
+  <% end -%>
 <% end -%>
 commit and-quit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-junos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - John Deatherage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - lib/vagrant-junos.rb
 - lib/vagrant-junos/cap/change_host_name.rb
 - lib/vagrant-junos/cap/configure_networks.rb