vagrant-haipa 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0fc2824da037b8d780af1d923852a08014c24964a8e5ac26964c869fe2352fe
-  data.tar.gz: fd3d7da66c342b5bcc0e59a858804b16c9703b65bfd88776d58e57c3cca9b3d8
+  metadata.gz: 8eee5308a57ce3061bb3126c80df2f0ab35f40dd1453a45a36fe7daa9d13f1df
+  data.tar.gz: dc43555a1ac9e7ebf63dd10351bc768a4ff4cd865075a05cc72987b2e3c45b4e
 SHA512:
-  metadata.gz: 28f888f6f201ab402aca8aaa5200cabfd24831cdd06c4f00015ae0785a2167c5b5894c19cb361f1004214ce394a04f8d3fe5a46e6dd03902848156dbf69d8981
-  data.tar.gz: 865d9dbd0f8537dc1d3d0375d214f1a967f2d1f051dae37aba408ea7b6ef8c6a8e5a4ebf9fbe30cacd5c37e6a5ccbb0fe8095a92f18bc3a1799c100e72875482
+  metadata.gz: 23555a3590f4d71b59e011444a7b568268e1f38ef7ea05d6d786b31028c492123c1b8b9f660926d931cce53bd696d724bf23d48cf3b621e02191c46c5d34235b
+  data.tar.gz: 746251a86a253fcaf627a6ff3981869a7528426f288bf7016aeb2daf03bf89244534bbebe2a0f0712399f41faee7965c5742e414ee353c6418dff4a3611d0f8f

data/lib/vagrant-haipa/action.rb

@@ -10,7 +10,6 @@ module VagrantPlugins
           b.use Call, IsCreated do |env, b2|
 
             if !env[:result]
-              b2.use SetName     
               b2.use ConvergeMachine 
             end
           end
@@ -165,7 +164,6 @@ module VagrantPlugins
       autoload :ReadState, action_root.join('read_state')
       autoload :IsCreated, action_root.join('is_created')
       autoload :IsRunning, action_root.join('is_running')
-      autoload :SetName, action_root.join('set_name')
       autoload :ConvergeMachine, action_root.join('converge_machine')
       autoload :DeleteMachine, action_root.join('delete_machine')
       autoload :StartMachine, action_root.join('start_machine')      

data/lib/vagrant-haipa/action/converge_machine.rb

@@ -9,26 +9,23 @@ module VagrantPlugins
           @logger = Log4r::Logger.new('vagrant::haipa::converge_machine')
         end
 
-        def call(env)
+        def call(env)        
 
-          name = env[:generated_name]
-          unless @machine.id.nil?
-            haipa_machine = @machine.provider.driver.machine
-            name = haipa_machine.name
+          # terminate only if machine has been created by this action
+          if @machine.id.nil?
+            env[:converge_cleanup] = true
           end
-          
-          operation_result = @machine.provider.driver.converge(env, name)                  
+
+          operation_result = @machine.provider.driver.converge(env)                  
           @machine.id = operation_result.machine_guid if @machine.id.nil?
           
 
           @app.call(env)
         end
 
-        # Both the recover and terminate are stolen almost verbatim from
-        # the Vagrant AWS provider up action
         def recover(env)
           return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
-          terminate(env) if @machine.state.id != :not_created
+          terminate(env) if @machine.state.id != :not_created && env[:converge_cleanup] == true
         end
 
         def terminate(env)

data/lib/vagrant-haipa/driver.rb

@@ -1,4 +1,5 @@
 require 'haipa_compute'
+require 'time'
 
 module VagrantPlugins
   module Haipa
@@ -9,6 +10,8 @@ module VagrantPlugins
 
       def initialize(machine)
         @machine = machine
+        @logger = Log4r::Logger.new('vagrant::haipa::driver')
+ 
       end
 
       # @return [::Haipa::Client::Compute::ApiConfiguration] Haipa Compute API
@@ -50,24 +53,31 @@ module VagrantPlugins
         haipa_machine.status
       end
       
-      def machine_by_name(name)
-        haipa_machine_list = compute_api.client.machines.list(:filter=>"name eq '#{name}'")
-        haipa_machine_list.value.first
-      end
-
       def machine(expand = nil)
         compute_api.client.machines.get(@machine.id, :expand => expand)
       end
 
-      def converge(env, name)
+      def machine_name
+        unless @machine.provider_config.name.nil?
+          @machine.provider_config.name
+        else
+          @machine.name
+        end        
+      end
+
+      def converge(env)
 
         machine_config_hash = {
-          'name' => name,                           
-          'vm' => @machine.provider_config.vm_config,
-          "provisioning" => @machine.provider_config.provision   
+          :name => machine_name, 
+          :id =>  @machine.id,                         
+          :vm => @machine.provider_config.vm_config,
+          :provisioning => @machine.provider_config.provision   
         }
 
-        machine_config = compute_api.deserialize(:MachineConfig, machine_config_hash)
+        # this will convert all symbols to strings as required by deserialize
+        machine_config_string_hash = JSON.parse(machine_config_hash.to_json)
+        
+        machine_config = compute_api.deserialize(:MachineConfig, machine_config_string_hash)
         operation = compute_api.client.machines.update_or_create(:config => machine_config)
 
         wait_for_operation(env,operation) 
@@ -91,7 +101,7 @@ module VagrantPlugins
       protected
 
       def wait_for_operation(env,operation)
-        timestamp = '2018-09-01T23:47:17.50094+02:00'
+        timestamp = DateTime.parse('2018-09-01T23:47:17.50094+02:00')
 
         operation_error = nil
         
@@ -114,13 +124,19 @@ module VagrantPlugins
             next if env[:interrupted]
 
             # check action status
-            result = compute_api.client.operations.get(operation.id, :expand => "LogEntries($filter=Timestamp gt #{timestamp})")
+            result = compute_api.client.operations.get(operation.id, :expand => "LogEntries($filter=Timestamp gt #{timestamp.iso8601})")
 
             result.log_entries.each do |entry|
-              env[:ui].info(entry.message)
-              timestamp = entry.timestamp
+              if timestamp < entry.timestamp     
+                env[:ui].info(entry.message) 
+                timestamp = entry.timestamp
+
+                # randomized delay for smoother output
+                delay = rand(4) * 0.2
+                sleep delay
+              end
             end
-          
+
             yield result if block_given?
 
             raise 'Operation not completed' if result.status == 'Running'
@@ -130,6 +146,13 @@ module VagrantPlugins
 
         raise "Operation failed: #{result.status_message}" if result.status == 'Failed'   
         
+        #write latest log entries
+        result = compute_api.client.operations.get(operation.id, :expand => "LogEntries($filter=Timestamp gt #{timestamp.iso8601})")
+        result.log_entries.each do |entry|
+          env[:ui].info(entry.message) if timestamp < entry.timestamp     
+          timestamp = entry.timestamp if timestamp < entry.timestamp
+        end
+
         #refresh operation result
         compute_api.client.operations.get(operation.id)
       end

data/lib/vagrant-haipa/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Haipa
-    VERSION = '0.2.2'
+    VERSION = '0.3.1'
   end
 end

data/test/Vagrantfile

@@ -2,9 +2,9 @@ REQUIRED_PLUGINS = %w(vagrant-haipa)
 
 Vagrant.configure('2') do |config|
 
-  config.ssh.username = 'ubuntu'
-  config.ssh.password = 'ubuntu'
-
+ # config.ssh.username = 'ubuntu'
+ # config.ssh.password = 'ubuntu'
+  
   config.vm.synced_folder ".", "/vagrant", disabled: true
  
   #config.vm.provision :shell, :path => 'scripts/provision.sh'
@@ -18,15 +18,15 @@ Vagrant.configure('2') do |config|
       provider.client_key_file = 'console.key'
       provider.identity_endpoint = 'https://localhost:62189/identity'
       provider.api_endpoint = 'https://localhost:62189/api'
-
       provider.vm_config = {
-         'memory' => {
-          'startup' => 2048
+        'memory' => {
+          'startup' => 2096
         },
-        'disks' => [
+        'drives' => [
           {
-            'template' => 'T:\openstack\ubuntu-xenial.vhdx',
-            'size' => 20
+            'name' => 'sda',
+            'template' => 'C:\Users\fwagner\.vagrant.d\boxes\bento-VAGRANTSLASH-ubuntu-16.04\201812.27.0\hyperv\Virtual Hard Disks\ubuntu-16.04-amd64.vhdx',
+            'size' => 40
           }
         ],  
         'networkAdapters' => [
@@ -38,9 +38,10 @@ Vagrant.configure('2') do |config|
       }
 
       provider.provision = {
+        'method' => 'none',
         'hostname' => 'basic',
         'userData' => {
-          "package_upgrade": true,
+          "package_upgrade": false,
           "chpasswd" => {
             "expire": false
             },

data/test/console.key

@@ -1,27 +1,27 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAw+q1IZy3iYRsjzZuitP4+2UYVY+AO/OZq5/O5erlseayss7g
-zomY2NIg/kYKcrJkUZ04Y9RknWLHEw9iHGIxEMIChdaJTlM0IYgaVToWKZeWi2+h
-yogPzAYziL/+fG0r6GnEvI7AHztsZUbZe7PcXL/NP0ZIamsMzXSAEt1Y8Fi50reV
-XkNO9h60oI79crOIH+bcfgIpRYMkHcxrAFGBkfFMcIjup/G4GPEpKl7pbeTHm87u
-3QwQivIlYCX/fkdmggLcWaOpA4GtkLOzWgjekIulj1pGymbCsdOd48Pnp/+zWttA
-SxVLMq6egGXya/I8mQcAMBx4tm5HiMi/dXNS1QIDAQABAoIBAE9TsZOyiP49iFdU
-it3bhm0EOh4qxJmBwS8kvfmKawblimWsLopyXFkue/15DrHyWXxSVIrXbQXtAP5O
-tEMZ3xQR+kOG4oG8XtdU7JSluGOO5X3/7Vq8TOkneaZdVwW6jpTEfsx6YIBE51b6
-oQTdhtRnNQvxwVCVl9F44oLA7UojbX1PbSbW4OO5X+ZX0Xgk3U39MUjdza4jyggx
-Dyp+QWk8sN/6Xn0E5DM97c+y2xsLlekFckWTUp7ECb0iTZ35SuHxe3n9xAOclXBI
-CQ8VZZxKqRwh8guB6OFxrE9jjVCxSg11hnXbHte9iJYb4sCAI4I+jNJFprLhEmSs
-cvtjkuECgYEA3ptQTys9IAv6H9WNZ49TBQqzL1Y+rNm8k1zkxo6G1z/47FtPSjmU
-0SRdeJYjRWiM8k5WE8mMl5qqhonFoDq9ILF/70GgKnaI62P8vF4meAWW6dERY//P
-JyquYJBX+oQjPVStWrSihD5/yjhhciy78BFQLPbfc7Hp8XJxS8MLzPsCgYEA4U5u
-qNmJKECPg+TJUw1gxKggAMINNIezMSsmPXRdCN5MZugfL1uTdJN3Wu8kdc+3hmHQ
-k1k2iYMCJ718cD2H3zanOYs6iqeD5o5K00JJKBbgnWyGB1I7uSHJMAp9Ur4nX+LV
-8/zFd4KI0Nmv1AUlb3gG8e680TnZabZX11Xhtm8CgYAJD/GZB32ZjGNGYH89NAyB
-LApXZv9uMf8HUMTPgIXkxWnw1VbJAscYLI7RleshrDvwsVe3voDGuzkt+PXerAV/
-CzrWFqnakLDKRGvJj1upjzCxnB1FIOjiA07OB5JNVIvKt2PHSYtELvcs2Fa/Oyr7
-fvjwm6xFHX0Uo0ARgYM9eQKBgBecdJRVV75UJbYYv9BoUn/JbrElpOSgY/L/Jp7C
-Fw3a3f7azInV+vn4ikWJUjTWc9EtZwJKEyEODafEf8nzaM3HmHa7VIM7UuNSfhzt
-kWUWIKvet50EzSV1mPPj5YZKTy4JQ4qyLq97ioL4jSiW8XlhBrlL35W9jj850LLM
-WT8ZAoGAU4omGMECa9CNU9QoZvNuXpUju823Euja2Lg2AE7XGNBxqA8dmL5czuXR
-gEEZ740uPRplAj3SPWoBHT/Gzo44NUCJFuouHu0CBaTUssir1E/TnS9wQI694eRg
-hoqMWWCMQ2+rE7bONY60PaB4Y6mAY9SMS9r2QAI8sipuwraj5l8=
------END RSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAw+q1IZy3iYRsjzZuitP4+2UYVY+AO/OZq5/O5erlseayss7g
+zomY2NIg/kYKcrJkUZ04Y9RknWLHEw9iHGIxEMIChdaJTlM0IYgaVToWKZeWi2+h
+yogPzAYziL/+fG0r6GnEvI7AHztsZUbZe7PcXL/NP0ZIamsMzXSAEt1Y8Fi50reV
+XkNO9h60oI79crOIH+bcfgIpRYMkHcxrAFGBkfFMcIjup/G4GPEpKl7pbeTHm87u
+3QwQivIlYCX/fkdmggLcWaOpA4GtkLOzWgjekIulj1pGymbCsdOd48Pnp/+zWttA
+SxVLMq6egGXya/I8mQcAMBx4tm5HiMi/dXNS1QIDAQABAoIBAE9TsZOyiP49iFdU
+it3bhm0EOh4qxJmBwS8kvfmKawblimWsLopyXFkue/15DrHyWXxSVIrXbQXtAP5O
+tEMZ3xQR+kOG4oG8XtdU7JSluGOO5X3/7Vq8TOkneaZdVwW6jpTEfsx6YIBE51b6
+oQTdhtRnNQvxwVCVl9F44oLA7UojbX1PbSbW4OO5X+ZX0Xgk3U39MUjdza4jyggx
+Dyp+QWk8sN/6Xn0E5DM97c+y2xsLlekFckWTUp7ECb0iTZ35SuHxe3n9xAOclXBI
+CQ8VZZxKqRwh8guB6OFxrE9jjVCxSg11hnXbHte9iJYb4sCAI4I+jNJFprLhEmSs
+cvtjkuECgYEA3ptQTys9IAv6H9WNZ49TBQqzL1Y+rNm8k1zkxo6G1z/47FtPSjmU
+0SRdeJYjRWiM8k5WE8mMl5qqhonFoDq9ILF/70GgKnaI62P8vF4meAWW6dERY//P
+JyquYJBX+oQjPVStWrSihD5/yjhhciy78BFQLPbfc7Hp8XJxS8MLzPsCgYEA4U5u
+qNmJKECPg+TJUw1gxKggAMINNIezMSsmPXRdCN5MZugfL1uTdJN3Wu8kdc+3hmHQ
+k1k2iYMCJ718cD2H3zanOYs6iqeD5o5K00JJKBbgnWyGB1I7uSHJMAp9Ur4nX+LV
+8/zFd4KI0Nmv1AUlb3gG8e680TnZabZX11Xhtm8CgYAJD/GZB32ZjGNGYH89NAyB
+LApXZv9uMf8HUMTPgIXkxWnw1VbJAscYLI7RleshrDvwsVe3voDGuzkt+PXerAV/
+CzrWFqnakLDKRGvJj1upjzCxnB1FIOjiA07OB5JNVIvKt2PHSYtELvcs2Fa/Oyr7
+fvjwm6xFHX0Uo0ARgYM9eQKBgBecdJRVV75UJbYYv9BoUn/JbrElpOSgY/L/Jp7C
+Fw3a3f7azInV+vn4ikWJUjTWc9EtZwJKEyEODafEf8nzaM3HmHa7VIM7UuNSfhzt
+kWUWIKvet50EzSV1mPPj5YZKTy4JQ4qyLq97ioL4jSiW8XlhBrlL35W9jj850LLM
+WT8ZAoGAU4omGMECa9CNU9QoZvNuXpUju823Euja2Lg2AE7XGNBxqA8dmL5czuXR
+gEEZ740uPRplAj3SPWoBHT/Gzo44NUCJFuouHu0CBaTUssir1E/TnS9wQI694eRg
+hoqMWWCMQ2+rE7bONY60PaB4Y6mAY9SMS9r2QAI8sipuwraj5l8=
+-----END RSA PRIVATE KEY-----

data/vagrant

@@ -1,27 +1,27 @@
-#!C:/Users/vagrant/AppData/Local/Temp/hecdnuu3.bee/embedded/mingw64/bin/ruby.exe
-#
-# This file was generated by RubyGems.
-#
-# The application 'vagrant' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'rubygems'
-
-version = ">= 0.a"
-
-if ARGV.first
-  str = ARGV.first
-  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
-    version = $1
-    ARGV.shift
-  end
-end
-
-if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('vagrant', 'vagrant', version)
-else
-gem "vagrant", version
-load Gem.bin_path("vagrant", "vagrant", version)
-end
+#!C:/Users/vagrant/AppData/Local/Temp/hecdnuu3.bee/embedded/mingw64/bin/ruby.exe
+#
+# This file was generated by RubyGems.
+#
+# The application 'vagrant' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
+    version = $1
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('vagrant', 'vagrant', version)
+else
+gem "vagrant", version
+load Gem.bin_path("vagrant", "vagrant", version)
+end

data/vagrant-haipa.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "log4r"
-  gem.add_dependency "haipa_compute", ">= 0.0.3"
+  gem.add_dependency "haipa_compute", ">= 0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-haipa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Haipa contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.2.2
 description: Enables Vagrant to manage Hyper-V with Haipa
 email:
 - package-maintainers@haipa.io
@@ -63,7 +63,6 @@ files:
 - lib/vagrant-haipa/action/message_not_created.rb
 - lib/vagrant-haipa/action/message_will_not_destroy.rb
 - lib/vagrant-haipa/action/read_state.rb
-- lib/vagrant-haipa/action/set_name.rb
 - lib/vagrant-haipa/action/start_machine.rb
 - lib/vagrant-haipa/action/stop_machine.rb
 - lib/vagrant-haipa/action/wait_for_ip_address.rb

data/lib/vagrant-haipa/action/set_name.rb

@@ -1,50 +0,0 @@
-require 'vagrant-haipa'
-
-module VagrantPlugins
-  module Haipa
-    module Action
-      class SetName
-         def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @logger = Log4r::Logger.new('vagrant::haipa::set_name')
-        end
-
-        def call(env)
-          name = @machine.provider_config.name
-
-          # If we already set the name before, then don't do anything
-          sentinel = @machine.data_dir.join("action_set_name")
-          if !name && sentinel.file?
-            @logger.info("Default name was already set before, not doing it again.")
-            return @app.call(env)
-          end
-
-          # If no name was manually set, then use a default
-          if !name
-            prefix = "#{env[:root_path].basename.to_s}_#{@machine.name}"
-            prefix.gsub!(/[^-a-z0-9_]/i, "")
-
-            # milliseconds + random number suffix to allow for simultaneous
-            # `vagrant up` of the same box in different dirs
-            name = prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
-          end
-
-          # Verify the name is not taken
-          haipa_machine =  @machine.provider.driver.machine_by_name(name)
-          raise Vagrant::Errors::VMNameExists, name: name if haipa_machine
-          
-          env[:generated_name] = name
-          # Create the sentinel
-          sentinel.open("w") do |f|
-            f.write(Time.now.to_i.to_s)
-          end
-          
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
-
-