vagrant-guests-photon 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4c53f5252dcca41018c65180fdcd71c60a57ca
-  data.tar.gz: 41f24c6616adfccca687a5725efc1a3b8ca799d8
+  metadata.gz: 78a2f47f2f4da91108b4e1a202da0f3006f6f08b
+  data.tar.gz: 0085fd4d34bdda428f9129adc791b2af45dee6a6
 SHA512:
-  metadata.gz: b2bd905bcc1d184e23ad3cfee9ba9c4899637d3129fe3413383e9070b65c4cd80ae16e6db3a6b3d98f2a288a8b26e09fe4f0aaf062e479f82557de780f515428
-  data.tar.gz: faf4b0a58521adb7a4a9e1dca8c6d4884f6efb692f071b3b52839b2161ac901b89f41002bc04184f6d289932622ee930624c6f66f8206534c5a30c8954b8a6e9
+  metadata.gz: d628f32f1edb4319b9246090a1e1c7590b6188a1faab21bf83e9327779846424dfdabfcbea4c2e743ae6b0e91bbe56b0c8e69469e6c4d6ec5aa942d2b617e82f
+  data.tar.gz: 721336c56c357163a9ca5b7a05af9d31def65f32057561f2ec5ca127e1fe780c3fbebea760d7adcb89193f68658d99a21ecfc2926ff1ea39ca2570b1b4db2dd5

data/README.md

@@ -14,11 +14,11 @@ To build and install the plugin directly from this repo:
 
 ```
 $ rake build
-$ vagrant plugin install pkg/vagrant-guests-photon-1.0.0.gem
+$ vagrant plugin install pkg/vagrant-guests-photon-1.0.1.gem
 ```
 
 You can run RSpec with:
 
 ```
 $ rake
-```
+```

data/lib/vagrant-guests-photon/cap/configure_networks.rb

@@ -2,41 +2,80 @@
 # Copyright (c) 2015 VMware, Inc. All Rights Reserved.
 
 require 'tempfile'
-require 'vagrant/util/template_renderer'
+require 'ipaddr'
+require 'log4r'
+
+# Borrowed from http://stackoverflow.com/questions/1825928/netmask-to-cidr-in-ruby
+IPAddr.class_eval do
+  def to_cidr
+    self.to_i.to_s(2).count("1")
+  end
+end
+
+STATIC_NETWORK = <<EOF
+[Match]
+Name=%s
+
+[Network]
+Address=%s
+EOF
+
+DHCP_NETWORK = <<EOF
+[Match]
+Name=%s
+
+[Network]
+DHCP=yes
+EOF
 
 module VagrantPlugins
   module GuestPhoton
     module Cap
       class ConfigureNetworks
-        include Vagrant::Util
+        @@logger = Log4r::Logger.new("vagrant::guest::photon::configure_networks")
 
         def self.configure_networks(machine, networks)
           machine.communicate.tap do |comm|
+            comm.sudo("rm -f /etc/systemd/network/50-vagrant-*.network")
+
             # Read network interface names
             interfaces = []
-            comm.sudo("ifconfig | grep 'eth' | cut -f1 -d' '") do |_, result|
+            comm.sudo("ifconfig -a | grep '^eth' | cut -f1 -d' '") do |_, result|
               interfaces = result.split("\n")
             end
 
             # Configure interfaces
             networks.each do |network|
-              comm.sudo("ifconfig #{interfaces[network[:interface].to_i]} #{network[:ip]} netmask #{network[:netmask]}")
-            end
+              interface = network[:interface].to_i
+
+              iface = interfaces[interface]
+              if iface.nil?
+                @@logger.warn("Could not find match rule for network #{network.inspect}")
+                next
+              end
 
-            primary_machine_config = machine.env.active_machines.first
-            primary_machine = machine.env.machine(*primary_machine_config, true)
+              unit_name = "50-vagrant-%s.network" % [iface]
 
-            get_ip = lambda do |machine|
-              ip = nil
-              machine.config.vm.networks.each do |type, opts|
-                if type == :private_network && opts[:ip]
-                  ip = opts[:ip]
-                  break
-                end
+              if network[:type] == :static
+                cidr = IPAddr.new(network[:netmask]).to_cidr
+                address = "%s/%s" % [network[:ip], cidr]
+                unit_file = STATIC_NETWORK % [iface, address]
+              elsif network[:type] == :dhcp
+                unit_file = DHCP_NETWORK % [iface]
               end
 
-              ip
+              temp = Tempfile.new("vagrant")
+              temp.binmode
+              temp.write(unit_file)
+              temp.close
+
+              comm.upload(temp.path, "/tmp/#{unit_name}")
+              comm.sudo("mv /tmp/#{unit_name} /etc/systemd/network/")
+              comm.sudo("chown root:root /etc/systemd/network/#{unit_name}")
+              comm.sudo("chmod +r /etc/systemd/network/#{unit_name}")
             end
+
+            comm.sudo("systemctl restart systemd-networkd.service")
           end
         end
       end

data/lib/vagrant-guests-photon/version.rb

@@ -4,6 +4,6 @@
 module VagrantPlugins
   # Set version for vagrant-guests-photon gem.
   module GuestPhoton
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/cap/configure_networks_spec.rb

@@ -7,23 +7,171 @@ require 'spec_helper'
 describe VagrantPlugins::GuestPhoton::Cap::ConfigureNetworks do
   include_context 'machine'
 
-  it 'should configure networks' do
+  context 'configure 4 kinds of networks' do
     networks = [
-      { :type => :static, :ip => '192.168.10.10', :netmask => '255.255.255.0', :interface => 1, :name => 'eth0' },
-      { :type => :dhcp, :interface => 2, :name => 'eth1' },
-      { :type => :static, :ip => '10.168.10.10', :netmask => '255.255.0.0', :interface => 3, :name => 'docker0' }
+      # config.vm.network :private_network, ip: "192.168.33.10"
+      {
+        :type => :static,
+        :adapter_ip => '192.168.10.1',
+        :ip => '192.168.10.10',
+        :netmask => '255.255.255.0',
+        :auto_config => true,
+        :interface => 1
+      },
+      # config.vm.network :private_network, type: "dhcp"
+      {
+        :type => :dhcp,
+        :adapter_ip => "172.28.128.1",
+        :ip => "172.28.128.1",
+        :netmask => "255.255.255.0",
+        :auto_config => true,
+        :interface => 2
+      },
+      # config.vm.network :public_network, bridge: "en0: Wi-Fi (AirPort)"
+      {
+        :type => :dhcp,
+        :use_dhcp_assigned_default_route => false,
+        :auto_config => true,
+        :interface => 3
+      },
+      # config.vm.network :public_network, bridge: "en0: Wi-Fi (AirPort)", ip: "192.168.1.201"
+      {
+        :type=>:static,
+        :bridge => "en0: Wi-Fi (AirPort)",
+        :ip => "192.168.1.201",
+        :netmask => "255.255.255.0",
+        :use_dhcp_assigned_default_route => false,
+        :auto_config => true,
+        :interface => 4
+      }
     ]
-    communicate.should_receive(:sudo).with("ifconfig | grep 'eth' | cut -f1 -d' '")
-    communicate.should_receive(:sudo).with('ifconfig  192.168.10.10 netmask 255.255.255.0')
-    communicate.should_receive(:sudo).with('ifconfig   netmask ')
-    communicate.should_receive(:sudo).with('ifconfig  10.168.10.10 netmask 255.255.0.0')
-
-    allow_message_expectations_on_nil
-    machine.should_receive(:env).at_least(5).times
-    machine.env.should_receive(:active_machines).at_least(:twice)
-    machine.env.active_machines.should_receive(:first)
-    machine.env.should_receive(:machine)
-
-    described_class.configure_networks(machine, networks)
+
+    interfaces = "eth0\neth1\neth2\neth3\neth4\n"
+
+    before do
+      communicate.stub(:sudo).with("ifconfig -a | grep '^eth' | cut -f1 -d' '")
+        .and_yield(nil, interfaces)
+    end
+
+    it 'should configure networks' do
+      communicate.should_receive(:sudo).with("rm -f /etc/systemd/network/50-vagrant-*.network")
+      communicate.should_receive(:sudo).with("ifconfig -a | grep '^eth' | cut -f1 -d' '")
+
+      # eth1
+      communicate.should_receive(:upload) do |src, dst|
+        contents = (File.readlines src).join("")
+        contents.should eq "[Match]\nName=eth1\n\n[Network]\nAddress=192.168.10.10/24\n"
+        dst.should eq "/tmp/50-vagrant-eth1.network"
+      end
+      communicate.should_receive(:sudo)
+        .with("mv /tmp/50-vagrant-eth1.network /etc/systemd/network/")
+      communicate.should_receive(:sudo)
+        .with("chown root:root /etc/systemd/network/50-vagrant-eth1.network")
+      communicate.should_receive(:sudo)
+        .with("chmod +r /etc/systemd/network/50-vagrant-eth1.network")
+
+      # eth2
+      communicate.should_receive(:upload) do |src, dst|
+        contents = (File.readlines src).join("")
+        contents.should eq "[Match]\nName=eth2\n\n[Network]\nDHCP=yes\n"
+        dst.should eq "/tmp/50-vagrant-eth2.network"
+      end
+      communicate.should_receive(:sudo)
+        .with("mv /tmp/50-vagrant-eth2.network /etc/systemd/network/")
+      communicate.should_receive(:sudo)
+        .with("chown root:root /etc/systemd/network/50-vagrant-eth2.network")
+      communicate.should_receive(:sudo)
+        .with("chmod +r /etc/systemd/network/50-vagrant-eth2.network")
+
+      # eth3
+      communicate.should_receive(:upload) do |src, dst|
+        contents = (File.readlines src).join("")
+        contents.should eq "[Match]\nName=eth3\n\n[Network]\nDHCP=yes\n"
+        dst.should eq "/tmp/50-vagrant-eth3.network"
+      end
+      communicate.should_receive(:sudo)
+        .with("mv /tmp/50-vagrant-eth3.network /etc/systemd/network/")
+      communicate.should_receive(:sudo)
+        .with("chown root:root /etc/systemd/network/50-vagrant-eth3.network")
+      communicate.should_receive(:sudo)
+        .with("chmod +r /etc/systemd/network/50-vagrant-eth3.network")
+
+      # eth4
+      communicate.should_receive(:upload) do |src, dst|
+        contents = (File.readlines src).join("")
+        contents.should eq "[Match]\nName=eth4\n\n[Network]\nAddress=192.168.1.201/24\n"
+        dst.should eq "/tmp/50-vagrant-eth4.network"
+      end
+      communicate.should_receive(:sudo)
+        .with("mv /tmp/50-vagrant-eth4.network /etc/systemd/network/")
+      communicate.should_receive(:sudo)
+        .with("chown root:root /etc/systemd/network/50-vagrant-eth4.network")
+      communicate.should_receive(:sudo)
+        .with("chmod +r /etc/systemd/network/50-vagrant-eth4.network")
+
+      communicate.should_receive(:sudo).with("systemctl restart systemd-networkd.service")
+
+      described_class.configure_networks(machine, networks)
+    end
+  end
+
+  context 'configure 2 kinds of networks without eth2' do
+    networks = [
+      # config.vm.network :private_network, ip: "192.168.33.10"
+      {
+        :type => :static,
+        :adapter_ip => '192.168.10.1',
+        :ip => '192.168.10.10',
+        :netmask => '255.255.255.0',
+        :auto_config => true,
+        :interface => 1
+      },
+      # config.vm.network :private_network, type: "dhcp"
+      {
+        :type => :dhcp,
+        :adapter_ip => "172.28.128.1",
+        :ip => "172.28.128.1",
+        :netmask => "255.255.255.0",
+        :auto_config => true,
+        :interface => 2
+      }
+    ]
+
+    interfaces = "eth0\neth1\n"
+
+    before do
+      communicate.stub(:sudo).with("ifconfig -a | grep '^eth' | cut -f1 -d' '")
+        .and_yield(nil, interfaces)
+      @@logger = Log4r::Logger.new("vagrant::guest::photon::configure_networks") 
+    end
+
+    it 'should configure networks without eth2' do
+      communicate.should_receive(:sudo).with("rm -f /etc/systemd/network/50-vagrant-*.network")
+      communicate.should_receive(:sudo).with("ifconfig -a | grep '^eth' | cut -f1 -d' '")
+
+      # eth1
+      communicate.should_receive(:upload) do |src, dst|
+        contents = (File.readlines src).join("")
+        contents.should eq "[Match]\nName=eth1\n\n[Network]\nAddress=192.168.10.10/24\n"
+        dst.should eq "/tmp/50-vagrant-eth1.network"
+      end
+      communicate.should_receive(:sudo)
+        .with("mv /tmp/50-vagrant-eth1.network /etc/systemd/network/")
+      communicate.should_receive(:sudo)
+        .with("chown root:root /etc/systemd/network/50-vagrant-eth1.network")
+      communicate.should_receive(:sudo)
+        .with("chmod +r /etc/systemd/network/50-vagrant-eth1.network")
+
+      # eth2
+      @@logger.should_receive(:warn).with(
+        "Could not find match rule for network " +
+        "{:type=>:dhcp, :adapter_ip=>\"172.28.128.1\", :ip=>\"172.28.128.1\", " +
+        ":netmask=>\"255.255.255.0\", :auto_config=>true, :interface=>2}"
+      )
+
+      communicate.should_receive(:sudo).with("systemctl restart systemd-networkd.service")
+
+      described_class.configure_networks(machine, networks)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guests-photon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Fabio Rapposelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler