vagrant-kvm 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79770b8d1889daab867e796d16fe319c0c0eca24
-  data.tar.gz: db7ef74f5ec15c7fa3c931a4a54723bc890742b7
+  metadata.gz: fa4f4087c77fcb876af64a5f594b085f7f3917b3
+  data.tar.gz: 07bd965570032c753a326c1d82d859c441495b4f
 SHA512:
-  metadata.gz: 72729349c6a2aa2c1b529cbb49c4c1ffcf89e6533eacb5e668e539ac8c974d35b22c2cba0ee1916f2b7bee57e2b93efd57757c04f4aaf7e5f77e64ec7bd86d5b
-  data.tar.gz: fbec7423931ee5a19a2d09501eb1c7cd42b1bf50f3ceabfbd7049c40b2f1dd0aa45c771018e894b181a44fe4668cea0a16cc4a83c294c83825dd0ee0e7e81011
+  metadata.gz: 3f3e0c5026f39cab4d2086e5e0adf0bd4e5a06148a323d63d050d178c6159012f573ed0d0eda56a5cc8cbb8af57e21dbd0f34a95b8ee7ae5b3a5d529f7dcd59b
+  data.tar.gz: ae9fd175eddc447e2d4c1586915b1573a2042aaf2e82f9ef18937db011176ad757590909c0cdd252dabe08658f53db55b73824b07bcd6bd5efa0e4579d0f62f6

data/lib/vagrant-kvm/action.rb

@@ -258,7 +258,7 @@ module VagrantPlugins
               # XXX there must be a better way
               b2.use InitStoragePool
               b2.use Import
-              b2.use MatchMACAddress
+              b2.use NewMACAddress
               b2.use Network
             end
           end
@@ -286,7 +286,7 @@ module VagrantPlugins
       autoload :IsPaused, action_root.join("is_paused")
       autoload :IsRunning, action_root.join("is_running")
       autoload :IsSaved, action_root.join("is_saved")
-      autoload :MatchMACAddress, action_root.join("match_mac_address")
+      autoload :NewMACAddress, action_root.join("new_mac_address")
       autoload :MessageNotCreated, action_root.join("message_not_created")
       autoload :MessageNotRunning, action_root.join("message_not_running")
       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")

data/lib/vagrant-kvm/action/network.rb

@@ -140,15 +140,6 @@ module VagrantPlugins
           options
         end
 
-        def random_mac
-          rng = Random.new(Time.now.to_i)
-          mac = [0x00, 0x16, 0x3e,
-                rng.rand(128),
-                rng.rand(256),
-                rng.rand(256)]
-          mac.map {|x| "%02x" % x}.join(":")
-        end
-
         def format_mac(mac)
           return nil unless mac
           if mac.length == 12

data/lib/vagrant-kvm/action/new_mac_address.rb

@@ -0,0 +1,28 @@
+module VagrantPlugins
+  module ProviderKvm
+    module Action
+      class NewMACAddress
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          # Generate a new mac address for the vm
+          env[:ui].info I18n.t("vagrant_kvm.new_mac_address")
+          env[:machine].provider.driver.set_mac_address(random_mac)
+
+          @app.call(env)
+        end
+
+        def random_mac
+          rng = Random.new(Time.now.to_i)
+          mac = [0x52, 0x54, 0x00, # KVM Vendor prefix
+                rng.rand(128),
+                rng.rand(256),
+                rng.rand(256)]
+          mac.map {|x| "%02x" % x}.join(":")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-kvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderKvm
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

data/locales/en.yml

@@ -6,6 +6,8 @@ en:
       Change directory %{directory} permission from %{old_mode} to %{new_mode}.
     kvm_spool_problem_inform: |-
       Your vagrant-kvm environment should be fixed. see README.
+    new_mac_address: |-
+      Assigning a new mac address to the VM.
     errors:
       kvm_no_connection: |-
         Cannot connect to KVM through Libvirt. Please check kernel module

data/locales/ja.yml

@@ -2,8 +2,12 @@ en:
   vagrant_kvm:
     test_message: |-
       これはテストメッセージです。
+    repair_permission: |-
+      Change directory %{directory} permission from %{old_mode} to %{new_mode}.
     kvm_spool_problem_inform: |-
       このVagrant-kvm環境は修正の必要があります。READMEを確認してください。
+    new_mac_address: |-
+      Assigning a new mac address to the VM.
     errors:
       kvm_no_connection: |-
         KVMにLibvirt経由で接続できません。カーネルモジュールの

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-kvm
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Alex Drahon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-libvirt
@@ -176,6 +176,7 @@ files:
 - lib/vagrant-kvm/action/prepare_kvmconfig.rb
 - lib/vagrant-kvm/action/check_running.rb
 - lib/vagrant-kvm/action/check_kvm.rb
+- lib/vagrant-kvm/action/new_mac_address.rb
 - lib/vagrant-kvm/action/is_saved.rb
 - lib/vagrant-kvm/action/is_running.rb
 - lib/vagrant-kvm/action/message_not_created.rb