fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/vcloud_director/generators/compute/vm_network.rb

@@ -1,41 +1,40 @@
-# This is the data structure it accepts, this is the output of get_vm_network
-#
-# {:type=>"application/vnd.vmware.vcloud.networkConnectionSection+xml",
-#  :href=>
-#   "https://example.com/api/vApp/vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae/networkConnectionSection/",
-#  :id=>"vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae",
-#  :primary_network_connection_index=>0,
-#  :network=>"DevOps - Dev Network Connection",
-#  :needs_customization=>true,
-#  :network_connection_index=>0,
-#  :ip_address=>"10.192.0.130",
-#  :is_connected=>true,
-#  :mac_address=>"00:50:56:01:00:8d",
-#  :ip_address_allocation_mode=>"POOL"}
-#
-#
-# This is what it generates
-#
-# <NetworkConnectionSection xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://example.com/api/vApp/vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae/networkConnectionSection/" 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://10.194.1.65/api/v1.5/schema/master.xsd">
-#     <ovf:Info>Specifies the available VM network connections</ovf:Info>
-#     <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
-#     <NetworkConnection network="DevOps - Dev Network Connection" needsCustomization="true">
-#         <NetworkConnectionIndex>0</NetworkConnectionIndex>
-#         <IpAddress>10.192.0.130</IpAddress>
-#         <IsConnected>true</IsConnected>
-#         <MACAddress>00:50:56:01:00:8d</MACAddress>
-#         <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
-#     </NetworkConnection>
-#     <Link rel="edit" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://example.com/api/vApp/vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae/networkConnectionSection/"/>
-# </NetworkConnectionSection>
-#
 module Fog
   module Generators
     module Compute
       module VcloudDirector
-
+        # This is the data structure it accepts, this is the output of
+        # #get_vm_network
+        #
+        #   {:type=>"application/vnd.vmware.vcloud.networkConnectionSection+xml",
+        #    :href=>
+        #     "https://example.com/api/vApp/vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae/networkConnectionSection/",
+        #    :id=>"vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae",
+        #    :primary_network_connection_index=>0,
+        #    :network=>"DevOps - Dev Network Connection",
+        #    :needs_customization=>true,
+        #    :network_connection_index=>0,
+        #    :ip_address=>"10.192.0.130",
+        #    :is_connected=>true,
+        #    :mac_address=>"00:50:56:01:00:8d",
+        #    :ip_address_allocation_mode=>"POOL"}
+        #
+        # This is what it generates:
+        #
+        #   <NetworkConnectionSection xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://example.com/api/vApp/vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae/networkConnectionSection/" 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://10.194.1.65/api/v1.5/schema/master.xsd">
+        #     <ovf:Info>Specifies the available VM network connections</ovf:Info>
+        #     <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
+        #     <NetworkConnection network="DevOps - Dev Network Connection" needsCustomization="true">
+        #       <NetworkConnectionIndex>0</NetworkConnectionIndex>
+        #       <IpAddress>10.192.0.130</IpAddress>
+        #       <IsConnected>true</IsConnected>
+        #       <MACAddress>00:50:56:01:00:8d</MACAddress>
+        #       <IpAddressAllocationMode>POOL</IpAddressAllocationMode>
+        #     </NetworkConnection>
+        #     <Link rel="edit" type="application/vnd.vmware.vcloud.networkConnectionSection+xml" href="https://example.com/api/vApp/vm-8b74d95a-ee91-4f46-88d8-fc92be0dbaae/networkConnectionSection/"/>
+        #   </NetworkConnectionSection>
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/NetworkConnectionSectionType.html
         class VmNetwork
-
           attr_reader :attrs
 
           def initialize(attrs={})
@@ -82,40 +81,38 @@ module Fog
             @attrs[:ip_address_allocation_mode] = new_ip_address_allocation_mode
           end
 
-          def header
-              '<NetworkConnectionSection xmlns="http://www.vmware.com/vcloud/v1.5"
-                 xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-                 type="application/vnd.vmware.vcloud.networkConnectionSection+xml"
-                 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://10.194.1.65/api/v1.5/schema/master.xsd">'
+          private
 
+          def header
+            <<-END
+            <NetworkConnectionSection xmlns="http://www.vmware.com/vcloud/v1.5"
+              xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
+              type="application/vnd.vmware.vcloud.networkConnectionSection+xml">
+            END
           end
 
           def body(opts={})
-            body = <<EOF
-            <ovf:Info>#{opts[:info]}</ovf:Info>
-                 <PrimaryNetworkConnectionIndex>#{opts[:primary_network_connection_index]}</PrimaryNetworkConnectionIndex>
-                 <NetworkConnection
-                     network="#{opts[:network]}"
-                     needsCustomization="#{opts[:needs_customization]}">
-                     <NetworkConnectionIndex>#{opts[:network_connection_index]}</NetworkConnectionIndex>
-                     <IpAddress>#{opts[:ip_address]}</IpAddress>
-                     <IsConnected>#{opts[:is_connected]}</IsConnected>
-                     <MACAddress>#{opts[:mac_address]}</MACAddress>
-                     <IpAddressAllocationMode>#{opts[:ip_address_allocation_mode]}</IpAddressAllocationMode>
-                 </NetworkConnection>
-EOF
+            <<-END
+              <ovf:Info>#{opts[:info]}</ovf:Info>
+              <PrimaryNetworkConnectionIndex>#{opts[:primary_network_connection_index]}</PrimaryNetworkConnectionIndex>
+              <NetworkConnection
+                network="#{opts[:network]}"
+                needsCustomization="#{opts[:needs_customization]}">
+                <NetworkConnectionIndex>#{opts[:network_connection_index]}</NetworkConnectionIndex>
+                <IpAddress>#{opts[:ip_address]}</IpAddress>
+                <IsConnected>#{opts[:is_connected]}</IsConnected>
+                <MACAddress>#{opts[:mac_address]}</MACAddress>
+                <IpAddressAllocationMode>#{opts[:ip_address_allocation_mode]}</IpAddressAllocationMode>
+              </NetworkConnection>
+            END
           end
 
           def tail
-            '</NetworkConnectionSection>'
+            <<-END
+            </NetworkConnectionSection>
+            END
           end
-
         end
-
       end
     end
   end

data/lib/fog/vcloud_director/models/compute/catalog_item.rb

@@ -17,6 +17,7 @@ module Fog
         def instantiate(vapp_name, options={})
           response = service.instantiate_vapp_template(vapp_name, vapp_template_id, options)
           service.process_task(response.body[:Tasks][:Task])
+          response.body[:href].split('/').last # returns the vapp_id if it was instantiated successfully .
         end
 
       end

data/lib/fog/vcloud_director/models/compute/catalog_items.rb

@@ -14,8 +14,10 @@ module Fog
 
         def item_list
           data = service.get_catalog(catalog.id).body
-          items = ensure_list(data[:CatalogItems][:CatalogItem]).select { |link| link[:type] == "application/vnd.vmware.vcloud.catalogItem+xml" }
-          items.each{|item| service.add_id_from_href!(item) }
+          items = data[:CatalogItems][:CatalogItem].select do |link|
+            link[:type] == 'application/vnd.vmware.vcloud.catalogItem+xml'
+          end
+          items.each {|item| service.add_id_from_href!(item)}
           items
         end
 

data/lib/fog/vcloud_director/models/compute/disk.rb

@@ -28,7 +28,7 @@ module Fog
             data = Fog::Generators::Compute::VcloudDirector::Disks.new(all_disks)
             num_disk = name.scan(/\d+/).first.to_i
             data.modify_hard_disk_size(num_disk, new_capacity)
-            response = service.put_vm_disks(attributes[:vm].id, data.disks)
+            response = service.put_disks(attributes[:vm].id, data.disks)
             service.process_task(response.body)
           end
         end
@@ -41,7 +41,7 @@ module Fog
           num_disk = name.scan(/\d+/).first.to_i
           data = Fog::Generators::Compute::VcloudDirector::Disks.new(all_disks)
           data.delete_hard_disk(num_disk)
-          response = service.put_vm_disks(attributes[:vm].id, data.disks)
+          response = service.put_disks(attributes[:vm].id, data.disks)
           service.process_task(response.body)
         end
 

data/lib/fog/vcloud_director/models/compute/disks.rb

@@ -14,7 +14,7 @@ module Fog
           item_list unless @disks
           data = Fog::Generators::Compute::VcloudDirector::Disks.new(@disks)
           data.add_hard_disk(size)
-          response = service.put_vm_disks(vm.id, data.disks)
+          response = service.put_disks(vm.id, data.disks)
           service.process_task(response.body)
         end
 

data/lib/fog/vcloud_director/models/compute/media.rb

@@ -0,0 +1,29 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class VcloudDirector
+
+      class Media < Model
+
+        identity  :id
+
+        attribute :href
+        attribute :type
+        attribute :name
+        attribute :status, :type => :integer
+        attribute :image_type, :aliases => :imageType
+        attribute :size, :type => :integer
+        attribute :description, :aliases => :Description
+
+        # @return [Boolean]
+        def destroy
+          requires :id
+          response = service.delete_media(id)
+          service.process_task(response.body)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/models/compute/medias.rb

@@ -0,0 +1,77 @@
+require 'fog/core/collection'
+require 'fog/vcloud_director/models/compute/media'
+
+module Fog
+  module Compute
+    class VcloudDirector
+
+      class Medias < Collection
+        model Fog::Compute::VcloudDirector::Media
+
+        attribute :vdc
+
+        # @param [String] name The name of the entity.
+        # @param [#read] io The input object to read from.
+        # @param [String] image_type Media image type. One of: iso, floppy.
+        # @return [Media]
+        def create(name, io, image_type='iso')
+          requires :vdc
+
+          response = service.post_upload_media(vdc.id, name, image_type, io.size)
+          service.add_id_from_href!(response.body)
+          media = new(response.body)
+
+          # Perhaps this would be better implemented as media#upload.
+
+          file = response.body[:Files][:File]
+          file[:Link] = [file[:Link]] if file[:Link].is_a?(Hash)
+          link = file[:Link].detect {|l| l[:rel] == 'upload:default'}
+
+          headers = {
+            'Content-Length' => io.size,
+            'Content-Type' => 'application/octet-stream',
+            'x-vcloud-authorization' => service.vcloud_token
+          }
+          chunker = lambda do
+            # to_s will convert the nil received after everything is read to
+            # the final empty chunk.
+            io.read(Excon.defaults[:chunk_size]).to_s
+          end
+          Excon.put(
+            link[:href],
+            :expects => 200,
+            :headers => headers,
+            :request_block => chunker)
+
+          service.process_task(response.body[:Tasks][:Task])
+
+          media.reload
+          media
+        end
+
+        private
+
+        # @param [String] item_id
+        # @return [Media]
+        def get_by_id(item_id)
+          item = service.get_media(item_id).body
+          %w(:Link).each {|key_to_delete| item.delete(key_to_delete)}
+          service.add_id_from_href!(item)
+          item
+        end
+
+        # @return [Array<Media>]
+        def item_list
+          data = service.get_vdc(vdc.id).body
+          return [] if data[:ResourceEntities].empty?
+          items = data[:ResourceEntities][:ResourceEntity].select do |resource|
+            resource[:type] == 'application/vnd.vmware.vcloud.media+xml'
+          end
+          items.each {|item| service.add_id_from_href!(item)}
+          items
+        end
+
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Fog
 
         def item_list
           data = service.get_organizations.body
-          orgs = ensure_list(data[:Org])
+          orgs = data[:Org]
           orgs.each {|org| service.add_id_from_href!(org)}
           orgs
         end

data/lib/fog/vcloud_director/models/compute/tag.rb

@@ -6,7 +6,6 @@ module Fog
 
       class Tag < Model
 
-
         identity  :id
         attribute :value
 
@@ -15,14 +14,13 @@ module Fog
           not_first_set = !value.nil?
           attributes[:value] = new_value
           if not_first_set && has_changed
-            response = service.put_metadata_value(vm.id, id, value)
+            response = service.put_vapp_metadata_item_metadata(vm.id, id, value)
             service.process_task(response.body)
           end
         end
 
-
         def destroy
-          response = service.delete_metadata(vm.id, id)
+          response = service.delete_vapp_metadata_item_metadata(vm.id, id)
           service.process_task(response.body)
         end
 

data/lib/fog/vcloud_director/models/compute/tags.rb

@@ -13,17 +13,14 @@ module Fog
         def get_by_name(tag_name)
           get(tag_name)
         end
+        
+        def get_by_id(item_id)
+          item_list unless @items
+          @items.detect{ |i| i[:id] == item_id}
+        end
 
         def create(key,value)
-          item_list unless @tags
-          metadata_klass = case service.api_version
-                           when '5.1' ; Fog::Generators::Compute::VcloudDirector::MetadataV51
-                           when '1.5' ; Fog::Generators::Compute::VcloudDirector::MetadataV15
-                           else raise "API version: #{api_version} not supported"
-                           end
-          data = metadata_klass.new(@tags)
-          data.add_item(key, value)
-          response = service.post_vm_metadata(vm.id, data.attrs)
+          response = service.post_update_vapp_metadata(vm.id, { key => value} )
           service.process_task(response.body)
         end
 
@@ -32,19 +29,14 @@ module Fog
           @tags[:metadata]
         end
 
-#        private
-
+        private
+        
         def item_list
           @items =[]
           hash_items.each_pair{ |k,v| @items << {:id => k, :value => v }.merge(:vm => vm) }
           @items
         end
 
-        def get_by_id(item_id)
-          item_list unless @items
-          @items.detect{ |i| i[:id] == item_id}
-        end
-
       end
     end
   end

data/lib/fog/vcloud_director/models/compute/task.rb

@@ -8,23 +8,24 @@ module Fog
 
         identity  :id
 
-        attribute :name
-        attribute :type
         attribute :href
-        attribute :status
+        attribute :type
+        attribute :name
+        attribute :end_time, :aliases => :endTime, :type => :time
+        attribute :expiry_time, :aliases => :expiryTime, :type => :time
         attribute :operation
         attribute :operation_name, :aliases => :operationName
-        attribute :expiry_time, :aliases => :expiryTime, :type => :time
-        attribute :end_time, :aliases => :endTime, :type => :time
         attribute :start_time, :aliases => :startTime, :type => :time
+        attribute :status
+        attribute :description, :aliases => :Description
         attribute :error, :aliases => :Error
-        attribute :result, :aliases => :Result
         attribute :progress, :aliases => :Progress, :type => :integer
 
         # Since 5.1
         attribute :operation_key, :aliases => :operationKey
         attribute :cancel_requested, :aliases => :cancelRequested, :type => :boolean
         attribute :service_namespace, :aliases => :serviceNamespace
+        attribute :details, :aliases => :Details
 
         def ready?
           status == 'success'
@@ -35,20 +36,20 @@ module Fog
         end
 
         def non_running?
-          if status == 'running'
-            if progress.to_i == 0
-              printf '.'
-            else
-              print " #{progress} %\r"
+          if @service.show_progress? && (@last_progress ||= 0) < 100
+            if status == 'running'
+              Formatador.redisplay_progressbar(progress, 100, :label => operation_name, :started_at => start_time)
+              @last_progress = progress
+            elsif status == 'success'
+              Formatador.redisplay_progressbar(100, 100, :label => operation_name, :started_at => start_time)
+              @last_progress = 100
             end
-          else
-            puts "  #{status}"
           end
           status != 'running'
         end
 
         def cancel
-          service.post_task_cancel(id)
+          service.post_cancel_task(id)
         end
 
       end

data/lib/fog/vcloud_director/models/compute/tasks.rb

@@ -20,9 +20,8 @@ module Fog
         private
 
         def item_list
-          data = service.get_tasks_list(organization.id).body
-          tasks = ensure_list(data[:Task])
-          tasks.each {|task| service.add_id_from_href!(task)}
+          data = service.get_task_list(organization.id).body
+          data[:Task].each {|task| service.add_id_from_href!(task)}
         end
 
       end

data/lib/fog/vcloud_director/models/compute/vapp.rb

@@ -30,23 +30,109 @@ module Fog
           service.tags(:vm => self)
         end
 
-        def undeploy
-          response = service.undeploy(id)
+        # @param [String] action The specified action is applied to all virtual
+        #   machines in the vApp. All values other than **default** ignore
+        #   actions, order, and delay specified in the StartupSection. One of:
+        # * powerOff (Power off the virtual machines. This is the default
+        #   action if this attribute is missing or empty)
+        # * suspend (Suspend the virtual machines)
+        # * shutdown (Shut down the virtual machines)
+        # * force (Attempt to power off the virtual machines. Failures in
+        #   undeploying the virtual machine or associated networks are ignored.
+        #   All references to the vApp and its virtual machines are removed
+        #   from the database)
+        # * default (Use the actions, order, and delay specified in the
+        #   StartupSection)
+        def undeploy(action='powerOff')
+          begin
+            response = service.post_undeploy_vapp(id, :UndeployPowerAction => action)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
           service.process_task(response.body)
         end
 
+        # Power off all VMs in the vApp.
+        def power_off
+          requires :id
+          begin
+            response = service.post_power_off_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
+        # Power on all VMs in the vApp.
         def power_on
-          response = service.post_vm_poweron(id)
+          requires :id
+          begin
+            response = service.post_power_on_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
           service.process_task(response.body)
         end
 
-        def power_off
-          response = service.post_vm_poweroff(id)
+        # Reboot all VMs in the vApp.
+        def reboot
+          requires :id
+          begin
+            response = service.post_reboot_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
+        # Reset all VMs in the vApp.
+        def reset
+          requires :id
+          begin
+            response = service.post_reset_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
+        # Shut down all VMs in the vApp.
+        def shutdown
+          requires :id
+          begin
+            response = service.post_shutdown_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
+        # Suspend all VMs in the vApp.
+        def suspend
+          requires :id
+          begin
+            response = service.post_suspend_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
           service.process_task(response.body)
         end
 
         def destroy
-          response = service.delete_vapp(id)
+          requires :id
+          begin
+            response = service.delete_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
           service.process_task(response.body)
         end
 

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

@@ -22,7 +22,7 @@ module Fog
         def item_list
           data = service.get_vdc(vdc.id).body
           return [] if data[:ResourceEntities].empty?
-          resource_entities = data[:ResourceEntities][:ResourceEntity].is_a?(Hash) ? [ data[:ResourceEntities][:ResourceEntity] ] : data[:ResourceEntities][:ResourceEntity]
+          resource_entities = data[:ResourceEntities][:ResourceEntity]
           items = resource_entities.select { |link| link[:type] == "application/vnd.vmware.vcloud.vApp+xml" }
           items.each{|item| service.add_id_from_href!(item) }
           items

data/lib/fog/vcloud_director/models/compute/vdc.rb

@@ -22,6 +22,11 @@ module Fog
         attribute :vm_quota ,:aliases => :VmQuota, :type => :integer
         attribute :is_enabled ,:aliases => :IsEnabled, :type => :boolean
 
+        def medias
+          requires :id
+          service.medias(:vdc => self)
+        end
+
         def vapps
           requires :id
           service.vapps(:vdc => self)