fog-maestrodev 1.15.0.20130829165835 → 1.15.0.20130927082724

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

@@ -0,0 +1,124 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        # TODO move all the logic to a generator
+
+        def instantiate_vapp_template(vapp_name, template_id, options = {})
+          params = populate_uris(options.merge(:vapp_name => vapp_name, :template_id => template_id))
+          validate_uris(params)
+
+          data = generate_instantiate_vapp_template_request(params)
+
+          request(
+            :body    => data,
+            :expects => 201,
+            :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml' },
+            :method  => 'POST',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vdc/#{params[:vdc_id]}/action/instantiateVAppTemplate"
+          )
+        end
+
+        def validate_uris(options ={})
+          [:vdc_uri, :network_uri].each do |opt_uri|
+            result = default_organization_body[:Link].detect {|org| org[:href] == options[opt_uri]}
+            raise("#{opt_uri}: #{options[opt_uri]} not found") unless result
+          end
+        end
+
+        def populate_uris(options = {})
+          options[:vdc_id] ||= default_vdc_id
+          options[:vdc_uri] =  vdc_end_point(options[:vdc_id])
+          options[:network_id] ||= default_network_id
+          options[:network_uri] = network_end_point(options[:network_id])
+          #options[:network_name] = default_network_name || raise("error retrieving network name")
+          options[:template_uri] = vapp_template_end_point(options[:template_id]) || raise(":template_id option is required")
+          #customization_options = get_vapp_template(options[:template_uri]).body[:Children][:Vm][:GuestCustomizationSection]
+          ## Check to see if we can set the password
+          #if options[:password] and customization_options[:AdminPasswordEnabled] == "false"
+          #  raise "The catalog item #{options[:catalog_item_uri]} does not allow setting a password."
+          #end
+          #
+          ## According to the docs if CustomizePassword is "true" then we NEED to set a password
+          #if customization_options[:AdminPasswordEnabled] == "true" and customization_options[:AdminPasswordAuto] == "false" and ( options[:password].nil? or options[:password].empty? )
+          #  raise "The catalog item #{options[:catalog_item_uri]} requires a :password to instantiate."
+          #end
+          options
+        end
+
+        def generate_instantiate_vapp_template_request(options ={})
+          xml = Builder::XmlMarkup.new
+          xml.InstantiateVAppTemplateParams(xmlns.merge!(:name => options[:vapp_name], :"xml:lang" => "en")) {
+            xml.Description(options[:description])
+            xml.InstantiationParams {
+              # This options are fully ignored
+              if options[:network_uri]
+                xml.NetworkConfigSection {
+                  xml.tag!("ovf:Info"){ "Configuration parameters for logical networks" }
+                  xml.NetworkConfig("networkName" => options[:network_name]) {
+                    xml.Configuration {
+                      xml.ParentNetwork(:href => options[:network_uri])
+                      xml.FenceMode("bridged")
+                    }
+                  }
+                }
+              end
+            }
+            # The template
+            xml.Source(:href => options[:template_uri])
+            xml.AllEULAsAccepted("true")
+          }
+        end
+
+        def xmlns
+          {
+            'xmlns'     => "http://www.vmware.com/vcloud/v1.5",
+            "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1",
+            "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+            "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema"
+          }
+        end
+
+#        def validate_instantiate_vapp_template_options options
+#          # :network_uri removed, if not specified will use template network config.
+#          valid_opts = [:catalog_item_uri, :name, :vdc_uri]
+#          unless valid_opts.all? { |opt| options.has_key?(opt) }
+#            raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
+#          end
+#
+#          catalog_item_uri = options[:catalog_item_uri]
+#
+#          # Figure out the template_uri
+#          catalog_item = get_catalog_item( catalog_item_uri ).body
+#          catalog_item[:Entity] = [ catalog_item[:Entity] ] if catalog_item[:Entity].is_a?(Hash)
+#          catalog_item[:Link] = [ catalog_item[:Link] ] if catalog_item[:Link].is_a?(Hash)
+#
+#          options[:template_uri] = begin
+#             catalog_item[:Entity].detect { |entity| entity[:type] == "application/vnd.vmware.vcloud.vAppTemplate+xml" }[:href]
+#          rescue
+#            raise RuntimeError.new("Unable to locate template uri for #{catalog_item_uri}")
+#          end
+#
+#          customization_options = begin
+#              get_vapp_template(options[:template_uri]).body[:Children][:Vm][:GuestCustomizationSection]
+#          rescue
+#            raise RuntimeError.new("Unable to get customization options for #{catalog_item_uri}")
+#          end
+#
+#          # Check to see if we can set the password
+#          if options[:password] and customization_options[:AdminPasswordEnabled] == "false"
+#            raise ArgumentError.new("This catalog item (#{catalog_item_uri}) does not allow setting a password.")
+#          end
+#
+#          # According to the docs if CustomizePassword is "true" then we NEED to set a password
+#          if customization_options[:AdminPasswordEnabled] == "true" and customization_options[:AdminPasswordAuto] == "false" and ( options[:password].nil? or options[:password].empty? )
+#            raise ArgumentError.new("This catalog item (#{catalog_item_uri}) requires a :password to instantiate.")
+#          end
+#        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        # Cancel a task.
+        #
+        # ==== Parameters
+        # * task_id<~String> - The ID of the task you want to cancel.
+        #
+        # === Returns
+        # * response<~Excon::Response>
+        #
+        def post_task_cancel(task_id)
+          request(
+            :expects => 204,
+            :method  => 'POST',
+            :path    => "task/#{task_id}/action/cancel"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        def undeploy(vapp_id)
+          body = <<EOF
+                        <UndeployVAppParams xmlns="http://www.vmware.com/vcloud/v1.5">
+                        <UndeployPowerAction>shutdown</UndeployPowerAction>
+                        </UndeployVAppParams>
+EOF
+
+          request(
+            :body    => body,
+            :expects => 202,
+            :method  => 'POST',
+            :parser  => Fog::ToHashDocument.new,
+            :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.undeployVAppParams+xml' },
+            :path    => "vApp/#{vapp_id}/action/undeploy"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/metadata'
+
+        def post_vm_metadata(vm_id, metadata={})
+          metadata_klass = case 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(metadata)
+
+          request(
+            :body    => data.generate_xml,
+            :expects => 202,
+            :headers => { 'Content-Type' => "application/vnd.vmware.vcloud.metadata+xml" },
+            :method  => 'POST',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/metadata/"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        def post_vm_poweroff(vm_id)
+
+          request(
+            :expects  => 202,
+            :method   => 'POST',
+            :parser => Fog::ToHashDocument.new,
+            :path     => "vApp/#{vm_id}/power/action/powerOff"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        def post_vm_poweron(vm_id)
+          request(
+            :expects => 202,
+            :method  => 'POST',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/power/action/powerOn"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        def put_metadata_value(vm_id, metadata_key, metadata_value)
+          body="
+          <MetadataValue xmlns=\"http://www.vmware.com/vcloud/v1.5\">
+              <Value>#{metadata_value}</Value>
+           </MetadataValue>"
+
+          request(
+            :body    => body,
+            :expects => 202,
+            :headers => { 'Content-Type' => "application/vnd.vmware.vcloud.metadata.value+xml" },
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/metadata/#{URI.escape(metadata_key)}"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        def put_vm_cpu(vm_id, num_cpus)
+          data = <<EOF
+          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="#{endpoint}vApp/#{vm_id}/virtualHardwareSection/cpu" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
+            <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
+            <rasd:Description>Number of Virtual CPUs</rasd:Description>
+            <rasd:ElementName>#{num_cpus} virtual CPU(s)</rasd:ElementName>
+            <rasd:InstanceID>4</rasd:InstanceID>
+            <rasd:Reservation>0</rasd:Reservation>
+            <rasd:ResourceType>3</rasd:ResourceType>
+            <rasd:VirtualQuantity>#{num_cpus}</rasd:VirtualQuantity>
+            <rasd:Weight>0</rasd:Weight>
+            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{endpoint}vApp/#{vm_id}/virtualHardwareSection/cpu"/>
+          </Item>
+EOF
+
+          request(
+            :body    => data,
+            :expects => 202,
+            :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.rasdItem+xml' },
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/virtualHardwareSection/cpu"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/customization'
+
+        def put_vm_customization(vm_id, customization={})
+          data = Fog::Generators::Compute::VcloudDirector::Customization.new(customization)
+
+          request(
+            :body    => data.generate_xml,
+            :expects => 202,
+            :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.guestCustomizationSection+xml' },
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/guestCustomizationSection"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/disks'
+
+        # disks is the body of get_vm_disks
+        def put_vm_disks(vm_id, disks=[])
+          data = Fog::Generators::Compute::VcloudDirector::Disks.new(disks)
+
+          request(
+            :body    => data.generate_xml,
+            :expects => 202,
+            :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.rasdItemsList+xml' },
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/virtualHardwareSection/disks"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        def put_vm_memory(vm_id, memory)
+          data = <<EOF
+          <Item xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns12="http://www.vmware.com/vcloud/v1.5" ns12:href="#{endpoint}vApp/#{vm_id}/virtualHardwareSection/memory" ns12:type="application/vnd.vmware.vcloud.rasdItem+xml" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">
+            <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
+            <rasd:Description>Memory Size</rasd:Description>
+            <rasd:ElementName>#{memory} MB of memory</rasd:ElementName>
+            <rasd:InstanceID>5</rasd:InstanceID>
+            <rasd:Reservation>0</rasd:Reservation>
+            <rasd:ResourceType>4</rasd:ResourceType>
+            <rasd:VirtualQuantity>#{memory}</rasd:VirtualQuantity>
+            <rasd:Weight>0</rasd:Weight>
+            <Link rel="edit" type="application/vnd.vmware.vcloud.rasdItem+xml" href="#{endpoint}vApp/#{vm_id}/virtualHardwareSection/memory"/>
+          </Item>
+EOF
+
+          request(
+            :body    => data,
+            :expects => 202,
+            :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.rasdItem+xml' },
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/virtualHardwareSection/memory"
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+
+        require 'fog/vcloud_director/generators/compute/vm_network'
+
+        def put_vm_network(vm_id, network={})
+          data = Fog::Generators::Compute::VcloudDirector::VmNetwork.new(network)
+
+          request(
+            :body    => data.generate_xml,
+            :expects => 202,
+            :headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.networkConnectionSection+xml' },
+            :method  => 'PUT',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "vApp/#{vm_id}/networkConnectionSection/"
+          )
+        end
+
+      end
+    end
+  end
+end

data/tests/aws/models/auto_scaling/groups_test.rb

@@ -18,5 +18,10 @@ Shindo.tests('AWS::AutoScaling | group', ['aws', 'auto_scaling_m']) do
   model_tests(Fog::AWS[:auto_scaling].groups, params, true) do
     @instance.update
   end
+  
+  test("setting attributes in the constructor") do
+    group = Fog::AWS[:auto_scaling].groups.new(:min_size => 1, :max_size => 2)
+    group.min_size == 1 && group.max_size == 2
+  end
 
 end

data/tests/aws/models/compute/subnet_tests.rb

@@ -1,5 +1,5 @@
 Shindo.tests("Fog::Compute[:aws] | subnet", ['aws']) do
   @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
-  model_tests(Fog::Compute[:aws].subnets, {:vpc_id => @vpc.id, :cidr_block => '10.0.10.0/28'}, true)
+  model_tests(Fog::Compute[:aws].subnets, {:vpc_id => @vpc.id, :cidr_block => '10.0.10.0/28', :availability_zone => 'us-east-1b'}, true)
   @vpc.destroy
 end