fog 1.14.0 → 1.15.0

data/lib/fog/rackspace/requests/monitoring/update_alarm.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Rackspace
+    class Monitoring
+      class Real
+
+        def update_alarm(entity_id, id, options)
+          request(
+            :body     => JSON.encode(options),
+            :expects  => [204],
+            :method   => 'PUT',
+            :path     => "entities/#{entity_id}/alarms/#{id}"
+          )
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/rackspace/requests/monitoring/update_check.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Rackspace
+    class Monitoring
+      class Real
+
+        def update_check(entity_id, id, options)
+          request(
+            :body     => JSON.encode(options),
+            :expects  => [204],
+            :method   => 'PUT',
+            :path     => "entities/#{entity_id}/checks/#{id}"
+          )
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/rackspace/requests/monitoring/update_entity.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Rackspace
+    class Monitoring
+      class Real
+
+        def update_entity(id, options)
+          request(
+            :body     => JSON.encode(options),
+            :expects  => [204],
+            :method   => 'PUT',
+            :path     => "entities/#{id}"
+          )
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/rackspace/requests/storage/put_object.rb

@@ -22,7 +22,7 @@ module Fog
 
           params.merge!(
             :expects    => 201,
-            :idempotent => true,
+            :idempotent => !params[:request_block],
             :headers    => headers,
             :method     => 'PUT',
             :path       => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"

data/lib/fog/rackspace/storage.rb

@@ -145,13 +145,13 @@ module Fog
         def request(params, parse_json = true, &block)
           super(params, parse_json, &block)
         rescue Excon::Errors::NotFound => error
-          raise NotFound.slurp(error, region)
+          raise NotFound.slurp(error, self)
         rescue Excon::Errors::BadRequest => error
-          raise BadRequest.slurp error
+          raise BadRequest.slurp(error, self)
         rescue Excon::Errors::InternalServerError => error
-          raise InternalServerError.slurp error
+          raise InternalServerError.slurp(error, self)
         rescue Excon::Errors::HTTPStatusError => error
-          raise ServiceError.slurp error
+          raise ServiceError.slurp(error, self)
         end
 
         def service_net?
@@ -177,6 +177,10 @@ module Fog
           :cloudFiles
         end
 
+        def request_id_header
+          "X-Trans-Id"
+        end
+
         def region
           @rackspace_region
         end

data/lib/fog/vcloud/compute.rb

@@ -231,7 +231,7 @@ module Fog
         # header from that call.
         def do_login
           @login_results = login
-          @cookie = @login_results.headers['Set-Cookie']
+          @cookie = @login_results.headers['Set-Cookie'] || @login_results.headers['set-cookie']
         end
 
         def ensure_unparsed(uri)

data/lib/fog/vcloud/examples/README.md

@@ -0,0 +1,54 @@
+# Using vCloud API via fog
+_contributor @singhgarima_
+
+For more information about fog [README](/README.md), or visit their website
+[fog.io](www.fog.io).
+
+## Vcloud API
+
+Some useful links to get started on the vCloud API:
+
+- [http://www.vmware.com/pdf/vcd_15_api_guide.pdf](http://www.vmware.com/pdf/vcd_15_api_guide.pdf)
+- [vCloud API Programming Guide](http://pubs.vmware.com/vcd-51/index.jsp?topic=%2Fcom.vmware.vcloud.api.doc_51%2FGUID-86CA32C2-3753-49B2-A471-1CE460109ADB.html)
+
+## Terminology
+
+- Organization: An Organization is the fundamental vCloud Director grouping
+  that contains users, the vApps that they create, and the resources the vApps
+  use. It is a top-level container in a cloud that contains one or more
+  Organization Virtual Data Centers (Org vDCs) and Catalog entities. It owns
+  all the virtual resources for a cloud instance and can have many Org vDCs.[1]
+
+- vApp: VMware vApp is a format for packaging and managing applications. A vApp
+  can contain multiple virtual machines.[2]
+
+- VM: A virtualized personal computer environment in which a guest
+  operating system and associated application software can run. Multiple virtual
+  machines can operate on the same managed host machine concurrently.[3]
+
+- Catalogs & Catalog-Items: Catalog is used in organizations for storing content.
+  Example: base images. Each item stored in catalog is referred as catalog item.
+
+- vDC: Virtual Data Center. These are of two kinds provider vDCs (accessible to
+  multiple organizations), and organization vDCs (accessible only by a given
+  organization). In fog we refer to organization vDCs.
+
+- Networks: You can setup various internal networks and assign various internal
+  ip ranges to them
+
+## What is the difference between a virtual appliance and a virtual machine?
+
+A  virtual machine is a tightly isolated software container created to run on
+virtualized platforms. It has four key virtualized resources (CPU, RAM,
+Storage, and Networking); but requires the installation of an Operating System
+and runs on one or more applications. A virtual appliance functions very much
+like a virtual machine, possessing the four key characteristics of
+compatibility, isolation, encapsulation, and hardware independence. However, a
+virtual appliance contains a pre-installed, pre-configured Operating System
+and an application stack optimized to provide a specific set of services.[3]
+
+**References**
+
+- [1] http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1026316
+- [2] http://www.vmware.com/pdf/vsphere4/r40/vsp_40_admin_guide.pdf
+- [3] http://www.vmware.com/technical-resources/virtualization-topics/virtual-appliances/faqs

data/lib/fog/vcloud/examples/creating_a_connection.md

@@ -0,0 +1,20 @@
+# Creating a connection
+
+      connection = Fog::Compute.new(
+        :provider           => :vcloud,
+        :vcloud_username    => "username@org-name",
+        :vcloud_password    => password,
+        :vcloud_host        => vendor-api-endpoint-host,
+        :vcloud_default_vdc => default_vdc_uri,
+        :connection_options => {
+          :ssl_verify_peer   => false,
+          :omit_default_port => true
+        }
+      )
+
+- Refer to links in [vcloud/examples/README.md](/lib/fog/vcloud/examples/REAME.md)
+  for find various different uris
+- connection_options are passed down to `excon`, which is used by fog to make
+  http requests.
+    - We using `omit_default_port`, as currently excon adds port to host entry
+      in headers, which might not be compatible with various vendors.

data/lib/fog/vcloud/examples/creating_a_vapp.md

@@ -0,0 +1,17 @@
+# Creating a vApp
+
+      connection.servers.create(
+        :vdc_uri            => vdc-uuid,
+        :catalog_item_uri   => catalog-uuid,
+        :name               => vApp-name,
+        :network_uri        => network-uri,
+        :network_name       => network-name,
+        :connection_options => {
+          :ssl_verify_peer   => false,
+          :omit_default_port => true
+        }
+      )
+
+- Not most of the uris can be found by understanding the vcloud api
+  eg various network information can be retrieved by
+  `connection.servers.service.networks`

data/lib/fog/vcloud/examples/get_network_information.md

@@ -0,0 +1,10 @@
+# Get network information
+
+- To see all networks list
+
+        connection.servers.service.networks
+
+- To see details of a particular network
+
+        selected_nw = connection.servers.service.networks.detect { |n| n.name == 'Default' }
+        connection.servers.service.get_network(selected_nw.href)

data/lib/fog/vcloud/examples/get_vapp_information.md

@@ -0,0 +1,10 @@
+# Get network information
+
+- To see all vApps list
+
+        connection.servers.service.vapps
+
+- To see details of a particular vApp
+
+        selected_vapp = connection.servers.service.vapps.detect { |n| n.name == 'vapp-name' }
+        connection.servers.service.get_vapp(selected_vapp.href)

data/lib/fog/vcloud/examples/more_on_vapps.md

@@ -0,0 +1,23 @@
+# More on vApps
+
+## Checking running or stopped
+
+    selected_vapp = connection.servers.service.vapps.detect { |n| n.name == 'vapp-name' }
+    selected_vapp.on?
+    selected_vapp.off?
+
+## Wait for app to come up or stop
+
+    selected_vapp.wait_for { selected_vapp.on? }
+    selected_vapp.wait_for { selected_vapp.off? }
+
+## Delete vApp
+
+    selected_vapp = connection.servers.service.vapps.detect { |n| n.name == 'vapp-name' }
+    vapp = connection.servers.service.get_vapp(selected_vapp.href)
+    if vapp.on?
+      vapp.service.undeploy selected_vapp.href #undeploy to stop vApp
+      vapp.wait_for { vapp.off? }
+    end
+    vapp.wait_for { vapp.off? } #double check
+    vapp.service.delete_vapp selected_vapp.href

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

@@ -18,8 +18,8 @@ module Fog
         def generate_configure_vm_request(vm_data)
           xmlns = 'http://schemas.dmtf.org/ovf/envelope/1'
           xmlns_vcloud = 'http://www.vmware.com/vcloud/v1'
-          xmlns_rasd = 'http://schemas.dmtf.org/wbem/wscim/1/cim‐schema/2/CIM_ResourceAllocationSettingData'
-          xmlns_vssd = 'http://schemas.dmtf.org/wbem/wscim/1/cim‐schema/2/CIM_VirtualSystemSettingData'
+          xmlns_rasd = 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData'
+          xmlns_vssd = 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData'
 
           builder = Builder::XmlMarkup.new(:target=>STDOUT, :indent=>2) # TODO - remove params
           builder.VirtualHardwareSection(

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.14.0'
+  VERSION = '1.15.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -169,12 +169,136 @@ module Fog
           obj.to_s.match(/\("([^"]+)"\)/)[1]
         end
 
+        def is_uuid?(id)
+          !(id =~ /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/).nil?
+        end
+
       end
 
       class Mock
 
         include Shared
 
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :servers => {
+                "5032c8a5-9c5e-ba7a-3804-832a03e16381" => {
+                 "resource_pool"    => "Resources",
+                 "memory_mb"        => 2196,
+                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:a9:00:28" },
+                 "power_state"      => "poweredOn",
+                 "cpus"             => 1,
+                 "hostname"         => "dhcp75-197.virt.bos.redhat.com",
+                 "mo_ref"           => "vm-562",
+                 "connection_state" => "connected",
+                 "overall_status"   => "green",
+                 "datacenter"       => "Solutions",
+                 "volumes"          =>
+                    [{
+                      "id"        => "6000C29c-a47d-4cd9-5249-c371de775f06",
+                      "datastore" => "Storage1",
+                      "mode"      => "persistent",
+                      "size"      => 8388608,
+                      "thin"      => true,
+                      "name"      => "Hard disk 1",
+                      "filename"  => "[Storage1] rhel6-mfojtik/rhel6-mfojtik.vmdk",
+                      "size_gb"   => 8
+                     }],
+                 "interfaces"       =>
+                    [{"mac"     => "00:50:56:a9:00:28",
+                      "network" => "VM Network",
+                      "name"    => "Network adapter 1",
+                      "status"  => "ok",
+                      "summary" => "VM Network",
+                     }],
+                 "hypervisor"       => "gunab.puppetlabs.lan",
+                 "guest_id"         => "rhel6_64Guest",
+                 "tools_state"      => "toolsOk",
+                 "cluster"          => "Solutionscluster",
+                 "name"             => "rhel64",
+                 "operatingsystem"  => "Red Hat Enterprise Linux 6 (64-bit)",
+                 "path"             => "/Datacenters/Solutions/vm",
+                 "uuid"             => "4229f0e9-bfdc-d9a7-7bac-12070772e6dc",
+                 "instance_uuid"    => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
+                 "id"               => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
+                 "tools_version"    => "guestToolsUnmanaged",
+                 "ipaddress"        => "192.168.100.184",
+                 "template"         => false
+                },
+                "502916a3-b42e-17c7-43ce-b3206e9524dc" => {
+                 "resource_pool"    => "Resources",
+                 "memory_mb"        => 512,
+                 "power_state"      => "poweredOn",
+                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:a9:00:00" },
+                 "hostname"         => nil,
+                 "cpus"             => 1,
+                 "connection_state" => "connected",
+                 "mo_ref"           => "vm-621",
+                 "overall_status"   => "green",
+                 "datacenter"       => "Solutions",
+                 "volumes"          =>
+                    [{"thin"      => false,
+                      "size_gb"   => 10,
+                      "datastore" => "datastore1",
+                      "filename"  => "[datastore1] i-1342439683/i-1342439683.vmdk",
+                      "size"      => 10485762,
+                      "name"      => "Hard disk 1",
+                      "mode"      => "persistent",
+                      "id"        => "6000C29b-f364-d073-8316-8e98ac0a0eae" }],
+                 "interfaces"       =>
+                    [{ "summary" => "VM Network",
+                      "mac"     => "00:50:56:a9:00:00",
+                      "status"  => "ok",
+                      "network" => "VM Network",
+                      "name"    => "Network adapter 1" }],
+                 "hypervisor"       => "gunab.puppetlabs.lan",
+                 "guest_id"         => nil,
+                 "cluster"          => "Solutionscluster",
+                 "tools_state"      => "toolsNotInstalled",
+                 "name"             => "i-1342439683",
+                 "operatingsystem"  => nil,
+                 "path"             => "/",
+                 "tools_version"    => "guestToolsNotInstalled",
+                 "uuid"             => "4229e0de-30cb-ceb2-21f9-4d8d8beabb52",
+                 "instance_uuid"    => "502916a3-b42e-17c7-43ce-b3206e9524dc",
+                 "id"               => "502916a3-b42e-17c7-43ce-b3206e9524dc",
+                 "ipaddress"        => nil,
+                 "template"         => false
+                },
+                "5029c440-85ee-c2a1-e9dd-b63e39364603" => {
+                 "resource_pool"    => "Resources",
+                 "memory_mb"        => 2196,
+                 "power_state"      => "poweredOn",
+                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:b2:00:af" },
+                 "hostname"         => "centos56gm.localdomain",
+                 "cpus"             => 1,
+                 "connection_state" => "connected",
+                 "mo_ref"           => "vm-715",
+                 "overall_status"   => "green",
+                 "datacenter"       => "Solutions",
+                 "hypervisor"       => "gunab.puppetlabs.lan",
+                 "guest_id"         => "rhel6_64Guest",
+                 "cluster"          => "Solutionscluster",
+                 "tools_state"      => "toolsOk",
+                 "name"             => "jefftest",
+                 "operatingsystem"  => "Red Hat Enterprise Linux 6 (64-bit)",
+                 "path"             => "/",
+                 "tools_version"    => "guestToolsUnmanaged",
+                 "ipaddress"        => "192.168.100.187",
+                 "uuid"             => "42329da7-e8ab-29ec-1892-d6a4a964912a",
+                 "instance_uuid"    => "5029c440-85ee-c2a1-e9dd-b63e39364603",
+                 "id"               => "5029c440-85ee-c2a1-e9dd-b63e39364603",
+                 "template"         => false
+                }
+              },
+              :datacenters => {
+                "Solutions" => {:name => "Solutions", :status => "grey"}
+              }
+            }
+          end
+        end
+
         def initialize(options={})
           require 'rbvmomi'
           @vsphere_username = options[:vsphere_username]
@@ -185,6 +309,13 @@ module Fog
           @vsphere_rev = '4.0'
         end
 
+        def data
+          self.class.data[@vsphere_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@vsphere_username)
+        end
       end
 
       class Real

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

@@ -98,7 +98,11 @@ module Fog
 
         def destroy(options = {})
           requires :instance_uuid
-          stop if ready? # need to turn it off before destroying
+          if ready?
+            # need to turn it off before destroying
+            stop
+            wait_for { !ready? }
+          end
           service.vm_destroy('instance_uuid' => instance_uuid)
         end
 

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

@@ -21,7 +21,9 @@ module Fog
 
       class Mock
         def get_datacenter name
-          {:name => "Solutions", :status => "grey"}
+          dc = self.data[:datacenters][name]
+          raise(Fog::Compute::Vsphere::NotFound) unless dc
+          dc
         end
       end
     end

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

@@ -9,50 +9,34 @@ module Fog
         protected
 
         def get_vm_ref(id, dc = nil)
-          vm = case id
-                 # UUID based
-                 when /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/
-                   @connection.searchIndex.FindByUuid :uuid => id, :vmSearch => true, :instanceUuid => true, :datacenter => dc
-                 else
-                   # try to find based on VM name
-                   if dc
-                     get_raw_datacenter(dc).find_vm(id)
-                   else
-                     raw_datacenters.map { |d| d.find_vm(id) }.compact.first
-                   end
-               end
+          raw_datacenter = find_raw_datacenter(dc) if dc
+          vm = case is_uuid?(id)
+            # UUID based
+            when true
+              params = {:uuid => id, :vmSearch => true, :instanceUuid => true}
+              params[:datacenter] = raw_datacenter if dc
+              @connection.searchIndex.FindByUuid(params)
+            else
+              # try to find based on VM name
+              if dc
+                raw_datacenter.find_vm(id)
+              else
+                raw_datacenters.map { |d| d.find_vm(id) }.compact.first
+              end
+          end
           vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
         end
       end
 
       class Mock
         def get_virtual_machine(id, datacenter_name = nil)
-          case id
-          when "5032c8a5-9c5e-ba7a-3804-832a03e16381", 'vm-715'
-            { :resource_pool    => "Resources",
-              :memory_mb        => 2196,
-              :power_state      => "poweredOn",
-              :mac_addresses    => { "Network adapter 1" => "00:50:56:b2:00:af" },
-              :hostname         => "centos56gm.localdomain",
-              :cpus             => 1,
-              :connection_state => "connected",
-              :mo_ref           => "vm-715",
-              :overall_status   => "green",
-              :datacenter       => "Solutions",
-              :instance_uuid    => "5029c440-85ee-c2a1-e9dd-b63e39364603",
-              :hypervisor       => "gunab.puppetlabs.lan",
-              :guest_id         => "rhel6_64Guest",
-              :cluster          => "virtlabcluster",
-              :tools_state      => "toolsOk",
-              :name             => "jefftest",
-              :operatingsystem  => "Red Hat Enterprise Linux 6 (64-bit)",
-              :path             => "/",
-              :tools_version    => "guestToolsUnmanaged",
-              :ipaddress        => "192.168.100.187",
-              :id               => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
-              :uuid             => "42329da7-e8ab-29ec-1892-d6a4a964912a"
-            }
+          if is_uuid?(id)
+            vm = list_virtual_machines({ 'instance_uuid' => id, 'datacenter' => datacenter_name }).first
+          else
+            # try to find based on VM name. May need to handle the path of the VM
+            vm = list_virtual_machines({ 'name' => id, 'datacenter' => datacenter_name }).first
           end
+          vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
         end
 
       end