set status when instantiating a vapp template, return it from the moc…

…k data in get vapp
danishkhan · Oct 15, 2010 · cee42dc · cee42dc
1 parent 549b3ab
commit cee42dc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/lib/fog/vcloud.rb b/lib/fog/vcloud.rb
@@ -333,7 +333,8 @@ def self.data( base_url = self.base_url )
                       :ip   => "1.2.3.3",
                       :memory => 1024,
                       :cpus => 1,
-                      :disks => [{ :size => 25 }]
+                      :disks => [{ :size => 25 }],
+                      :status => 2
                     },
                     { :href => "#{base_url}/vap/42",
                       :name => "Broom 2",

diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb
@@ -30,7 +30,7 @@ def generate_get_vapp_response(vapp, vdc)
                                      :href => vapp[:href],
                                      :type => "application/vnd.vmware.vcloud.vApp+xml",
                                      :name => vapp[:name],
-                                     :status => 2
+                                     :status => vapp[:status] || 4
                                      )) do
               builder.Link(:rel => "up", :href => vdc[:href], :type => "application/vnd.vmware.vcloud.vdc+xml")
 

diff --git a/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb b/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb
@@ -109,7 +109,7 @@ def instantiate_vapp_template(catalog_item_uri, options = {})
             if vdc = vdc_from_uri(options[:vdc_uri])
               vapp_id = rand(1000)
               vapp_uri = Fog::Vcloud::Terremark::Ecloud::Mock.vapp_href(:id => vapp_id)
-              options.update(:id => vapp_id.to_s, :href => vapp_uri, :disks => catalog_item[:disks], :ip => random_ip_in_network(options[:network_uri]))
+              options.update(:id => vapp_id.to_s, :href => vapp_uri, :disks => catalog_item[:disks], :ip => random_ip_in_network(options[:network_uri]), :status => 2)
               vdc[:vms] << options
 
               xml = generate_instantiate_vapp_template_response(vdc[:href], options[:name], vapp_uri)

diff --git a/spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb b/spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb
@@ -26,8 +26,8 @@
 
           its(:href) { should == vm_data[:href] }
           its(:name) { should == vm_data[:name] }
-          its(:status) { should == "2" }
-          its(:size) { (25 * 1024).to_s }
+          its(:status) { should == vm_data[:status].to_s }
+          its(:size) { (vm_data[:disks].inject(0) {|s, d| s += d[:size] } * 1024).to_s }
 
           describe "Link" do
             subject { @vapp.body[:Link] }

diff --git a/spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb b/spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb
@@ -41,6 +41,7 @@
           it { should include :href }
           it { should include :disks }
           it { should include :ip }
+          its(:status) { should == 2 }
 
           its(:disks) { should == catalog_item_data[:disks] }