fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

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

@@ -0,0 +1,18 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Tag < Fog::Vcloud::Model
+        identity :href, :aliases => :Href
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
+
+        attribute :key, :aliases => :Key
+        attribute :value, :aliases => :Value
+        
+        def destroy
+          service.delete_metadata(href)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'fog/vcloud/models/compute/tag'
+
+module Fog
+  module Vcloud
+    class Compute
+
+      class Tags < Fog::Vcloud::Collection
+
+        undef_method :create
+
+        model Fog::Vcloud::Compute::Tag
+
+        attribute :href, :aliases => :Href
+
+        def all
+          metadata = service.get_metadata(self.href)
+          load(metadata.body[:MetadataEntry]) if metadata.body[:MetadataEntry]
+        end
+
+        def get(uri)
+          service.get_metadata(uri)
+        rescue Fog::Errors::NotFound
+          nil
+        end
+        
+        def create(opts)
+          service.configure_metadata(opts.merge(href: href))
+        end
+      end
+    end
+  end
+end

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

@@ -37,6 +37,17 @@ module Fog
                  :href => href
             )
         end
+
+        def ready?
+          reload_status # always ensure we have the correct status
+          status != '0'
+        end
+
+        private
+        def reload_status
+          vapp = service.get_vapp(href)
+          self.status = vapp.status
+        end
       end
     end
   end

data/lib/fog/vcloud/requests/compute/configure_metadata.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Real
+
+        def configure_metadata(opts= {})
+          valid_opts = [:key, :value, :href]
+          unless valid_opts.all? { |opt| opts.has_key?(opt) }
+            raise ArgumentError.new("Required data missing: #{(valid_opts - opts.keys).map(&:inspect).join(", ")}")
+          end
+          
+          body = <<EOF
+          <Metadata
+             type="application/vnd.vmware.vcloud.metadata+xml"
+             xmlns="http://www.vmware.com/vcloud/v1.5">
+             <MetadataEntry>
+                <Key>#{opts[:key]}</Key>
+                <Value>#{opts[:value]}</Value>
+             </MetadataEntry>
+          </Metadata>
+EOF
+
+          request(
+            :body     => body,
+            :expects  => 202, # it returns a task object
+            :headers  => {'Content-Type' => 'application/vnd.vmware.vcloud.metadata+xml' },
+            :method   => 'POST',
+            :uri      => opts[:href],
+            :parse    => true
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/vcloud/requests/compute/configure_vm.rb

@@ -18,8 +18,8 @@ module Fog
         def generate_configure_vm_request(vm_data)
           xmlns = 'http://schemas.dmtf.org/ovf/envelope/1'
           xmlns_vcloud = 'http://www.vmware.com/vcloud/v1'
-          xmlns_rasd = 'http://schemas.dmtf.org/wbem/wscim/1/cim‐schema/2/CIM_ResourceAllocationSettingData'
-          xmlns_vssd = 'http://schemas.dmtf.org/wbem/wscim/1/cim‐schema/2/CIM_VirtualSystemSettingData'
+          xmlns_rasd = 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData'
+          xmlns_vssd = 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData'
 
           builder = Builder::XmlMarkup.new(:target=>STDOUT, :indent=>2) # TODO - remove params
           builder.VirtualHardwareSection(

data/lib/fog/vcloud/requests/compute/configure_vm_cpus.rb

@@ -24,7 +24,7 @@ EOF
           request(
             :body     => body,
             :expects  => 202,
-            :headers  => {'Content-Type' => vm_data[:"vcloud_type"] },
+            :headers  => { 'Content-Type' => vm_data[:"vcloud_type"] || 'application/vnd.vmware.vcloud.rasdItem+xml' },
             :method   => 'PUT',
             :uri      => "#{edit_uri}",
             :parse    => true

data/lib/fog/vcloud/requests/compute/configure_vm_customization_script.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+module Fog
+  module Vcloud
+    class Compute
+      class Real
+
+        def configure_vm_customization_script(vmdata)
+          edit_uri = vmdata[:href]
+          body = <<EOF
+          <GuestCustomizationSection xmlns="http://www.vmware.com/vcloud/v1.5" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="https://zone01.bluelock.com/api/vApp/vm-cc8e27be-f18c-4263-87c5-58a9297bac5b/guestCustomizationSection/" 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://zone01.bluelock.com/api/v1.5/schema/master.xsd">
+<ovf:Info>Specifies Guest OS Customization Settings</ovf:Info>
+<Enabled>true</Enabled>
+<CustomizationScript>#{CGI.escapeHTML(vmdata[:CustomizationScript])}</CustomizationScript>
+<ComputerName>#{vmdata[:ComputerName]}</ComputerName>
+
+<Link rel="edit" type="application/vnd.vmware.vcloud.guestCustomizationSection+xml" href="#{edit_uri}"/>
+</GuestCustomizationSection>
+EOF
+          request(
+            :body     => body,
+            :expects  => 202,
+            :headers  => {'Content-Type' => vmdata[:type] },
+            :method   => 'PUT',
+            :uri      => "#{edit_uri}",
+            :parse    => true
+          )
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud/requests/compute/configure_vm_memory.rb

@@ -25,7 +25,7 @@ EOF
           request(
             :body     => body,
             :expects  => 202,
-            :headers  => {'Content-Type' => vm_data[:"vcloud_type"] },
+            :headers  => { 'Content-Type' => vm_data[:"vcloud_type"] || 'application/vnd.vmware.vcloud.rasdItem+xml' },
             :method   => 'PUT',
             :uri      => edit_uri,
             :parse    => true

data/lib/fog/vcloud/requests/compute/configure_vm_network.rb

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+module Fog
+  module Vcloud
+    class Compute
+      class Real
+
+        def configure_vm_network(network_info)
+          edit_uri = network_info.select {|k,v| k == :Link && v[:rel] == 'edit'}
+          edit_uri = edit_uri.kind_of?(Array) ? edit_uri.flatten[1][:href] : edit_uri[:Link][:href]
+
+          body = <<EOF
+            <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="#{edit_uri}">
+              <ovf:Info>Specifies the available VM network connections</ovf:Info>
+              <PrimaryNetworkConnectionIndex>0</PrimaryNetworkConnectionIndex>
+              <NetworkConnection network="#{network_info[:NetworkConnection][:network]}" needsCustomization="true">
+                <NetworkConnectionIndex>0</NetworkConnectionIndex>
+                <IsConnected>true</IsConnected>
+                <IpAddressAllocationMode>#{network_info[:NetworkConnection][:IpAddressAllocationMode]}</IpAddressAllocationMode>
+              </NetworkConnection>
+            </NetworkConnectionSection>
+EOF
+          request(
+            :body     => body,
+            :expects  => 202,
+            :headers  => {'Content-Type' => network_info[:"type"] },
+            :method   => 'PUT',
+            :uri      => "#{edit_uri}",
+            :parse    => true
+          )
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud/requests/compute/delete_metadata.rb

@@ -0,0 +1,10 @@
+module Fog
+  module Vcloud
+    class Compute
+
+      class Real
+        basic_request :delete_metadata, 202, "DELETE"
+      end
+    end
+  end
+end

data/lib/fog/vcloud/requests/compute/get_metadata.rb

@@ -0,0 +1,10 @@
+module Fog
+  module Vcloud
+    class Compute
+
+      class Real
+        basic_request :get_metadata
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Fog
           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
@@ -49,8 +49,13 @@ module Fog
               if options[:network_uri]
                 # TODO - implement properly
                 xml.NetworkConfigSection {
-                  xml.NetworkConfig {
-                    xml.NetworkAssociation( :href => options[:network_uri] )
+                  xml.tag!("ovf:Info"){ "Configuration parameters for logical networks" }
+                  xml.NetworkConfig("networkName" => options[:network_name]) {
+                    # xml.NetworkAssociation( :href => options[:network_uri] )
+                      xml.Configuration {
+                        xml.ParentNetwork("name" => options[:network_name], "href" => options[:network_uri])
+                        xml.FenceMode("bridged")
+                    }
                   }
                 }
               end
@@ -67,7 +72,6 @@ module Fog
 
         def instantiate_vapp_template options = {}
           validate_instantiate_vapp_template_options options
-
           request(
             :body     => generate_instantiate_vapp_template_request(options),
             :expects  => 201,

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.8.0'
+  VERSION = '1.14.0'
 end

data/lib/fog/volume.rb

@@ -7,13 +7,13 @@ module Fog
 
     def self.new(attributes)
       attributes = attributes.dup # Prevent delete from having side effects
-      case provider = attributes.delete(:provider).to_s.downcase.to_sym
-      when :openstack
-        require 'fog/openstack/volume'
-        Fog::Volume::OpenStack.new(attributes)
-      else
-        raise ArgumentError.new("#{provider} has no identity service")
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+      if self.providers.include?(provider)
+        require "fog/#{provider}/volume"
+        return Fog::Volume.const_get(Fog.providers[provider]).new(attributes)
       end
+
+      raise ArgumentError.new("#{provider} has no identity service")
     end
 
     def self.providers

data/lib/fog/vpn.rb

@@ -0,0 +1,25 @@
+module Fog
+  module VPN
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+
+      if provider == :stormondemand
+        require 'fog/storm_on_demand/vpn'
+        Fog::VPN::StormOnDemand.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no vpn service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:vpn]
+    end
+
+  end
+end

data/lib/fog/vsphere/compute.rb

@@ -29,6 +29,10 @@ module Fog
       collection :datastores
       model :folder
       collection :folders
+      model :customvalue
+      collection :customvalues
+      model :customfield
+      collection :customfields
 
       request_path 'fog/vsphere/requests/compute'
       request :current_time
@@ -49,10 +53,13 @@ module Fog
       request :get_network
       request :list_datastores
       request :get_datastore
+      request :list_templates
+      request :get_template
       request :get_folder
       request :list_folders
       request :create_vm
       request :list_vm_interfaces
+      request :modify_vm_interface
       request :list_vm_volumes
       request :get_virtual_machine
       request :vm_reconfig_hardware
@@ -60,6 +67,8 @@ module Fog
       request :vm_reconfig_cpus
       request :vm_config_vnc
       request :create_folder
+      request :list_vm_customvalues
+      request :list_customfields
 
       module Shared
 
@@ -74,6 +83,8 @@ module Fog
           :id => 'config.instanceUuid',
           :name => 'name',
           :uuid => 'config.uuid',
+          :template => 'config.template',
+          :parent => 'parent',
           :hostname => 'summary.guest.hostName',
           :operatingsystem => 'summary.guest.guestFullName',
           :ipaddress => 'guest.ipAddress',
@@ -88,6 +99,11 @@ module Fog
           :guest_id => 'summary.guest.guestId',
         }
 
+        def convert_vm_view_to_attr_hash(vms)
+          vms = @connection.serviceContent.propertyCollector.collectMultiple(vms,*ATTR_TO_PROP.values.uniq)
+          vms.map { |vm| props_to_attr_hash(*vm) }
+        end
+
         # Utility method to convert a VMware managed object into an attribute hash.
         # This should only really be necessary for the real class.
         # This method is expected to be called by the request methods
@@ -96,6 +112,10 @@ module Fog
           return nil unless vm_mob_ref
 
           props = vm_mob_ref.collect!(*ATTR_TO_PROP.values.uniq)
+          props_to_attr_hash vm_mob_ref, props
+        end
+
+        def props_to_attr_hash vm_mob_ref, props
           # NOTE: Object.tap is in 1.8.7 and later.
           # Here we create the hash object that this method returns, but first we need
           # to add a few more attributes that require additional calls to the vSphere
@@ -110,26 +130,20 @@ module Fog
             # The name method "magically" appears after a VM is ready and
             # finished cloning.
             if attrs['hypervisor'].kind_of?(RbVmomi::VIM::HostSystem)
-              begin
-                host = attrs['hypervisor']
-                attrs['datacenter'] = parent_attribute(host.path, :datacenter)[1]
-                attrs['cluster']    = parent_attribute(host.path, :cluster)[1]
-                attrs['hypervisor'] = host.name
-                attrs['resource_pool'] = (vm_mob_ref.resourcePool || host.resourcePool).name rescue nil
-              rescue
-                # If it's not ready, set the hypervisor to nil
-                attrs['hypervisor'] = nil
-              end
+              host = attrs['hypervisor']
+              attrs['datacenter'] = Proc.new { parent_attribute(host.path, :datacenter)[1] rescue nil }
+              attrs['cluster']    = Proc.new { parent_attribute(host.path, :cluster)[1] rescue nil }
+              attrs['hypervisor'] = Proc.new { host.name rescue nil }
+              attrs['resource_pool'] = Proc.new {(vm_mob_ref.resourcePool || host.resourcePool).name rescue nil}
             end
             # This inline rescue catches any standard error.  While a VM is
             # cloning, a call to the macs method will throw and NoMethodError
-            attrs['mac_addresses'] = vm_mob_ref.macs rescue nil
-            # Rescue nil to catch testing while vm_mob_ref isn't reaL?? 
-            attrs['path'] = "/"+vm_mob_ref.parent.path.map(&:last).join('/') rescue nil
+            attrs['mac_addresses'] = Proc.new {vm_mob_ref.macs rescue nil}
+            # Rescue nil to catch testing while vm_mob_ref isn't reaL??
+            attrs['path'] = "/"+attrs['parent'].path.map(&:last).join('/') rescue nil
             attrs['relative_path'] = (attrs['path'].split('/').reject {|e| e.empty?} - ["Datacenters", attrs['datacenter'], "vm"]).join("/") rescue nil
           end
         end
-
         # returns the parent object based on a type
         # provides both real RbVmomi object and its name.
         # e.g.
@@ -152,7 +166,11 @@ module Fog
 
         # returns vmware managed obj id string
         def managed_obj_id obj
-          obj.to_s.match(/\("(\S+)"\)/)[1]
+          obj.to_s.match(/\("([^"]+)"\)/)[1]
+        end
+
+        def is_uuid?(id)
+          !(id =~ /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/).nil?
         end
 
       end
@@ -161,6 +179,126 @@ module Fog
 
         include Shared
 
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :servers => {
+                "5032c8a5-9c5e-ba7a-3804-832a03e16381" => {
+                 "resource_pool"    => "Resources",
+                 "memory_mb"        => 2196,
+                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:a9:00:28" },
+                 "power_state"      => "poweredOn",
+                 "cpus"             => 1,
+                 "hostname"         => "dhcp75-197.virt.bos.redhat.com",
+                 "mo_ref"           => "vm-562",
+                 "connection_state" => "connected",
+                 "overall_status"   => "green",
+                 "datacenter"       => "Solutions",
+                 "volumes"          =>
+                    [{
+                      "id"        => "6000C29c-a47d-4cd9-5249-c371de775f06",
+                      "datastore" => "Storage1",
+                      "mode"      => "persistent",
+                      "size"      => 8388608,
+                      "thin"      => true,
+                      "name"      => "Hard disk 1",
+                      "filename"  => "[Storage1] rhel6-mfojtik/rhel6-mfojtik.vmdk",
+                      "size_gb"   => 8
+                     }],
+                 "interfaces"       =>
+                    [{"mac"     => "00:50:56:a9:00:28",
+                      "network" => "VM Network",
+                      "name"    => "Network adapter 1",
+                      "status"  => "ok",
+                      "summary" => "VM Network",
+                     }],
+                 "hypervisor"       => "gunab.puppetlabs.lan",
+                 "guest_id"         => "rhel6_64Guest",
+                 "tools_state"      => "toolsOk",
+                 "cluster"          => "Solutionscluster",
+                 "name"             => "rhel64",
+                 "operatingsystem"  => "Red Hat Enterprise Linux 6 (64-bit)",
+                 "path"             => "/Datacenters/Solutions/vm",
+                 "uuid"             => "4229f0e9-bfdc-d9a7-7bac-12070772e6dc",
+                 "instance_uuid"    => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
+                 "id"               => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
+                 "tools_version"    => "guestToolsUnmanaged",
+                 "ipaddress"        => "192.168.100.184",
+                 "template"         => false
+                },
+                "502916a3-b42e-17c7-43ce-b3206e9524dc" => {
+                 "resource_pool"    => "Resources",
+                 "memory_mb"        => 512,
+                 "power_state"      => "poweredOn",
+                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:a9:00:00" },
+                 "hostname"         => nil,
+                 "cpus"             => 1,
+                 "connection_state" => "connected",
+                 "mo_ref"           => "vm-621",
+                 "overall_status"   => "green",
+                 "datacenter"       => "Solutions",
+                 "volumes"          =>
+                    [{"thin"      => false,
+                      "size_gb"   => 10,
+                      "datastore" => "datastore1",
+                      "filename"  => "[datastore1] i-1342439683/i-1342439683.vmdk",
+                      "size"      => 10485762,
+                      "name"      => "Hard disk 1",
+                      "mode"      => "persistent",
+                      "id"        => "6000C29b-f364-d073-8316-8e98ac0a0eae" }],
+                 "interfaces"       =>
+                    [{ "summary" => "VM Network",
+                      "mac"     => "00:50:56:a9:00:00",
+                      "status"  => "ok",
+                      "network" => "VM Network",
+                      "name"    => "Network adapter 1" }],
+                 "hypervisor"       => "gunab.puppetlabs.lan",
+                 "guest_id"         => nil,
+                 "cluster"          => "Solutionscluster",
+                 "tools_state"      => "toolsNotInstalled",
+                 "name"             => "i-1342439683",
+                 "operatingsystem"  => nil,
+                 "path"             => "/",
+                 "tools_version"    => "guestToolsNotInstalled",
+                 "uuid"             => "4229e0de-30cb-ceb2-21f9-4d8d8beabb52",
+                 "instance_uuid"    => "502916a3-b42e-17c7-43ce-b3206e9524dc",
+                 "id"               => "502916a3-b42e-17c7-43ce-b3206e9524dc",
+                 "ipaddress"        => nil,
+                 "template"         => false
+                },
+                "5029c440-85ee-c2a1-e9dd-b63e39364603" => {
+                 "resource_pool"    => "Resources",
+                 "memory_mb"        => 2196,
+                 "power_state"      => "poweredOn",
+                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:b2:00:af" },
+                 "hostname"         => "centos56gm.localdomain",
+                 "cpus"             => 1,
+                 "connection_state" => "connected",
+                 "mo_ref"           => "vm-715",
+                 "overall_status"   => "green",
+                 "datacenter"       => "Solutions",
+                 "hypervisor"       => "gunab.puppetlabs.lan",
+                 "guest_id"         => "rhel6_64Guest",
+                 "cluster"          => "Solutionscluster",
+                 "tools_state"      => "toolsOk",
+                 "name"             => "jefftest",
+                 "operatingsystem"  => "Red Hat Enterprise Linux 6 (64-bit)",
+                 "path"             => "/",
+                 "tools_version"    => "guestToolsUnmanaged",
+                 "ipaddress"        => "192.168.100.187",
+                 "uuid"             => "42329da7-e8ab-29ec-1892-d6a4a964912a",
+                 "instance_uuid"    => "5029c440-85ee-c2a1-e9dd-b63e39364603",
+                 "id"               => "5029c440-85ee-c2a1-e9dd-b63e39364603",
+                 "template"         => false
+                }
+              },
+              :datacenters => {
+                "Solutions" => {:name => "Solutions", :status => "grey"}
+              }
+            }
+          end
+        end
+
         def initialize(options={})
           require 'rbvmomi'
           @vsphere_username = options[:vsphere_username]
@@ -171,6 +309,13 @@ module Fog
           @vsphere_rev = '4.0'
         end
 
+        def data
+          self.class.data[@vsphere_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@vsphere_username)
+        end
       end
 
       class Real