bosh_vcloud_cpi 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8221918d582915c2eea63a73e84da36e406564e
-  data.tar.gz: ebcdc1bb6b631d7921bae2980a1d87397d2d778b
+  metadata.gz: cf849aca94b875385ed294be390fb8f9e69ab2fa
+  data.tar.gz: 32c666a6702a4f3000441bd074ecedcb70bc0530
 SHA512:
-  metadata.gz: 7978e222cdecb48feeffdbd3a6307f030a52633e5e61c045494fa349b890ac6566995e6ad171626bd9a0ccd788d05871069bfd1f47a1ed9ea01f47fba35f1bb8
-  data.tar.gz: fd063bb3a2e60b890d408f0967f5cff7a464f65a898b44e376ae48e3fd709fc5b9a9475bccb39b2ccdccd7c51fd87a2941cb6321642f02f53c1f8cce99cc4dad
+  metadata.gz: eb7a0ee08d1289702d516b90c285647c64caf0604bdc665c9a132e3027ff16782e9d2e19e6e2a8bcb909e2ed23b8c1a6148e80a02b3b62329719996c66f45a8f
+  data.tar.gz: 9d40d0aead537318a279bbfdaa8fe2558cf6720e91bbc37b393d66fad81c62b7ffc8c0aa267e5e2363ba447a9d79bced779c33eb751f9fb45a7ebde7d636c772

data/lib/cloud/vcloud/cloud.rb

@@ -57,7 +57,10 @@ module VCloudCloud
         requested_name = environment && environment['vapp']
         vapp_name = requested_name ? "vapp-tmp-#{unique_name}" : agent_id
 
-        s.next Steps::Instantiate, catalog_vapp_id, vapp_name, description, disk_locality
+        storage_profiles = client.vdc.storage_profiles || []
+        storage_profile = storage_profiles.find { |sp| sp['name'] == @entities['vapp_storage_profile'] }
+
+        s.next Steps::Instantiate, catalog_vapp_id, vapp_name, description, disk_locality, storage_profile
         client.flush_cache  # flush cached vdc which contains vapp list
         vapp = s.state[:vapp]
         vm = s.state[:vm] = vapp.vms[0]
@@ -220,11 +223,13 @@ module VCloudCloud
       end
     end
 
-    def create_disk(size_mb, vm_locality = nil)
-      (steps "create_disk(#{size_mb}, #{vm_locality.inspect})" do |s|
+    def create_disk(size_mb, cloud_properties, vm_locality = nil)
+      (steps "create_disk(#{size_mb}, #{cloud_properties.inspect}, #{vm_locality.inspect})" do |s|
         # vm_locality is used as vm_id
         vm = vm_locality.nil? ? nil : client.resolve_entity(vm_locality)
-        s.next Steps::CreateDisk, unique_name, size_mb, vm
+        storage_profiles = client.vdc.storage_profiles || []
+        storage_profile = storage_profiles.find { |sp| sp['name'] == @entities['vapp_storage_profile'] }
+        s.next Steps::CreateDisk, unique_name, size_mb, vm, storage_profile
       end)[:disk].urn
     end
 

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

@@ -1,13 +1,14 @@
 module VCloudCloud
   module Steps
     class CreateDisk < Step
-      def perform(name, size_mb, vm, &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
         params.bus_type     = VCloudSdk::Xml::HARDWARE_TYPE[:SCSI_CONTROLLER]
         params.bus_sub_type = VCloudSdk::Xml::BUS_SUB_TYPE[:LSILOGIC]
         params.add_locality vm if vm
+        params.storage_profile = storage_profile if storage_profile
         disk = client.invoke :post, client.vdc.add_disk_link,
                   :payload => params,
                   :headers => { :content_type => VCloudSdk::Xml::MEDIA_TYPE[:DISK_CREATE_PARAMS] }

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

@@ -3,7 +3,7 @@ module VCloudCloud
     # Create a vApp from a vApp template
     # Ref: http://pubs.vmware.com/vcd-51/index.jsp?topic=%2Fcom.vmware.vcloud.api.reference.doc_51%2Fdoc%2Foperations%2FPOST-InstantiateVAppTemplate.html
     class Instantiate < Step
-      def perform(template_id, vapp_name, description, disk_locality, &block)
+      def perform(template_id, vapp_name, description, disk_locality, storage_profile, &block)
         catalog_item = client.resolve_entity template_id
         raise ObjectNotFoundError, "Invalid vApp template Id: #{template_id}" unless catalog_item
         template = client.resolve_link catalog_item.entity
@@ -15,6 +15,7 @@ module VCloudCloud
         params.all_eulas_accepted = true
         params.linked_clone = false
         params.set_locality = locality_spec template, disk_locality
+        params.set_storage_profile = storage_profile_spec(template, storage_profile) if storage_profile
 
         state[:instantiate_vapp_name] = vapp_name
 
@@ -57,6 +58,14 @@ module VCloudCloud
         end
         locality
       end
+
+      def storage_profile_spec(template, storage_profile)
+        vm_storage_profiles = {}
+        template.vms.each do |vm|
+          vm_storage_profiles[vm] = storage_profile
+        end
+        vm_storage_profiles
+      end
     end
   end
 end

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

@@ -32,6 +32,19 @@ module VCloudSdk
         disk.node.after(node)
       end
 
+      def storage_profile=(storage_profile)
+        return unless storage_profile
+
+        raise "disk storage profile already set." if @storage_profile
+        @storage_profile = true
+
+        node = create_child("StorageProfile")
+        node["type"] = storage_profile.type
+        node["name"] = storage_profile.name
+        node["href"] = storage_profile.href
+        disk.node.add_child(node)
+      end
+
       private
 
       def disk

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

@@ -32,7 +32,6 @@ module VCloudSdk
         source_node["href"] = src["href"]
         source_node["id"] = src["id"]
         source_node["type"] = src["type"]
-        source_node["id"] = src["id"]
       end
 
       def set_locality=(locality)
@@ -74,6 +73,39 @@ module VCloudSdk
         end
       end
 
+      def set_storage_profile=(storage_profile)
+        return unless storage_profile
+
+        raise "vApp storage profile already set." if @storage_profile
+        @storage_profile = true
+
+        storage_profile.each do |k,v|
+          node_sp = create_child("SourcedVmInstantiationParams",
+                                 namespace.prefix,
+                                 namespace.href)
+
+          is_source_delete.node.after(node_sp)
+
+          node_sv = add_child("Source",
+                              namespace.prefix,
+                              namespace.href,
+                              node_sp)
+
+          node_sv["type"] = k.type
+          node_sv["name"] = k.name
+          node_sv["href"] = k.href
+
+          node_lp = create_child("StorageProfile",
+                                 namespace.prefix,
+                                 namespace.href)
+          node_lp["type"] = v.type
+          node_lp["name"] = v.name
+          node_lp["href"] = v.href
+
+          node_sv.after(node_lp)
+        end
+      end
+
       private
 
       def is_source_delete

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  98dd77
+  7133d0
 email: support@cloudfoundry.com
 executables: []
 extensions: []