fog 1.5.0 → 1.6.0

data/lib/fog/vcloud/models/compute/organizations.rb

@@ -16,8 +16,7 @@ module Fog
           else
             connection.request(connection.basic_request_params("#{connection.base_path_url}/org/"))
           end
-          data = raw_orgs.body[:Org].select { |org| org[:type] == "application/vnd.vmware.vcloud.org+xml" }
-          data.each { |org| org.delete_if { |key, value| [:rel].include?(key) } }
+          data = raw_orgs.body[:Org]
           load(data)
         end
 

data/lib/fog/vcloud/models/compute/server.rb

@@ -50,7 +50,7 @@ module Fog
 
         def ready?
           reload_status # always ensure we have the correct status
-          running_tasks = tasks && tasks.flatten.any? {|ti| ti.kind_of?(Hash) && ti[:status] == 'running' }
+          running_tasks = self.tasks && self.tasks.flatten.any? {|ti| ti.kind_of?(Hash) && ti[:status] == 'running' }
           status != '0' && !running_tasks # 0 is provisioning, and no running tasks
         end
 
@@ -86,7 +86,15 @@ module Fog
           attributes[:name] = new_name
           @changed = true
         end
+        def password
+          guest_customization[:AdminPassword]
+        end
 
+        def password=(password)
+          return if password.nil? or password.size == 0
+          @changed = true
+          @update_password = password
+        end
         def cpus
           if cpu_mess
             { :count => cpu_mess[:"rasd:VirtualQuantity"].to_i,
@@ -95,8 +103,11 @@ module Fog
         end
 
         def cpus=(qty)
+          return if qty.nil? or qty.size == 0
+           
           @changed = true
-          cpu_mess[:"rasd:VirtualQuantity"] = qty.to_s
+          @update_cpu_value = qty
+          qty
         end
 
         def memory
@@ -107,6 +118,7 @@ module Fog
         end
 
         def memory=(amount)
+          return if amount.nil? or amount.size == 0
           @changed = true
           @update_memory_value = amount
           amount
@@ -172,26 +184,44 @@ module Fog
                 raise RuntimeError, "Can't save cpu, name or memory changes while the VM is on."
               end
             end
+
+            if @update_password
+                guest_customization[:AdminPassword] = @update_password.to_s
+                connection.configure_vm_password(guest_customization)
+                wait_for { ready? }
+            end
+
+            if @update_cpu_value
+              cpu_mess[:"rasd:VirtualQuantity"] = @update_cpu_value.to_s
+              connection.configure_vm_cpus(cpu_mess)
+              wait_for { ready? }
+            end
+                
             if @update_memory_value
               memory_mess[:"rasd:VirtualQuantity"] = @update_memory_value.to_s
               connection.configure_vm_memory(memory_mess)
+              wait_for { ready? }
             end
+
             if @disk_change == :deleted
               data = disk_mess.delete_if do |vh|
                 vh[:'rasd:ResourceType'] == '17' &&
                   vh[:'rasd:AddressOnParent'].to_s == @remove_disk.to_s
               end
               connection.configure_vm_disks(self.href, data)
+              wait_for { ready? }
             end
             if @disk_change == :added
               data = disk_mess
               data << @add_disk
               connection.configure_vm_disks(self.href, data)
+              wait_for { ready? }
             end
             if @name_changed || @description_changed
               edit_uri = links.select {|i| i[:rel] == 'edit'}
               edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[0][:href] : edit_uri[:href]
               connection.configure_vm_name_description(edit_uri, self.name, self.description)
+              wait_for { ready? }
             end
           end
           reset_tracking
@@ -215,6 +245,8 @@ module Fog
         def reset_tracking
           @disk_change = false
           @changed = false
+          @update_password = nil
+          @update_cpu_value = nil
           @update_memory_value = nil
           @name_changed = false
           @description_changed = nil
@@ -263,7 +295,9 @@ module Fog
         end
 
         def reload_status
-          self.status = connection.get_vapp(href).status
+          server = connection.get_server(href)
+          self.status = server.status
+          self.tasks = server.tasks
         end
       end
     end

data/lib/fog/vcloud/models/compute/vapps.rb

@@ -13,7 +13,7 @@ module Fog
         attribute :href
 
         def all
-          load([connection.get_vdc(self.href).resource_entities].flatten.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" })
+          load([connection.get_vdc(connection.default_vdc_href).resource_entities].flatten.select { |re| re[:type] == "application/vnd.vmware.vcloud.vApp+xml" })
         end
 
         def get(uri)

data/lib/fog/vcloud/requests/compute/configure_org_network.rb

@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+module Fog
+  module Vcloud
+    class Compute
+      class Real
+
+        def generate_outbound_rule()
+          outbound_rule = <<EOF 
+            <ns0:FirewallRule>
+            <ns0:IsEnabled>true</ns0:IsEnabled>
+            <ns0:Description>OUTGOING</ns0:Description>
+            <ns0:Policy>allow</ns0:Policy>
+            <ns0:Protocols>
+                <ns0:Any>true</ns0:Any>
+            </ns0:Protocols>
+            <ns0:Port>-1</ns0:Port>
+            <ns0:DestinationIp>Any</ns0:DestinationIp>
+            <ns0:SourcePort>-1</ns0:SourcePort>
+            <ns0:SourceIp>Any</ns0:SourceIp>
+            <ns0:Direction>out</ns0:Direction>
+            <ns0:EnableLogging>false</ns0:EnableLogging>
+        </ns0:FirewallRule>
+EOF
+        outbound_rule
+        end
+        def generate_tcp_rules(tcp_ports)
+          firewall_rules = ""
+          tcp_ports.each do |port|
+            firewall_rules << <<EOF 
+                    <ns0:FirewallRule>
+                    <ns0:IsEnabled>true</ns0:IsEnabled>
+                    <ns0:Description>#{port}</ns0:Description>
+                    <ns0:Policy>allow</ns0:Policy>
+                    <ns0:Protocols>
+                    <ns0:Tcp>true</ns0:Tcp>
+                    </ns0:Protocols>
+                    <ns0:Port>#{port}</ns0:Port>
+                    <ns0:DestinationIp>Any</ns0:DestinationIp>
+                    <ns0:SourcePort>-1</ns0:SourcePort>
+                    <ns0:SourceIp>Any</ns0:SourceIp>
+                    <ns0:Direction>in</ns0:Direction>
+                    <ns0:EnableLogging>false</ns0:EnableLogging>
+                    </ns0:FirewallRule>
+EOF
+          end
+          firewall_rules
+        end
+
+        def generate_udp_rules(udp_ports)
+          firewall_rules = ""
+          udp_ports.each do |port|
+              firewall_rules << <<EOF 
+                    <ns0:FirewallRule>
+                    <ns0:IsEnabled>true</ns0:IsEnabled>
+                    <ns0:Description>#{port}</ns0:Description>
+                    <ns0:Policy>allow</ns0:Policy>
+                    <ns0:Protocols>
+                    <ns0:Udp>true</ns0:Udp>
+                    </ns0:Protocols>
+                    <ns0:Port>#{port}</ns0:Port>
+                    <ns0:DestinationIp>Any</ns0:DestinationIp>
+                    <ns0:SourcePort>-1</ns0:SourcePort>
+                    <ns0:SourceIp>Any</ns0:SourceIp>
+                    <ns0:Direction>in</ns0:Direction>
+                    <ns0:EnableLogging>false</ns0:EnableLogging>
+                    </ns0:FirewallRule>
+EOF
+          end
+          firewall_rules
+        end
+
+        def generate_configure_org_network_request(vapp_id, vapp_network, vapp_network_uri, org_network, org_network_uri, enable_firewall=false, portmap=nil)
+
+          firewall_body = ""
+          if not enable_firewall
+            firewall_body = "<ns0:IsEnabled>false</ns0:IsEnabled>"
+        
+          else
+            firewall_rules = generate_outbound_rule + generate_tcp_rules(portmap["TCP"]) + generate_udp_rules(portmap["UDP"])
+                    firewall_body = <<EOF
+                            <ns0:IsEnabled>true</ns0:IsEnabled>
+                            <ns0:DefaultAction>drop</ns0:DefaultAction>
+                            <ns0:LogDefaultAction>false</ns0:LogDefaultAction>
+                            #{firewall_rules}
+EOF
+          end
+        body = <<EOF
+          <ns0:NetworkConfigSection xmlns:ns0="http://www.vmware.com/vcloud/v1.5" xmlns:ns1="http://schemas.dmtf.org/ovf/envelope/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" href="#{vapp_id}/networkConfigSection/" type="application/vnd.vmware.vcloud.networkConfigSection+xml" ns1:required="false" xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://www.vmware.com/vcloud/v1.5 http://zone01.bluelock.com/api/v1.5/schema/master.xsd">
+<ns1:Info>The configuration parameters for logical networks</ns1:Info>
+<ns0:Link href="#{vapp_id}/networkConfigSection/" rel="edit" type="application/vnd.vmware.vcloud.networkConfigSection+xml" />
+<ns0:NetworkConfig networkName="#{vapp_network}">
+<ns0:Link href="#{vapp_network_uri}" rel="repair" />
+<ns0:Description />
+  <ns0:Configuration>
+<ns0:ParentNetwork href="#{org_network_uri}" name="#{org_network}" type="application/vnd.vmware.vcloud.network+xml" />
+<ns0:FenceMode>natRouted</ns0:FenceMode>
+<ns0:RetainNetInfoAcrossDeployments>true</ns0:RetainNetInfoAcrossDeployments>
+<ns0:Features>
+<ns0:FirewallService>
+#{firewall_body}
+</ns0:FirewallService>
+<ns0:NatService>
+<ns0:IsEnabled>true</ns0:IsEnabled>
+<ns0:NatType>ipTranslation</ns0:NatType>
+<ns0:Policy>allowTraffic</ns0:Policy>
+</ns0:NatService>
+</ns0:Features>
+</ns0:Configuration>
+<ns0:IsDeployed>false</ns0:IsDeployed>
+</ns0:NetworkConfig>
+<ns0:NetworkConfig networkName="#{org_network}"><ns0:Link href="#{org_network_uri}" rel="repair" />
+<ns0:Description />
+<ns0:Configuration>
+<ns0:ParentNetwork href="#{org_network_uri}" name="#{org_network}" type="application/vnd.vmware.vcloud.network+xml" />
+<ns0:FenceMode>bridged</ns0:FenceMode>
+<ns0:RetainNetInfoAcrossDeployments>true</ns0:RetainNetInfoAcrossDeployments>
+<ns0:SyslogServerSettings />
+</ns0:Configuration>
+</ns0:NetworkConfig>
+</ns0:NetworkConfigSection>
+EOF
+        end
+
+    def configure_org_network(vapp_id, vapp_network, vapp_network_uri, org_network, org_network_uri, enable_firewall=false, port_map=nil)
+      body = generate_configure_org_network_request(vapp_id, vapp_network, vapp_network_uri, org_network, org_network_uri, enable_firewall, port_map)
+      #puts ("Body: #{body}")
+
+      request(
+            :body     => body,
+            :expects  => 202,
+            :headers  => {'Content-Type' => 'Application/vnd.vmware.vcloud.networkConfigSection+xml' },
+            :method   => 'PUT',
+            :uri      => "#{vapp_id}/networkConfigSection",
+            :parse    => true
+          )
+    end
+      end
+    end
+  end
+end
+

data/lib/fog/vcloud/requests/compute/configure_vm_cpus.rb

@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+module Fog
+  module Vcloud
+    class Compute
+      class Real
+
+        def configure_vm_cpus(vm_data)
+          edit_uri = vm_data.select {|k,v| k == :Link && v[:rel] == 'edit'}
+          edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[1][:href] : edit_uri[:Link][:href]
+
+          body = <<EOF
+          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vcloud="http://www.vmware.com/vcloud/v1.5" vcloud:href="#{edit_uri}" vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://#{@host}/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
+            <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
+            <rasd:Description>Number of Virtual CPUs</rasd:Description>
+            <rasd:ElementName>#{vm_data[:'rasd:VirtualQuantity']} virtual CPU(s)</rasd:ElementName>
+            <rasd:InstanceID>4</rasd:InstanceID>
+            <rasd:Reservation>0</rasd:Reservation>
+            <rasd:ResourceType>3</rasd:ResourceType>
+            <rasd:VirtualQuantity>#{vm_data[:'rasd:VirtualQuantity']}</rasd:VirtualQuantity>
+            <rasd:Weight>0</rasd:Weight>
+            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{edit_uri}"/>
+        </Item>
+EOF
+          request(
+            :body     => body,
+            :expects  => 202,
+            :headers  => {'Content-Type' => vm_data[:"vcloud_type"] },
+            :method   => 'PUT',
+            :uri      => "#{edit_uri}",
+            :parse    => true
+          )
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud/requests/compute/configure_vm_memory.rb

@@ -9,18 +9,17 @@ module Fog
           edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[1][:href] : edit_uri[:Link][:href]
 
           body = <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<Item xmlns="http://www.vmware.com/vcloud/v1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vcloud="http://www.vmware.com/vcloud/v1" vcloud:href="https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-329805878/virtualHardwareSection/memory" vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd http://www.vmware.com/vcloud/v1 http://vcd01.esx.dev.int.realestate.com.au/api/v1.0/schema/master.xsd">
-    <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-    <rasd:Description>Memory Size</rasd:Description>
-    <rasd:ElementName>#{vm_data[:'rasd:VirtualQuantity']} MB of memory</rasd:ElementName>
-    <rasd:InstanceID>5</rasd:InstanceID>
-    <rasd:Reservation>0</rasd:Reservation>
-    <rasd:ResourceType>4</rasd:ResourceType>
-    <rasd:VirtualQuantity>#{vm_data[:'rasd:VirtualQuantity']}</rasd:VirtualQuantity>
-    <rasd:Weight>5120</rasd:Weight>
-    <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="https://vcd01.esx.dev.int.realestate.com.au/api/v1.0/vApp/vm-329805878/virtualHardwareSection/memory"/>
-</Item>
+          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vcloud="http://www.vmware.com/vcloud/v1.5" vcloud:href="#{edit_uri}" vcloud:type="application/vnd.vmware.vcloud.rasdItem+xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://#{@host}/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
+            <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
+            <rasd:Description>Memory Size</rasd:Description>
+            <rasd:ElementName>#{vm_data[:'rasd:VirtualQuantity']} MB of memory</rasd:ElementName>
+            <rasd:InstanceID>5</rasd:InstanceID>
+            <rasd:Reservation>0</rasd:Reservation>
+            <rasd:ResourceType>4</rasd:ResourceType>
+            <rasd:VirtualQuantity>#{vm_data[:'rasd:VirtualQuantity']}</rasd:VirtualQuantity>
+            <rasd:Weight>0</rasd:Weight>
+            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{edit_uri}"/>
+        </Item>
 EOF
 
           request(

data/lib/fog/vcloud/requests/compute/configure_vm_password.rb

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+module Fog
+  module Vcloud
+    class Compute
+      class Real
+
+        def configure_vm_password(vmdata)
+          edit_uri = vmdata[:href]
+          body = <<EOF
+          <GuestCustomizationSection xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://zone01.bluelock.com/api/vApp/vm-cc8e27be-f18c-4263-87c5-58a9297bac5b/guestCustomizationSection/" ovf:required="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.dmtf.org/ovf/envelope/1 http://schemas.dmtf.org/ovf/envelope/1/dsp8023_1.1.0.xsd http://www.vmware.com/vcloud/v1.5 http://zone01.bluelock.com/api/v1.5/schema/master.xsd">
+<ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
+<Enabled>true</Enabled>
+<ChangeSid>false</ChangeSid>
+<VirtualMachineId>#{vmdata[:VirtualMachineId]}</VirtualMachineId>
+<JoinDomainEnabled>false</JoinDomainEnabled>
+<UseOrgSettings>false</UseOrgSettings>
+<AdminPasswordEnabled>true</AdminPasswordEnabled>
+<AdminPasswordAuto>false</AdminPasswordAuto>
+<AdminPassword>#{vmdata[:AdminPassword]}</AdminPassword>
+<ResetPasswordRequired>false</ResetPasswordRequired>
+<ComputerName>#{vmdata[:ComputerName]}</ComputerName>
+<Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="#{edit_uri}"/>
+</GuestCustomizationSection>
+EOF
+          request(
+            :body     => body,
+            :expects  => 202,
+            :headers  => {'Content-Type' => vmdata[:type] },
+            :method   => 'PUT',
+            :uri      => "#{edit_uri}",
+            :parse    => true
+          )
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud/requests/compute/undeploy.rb

@@ -6,8 +6,16 @@ module Fog
           # builder = Builder::XmlMarkup.new
           # builder.UndeployVAppParams(:xmlns => 'http://www.vmware.com/vcloud/v1',
           #                            :saveState => save_state) {}
-          builder = "<UndeployVAppParams saveState=\"#{save_state.to_s}\" xmlns=\"http://www.vmware.com/vcloud/v1\"/>"
+          builder = if version =='1.0' 
+                        "<UndeployVAppParams saveState=\"#{save_state.to_s}\" xmlns=\"http://www.vmware.com/vcloud/v1\"/>"
+                    else
+                       <<EOF 
+                        <UndeployVAppParams xmlns="http://www.vmware.com/vcloud/v1.5">
+                        <UndeployPowerAction>shutdown</UndeployPowerAction>
+                        </UndeployVAppParams>
 
+EOF
+                    end
           request(
                   :body     => builder,
                   :expects  => 202,

data/lib/fog/vsphere/requests/compute/vm_reboot.rb

@@ -15,7 +15,7 @@ module Fog
             task.wait_for_completion
             { 'task_state' => task.info.result, 'reboot_type' => 'reset_power' }
           else
-            vm_mob_ref.ShutdownGuest
+            vm_mob_ref.RebootGuest
             { 'task_state' => "running", 'reboot_type' => 'reboot_guest' }
           end
         end

data/tests/atmos/models/storage/file_update_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests("Storage[:atmos] | nested directories", ['atmos']) do
+
+  unless Fog.mocking?
+    @directory = Fog::Storage[:atmos].directories.create(:key => 'updatefiletests')
+  end
+
+  atmos = Fog::Storage[:atmos]
+  tests("update a file").succeeds do
+    pending if Fog.mocking?
+    file = @directory.files.create(:key => 'lorem.txt', :body => lorem_file)
+    file.body = "xxxxxx"
+    file.save
+  end
+
+  unless Fog.mocking?
+    @directory.destroy(:recursive => true)
+  end
+
+end

data/tests/atmos/models/storage/nested_directories_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests("Storage[:atmos] | nested directories", ['atmos']) do
+  atmos = Fog::Storage[:atmos]
+  tests("create a directory with a / character").succeeds do
+    pending if Fog.mocking?
+    atmos.directories.create(:key => 'sub/path')
+  end
+
+  tests("List of top directory returns sub dir").returns(1) do
+    pending if Fog.mocking?
+    atmos.directories.get('sub').directories.count
+  end
+
+  tests("create a directory in a sub dir").returns('sub/path/newdir/') do
+    pending if Fog.mocking?
+    atmos.directories.get('sub/path').directories.create(:key => 'newdir').identity
+  end
+
+  tests("Recursively destroy parent dir").succeeds do
+    pending if Fog.mocking?
+    atmos.directories.get('sub').destroy(:recursive => true)
+  end
+
+end