bosh_vcloud_cpi 0.7.10 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7cda14ebdb11a1c818ce26c463bc7fd9605bd3
-  data.tar.gz: 7a6e5455d43ccd766749289d04592e9d61c630cd
+  metadata.gz: c4d97d94d84c1a9a705a9ba642388c1f47b34cf7
+  data.tar.gz: 34d48cd6dfe0feb24ed2e726b4787f852c50b4c8
 SHA512:
-  metadata.gz: d644a6ecb8f31d59a23e18c11bd479233a1bd48420b449816d751c5f8d1bbf01836d8dbd12c630da58a383f75fd0af3dab8f2be2dfbb4da70365bacb9adc6998
-  data.tar.gz: e5f5d04c699e5f7e56068be8f7c54c2add73396e8e12e77fbaffa4b1c45f446a7770b5f0c3c873345840c42730e27bb9b30472684e765e44ef4378645998bf4e
+  metadata.gz: 33d7e13c598313b197ee41be1979e3d86ad3de71c5584575f192708fa6b7840c5193dd98579a6b3e4e7e3a4a95a60c92cf111bbf889b1a2f76fd8ec89bb2a7be
+  data.tar.gz: d2d62fa77096ee532349c274d64f9e8ec3425cc34dba3771e43a55f5969b5b1d6b36b2903ebd1d211445eb96f0dd3bb52c6651b2dc119022f2de172bdba16825

data/lib/cloud/vcloud/cloud.rb

@@ -29,10 +29,15 @@ module VCloudCloud
     def create_stemcell(image, _)
       (steps "create_stemcell(#{image}, _)" do |s|
         s.next Steps::StemcellInfo, image
-        s.next Steps::CreateTemplate, "sc-#{unique_name}"
-        s.next Steps::UploadTemplateFiles
-        s.next Steps::AddCatalog, @client.catalog_name(:vapp)
-        s.next Steps::AddCatalogItem, :vapp, s.state[:vapp_template]
+        catalog_type = :vapp
+        s.next Steps::AddCatalog, @client.catalog_name(catalog_type)
+        s.next Steps::CreateTemplate, "sc-#{unique_name}", catalog_type
+
+        # Retry upload template file in case of timeout
+        errors = [Timeout::Error]
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: cpi_retries, on: errors) do |tries, error|
+          s.next Steps::UploadTemplateFiles
+        end
       end)[:catalog_item].urn
     end
 
@@ -60,6 +65,10 @@ module VCloudCloud
       2
     end
 
+    def cpi_retries
+      10
+    end
+
     def create_vm(agent_id, catalog_vapp_id, resource_pool, networks, disk_locality = nil, environment = nil)
       (steps "create_vm(#{agent_id}, #{catalog_vapp_id}, #{resource_pool}, ...)" do |s|
         # disk_locality should be an array of disk ids
@@ -92,7 +101,7 @@ module VCloudCloud
           container_vapp = nil
 
           errors = [RuntimeError]
-          Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 10, on: errors) do
+          Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: cpi_retries, on: errors) do |tries, error|
             begin
               begin
                 @logger.debug "Requesting container vApp: #{requested_name}"
@@ -152,7 +161,7 @@ module VCloudCloud
         # TODO refact this
         if requested_name
           errors = [RuntimeError]
-          Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+          Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: cpi_retries, on: errors) do |tries, error|
             begin
               save_agent_env s
               s.next Steps::PowerOn, :vm
@@ -177,7 +186,7 @@ module VCloudCloud
         vm = s.state[:vm] = client.resolve_entity(vm_id)
 
         errors = [RuntimeError]
-        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: cpi_retries, on: errors) do |tries, error|
           begin
             if vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:SUSPENDED].to_s
               s.next Steps::DiscardSuspendedState, :vm
@@ -219,18 +228,8 @@ module VCloudCloud
 
           # poweroff vm before we are able to delete it
           s.next Steps::PowerOff, :vm, true
-
-          vapp = s.state[:vapp] = client.resolve_link vm.container_vapp_link
-          if vapp.vms.size == 1
-            # Hack: if vApp is running, and the last VM is deleted, it is no longer stoppable and removable
-            # even from dashboard. So if there's only one VM, just stop and delete the vApp
-            s.next Steps::PowerOff, :vapp, true
-            s.next Steps::Undeploy, :vapp
-            s.next Steps::Delete, s.state[:vapp], true
-          else
-            s.next Steps::Undeploy, :vm
-            s.next Steps::Delete, s.state[:vm], true
-          end
+          s.next Steps::Undeploy, :vm
+          s.next Steps::Delete, s.state[:vm], true
 
           s.next Steps::DeleteCatalogMedia, vm.name
         rescue RestClient::Forbidden, ObjectNotFoundError => e
@@ -264,7 +263,7 @@ module VCloudCloud
         s.state[:disk] = client.resolve_entity disk_id
 
         errors = [RuntimeError]
-        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: cpi_retries, on: errors) do |tries, error|
           begin
             s.next Steps::AttachDetachDisk, :attach
 
@@ -293,7 +292,7 @@ module VCloudCloud
         next unless vm.find_attached_disk s.state[:disk]
 
         errors = [RuntimeError]
-        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: 20, on: errors) do
+        Bosh::Common.retryable(sleep: cpi_call_wait_time, tries: cpi_retries, on: errors) do |tries, error|
           begin
             if vm['status'] == VCloudSdk::Xml::RESOURCE_ENTITY_STATUS[:SUSPENDED].to_s
               s.next Steps::DiscardSuspendedState, :vm

data/lib/cloud/vcloud/steps/create_disk.rb

@@ -1,7 +1,7 @@
 module VCloudCloud
   module Steps
     class CreateDisk < Step
-      def perform(name, size_mb, vm, storage_profile, &block)
+      def perform(name, size_mb, vm, storage_profile, &_block)
         params = VCloudSdk::Xml::WrapperFactory.create_instance 'DiskCreateParams'
         params.name         = name
         params.size_bytes   = size_mb << 20 # VCD expects bytes

data/lib/cloud/vcloud/steps/create_template.rb

@@ -1,12 +1,23 @@
 module VCloudCloud
   module Steps
     class CreateTemplate < Step
-      def perform(name, &block)
+      def perform(name, catalog_type, &block)
+        catalog = client.catalog catalog_type
+
         params = VCloudSdk::Xml::WrapperFactory.create_instance 'UploadVAppTemplateParams'
         params.name = name
-        template = client.invoke :post, client.vdc.upload_link, :payload => params
+        upload_link = catalog.add_vapp_template_link
+        catalog_item = client.invoke(
+          :post,
+          upload_link,
+          :payload => params,
+          :headers => {:content_type => upload_link.type}
+        )
+
+        template = client.invoke :get, catalog_item.entity.href
 
         # commit states
+        state[:catalog_item] = catalog_item
         state[:vapp_template] = template
       end
 

data/lib/cloud/vcloud/steps/insert_catalog_media.rb

@@ -21,6 +21,31 @@ module VCloudCloud
         end
         state[:vm] = client.reload vm
       end
+
+      def rollback
+        vm = state[:vm]
+        name = vm.name
+
+        catalog_media = client.catalog_item :media, name, VCloudSdk::Xml::MEDIA_TYPE[:MEDIA]
+        # return if doesn't exist
+        return unless catalog_media
+        media = client.resolve_link catalog_media.entity
+        params = VCloudSdk::Xml::WrapperFactory.create_instance 'MediaInsertOrEjectParams'
+        params.media_href = media.href
+        vm = state[:vm]
+        client.timed_loop do
+          media = client.reload media
+          vm = client.reload vm
+          if media.running_tasks.empty?
+            client.invoke_and_wait :post, vm.eject_media_link,
+                                   :payload => params,
+                                   :headers => { :content_type => VCloudSdk::Xml::MEDIA_TYPE[:MEDIA_INSERT_EJECT_PARAMS] }
+            break
+          else
+            media = client.wait_entity media
+          end
+        end
+      end
     end
   end
 end

data/lib/cloud/vcloud/steps/save_agent_env.rb

@@ -16,9 +16,11 @@ module VCloudCloud
         env_path = File.join tmpdir, 'env'
         iso_path = File.join tmpdir, 'env.iso'
         File.open(env_path, 'w') { |f| f.write env_json }
-        output = `#{genisoimage} -o #{iso_path} #{env_path} 2>&1`
-        @logger.debug "GENISOIMAGE #{output}"
-        raise "genisoimage: #{$?.exitstatus}: #{output}" unless $?.success?
+        command = "#{create_iso_cmd} -o #{iso_path} #{env_path} 2>&1"
+        output = `#{command}`
+        message = "command `#{command}`: exited with stats: `#{$?.exitstatus}`: and output `#{output}`"
+        @logger.debug message
+        raise message unless $?.success?
 
         metadata = VCloudSdk::Xml::WrapperFactory.create_instance 'MetadataValue'
         metadata.value = env_json
@@ -35,8 +37,13 @@ module VCloudCloud
 
       private
 
-      def genisoimage  # TODO: this should exist in bosh_common, eventually
-        @genisoimage ||= Bosh::Common.which(%w{genisoimage mkisofs})
+      def create_iso_cmd # TODO: this should exist in bosh_common, eventually
+        @create_iso_cmd ||= begin
+          possibilities = %w{genisoimage mkisofs}
+          cmd = Bosh::Common.which(possibilities)
+          raise("Unable to find a iso creation utility `#{possibilities.inspect}`") unless cmd
+          cmd
+        end
       end
     end
   end

data/lib/cloud/vcloud/vcd_client.rb

@@ -12,7 +12,7 @@ module VCloudCloud
   class VCloudClient
     attr_reader :logger
 
-    VCLOUD_VERSION_NUMBER = '5.1'
+    VCLOUD_VERSION_NUMBER = '5.5'
 
     def initialize(vcd_settings, logger)
       @logger = logger
@@ -144,7 +144,7 @@ module VCloudCloud
         return task if status == VCloudSdk::Xml::TASK_STATUS[:SUCCESS]
         if [:ABORTED, :ERROR, :CANCELED].any? { |s| status == VCloudSdk::Xml::TASK_STATUS[s] }
           return task if accept_failure
-          raise "Task #{task.urn} #{task.operation} completed unsuccessfully"
+          raise "Task #{task.urn} #{task.operation} completed unsuccessfully, Details:#{task.details}"
         end
       end
       task
@@ -164,12 +164,14 @@ module VCloudCloud
       entity = reload entity
 
       # verify all tasks succeeded
-      unless accept_failure || entity.tasks.nil? || entity.tasks.empty?
+      unless entity.tasks.nil? || entity.tasks.empty?
         failed_tasks = entity.tasks.find_all { |task| task.status.downcase != VCloudSdk::Xml::TASK_STATUS[:SUCCESS] }
         unless failed_tasks.empty?
-          @logger.error "Failed tasks: #{failed_tasks}"
-          failed_tasks_info = failed_tasks.map {|t| "Task #{t.urn} #{t.operation}"}
-          raise "Some tasks failed: #{failed_tasks_info.join('; ')}"
+          @logger.debug "Failed tasks: #{failed_tasks}"
+          unless accept_failure
+            failed_tasks_info = failed_tasks.map { |t| "Task #{t.urn} #{t.operation}, Details:#{t.details}" }
+            raise "Some tasks failed: #{failed_tasks_info.join('; ')}"
+          end
         end
       end
 
@@ -247,13 +249,14 @@ module VCloudCloud
       params = {
           :method => method,
           :url => if path.start_with?('/')
-                    @url + path
-                  else
-                    path
-                  end,
+            @url + path
+          else
+            path
+          end,
           :headers => {
-              :Accept => "application/*+xml;version=#{VCLOUD_VERSION_NUMBER}",
-              :content_type => '*/*'
+            :Accept => "application/*+xml;version=#{VCLOUD_VERSION_NUMBER}",
+            :content_type => '*/*',
+            'X-VMWARE-VCLOUD-CLIENT-REQUEST-ID' => SecureRandom.uuid
           }
       }
       params[:headers][:x_vcloud_authorization] = @auth_token if !options[:login] && @auth_token
@@ -280,11 +283,20 @@ module VCloudCloud
     def session
       unless cookie_available?
         auth = "#{@user}@#{@entities['organization']}:#{@pass}"
-        auth_header = "Basic #{Base64.encode64(auth)}"
-        response = send_request :post, login_url,
-                    :headers => { :Authorization => auth_header, :content_type => 'application/x-www-form-urlencoded' },
-                    :payload => URI.encode_www_form({ :Authorization => auth_header, :Accept => "application/*+xml;version=#{VCLOUD_VERSION_NUMBER}" }),
-                    :with_response => true
+        auth_header = "Basic #{Base64.strict_encode64(auth)}"
+        response = send_request(
+          :post,
+          login_url,
+          :headers => {
+            :Authorization => auth_header,
+            :content_type => 'application/x-www-form-urlencoded'
+          },
+          :payload => URI.encode_www_form({
+            :Authorization => auth_header,
+            :Accept => "application/*+xml;version=#{VCLOUD_VERSION_NUMBER}"
+          }),
+          :with_response => true
+        )
 
         @auth_token = response.headers[:x_vcloud_authorization]
         @cookie = response.cookies

data/lib/cloud/vcloud/version.rb

@@ -1,9 +1,7 @@
 module Bosh
   module Clouds
-
     class VCloud
-      VERSION = '0.5.5'
+      VERSION = '0.9.0'
     end
-
   end
 end

data/lib/cloud/vcloud/xml/wrapper.rb

@@ -35,8 +35,7 @@ module VCloudSdk
           end
         end
 
-        def create_instance(type_name, ns = nil, namespace_defintions = nil,
-            *args)
+        def create_instance(type_name, ns = nil, namespace_defintions = nil, *args)
           xml = @@xml_dictionary[type_name]
           if (xml)
             wrap_document(xml, ns, namespace_defintions, *args)

data/lib/cloud/vcloud/xml/wrapper_classes/catalog.rb

@@ -7,6 +7,11 @@ module VCloudSdk
                            "rel"=>"add"}).first
       end
 
+      def add_vapp_template_link
+        get_nodes("Link", {"type" => MEDIA_TYPE[:UPLOAD_VAPP_TEMPLATE_PARAMS],
+                           "rel"=>"add"}).first
+      end
+
       def catalog_items(name = nil)
         if name
           get_nodes("CatalogItem", {"name" => name})

data/lib/cloud/vcloud/xml/wrapper_classes/task.rb

@@ -15,6 +15,12 @@ module VCloudSdk
         self["operation"]
       end
 
+      def details
+        details = get_nodes("Details")
+        return nil if details.nil?
+        return details.collect {|d| d.content}.join
+      end
+
       # Short form name of the operation
       def operation_name
         self["operationName"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.9.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  dc1c42
+  b1e960
 email: support@cloudfoundry.com
 executables: []
 extensions: []