vagrant-cloudstack 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d080a68ae597bf9a88abb59566e3fe84e1cb4eb018a4139ec7a7c968f7ef9f88
-  data.tar.gz: 5b6e37340002a87d34c63c319f6e2d70d700f2af6bd074ed20b8c222c5023aa6
+  metadata.gz: 6019985a53dd946fc187fd0848a6d6100a2e1bffba735bce3763c8cde13b1140
+  data.tar.gz: 2202f98c83ac5933ae16c69ea1b0b2e8265d43411db468888600f199f8dc5b78
 SHA512:
-  metadata.gz: 6baa746f63b7cda0063e46c41182fab7989f3fe38b30cf7dc534db33f741ff43f0981797f20fe98e83f98d0a823f3643947f7d7d29f3b6100ff33d8541874a1d
-  data.tar.gz: '08d800fed8637887827040c62dbabbea9f860107099a37614d34e4a40c2af15a18423740074b91bc87b97b9d8199289960e8a14efb1058634779ea09de749d93'
+  metadata.gz: ae5196531d1dc40f27dd1d81e6d33112d52b2f3ab38f9ef5067be7f08f842f37d6ea4e62ab73b5dccc6b03978594a38472ef32a800408d58e246a5fde3b919c6
+  data.tar.gz: 39679ffd0a1797297626a5969512e015bd0d471a7aa466e3027bdb9b60759f4ab6a8cbaa9b725fa9b2efcfc1ba3be73e222dc1f19d70149c15a1c6ba3655c4a7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.5.2 (02 Oct 2019)
+
+Fixed bugs:
+
+- `store_passwd` would sometimes try to lookup an async job status without including the job id causing an exception being raised [\#187](https://github.com/MissionCriticalCloud/vagrant-cloudstack/issues/187)
+
 # 1.5.1 (18 Apr 2019)
 
 **Implemented enhancements:**

data/Gemfile.lock

@@ -24,7 +24,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-cloudstack (1.5.1)
+    vagrant-cloudstack (1.5.2)
       fog (>= 1.32.0)
       fog-xml (>= 0.1.2)
 
@@ -49,7 +49,7 @@ GEM
     docile (1.3.0)
     dry-inflector (0.1.2)
     erubis (2.7.0)
-    excon (0.64.0)
+    excon (0.67.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.23)
@@ -90,7 +90,7 @@ GEM
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       json (~> 2.0)
-    fog-aliyun (0.3.3)
+    fog-aliyun (0.3.4)
       fog-core
       fog-json
       ipaddress (~> 0.8)
@@ -198,7 +198,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (3.0.0)
+    fog-vsphere (3.2.0)
       fog-core
       rbvmomi (>= 1.9, < 3)
     fog-xenserver (1.0.0)
@@ -233,7 +233,7 @@ GEM
     i18n (0.8.0)
     ipaddress (0.8.3)
     json (2.1.0)
-    jwt (2.1.0)
+    jwt (2.2.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -249,25 +249,25 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.4.0)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
-    nokogiri (1.10.2)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nori (2.6.0)
     optimist (3.0.0)
-    os (1.0.0)
-    public_suffix (3.0.3)
+    os (1.0.1)
+    public_suffix (3.1.1)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
-    rbvmomi (2.1.1)
+    rbvmomi (2.2.0)
       builder (~> 3.0)
       json (>= 1.8)
       nokogiri (~> 1.5)

data/lib/vagrant-cloudstack/action/run_instance.rb

@@ -253,6 +253,7 @@ module VagrantPlugins
             options = compose_server_creation_options
 
             @server = @env[:cloudstack_compute].servers.create(options)
+            @server_job_id = @server.job_id
           rescue Fog::Compute::Cloudstack::NotFound => e
             # Invalid subnet doesn't have its own error so we catch and
             # check the error message here.
@@ -759,14 +760,14 @@ module VagrantPlugins
         def store_password
           password = nil
           if @server.password_enabled and @server.respond_to?('job_id')
-            server_job_result = @env[:cloudstack_compute].query_async_job_result({:jobid => @server.job_id})
+            server_job_result = @env[:cloudstack_compute].query_async_job_result({:jobid => @server_job_id})
             if server_job_result.nil?
               @env[:ui].warn(' -- Failed to retrieve job_result for retrieving the password')
               return
             end
 
             while true
-              server_job_result = @env[:cloudstack_compute].query_async_job_result({:jobid => @server.job_id})
+              server_job_result = @env[:cloudstack_compute].query_async_job_result({:jobid => @server_job_id})
               if server_job_result['queryasyncjobresultresponse']['jobstatus'] != 0
                 password = server_job_result['queryasyncjobresultresponse']['jobresult']['virtualmachine']['password']
                 break

data/lib/vagrant-cloudstack/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cloudstack
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
 end

data/spec/vagrant-cloudstack/action/run_instance_spec.rb

@@ -260,13 +260,14 @@ describe VagrantPlugins::Cloudstack::Action::RunInstance do
 
       allow(machine).to receive(:provider_config).and_return(provider_config)
       expect(server).to receive(:wait_for).and_return(ready = true)
+      allow(server).to receive(:job_id).and_return(JOB_ID)
       allow(server).to receive(:password_enabled).and_return(false)
       expect(cloudstack_compute).to receive(:servers).and_return(servers)
-      allow(cloudstack_compute).to receive(:send).with(:list_zones, available: true).and_return(list_zones_response)
-      allow(cloudstack_compute).to receive(:send).with(:list_service_offerings, listall: true)
+      allow(cloudstack_compute).to receive(:send).with(:list_zones, available: true, name: ZONE_NAME).and_return(list_zones_response)
+      allow(cloudstack_compute).to receive(:send).with(:list_service_offerings, listall: true, name: SERVICE_OFFERING_NAME)
         .and_return(list_service_offerings_response)
       allow(cloudstack_compute).to receive(:send)
-        .with(:list_templates, zoneid: ZONE_ID, templatefilter: 'executable', listall: true)
+        .with(:list_templates, zoneid: ZONE_ID, templatefilter: 'executable', listall: true, name: TEMPLATE_NAME)
         .and_return(list_templates_response)
       allow(cloudstack_compute).to receive(:zones).and_return([cloudstack_zone])
       allow(servers).to receive(:create).with(create_servers_parameters).and_return(server)
@@ -413,7 +414,7 @@ describe VagrantPlugins::Cloudstack::Action::RunInstance do
         let(:volume) { double('Fog::Compute::Cloudstack::Volume') }
 
         before(:each) do
-          allow(cloudstack_compute).to receive(:send).with(:list_disk_offerings, listall: true)
+          allow(cloudstack_compute).to receive(:send).with(:list_disk_offerings, listall: true, name: DISK_OFFERING_NAME)
             .and_return(list_disk_offerings_response)
           expect(cloudstack_compute).to receive(:volumes).and_return([volume])
           allow(volume).to receive(:server_id).and_return(SERVER_ID)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cloudstack
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog