RubyGems - fog-maestrodev - Versions diffs - 1.18.0.20131209091424 → 1.18.0.20131218202447 - Mend

fog-maestrodev 1.18.0.20131209091424 → 1.18.0.20131218202447

Files changed (133) hide show

data/.gitignore +1 -0
data/CONTRIBUTING.md +22 -0
data/LICENSE.md +20 -0
data/README.md +29 -42
data/fog.gemspec +3 -3
data/lib/fog/aws/compute.rb +1 -0
data/lib/fog/aws/models/compute/subnet.rb +4 -0
data/lib/fog/aws/models/compute/vpc.rb +5 -0
data/lib/fog/aws/models/rds/server.rb +2 -0
data/lib/fog/aws/models/storage/file.rb +2 -2
data/lib/fog/aws/parsers/compute/assign_private_ip_addresses.rb +25 -0
data/lib/fog/aws/requests/compute/assign_private_ip_addresses.rb +60 -0
data/lib/fog/aws/requests/compute/describe_subnets.rb +8 -0
data/lib/fog/aws/requests/compute/describe_vpcs.rb +8 -0
data/lib/fog/cloudstack.rb +1 -1
data/lib/fog/core/connection.rb +1 -2
data/lib/fog/core/hmac.rb +3 -3
data/lib/fog/core/mock.rb +2 -2
data/lib/fog/core/wait_for.rb +1 -1
data/lib/fog/core/{timeout.rb → wait_for_defaults.rb} +10 -0
data/lib/fog/core.rb +1 -1
data/lib/fog/google/compute.rb +19 -11
data/lib/fog/google/examples/create.rb +12 -1
data/lib/fog/google/examples/eric-fail.rb +13 -2
data/lib/fog/google/examples/image_create.rb +0 -1
data/lib/fog/google/examples/launch_micro_instance.rb +1 -2
data/lib/fog/google/examples/metadata.rb +14 -2
data/lib/fog/google/examples/network.rb +13 -2
data/lib/fog/google/models/compute/disk.rb +10 -8
data/lib/fog/google/models/compute/image.rb +8 -3
data/lib/fog/google/models/compute/server.rb +19 -4
data/lib/fog/google/models/compute/servers.rb +25 -9
data/lib/fog/google/requests/compute/insert_disk.rb +6 -3
data/lib/fog/google/requests/compute/insert_image.rb +1 -5
data/lib/fog/google/requests/compute/insert_server.rb +8 -21
data/lib/fog/openstack/compute.rb +3 -0
data/lib/fog/openstack/models/compute/host.rb +1 -0
data/lib/fog/openstack/models/compute/security_group.rb +18 -4
data/lib/fog/openstack/models/compute/security_group_rule.rb +32 -0
data/lib/fog/openstack/models/compute/security_group_rules.rb +22 -0
data/lib/fog/openstack/network.rb +33 -3
data/lib/fog/openstack/requests/compute/create_security_group.rb +3 -3
data/lib/fog/openstack/requests/compute/create_security_group_rule.rb +1 -1
data/lib/fog/openstack/requests/compute/create_server.rb +12 -5
data/lib/fog/openstack/requests/compute/delete_security_group.rb +1 -1
data/lib/fog/openstack/requests/compute/delete_security_group_rule.rb +2 -0
data/lib/fog/openstack/requests/compute/get_security_group.rb +14 -24
data/lib/fog/openstack/requests/compute/get_security_group_rule.rb +38 -0
data/lib/fog/openstack/requests/compute/list_hosts.rb +3 -3
data/lib/fog/openstack/volume.rb +3 -1
data/lib/fog/rackspace/docs/auto_scale.md +9 -9
data/lib/fog/rackspace/docs/getting_started.md +1 -0
data/lib/fog/rackspace/docs/queues.md +312 -0
data/lib/fog/vcloud_director/README.md +2 -0
data/lib/fog/vcloud_director/compute.rb +78 -8
data/lib/fog/vcloud_director/generators/compute/org_vdc_network.rb +91 -0
data/lib/fog/vcloud_director/generators/compute/vapp.rb +30 -0
data/lib/fog/vcloud_director/models/compute/vm_customization.rb +2 -0
data/lib/fog/vcloud_director/parsers/compute/vm_customization.rb +2 -0
data/lib/fog/vcloud_director/requests/compute/delete_network.rb +64 -0
data/lib/fog/vcloud_director/requests/compute/get_execute_query.rb +433 -333
data/lib/fog/vcloud_director/requests/compute/get_vapp_metadata.rb +3 -1
data/lib/fog/vcloud_director/requests/compute/post_attach_disk.rb +1 -1
data/lib/fog/vcloud_director/requests/compute/post_create_org_vdc_network.rb +83 -0
data/lib/fog/vcloud_director/requests/compute/post_detach_disk.rb +1 -1
data/lib/fog/vcloud_director/requests/compute/post_eject_cd_rom.rb +1 -1
data/lib/fog/vcloud_director/requests/compute/post_insert_cd_rom.rb +1 -1
data/lib/fog/vcloud_director/requests/compute/put_guest_customization_section_vapp.rb +1 -0
data/lib/fog/vcloud_director/requests/compute/put_vapp_name_and_description.rb +37 -0
data/lib/fog/vsphere/models/compute/server.rb +1 -1
data/lib/fog/xenserver/compute.rb +35 -0
data/lib/fog/xenserver/models/compute/blob.rb +22 -0
data/lib/fog/xenserver/models/compute/blobs.rb +25 -0
data/lib/fog/xenserver/models/compute/bond.rb +23 -0
data/lib/fog/xenserver/models/compute/bonds.rb +25 -0
data/lib/fog/xenserver/models/compute/console.rb +3 -1
data/lib/fog/xenserver/models/compute/crash_dump.rb +19 -0
data/lib/fog/xenserver/models/compute/crash_dumps.rb +25 -0
data/lib/fog/xenserver/models/compute/dr_task.rb +17 -0
data/lib/fog/xenserver/models/compute/dr_tasks.rb +25 -0
data/lib/fog/xenserver/models/compute/gpu_group.rb +22 -0
data/lib/fog/xenserver/models/compute/gpu_groups.rb +25 -0
data/lib/fog/xenserver/models/compute/guest_metrics.rb +2 -1
data/lib/fog/xenserver/models/compute/host.rb +41 -8
data/lib/fog/xenserver/models/compute/host_cpu.rb +2 -1
data/lib/fog/xenserver/models/compute/host_crash_dump.rb +20 -0
data/lib/fog/xenserver/models/compute/host_crash_dumps.rb +25 -0
data/lib/fog/xenserver/models/compute/host_metrics.rb +1 -1
data/lib/fog/xenserver/models/compute/host_patch.rb +25 -0
data/lib/fog/xenserver/models/compute/host_patchs.rb +25 -0
data/lib/fog/xenserver/models/compute/network.rb +7 -6
data/lib/fog/xenserver/models/compute/pbd.rb +3 -1
data/lib/fog/xenserver/models/compute/pci.rb +22 -0
data/lib/fog/xenserver/models/compute/pcis.rb +25 -0
data/lib/fog/xenserver/models/compute/pgpu.rb +20 -0
data/lib/fog/xenserver/models/compute/pgpus.rb +25 -0
data/lib/fog/xenserver/models/compute/pif.rb +19 -8
data/lib/fog/xenserver/models/compute/pif_metrics.rb +28 -0
data/lib/fog/xenserver/models/compute/pifs_metrics.rb +25 -0
data/lib/fog/xenserver/models/compute/pool.rb +18 -1
data/lib/fog/xenserver/models/compute/pool_patch.rb +24 -0
data/lib/fog/xenserver/models/compute/pool_patchs.rb +25 -0
data/lib/fog/xenserver/models/compute/role.rb +19 -0
data/lib/fog/xenserver/models/compute/roles.rb +25 -0
data/lib/fog/xenserver/models/compute/server.rb +59 -26
data/lib/fog/xenserver/models/compute/server_appliance.rb +21 -0
data/lib/fog/xenserver/models/compute/server_appliances.rb +25 -0
data/lib/fog/xenserver/models/compute/storage_manager.rb +28 -0
data/lib/fog/xenserver/models/compute/storage_managers.rb +25 -0
data/lib/fog/xenserver/models/compute/storage_repository.rb +4 -1
data/lib/fog/xenserver/models/compute/tunnel.rb +20 -0
data/lib/fog/xenserver/models/compute/tunnels.rb +25 -0
data/lib/fog/xenserver/models/compute/vbd.rb +3 -2
data/lib/fog/xenserver/models/compute/vbd_metrics.rb +1 -1
data/lib/fog/xenserver/models/compute/vdi.rb +4 -1
data/lib/fog/xenserver/models/compute/vif.rb +11 -2
data/lib/fog/xenserver/models/compute/vlan.rb +2 -1
data/lib/fog/xenserver/models/compute/vmpp.rb +35 -0
data/lib/fog/xenserver/models/compute/vmpps.rb +25 -0
data/lib/fog/xenserver/models/compute/vtpm.rb +18 -0
data/lib/fog/xenserver/models/compute/vtpms.rb +25 -0
data/tests/aws/requests/compute/assign_private_ip_tests.rb +52 -0
data/tests/google/models/compute/servers_tests.rb +12 -1
data/tests/google/requests/compute/image_tests.rb +0 -1
data/tests/helpers/mock_helper.rb +1 -1
data/tests/openstack/models/compute/security_group_tests.rb +54 -0
data/tests/openstack/requests/compute/security_group_tests.rb +22 -20
data/tests/openstack/requests/network/network_tests.rb +8 -8
data/tests/vcloud_director/requests/compute/edge_gateway_tests.rb +17 -8
data/tests/vcloud_director/requests/compute/network_tests.rb +25 -1
data/tests/vcloud_director/requests/compute/query_tests.rb +67 -2
metadata +125 -132
checksums.yaml +0 -15

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

@@ -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&#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')}]}
+            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