fog 1.18.0 → 1.19.0

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

@@ -0,0 +1,91 @@
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/OrgVdcNetworkType.html
+        class OrgVdcNetwork
+          attr_reader :options
+
+          def initialize(options={})
+            @options = options
+          end
+
+          def generate_xml
+
+            body = Nokogiri::XML::Builder.new do
+              attrs = {
+                :xmlns => 'http://www.vmware.com/vcloud/v1.5',
+                :name  => options[:name]
+              }
+              OrgVdcNetwork(attrs) {
+                Description options[:Description] if options.key?(:Description)
+                if configuration = options[:Configuration]
+                  Configuration {
+                    if ip_scopes = configuration[:IpScopes]
+                      IpScopes {
+                        if ip_scope = ip_scopes[:IpScope]
+                          IpScope {
+                            IsInherited  ip_scope[:IsInherited] if ip_scope.key?(:IsInherited)
+                            Gateway      ip_scope[:Gateway]     if ip_scope.key?(:Gateway)
+                            Netmask      ip_scope[:Netmask]     if ip_scope.key?(:Netmask)
+                            Dns1         ip_scope[:Dns1]        if ip_scope.key?(:Dns1)
+                            Dns2         ip_scope[:Dns2]        if ip_scope.key?(:Dns2)
+                            DnsSuffix    ip_scope[:DnsSuffix]   if ip_scope.key?(:DnsSuffix)
+                            IsEnabled    ip_scope[:IsEnabled]   if ip_scope.key?(:IsEnabled)
+                            if ip_ranges = ip_scope[:IpRanges]
+                              IpRanges {
+                                ip_ranges.each do |h|
+                                  if h.key?(:IpRange)
+                                    IpRange {
+                                      StartAddress h[:IpRange][:StartAddress]
+                                      EndAddress   h[:IpRange][:EndAddress]
+                                    }
+                                  end
+                                end
+                              }
+                            end
+                          }
+                        end
+                      }
+                    end
+                    FenceMode    configuration[:FenceMode]
+                    if router_info = configuration[:RouterInfo]
+                      RouterInfoType {
+                        ExternalIp router_info[:ExternalIp]
+                      }
+                    end
+                  }
+                end # Configuration
+
+                if edgegw = options[:EdgeGateway] and configuration[:FenceMode] != 'isolated'
+                  EdgeGateway(edgegw)
+                elsif options[:Configuration] && options[:Configuration][:FenceMode] == 'isolated'
+                  # isolated networks can specify ServiceConfig
+                  if sc = options[:ServiceConfig]
+                    ServiceConfig {
+                      if dhcp = sc[:GatewayDhcpService]
+                        IsEnabled dhcp[:IsEnabled] if dhcp[:IsEnabled]
+                        if pool = dhcp[:Pool]
+                          IsEnabled        pool[:IsEnabled]
+                          DefaultLeaseTime pool[:DefaultLeaseTime]
+                          MaxLeaseTime     pool[:MaxLeaseTime]
+                          LowIpAddress     pool[:LowIpAddress]
+                          HighIpAddress    pool[:HighIpAddress]
+                        end
+                      end
+                    }
+                  end
+                end
+
+                IsShared       options[:IsShared] if options.key?(:IsShared)
+
+              }
+            end.to_xml
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VAppType.html
+        class Vapp
+          attr_reader :name, :options
+
+          def initialize(name, options={})
+            @name = name
+            @options = options
+          end
+
+          def generate_xml
+            attrs = @attrs
+            Nokogiri::XML::Builder.new do
+              VApp('xmlns' => 'http://www.vmware.com/vcloud/v1.5',
+                   'name' => name
+                  ) {
+                Description options[:Description] if options.key?(:Description)
+              }
+            end.to_xml
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VmType.html
+        class Vm
+          attr_reader :attrs
+
+          def initialize(attrs={})
+            @attrs = attrs
+          end
+
+          def generate_xml
+            attrs = @attrs
+            Nokogiri::XML::Builder.new do
+              Vm('xmlns' => 'http://www.vmware.com/vcloud/v1.5', 'name' => attrs[:name]) {
+                Description attrs[:Description] if attrs.key?(:Description)
+                if  attrs.key?(:StorageProfile)
+                  StorageProfile(
+                    'type' => 'application/vnd.vmware.vcloud.vdcStorageProfile+xml',
+                    'name' => attrs[:StorageProfile][:name],
+                    'href' => attrs[:StorageProfile][:href]
+                  )
+                end
+              }
+            end.to_xml
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Fog
 
           # Perhaps this would be better implemented as media#upload.
 
-          file = response.body[:Files][:File]
+          file = response.body[:Files][:File].first
           file[:Link] = [file[:Link]] if file[:Link].is_a?(Hash)
           link = file[:Link].detect {|l| l[:rel] == 'upload:default'}
 

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

@@ -14,6 +14,8 @@ module Fog
         attribute :change_sid
         attribute :join_domain_enabled
         attribute :use_org_settings
+        attribute :admin_password_auto
+        attribute :admin_password
         attribute :admin_password_enabled
         attribute :reset_password_required
         attribute :virtual_machine_id

data/lib/fog/vcloud_director/parsers/compute/vm_customization.rb

@@ -32,6 +32,8 @@ module Fog
               @response[:join_domain_enabled] = (value == "true")
             when 'UseOrgSettings'
               @response[:use_org_settings] = (value == "true")
+            when 'AdminPassword'
+              @response[:admin_password] = value
             when 'AdminPasswordEnabled'
               @response[:admin_password_enabled] = (value == "true")
             when 'AdminPasswordAuto'

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

@@ -0,0 +1,64 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        # Delete an OrgVdcNetwork
+        #
+        # This operation is asynchronous and returns a task that you can
+        # monitor to track the progress of the request.
+        #
+        # @param [String] id Object identifier of the OrgVdcNetwork.
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/DELETE-Network.html
+        # @since vCloud API version 0.9
+        def delete_network(id)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "admin/network/#{id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_network(id)
+
+          unless data[:networks][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              "No access to entity \"(com.vmware.vcloud.entity.orgVdcNetwork:#{id})\""
+            )
+          end
+
+          owner = {
+            :href => make_href("network/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.network+xml'
+          }
+          task_id = enqueue_task(
+            "Deleting Network(#{id})", 'DeleteNetwork', owner,
+            :on_success => lambda do
+              data[:networks].delete(id)
+            end
+          )
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location,
+          }.merge(task_body(task_id))
+
+          Excon::Response.new(
+            :status => 202,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -118,344 +118,444 @@ module Fog
 
       class Mock
         def get_execute_query(type=nil, options={})
+
+          unless options[:fields].nil?
+            Fog::Mock.not_implemented("Fields are not yet implemented in get_execute_query Mock for #{type}")
+          end
+
+          unless options[:format].nil? || options[:format] == 'records'
+            Fog::Mock.not_implemented("Formats #{options[:format]} is not yet implemented in get_execute_query Mock for #{type}")
+          end
+
+          # NB: default is to sort by 'Database ID' (uuid?). Does this matter?
+          unless options[:sortAsc].nil? && options[:sortDesc].nil?
+            Fog::Mock.not_implemented("Sorting by field is not yet implemented in get_execute_query Mock for #{type}")
+          end
+
+          # NB: default offset is 0
+          unless options[:offset].nil?
+            Fog::Mock.not_implemented("Offset results are not yet implemented in get_execute_query Mock for #{type}")
+          end
+
+          # NB: default page is 1
+          if options.key?(:page) && options[:page].to_i != 1
+            Fog::Mock.not_implemented("Paginated results are not yet implemented in get_execute_query Mock for #{type}")
+          end
+
+          # NB: default pageSize is 25
+          unless options[:pageSize].nil?
+            Fog::Mock.not_implemented("Paginated results are not yet implemented in get_execute_query Mock for #{type}")
+          end
+
           if type.nil?
-            body =
-              {:xmlns=>xmlns,
-               :xmlns_xsi=>xmlns_xsi,
-               :type=>"application/vnd.vmware.vcloud.query.queryList+xml",
-               :href=>make_href('query'),
-               :xsi_schemaLocation=>xsi_schema_location,
-               :Link=>
-                [{:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"organization",
-                  :href=>make_href('query?type=organization&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"organization",
-                  :href=>make_href('query?type=organization&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"organization",
-                  :href=>make_href('query?type=organization&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"orgVdc",
-                  :href=>make_href('query?type=orgVdc&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"orgVdc",
-                  :href=>make_href('query?type=orgVdc&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"orgVdc",
-                  :href=>make_href('query?type=orgVdc&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"media",
-                  :href=>make_href('query?type=media&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"media",
-                  :href=>make_href('query?type=media&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"media",
-                  :href=>make_href('query?type=media&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"vAppTemplate",
-                  :href=>make_href('query?type=vAppTemplate&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"vAppTemplate",
-                  :href=>make_href('query?type=vAppTemplate&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"vAppTemplate",
-                  :href=>make_href('query?type=vAppTemplate&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"vApp",
-                  :href=>make_href('query?type=vApp&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"vApp",
-                  :href=>make_href('query?type=vApp&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"vApp",
-                  :href=>make_href('query?type=vApp&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"vm",
-                  :href=>make_href('query?type=vm&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"vm",
-                  :href=>make_href('query?type=vm&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"vm",
-                  :href=>make_href('query?type=vm&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"orgNetwork",
-                  :href=>make_href('query?type=orgNetwork&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"orgNetwork",
-                  :href=>make_href('query?type=orgNetwork&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"orgNetwork",
-                  :href=>make_href('query?type=orgNetwork&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"vAppNetwork",
-                  :href=>make_href('query?type=vAppNetwork&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"vAppNetwork",
-                  :href=>make_href('query?type=vAppNetwork&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"vAppNetwork",
-                  :href=>make_href('query?type=vAppNetwork&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"catalog",
-                  :href=>make_href('query?type=catalog&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"catalog",
-                  :href=>make_href('query?type=catalog&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"catalog",
-                  :href=>make_href('query?type=catalog&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"group",
-                  :href=>make_href('query?type=group&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"group",
-                  :href=>make_href('query?type=group&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"group",
-                  :href=>make_href('query?type=group&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"user",
-                  :href=>make_href('query?type=user&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"user",
-                  :href=>make_href('query?type=user&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"user",
-                  :href=>make_href('query?type=user&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"strandedUser",
-                  :href=>make_href('query?type=strandedUser&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"strandedUser",
-                  :href=>make_href('query?type=strandedUser&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"strandedUser",
-                  :href=>make_href('query?type=strandedUser&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"role",
-                  :href=>make_href('query?type=role&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"role",
-                  :href=>make_href('query?type=role&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"role",
-                  :href=>make_href('query?type=role&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"allocatedExternalAddress",
-                  :href=>make_href('query?type=allocatedExternalAddress&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"allocatedExternalAddress",
-                  :href=>make_href('query?type=allocatedExternalAddress&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"event",
-                  :href=>make_href('query?type=event&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"event",
-                  :href=>make_href('query?type=event&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"right",
-                  :href=>make_href('query?type=right&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"right",
-                  :href=>make_href('query?type=right&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"right",
-                  :href=>make_href('query?type=right&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"vAppOrgNetworkRelation",
-                  :href=>make_href('query?type=vAppOrgNetworkRelation&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"vAppOrgNetworkRelation",
-                  :href=>make_href('query?type=vAppOrgNetworkRelation&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"vAppOrgNetworkRelation",
-                  :href=>make_href('query?type=vAppOrgNetworkRelation&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"catalogItem",
-                  :href=>make_href('query?type=catalogItem&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"catalogItem",
-                  :href=>make_href('query?type=catalogItem&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"catalogItem",
-                  :href=>make_href('query?type=catalogItem&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"task",
-                  :href=>make_href('query?type=task&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"task",
-                  :href=>make_href('query?type=task&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"task",
-                  :href=>make_href('query?type=task&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"disk",
-                  :href=>make_href('query?type=disk&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"disk",
-                  :href=>make_href('query?type=disk&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"disk",
-                  :href=>make_href('query?type=disk&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"vmDiskRelation",
-                  :href=>make_href('query?type=vmDiskRelation&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"vmDiskRelation",
-                  :href=>make_href('query?type=vmDiskRelation&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"service",
-                  :href=>make_href('query?type=service&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"service",
-                  :href=>make_href('query?type=service&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"service",
-                  :href=>make_href('query?type=service&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"orgVdcStorageProfile",
-                  :href=>make_href('query?type=orgVdcStorageProfile&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"orgVdcStorageProfile",
-                  :href=>make_href('query?type=orgVdcStorageProfile&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"orgVdcStorageProfile",
-                  :href=>make_href('query?type=orgVdcStorageProfile&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"apiDefinition",
-                  :href=>make_href('query?type=apiDefinition&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"apiDefinition",
-                  :href=>make_href('query?type=apiDefinition&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"apiDefinition",
-                  :href=>make_href('query?type=apiDefinition&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"fileDescriptor",
-                  :href=>make_href('query?type=fileDescriptor&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"fileDescriptor",
-                  :href=>make_href('query?type=fileDescriptor&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"edgeGateway",
-                  :href=>make_href('query?type=edgeGateway&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"edgeGateway",
-                  :href=>make_href('query?type=edgeGateway&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"edgeGateway",
-                  :href=>make_href('query?type=edgeGateway&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"orgVdcNetwork",
-                  :href=>make_href('query?type=orgVdcNetwork&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"orgVdcNetwork",
-                  :href=>make_href('query?type=orgVdcNetwork&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"orgVdcNetwork",
-                  :href=>make_href('query?type=orgVdcNetwork&format=idrecords')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.references+xml",
-                  :name=>"vAppOrgVdcNetworkRelation",
-                  :href=>make_href('query?type=vAppOrgVdcNetworkRelation&format=references')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.records+xml",
-                  :name=>"vAppOrgVdcNetworkRelation",
-                  :href=>make_href('query?type=vAppOrgVdcNetworkRelation&format=records')},
-                 {:rel=>"down",
-                  :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
-                  :name=>"vAppOrgVdcNetworkRelation",
-                  :href=>make_href('query?type=vAppOrgVdcNetworkRelation&format=idrecords')}]}
+            body = all_types
+          else 
+            body = fetch_items(type, options)
+          end
 
-            Excon::Response.new(
-              :status  => 200,
-              :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
-              :body    => body
-            )
+          Excon::Response.new(
+            :status  => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body    => body
+          )
+
+        end
+
+        private
+
+        def fetch_items(type, opts)
+
+          if opts.key?(:filter) && opts[:filter] =~ /^name==([^;,]+)$/
+            name = $1
+          elsif opts.key?(:filter)
+            Fog::Mock.not_implemented("Complex filters are not yet implemented in get_execute_query Mock for #{type}: #{opts[:filter]}")
+          end
+
+          body = {
+            :xmlns=>xmlns,
+            :xmlns_xsi=>xmlns_xsi,
+            :href=>make_href('query'),
+            :name=>type,
+            :type=>"application/vnd.vmware.vcloud.query.records+xml",
+            :xsi_schemaLocation=>xsi_schema_location,
+          }
+
+          if type == 'orgVdcNetwork'
+            record_type = :OrgVdcNetworkRecords
+            data_type = :networks
+            records = []
+            data[data_type].each do |id, dr|
+              r = {}
+              if name.nil? || dr[:name] == name
+                vdc_id = dr[:vdc]
+                if data[:vdcs][vdc_id] && data[:vdcs][vdc_id].key?(:name)
+                  r[:vdcName] = data[:vdcs][vdc_id][:name]
+                end
+                r[:name] = dr[:name]
+                r[:vdc]  = make_href("vdc/#{vdc_id}") if vdc_id
+                r[:href] = make_href("admin/network/#{id}")
+                mapping = {
+                  :description    => :Description,
+                  :netmask        => :Netmask,
+                  :linkType       => :LinkType,
+                  :dns1           => :Dns1,
+                  :dns2           => :Dns2,
+                  :dnsSuffix      => :DnsSuffix,
+                  :defaultGateway => :Gateway,
+                  :isShared       => :IsShared,
+                  :isBusy         => :IsBusy,
+                  :isIpScopeInherited => :IsIpScopeInherited,
+                }
+
+                mapping.each do |k,v|
+                  r[k] = dr[v] if dr.key?(v)
+                end
+
+                records << r
+              end
+            end
+            body[:page]     = 1.to_s             # TODO: Support pagination
+            body[:pageSize] = records.size.to_s  # TODO: Support pagination
+            body[:total]    = records.size.to_s
+            body[record_type] = records
           else
-            Fog::Mock.not_implemented
+            Fog::Mock.not_implemented("No 'get by name' get_execute_query Mock for #{type} (#{name})")
           end
+
+          body
         end
+
+        def all_types
+          {:xmlns=>xmlns,
+           :xmlns_xsi=>xmlns_xsi,
+           :type=>"application/vnd.vmware.vcloud.query.queryList+xml",
+           :href=>make_href('query'),
+           :xsi_schemaLocation=>xsi_schema_location,
+           :Link=>
+            [{:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"organization",
+              :href=>make_href('query?type=organization&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"organization",
+              :href=>make_href('query?type=organization&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"organization",
+              :href=>make_href('query?type=organization&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"orgVdc",
+              :href=>make_href('query?type=orgVdc&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"orgVdc",
+              :href=>make_href('query?type=orgVdc&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"orgVdc",
+              :href=>make_href('query?type=orgVdc&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"media",
+              :href=>make_href('query?type=media&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"media",
+              :href=>make_href('query?type=media&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"media",
+              :href=>make_href('query?type=media&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"vAppTemplate",
+              :href=>make_href('query?type=vAppTemplate&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"vAppTemplate",
+              :href=>make_href('query?type=vAppTemplate&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"vAppTemplate",
+              :href=>make_href('query?type=vAppTemplate&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"vApp",
+              :href=>make_href('query?type=vApp&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"vApp",
+              :href=>make_href('query?type=vApp&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"vApp",
+              :href=>make_href('query?type=vApp&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"vm",
+              :href=>make_href('query?type=vm&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"vm",
+              :href=>make_href('query?type=vm&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"vm",
+              :href=>make_href('query?type=vm&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"orgNetwork",
+              :href=>make_href('query?type=orgNetwork&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"orgNetwork",
+              :href=>make_href('query?type=orgNetwork&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"orgNetwork",
+              :href=>make_href('query?type=orgNetwork&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"vAppNetwork",
+              :href=>make_href('query?type=vAppNetwork&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"vAppNetwork",
+              :href=>make_href('query?type=vAppNetwork&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"vAppNetwork",
+              :href=>make_href('query?type=vAppNetwork&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"catalog",
+              :href=>make_href('query?type=catalog&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"catalog",
+              :href=>make_href('query?type=catalog&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"catalog",
+              :href=>make_href('query?type=catalog&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"group",
+              :href=>make_href('query?type=group&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"group",
+              :href=>make_href('query?type=group&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"group",
+              :href=>make_href('query?type=group&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"user",
+              :href=>make_href('query?type=user&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"user",
+              :href=>make_href('query?type=user&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"user",
+              :href=>make_href('query?type=user&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"strandedUser",
+              :href=>make_href('query?type=strandedUser&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"strandedUser",
+              :href=>make_href('query?type=strandedUser&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"strandedUser",
+              :href=>make_href('query?type=strandedUser&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"role",
+              :href=>make_href('query?type=role&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"role",
+              :href=>make_href('query?type=role&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"role",
+              :href=>make_href('query?type=role&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"allocatedExternalAddress",
+              :href=>make_href('query?type=allocatedExternalAddress&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"allocatedExternalAddress",
+              :href=>make_href('query?type=allocatedExternalAddress&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"event",
+              :href=>make_href('query?type=event&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"event",
+              :href=>make_href('query?type=event&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"right",
+              :href=>make_href('query?type=right&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"right",
+              :href=>make_href('query?type=right&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"right",
+              :href=>make_href('query?type=right&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"vAppOrgNetworkRelation",
+              :href=>make_href('query?type=vAppOrgNetworkRelation&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"vAppOrgNetworkRelation",
+              :href=>make_href('query?type=vAppOrgNetworkRelation&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"vAppOrgNetworkRelation",
+              :href=>make_href('query?type=vAppOrgNetworkRelation&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"catalogItem",
+              :href=>make_href('query?type=catalogItem&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"catalogItem",
+              :href=>make_href('query?type=catalogItem&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"catalogItem",
+              :href=>make_href('query?type=catalogItem&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"task",
+              :href=>make_href('query?type=task&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"task",
+              :href=>make_href('query?type=task&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"task",
+              :href=>make_href('query?type=task&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"disk",
+              :href=>make_href('query?type=disk&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"disk",
+              :href=>make_href('query?type=disk&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"disk",
+              :href=>make_href('query?type=disk&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"vmDiskRelation",
+              :href=>make_href('query?type=vmDiskRelation&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"vmDiskRelation",
+              :href=>make_href('query?type=vmDiskRelation&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"service",
+              :href=>make_href('query?type=service&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"service",
+              :href=>make_href('query?type=service&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"service",
+              :href=>make_href('query?type=service&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"orgVdcStorageProfile",
+              :href=>make_href('query?type=orgVdcStorageProfile&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"orgVdcStorageProfile",
+              :href=>make_href('query?type=orgVdcStorageProfile&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"orgVdcStorageProfile",
+              :href=>make_href('query?type=orgVdcStorageProfile&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"apiDefinition",
+              :href=>make_href('query?type=apiDefinition&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"apiDefinition",
+              :href=>make_href('query?type=apiDefinition&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"apiDefinition",
+              :href=>make_href('query?type=apiDefinition&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"fileDescriptor",
+              :href=>make_href('query?type=fileDescriptor&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"fileDescriptor",
+              :href=>make_href('query?type=fileDescriptor&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"edgeGateway",
+              :href=>make_href('query?type=edgeGateway&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"edgeGateway",
+              :href=>make_href('query?type=edgeGateway&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"edgeGateway",
+              :href=>make_href('query?type=edgeGateway&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"orgVdcNetwork",
+              :href=>make_href('query?type=orgVdcNetwork&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"orgVdcNetwork",
+              :href=>make_href('query?type=orgVdcNetwork&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"orgVdcNetwork",
+              :href=>make_href('query?type=orgVdcNetwork&#38;format=idrecords')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.references+xml",
+              :name=>"vAppOrgVdcNetworkRelation",
+              :href=>make_href('query?type=vAppOrgVdcNetworkRelation&#38;format=references')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.records+xml",
+              :name=>"vAppOrgVdcNetworkRelation",
+              :href=>make_href('query?type=vAppOrgVdcNetworkRelation&#38;format=records')},
+             {:rel=>"down",
+              :type=>"application/vnd.vmware.vcloud.query.idrecords+xml",
+              :name=>"vAppOrgVdcNetworkRelation",
+              :href=>make_href('query?type=vAppOrgVdcNetworkRelation&#38;format=idrecords')}
+            ]
+          }
+        end
+
       end
     end
   end