fog-maestrodev 1.18.0.20131209091424 → 1.18.0.20131218202447

data/lib/fog/vcloud_director/requests/compute/get_vapp_metadata.rb

@@ -11,13 +11,15 @@ module Fog
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-VAppMetadata.html
         # @since vCloud API version 1.5
         def get_vapp_metadata(id)
-          request(
+          response = request(
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => "vApp/#{id}/metadata/"
           )
+          ensure_list! response.body, :MetadataEntry
+          response
         end
       end
     end

data/lib/fog/vcloud_director/requests/compute/post_attach_disk.rb

@@ -26,7 +26,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             DiskAttachOrDetachParams(attrs) {
-              Disk(:href => "#{@end_point}disk/#{media_id}")
+              Disk(:href => "#{end_point}disk/#{disk_id}")
               if options.key?(:BusNumber)
                 BusNumber options[:BusNumber]
               end

data/lib/fog/vcloud_director/requests/compute/post_create_org_vdc_network.rb

@@ -0,0 +1,83 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/org_vdc_network'
+
+        # Create an Org vDC network.
+        #
+        # This operation is asynchronous and returns a task that you can
+        # monitor to track the progress of the request.
+        #
+        # Produce media type(s):
+        # application/vnd.vmware.vcloud.orgVdcNetwork+xml
+        # Output type:
+        # OrgVdcNetworkType
+        #
+        # @param [String] vdc_id Object identifier of the vDC
+        # @param [String] name   The name of the entity.
+        # @param [Hash] options
+        # @option options [String] :Description Optional description.
+        # @option options [Hash] :Configuration Network configuration.
+        # @option options [Hash] :EdgeGateway  EdgeGateway that connects this 
+        #   Org vDC network. Applicable only for routed networks.
+        # @option options [Hash] :ServiceConfig Specifies the service 
+        #   configuration for an isolated Org vDC networks.
+        # @option options [Boolean] :IsShared True if this network is shared 
+        #   to multiple Org vDCs.
+        #   * :Configuration<~Hash>: NetworkConfigurationType
+        #     * :IpScopes<~Hash>:
+        #       * :IpScope<~Hash>:
+        #         * :IsInherited<~Boolean>: ?
+        #         * :Gateway<~String>: IP address of gw
+        #         * :Netmask<~String>: Subnet mask of network
+        #         * :Dns1<~String>: Primary DNS server.
+        #         * :Dns2<~String>: Secondary DNS server.
+        #         * :DnsSuffix<~String>: DNS suffix.
+        #         * :IsEnabled<~String>: Indicates if subnet is enabled or not.
+        #                                Default value is True.
+        #         * :IpRanges<~Array>: IP ranges used for static pool allocation
+        #                             in the network. Array of Hashes of:
+        #                               * :StartAddress - start IP in range
+        #                               * :EndAddress - end IP in range
+        #   * :EdgeGateway<~Hash>: EdgeGateway that connects this Org vDC
+        #                          network. Applicable only for routed networks.
+        #   * :ServiceConfig<~Hash>: Specifies the service configuration for an
+        #                            isolated network
+        #
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-CreateOrgVdcNetwork.html
+        # @since vCloud API version 5.1
+        def post_create_org_vdc_network(vdc_id, name, options={})
+
+          body = Fog::Generators::Compute::VcloudDirector::OrgVdcNetwork.new(options.merge(:name => name)).generate_xml
+
+          request(
+            :body    => body,
+            :expects => 201,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.orgVdcNetwork+xml'},
+            :method  => 'POST',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "admin/vdc/#{vdc_id}/networks"
+          )
+
+        end
+      end
+
+      class Mock
+
+        def post_create_org_vdc_network(vdc_id, name, options={})
+          unless data[:vdcs][vdc_id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              "No access to entity \"(com.vmware.vcloud.entity.vdc:#{vdc_id})\"."
+            )
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/requests/compute/post_detach_disk.rb

@@ -20,7 +20,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             DiskAttachOrDetachParams(attrs) {
-              Disk(:href => "#{@end_point}disk/#{media_id}")
+              Disk(:href => "#{end_point}disk/#{disk_id}")
             }
           end.to_xml
 

data/lib/fog/vcloud_director/requests/compute/post_eject_cd_rom.rb

@@ -20,7 +20,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             MediaInsertOrEjectParams(attrs) {
-              Media(:href => "#{@end_point}media/#{media_id}")
+              Media(:href => "#{end_point}media/#{media_id}")
             }
           end.to_xml
 

data/lib/fog/vcloud_director/requests/compute/post_insert_cd_rom.rb

@@ -20,7 +20,7 @@ module Fog
               :xmlns => 'http://www.vmware.com/vcloud/v1.5'
             }
             MediaInsertOrEjectParams(attrs) {
-              Media(:href => "#{@end_point}media/#{media_id}")
+              Media(:href => "#{end_point}media/#{media_id}")
             }
           end.to_xml
 

data/lib/fog/vcloud_director/requests/compute/put_guest_customization_section_vapp.rb

@@ -62,6 +62,7 @@ module Fog
             :change_sid => :ChangeSid,
             :join_domain_enabled => :JoinDomainEnabled,
             :use_org_settings => :UseOrgSettings,
+            :admin_password => :AdminPassword,
             :admin_password_enabled => :AdminPasswordEnabled,
             :admin_password_auto => :AdminPasswordAuto,
             :reset_password_required => :ResetPasswordRequired,

data/lib/fog/vcloud_director/requests/compute/put_vapp_name_and_description.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/vapp'
+
+        # Modify the name or description of a vApp.
+        #
+        # This operation is asynchronous and returns a task that you can monitor
+        # to track the progress of the request.
+        #
+        #
+        # @param [String] id Object identifier of the vApp.
+        # @param [String] name of the vApp.
+        # @param [Hash] options
+        #   * :Description<~String>: - description to be assigned (optional)
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-55/topic/com.vmware.vcloud.api.reference.doc_55/doc/operations/PUT-VAppNameAndDescription.html
+        # @since vCloud API version 0.9
+        def put_vapp_name_and_description(id, name, options={})
+          body = Fog::Generators::Compute::VcloudDirector::Vapp.new(name, options).generate_xml
+          request(
+            :body    => body,
+            :expects => 202,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.vApp+xml'},
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{id}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -255,7 +255,7 @@ module Fog
             :cpus      => 1,
 #            :corespersocket => 1,
             :memory_mb => 512,
-#            :guest_id  => 'otherGuest',
+            :guest_id  => 'otherGuest',
             :path      => '/'
           }
         end

data/lib/fog/xenserver/compute.rb

@@ -12,10 +12,45 @@ module Fog
       requires :xenserver_password
       requires :xenserver_url
       recognizes :xenserver_defaults
+      recognizes :xenserver_timeout
 
       model_path 'fog/xenserver/models/compute'
+      model :blob
+      collection :blobs
+      model :bond
+      collection :bonds
+      model :crash_dump
+      collection :crash_dumps
+      model :dr_task
+      collection :dr_tasks
+      model :gpu_group
+      collection :gpu_groups
+      model :host_crash_dump
+      collection :host_crash_dumps
+      model :host_patch
+      collection :host_patchs
+      model :pci
+      collection :pcis
+      model :pgpu
+      collection :pgpus
+      model :pif_metrics
+      collection :pifs_metrics
+      model :pool_patch
+      collection :pool_patchs
+      model :role
+      collection :roles
       model :server
       collection :servers
+      model :server_appliance
+      collection :server_appliances
+      model :storage_manager
+      collection :storage_managers
+      model :tunnel
+      collection :tunnels
+      model :vmpp
+      collection :vmpps
+      model :vtpm
+      collection :vtpms
       model :host
       collection :hosts
       collection :vifs

data/lib/fog/xenserver/models/compute/blob.rb

@@ -0,0 +1,22 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Blob < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=blob
+
+        identity :reference
+
+        attribute :last_updated
+        attribute :mime_type
+        attribute :description,         :aliases => :name_description
+        attribute :name,                :aliases => :name_label
+        attribute :public
+        attribute :size
+        attribute :uuid
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/blobs.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/blob'
+
+module Fog
+  module Compute
+    class XenServer
+      class Blobs < Fog::Collection
+        model Fog::Compute::XenServer::Blob
+
+        def all(options={})
+          data = service.get_records 'blob'
+          load(data)
+        end
+
+        def get( blob_ref )
+          if blob_ref && blob = service.get_record( blob_ref, 'blob' )
+            new(blob)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/bond.rb

@@ -0,0 +1,23 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Bond < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=Bond
+
+        identity :reference
+
+        attribute :links_up
+        attribute :__master,            :aliases => :master
+        attribute :mode
+        attribute :other_config
+        attribute :__primary_slave,     :aliases => :primary_slave
+        attribute :properties
+        attribute :__slaves,            :aliases => :slaves
+        attribute :uuid
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/bonds.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/bond'
+
+module Fog
+  module Compute
+    class XenServer
+      class Bonds < Fog::Collection
+        model Fog::Compute::XenServer::Bond
+
+        def all(options={})
+          data = service.get_records 'Bond'
+          load(data)
+        end
+
+        def get( bond_ref )
+          if bond_ref && bond = service.get_record( bond_ref, 'Bond' )
+            new(bond)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/console.rb

@@ -5,10 +5,12 @@ module Fog
     class XenServer
       class Console < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=console
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=console
 
         identity :reference
+
         attribute :location
+        attribute :other_config
         attribute :protocol
         attribute :uuid
         attribute :__vm, aliases: :VM

data/lib/fog/xenserver/models/compute/crash_dump.rb

@@ -0,0 +1,19 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class CrashDump < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=crashdump
+
+        identity :reference
+
+        attribute :other_config
+        attribute :__vdi,           :aliases => :VDI
+        attribute :__vm,            :aliases => :VM
+        attribute :uuid
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/crash_dumps.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/crash_dump'
+
+module Fog
+  module Compute
+    class XenServer
+      class Bonds < Fog::Collection
+        model Fog::Compute::XenServer::CrashDump
+
+        def all(options={})
+          data = service.get_records 'crashdump'
+          load(data)
+        end
+
+        def get( crashdump_ref )
+          if crashdump_ref && crashdump = service.get_record( crashdump_ref, 'crashdump' )
+            new(crashdump)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/dr_task.rb

@@ -0,0 +1,17 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class DrTask < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=DR_task
+
+        identity :reference
+
+        attribute :__introduced_srs,        :aliases => :introduced_SRs
+        attribute :uuid
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/dr_tasks.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/dr_task'
+
+module Fog
+  module Compute
+    class XenServer
+      class DrTasks < Fog::Collection
+        model Fog::Compute::XenServer::DrTask
+
+        def all(options={})
+          data = service.get_records 'DR_task'
+          load(data)
+        end
+
+        def get( dr_task_ref )
+          if dr_task_ref && dr_task = service.get_record( dr_task_ref, 'DR_task' )
+            new(dr_task)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/gpu_group.rb

@@ -0,0 +1,22 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class GpuGroup < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=GPU_group
+
+        identity :reference
+
+        attribute :gpu_types,           :aliases => :GPU_types
+        attribute :description,         :aliases => :name_description
+        attribute :name,                :aliases => :name_label
+        attribute :other_config
+        attribute :__pgpus,             :aliases => :PGPUs
+        attribute :__vgpus,             :aliases => :VGPUs
+        attribute :uuid
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/gpu_groups.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/gpu_group'
+
+module Fog
+  module Compute
+    class XenServer
+      class GpuGroups < Fog::Collection
+        model Fog::Compute::XenServer::GpuGroup
+
+        def all(options={})
+          data = service.get_records 'GPU_group'
+          load(data)
+        end
+
+        def get( gpu_group_ref )
+          if gpu_group_ref && gpu_group = service.get_record( gpu_group_ref, 'GPU_group' )
+            new(gpu_group)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/guest_metrics.rb

@@ -6,11 +6,12 @@ module Fog
     
       class GuestMetrics < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VM_guest_metrics
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VM_guest_metrics
         
         identity :reference
         
         attribute :uuid
+        attribute :disk
         attribute :last_updated
         attribute :live
         attribute :memory

data/lib/fog/xenserver/models/compute/host.rb

@@ -6,23 +6,56 @@ module Fog
 
       class Host < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=host
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host
 
         identity :reference
 
-        attribute :name,              :aliases => :name_label
+        attribute :name,                                :aliases => :name_label
         attribute :uuid
         attribute :address
         attribute :allowed_operations
+        attribute :api_version_major,                   :aliases => :API_version_major
+        attribute :api_version_minor,                   :aliases => :API_version_minor
+        attribute :api_version_vendor,                  :aliases => :API_version_vendor
+        attribute :api_version_vendor_implementation,   :aliases => :API_version_vendor_implementation
+        attribute :bios_strings
+        attribute :blobs
+        attribute :capabilities
+        attribute :chipset_info
+        attribute :cpu_configuration
+        attribute :cpu_info
+        attribute :__crash_dump_sr,                     :aliases => :crash_dump_sr
+        attribute :__crashdumps,                        :aliases => :crashdumps
+        attribute :current_operations
         attribute :enabled
+        attribute :external_auth_configuration
+        attribute :external_auth_service_name
+        attribute :external_auth_type
+        attribute :guest_vcpus_params,                  :aliases => :guest_VCPUs_params
+        attribute :ha_network_peers
+        attribute :ha_statefiles
         attribute :hostname
-        attribute :__metrics,          :aliases => :metrics
-        attribute :name_description
+        attribute :license_params
+        attribute :license_server
+        attribute :__local_cache_sr,                    :aliases => :local_cache_sr
+        attribute :logging
+        attribute :memory_overhead
+        attribute :__metrics,                           :aliases => :metrics
+        attribute :description,                         :aliases => :name_description
         attribute :other_config
-        attribute :__pbds,            :aliases => :PBDs
-        attribute :__pifs,            :aliases => :PIFs
-        attribute :__resident_vms,      :aliases => :resident_VMs
-        attribute :__host_cpus,         :aliases => :host_CPUs
+        attribute :patches
+        attribute :__pbds,                              :aliases => :PBDs
+        attribute :__pcis,                              :aliases => :PCIs
+        attribute :__pgpus,                             :aliases => :PGPUs
+        attribute :__pifs,                              :aliases => :PIFs
+        attribute :power_on_config
+        attribute :power_on_mode
+        attribute :__resident_vms,                      :aliases => :resident_VMs
+        attribute :sched_policy
+        attribute :supported_bootloaders
+        attribute :suspend_image_sr
+        attribute :tags
+        attribute :__host_cpus,                         :aliases => :host_CPUs
         attribute :edition
         attribute :software_version
         

data/lib/fog/xenserver/models/compute/host_cpu.rb

@@ -7,7 +7,7 @@ module Fog
       #
       # A physical CPU
       #
-      # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=host_cpu
+      # @see http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_cpu
       #
       class HostCpu < Fog::Model
         
@@ -15,6 +15,7 @@ module Fog
         
         attribute :uuid
         attribute :family
+        attribute :features
         attribute :flags
         attribute :__host,          :aliases => :host
         attribute :model

data/lib/fog/xenserver/models/compute/host_crash_dump.rb

@@ -0,0 +1,20 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class HostCrashDump < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_crashdump
+
+        identity :reference
+
+        attribute :__host,              :aliases => :host
+        attribute :other_config
+        attribute :size
+        attribute :timestamp
+        attribute :uuid
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/host_crash_dumps.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/host_crash_dump'
+
+module Fog
+  module Compute
+    class XenServer
+      class HostCrashDumps < Fog::Collection
+        model Fog::Compute::XenServer::HostCrashDump
+
+        def all(options={})
+          data = service.get_records 'host_crashdump'
+          load(data)
+        end
+
+        def get( host_crashdump_ref )
+          if host_crashdump_ref && host_crashdump = service.get_record( host_crashdump_ref, 'host_crashdump' )
+            new(host_crashdump)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/host_metrics.rb

@@ -6,7 +6,7 @@ module Fog
     
       class HostMetrics < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VM_host_metrics
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=host_metrics
         
         identity :reference