fog 0.5.3 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -0
- data/Gemfile.lock +3 -3
- data/bin/fog +0 -5
- data/changelog.txt +88 -0
- data/fog.gemspec +3 -3
- data/lib/fog.rb +1 -2
- data/lib/fog/aws/elb.rb +2 -0
- data/lib/fog/aws/iam.rb +7 -0
- data/lib/fog/aws/parsers/iam/get_group.rb +55 -0
- data/lib/fog/aws/parsers/iam/get_user_policy.rb +27 -0
- data/lib/fog/aws/parsers/iam/update_group.rb +26 -0
- data/lib/fog/aws/parsers/iam/update_user.rb +27 -0
- data/lib/fog/aws/requests/iam/create_access_key.rb +1 -1
- data/lib/fog/aws/requests/iam/get_group.rb +44 -0
- data/lib/fog/aws/requests/iam/get_user_policy.rb +36 -0
- data/lib/fog/aws/requests/iam/update_group.rb +39 -0
- data/lib/fog/aws/requests/iam/update_signing_certificate.rb +32 -0
- data/lib/fog/aws/requests/iam/update_user.rb +39 -0
- data/lib/fog/aws/ses.rb +2 -0
- data/lib/fog/aws/simpledb.rb +2 -0
- data/lib/fog/bin.rb +3 -8
- data/lib/fog/bin/aws.rb +2 -14
- data/lib/fog/bin/bluebox.rb +6 -8
- data/lib/fog/bin/dnsimple.rb +30 -0
- data/lib/fog/bin/ecloud.rb +30 -0
- data/lib/fog/bin/go_grid.rb +1 -7
- data/lib/fog/bin/linode.rb +0 -6
- data/lib/fog/bin/local.rb +1 -7
- data/lib/fog/bin/new_servers.rb +1 -7
- data/lib/fog/bin/rackspace.rb +2 -14
- data/lib/fog/bin/slicehost.rb +2 -8
- data/lib/fog/bin/terremark.rb +0 -5
- data/lib/fog/bin/voxel.rb +30 -0
- data/lib/fog/cdn/aws.rb +2 -0
- data/lib/fog/compute.rb +6 -3
- data/lib/fog/compute/aws.rb +4 -18
- data/lib/fog/compute/ecloud.rb +1306 -0
- data/lib/fog/compute/models/aws/key_pair.rb +0 -2
- data/lib/fog/compute/models/aws/security_group.rb +4 -4
- data/lib/fog/compute/models/aws/server.rb +13 -3
- data/lib/fog/compute/models/aws/snapshot.rb +0 -2
- data/lib/fog/compute/models/aws/volume.rb +0 -2
- data/lib/fog/compute/models/bluebox/server.rb +23 -11
- data/lib/fog/compute/models/brightbox/server.rb +8 -0
- data/lib/fog/compute/models/ecloud/backup_internet_service.rb +56 -0
- data/lib/fog/compute/models/ecloud/backup_internet_services.rb +33 -0
- data/lib/fog/compute/models/ecloud/catalog.rb +28 -0
- data/lib/fog/compute/models/ecloud/catalog_item.rb +29 -0
- data/lib/fog/compute/models/ecloud/firewall_acl.rb +24 -0
- data/lib/fog/compute/models/ecloud/firewall_acls.rb +31 -0
- data/lib/fog/compute/models/ecloud/internet_service.rb +117 -0
- data/lib/fog/compute/models/ecloud/internet_services.rb +33 -0
- data/lib/fog/compute/models/ecloud/ip.rb +49 -0
- data/lib/fog/compute/models/ecloud/ips.rb +32 -0
- data/lib/fog/compute/models/ecloud/network.rb +72 -0
- data/lib/fog/compute/models/ecloud/networks.rb +33 -0
- data/lib/fog/compute/models/ecloud/node.rb +43 -0
- data/lib/fog/compute/models/ecloud/nodes.rb +31 -0
- data/lib/fog/compute/models/ecloud/public_ip.rb +22 -0
- data/lib/fog/compute/models/ecloud/public_ips.rb +36 -0
- data/lib/fog/compute/models/ecloud/server.rb +209 -0
- data/lib/fog/compute/models/ecloud/servers.rb +55 -0
- data/lib/fog/compute/models/ecloud/task.rb +21 -0
- data/lib/fog/compute/models/ecloud/tasks.rb +31 -0
- data/lib/fog/compute/models/ecloud/vdc.rb +81 -0
- data/lib/fog/compute/models/ecloud/vdcs.rb +40 -0
- data/lib/fog/compute/models/go_grid/server.rb +15 -1
- data/lib/fog/compute/models/rackspace/server.rb +16 -0
- data/lib/fog/compute/models/slicehost/server.rb +16 -0
- data/lib/fog/compute/models/voxel/image.rb +12 -0
- data/lib/fog/compute/models/voxel/images.rb +30 -0
- data/lib/fog/compute/models/voxel/server.rb +77 -0
- data/lib/fog/compute/models/voxel/servers.rb +31 -0
- data/lib/fog/compute/new_servers.rb +2 -2
- data/lib/fog/compute/parsers/voxel/basic.rb +31 -0
- data/lib/fog/compute/parsers/voxel/devices_list.rb +111 -0
- data/lib/fog/compute/parsers/voxel/images_list.rb +59 -0
- data/lib/fog/compute/parsers/voxel/voxcloud_create.rb +40 -0
- data/lib/fog/compute/parsers/voxel/voxcloud_delete.rb +31 -0
- data/lib/fog/compute/parsers/voxel/voxcloud_status.rb +42 -0
- data/lib/fog/compute/rackspace.rb +0 -16
- data/lib/fog/compute/requests/aws/associate_address.rb +2 -0
- data/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb +28 -8
- data/lib/fog/compute/requests/aws/create_security_group.rb +2 -0
- data/lib/fog/compute/requests/aws/create_tags.rb +2 -0
- data/lib/fog/compute/requests/aws/delete_key_pair.rb +2 -0
- data/lib/fog/compute/requests/aws/delete_security_group.rb +2 -0
- data/lib/fog/compute/requests/aws/delete_snapshot.rb +2 -0
- data/lib/fog/compute/requests/aws/delete_tags.rb +2 -0
- data/lib/fog/compute/requests/aws/delete_volume.rb +2 -0
- data/lib/fog/compute/requests/aws/disassociate_address.rb +2 -0
- data/lib/fog/compute/requests/aws/modify_image_attributes.rb +2 -0
- data/lib/fog/compute/requests/aws/modify_snapshot_attribute.rb +2 -0
- data/lib/fog/compute/requests/aws/reboot_instances.rb +2 -0
- data/lib/fog/compute/requests/aws/release_address.rb +2 -0
- data/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb +2 -0
- data/lib/fog/compute/requests/ecloud/add_backup_internet_service.rb +109 -0
- data/lib/fog/compute/requests/ecloud/add_internet_service.rb +149 -0
- data/lib/fog/compute/requests/ecloud/add_node.rb +62 -0
- data/lib/fog/compute/requests/ecloud/clone_vapp.rb +40 -0
- data/lib/fog/compute/requests/ecloud/configure_internet_service.rb +112 -0
- data/lib/fog/compute/requests/ecloud/configure_network.rb +44 -0
- data/lib/fog/compute/requests/ecloud/configure_network_ip.rb +66 -0
- data/lib/fog/compute/requests/ecloud/configure_node.rb +56 -0
- data/lib/fog/compute/requests/ecloud/configure_vapp.rb +144 -0
- data/lib/fog/compute/requests/ecloud/delete_internet_service.rb +22 -0
- data/lib/fog/compute/requests/ecloud/delete_node.rb +22 -0
- data/lib/fog/compute/requests/ecloud/delete_vapp.rb +29 -0
- data/lib/fog/compute/requests/ecloud/get_catalog.rb +44 -0
- data/lib/fog/compute/requests/ecloud/get_catalog_item.rb +47 -0
- data/lib/fog/compute/requests/ecloud/get_customization_options.rb +22 -0
- data/lib/fog/compute/requests/ecloud/get_firewall_acl.rb +11 -0
- data/lib/fog/compute/requests/ecloud/get_firewall_acls.rb +11 -0
- data/lib/fog/compute/requests/ecloud/get_internet_services.rb +82 -0
- data/lib/fog/compute/requests/ecloud/get_network.rb +44 -0
- data/lib/fog/compute/requests/ecloud/get_network_extensions.rb +33 -0
- data/lib/fog/compute/requests/ecloud/get_network_ip.rb +43 -0
- data/lib/fog/compute/requests/ecloud/get_network_ips.rb +35 -0
- data/lib/fog/compute/requests/ecloud/get_node.rb +40 -0
- data/lib/fog/compute/requests/ecloud/get_nodes.rb +41 -0
- data/lib/fog/compute/requests/ecloud/get_organization.rb +49 -0
- data/lib/fog/compute/requests/ecloud/get_public_ip.rb +34 -0
- data/lib/fog/compute/requests/ecloud/get_public_ips.rb +38 -0
- data/lib/fog/compute/requests/ecloud/get_task.rb +11 -0
- data/lib/fog/compute/requests/ecloud/get_task_list.rb +11 -0
- data/lib/fog/compute/requests/ecloud/get_vapp.rb +99 -0
- data/lib/fog/compute/requests/ecloud/get_vapp_template.rb +11 -0
- data/lib/fog/compute/requests/ecloud/get_vdc.rb +84 -0
- data/lib/fog/compute/requests/ecloud/get_versions.rb +37 -0
- data/lib/fog/compute/requests/ecloud/instantiate_vapp_template.rb +142 -0
- data/lib/fog/compute/requests/ecloud/login.rb +48 -0
- data/lib/fog/compute/requests/ecloud/power_off.rb +23 -0
- data/lib/fog/compute/requests/ecloud/power_on.rb +23 -0
- data/lib/fog/compute/requests/ecloud/power_reset.rb +11 -0
- data/lib/fog/compute/requests/ecloud/power_shutdown.rb +11 -0
- data/lib/fog/compute/requests/voxel/devices_list.rb +24 -0
- data/lib/fog/compute/requests/voxel/devices_power.rb +22 -0
- data/lib/fog/compute/requests/voxel/images_list.rb +31 -0
- data/lib/fog/compute/requests/voxel/voxcloud_create.rb +22 -0
- data/lib/fog/compute/requests/voxel/voxcloud_delete.rb +20 -0
- data/lib/fog/compute/requests/voxel/voxcloud_status.rb +29 -0
- data/lib/fog/compute/slicehost.rb +2 -0
- data/lib/fog/compute/voxel.rb +112 -0
- data/lib/fog/core.rb +1 -0
- data/lib/fog/core/credentials.rb +6 -2
- data/lib/fog/core/parser.rb +2 -0
- data/lib/fog/core/scp.rb +67 -0
- data/lib/fog/dns.rb +6 -0
- data/lib/fog/dns/aws.rb +2 -0
- data/lib/fog/dns/bluebox.rb +110 -0
- data/lib/fog/dns/dnsimple.rb +95 -0
- data/lib/fog/dns/models/bluebox/record.rb +52 -0
- data/lib/fog/dns/models/bluebox/records.rb +36 -0
- data/lib/fog/dns/models/bluebox/zone.rb +63 -0
- data/lib/fog/dns/models/bluebox/zones.rb +28 -0
- data/lib/fog/dns/models/dnsimple/record.rb +54 -0
- data/lib/fog/dns/models/dnsimple/records.rb +38 -0
- data/lib/fog/dns/models/dnsimple/zone.rb +50 -0
- data/lib/fog/dns/models/dnsimple/zones.rb +28 -0
- data/lib/fog/dns/parsers/bluebox/create_record.rb +26 -0
- data/lib/fog/dns/parsers/bluebox/create_zone.rb +26 -0
- data/lib/fog/dns/parsers/bluebox/get_record.rb +21 -0
- data/lib/fog/dns/parsers/bluebox/get_records.rb +27 -0
- data/lib/fog/{compute/parsers/terremark_ecloud/get_ip_address.rb → dns/parsers/bluebox/get_zone.rb} +6 -6
- data/lib/fog/dns/parsers/bluebox/get_zones.rb +30 -0
- data/lib/fog/dns/requests/bluebox/create_record.rb +48 -0
- data/lib/fog/dns/requests/bluebox/create_zone.rb +52 -0
- data/lib/fog/dns/requests/bluebox/delete_record.rb +31 -0
- data/lib/fog/dns/requests/bluebox/delete_zone.rb +31 -0
- data/lib/fog/dns/requests/bluebox/get_record.rb +40 -0
- data/lib/fog/dns/requests/bluebox/get_records.rb +41 -0
- data/lib/fog/dns/requests/bluebox/get_zone.rb +44 -0
- data/lib/fog/dns/requests/bluebox/get_zones.rb +43 -0
- data/lib/fog/dns/requests/bluebox/update_record.rb +34 -0
- data/lib/fog/dns/requests/bluebox/update_zone.rb +30 -0
- data/lib/fog/dns/requests/dnsimple/create_domain.rb +27 -0
- data/lib/fog/dns/requests/dnsimple/create_record.rb +48 -0
- data/lib/fog/dns/requests/dnsimple/delete_domain.rb +26 -0
- data/lib/fog/dns/requests/dnsimple/delete_record.rb +21 -0
- data/lib/fog/dns/requests/dnsimple/get_domain.rb +37 -0
- data/lib/fog/dns/requests/dnsimple/list_domains.rb +35 -0
- data/lib/fog/dns/requests/dnsimple/list_records.rb +32 -0
- data/lib/fog/dns/requests/dnsimple/update_record.rb +42 -0
- data/lib/fog/dns/slicehost.rb +2 -0
- data/lib/fog/dns/zerigo.rb +2 -0
- data/lib/fog/providers.rb +3 -1
- data/lib/fog/providers/aws.rb +0 -4
- data/lib/fog/providers/bluebox.rb +1 -8
- data/lib/fog/providers/dnsimple.rb +11 -0
- data/lib/fog/providers/ecloud.rb +11 -0
- data/lib/fog/providers/go_grid.rb +0 -8
- data/lib/fog/providers/google.rb +0 -3
- data/lib/fog/providers/linode.rb +0 -8
- data/lib/fog/providers/local.rb +0 -8
- data/lib/fog/providers/new_servers.rb +0 -11
- data/lib/fog/providers/rackspace.rb +0 -2
- data/lib/fog/providers/slicehost.rb +0 -11
- data/lib/fog/providers/voxel.rb +16 -0
- data/lib/fog/providers/zerigo.rb +0 -3
- data/lib/fog/storage/aws.rb +7 -19
- data/lib/fog/storage/google.rb +2 -2
- data/lib/fog/storage/models/aws/directory.rb +0 -3
- data/lib/fog/storage/models/aws/file.rb +0 -3
- data/lib/fog/storage/models/google/directory.rb +0 -3
- data/lib/fog/storage/models/google/file.rb +0 -3
- data/lib/fog/storage/models/local/directory.rb +0 -3
- data/lib/fog/storage/models/local/file.rb +29 -1
- data/lib/fog/storage/models/local/files.rb +8 -5
- data/lib/fog/storage/models/rackspace/directory.rb +1 -3
- data/lib/fog/storage/parsers/aws/get_bucket_website.rb +26 -0
- data/lib/fog/storage/rackspace.rb +0 -16
- data/lib/fog/storage/requests/aws/delete_bucket_website.rb +32 -0
- data/lib/fog/storage/requests/aws/get_bucket_website.rb +42 -0
- data/lib/fog/storage/requests/aws/put_bucket_website.rb +49 -0
- data/lib/fog/terremark.rb +0 -5
- data/spec/ecloud/bin_spec.rb +22 -0
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/backup_internet_service_spec.rb +5 -5
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/backup_internet_services_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/internet_service_spec.rb +5 -5
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/internet_services_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/ip_spec.rb +5 -5
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/ips_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/network_spec.rb +5 -5
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/networks_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/node_spec.rb +5 -5
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/nodes_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/public_ip_spec.rb +5 -5
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/public_ips_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/server_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/vdc_spec.rb +5 -5
- data/spec/{vcloud/terremark/ecloud → ecloud}/models/vdcs_spec.rb +4 -4
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/add_backup_internet_service_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/add_internet_service_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/add_node_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_internet_service_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_network_ip_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_node_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_vapp_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/delete_internet_service_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/delete_node_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/delete_vapp_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_catalog_item_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_catalog_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_customization_options_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_internet_services_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_network_ip_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_network_ips_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_network_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_node_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_nodes_spec.rb +2 -2
- data/spec/{vcloud → ecloud}/requests/get_organization_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_public_ip_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_public_ips_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_vapp_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_vdc_spec.rb +2 -2
- data/spec/ecloud/requests/get_versions_spec.rb +57 -0
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/instantiate_vapp_template_spec.rb +3 -3
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/login_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/power_off_spec.rb +2 -2
- data/spec/{vcloud/terremark/ecloud → ecloud}/requests/power_on_spec.rb +2 -2
- data/spec/{vcloud → ecloud}/spec_helper.rb +14 -29
- data/spec/{vcloud → ecloud}/vcloud_spec.rb +4 -4
- data/spec/spec_helper.rb +0 -1
- data/tests/compute/helper.rb +12 -1
- data/tests/compute/models/flavors_tests.rb +2 -0
- data/tests/compute/models/server_tests.rb +28 -1
- data/tests/compute/requests/voxel/image_tests.rb +46 -0
- data/tests/compute/requests/voxel/server_tests.rb +123 -0
- data/tests/dns/helper.rb +10 -1
- data/tests/dns/models/record_tests.rb +0 -1
- data/tests/dns/requests/bluebox/dns_tests.rb +271 -0
- data/tests/dns/requests/dnsimple/dns_tests.rb +130 -0
- data/tests/helper.rb +1 -1
- data/tests/helpers/mock_helper.rb +2 -0
- data/tests/storage/models/directory_test.rb +2 -1
- metadata +244 -224
- data/lib/fog/bin/terremark_ecloud.rb +0 -28
- data/lib/fog/bin/vcloud.rb +0 -59
- data/lib/fog/compute/parsers/terremark_ecloud/get_catalog.rb +0 -36
- data/lib/fog/compute/parsers/terremark_ecloud/get_catalog_item.rb +0 -43
- data/lib/fog/compute/parsers/terremark_ecloud/get_ip_addresses.rb +0 -27
- data/lib/fog/compute/parsers/terremark_ecloud/get_network.rb +0 -59
- data/lib/fog/compute/parsers/terremark_ecloud/get_organization.rb +0 -35
- data/lib/fog/compute/parsers/terremark_ecloud/get_task.rb +0 -42
- data/lib/fog/compute/parsers/terremark_ecloud/get_task_list.rb +0 -51
- data/lib/fog/compute/parsers/terremark_ecloud/get_vdc.rb +0 -110
- data/lib/fog/compute/parsers/terremark_ecloud/get_versions.rb +0 -28
- data/lib/fog/compute/parsers/terremark_ecloud/login.rb +0 -27
- data/lib/fog/compute/requests/terremark_ecloud/get_catalog.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_catalog_item.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_ip_address.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_ip_addresses.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_network.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_organization.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_task.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_task_list.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_vdc.rb +0 -19
- data/lib/fog/compute/requests/terremark_ecloud/get_versions.rb +0 -26
- data/lib/fog/compute/requests/terremark_ecloud/login.rb +0 -29
- data/lib/fog/compute/terremark_ecloud.rb +0 -93
- data/lib/fog/providers/terremark_ecloud.rb +0 -17
- data/lib/fog/terremark/ecloud.rb +0 -73
- data/lib/fog/vcloud.rb +0 -337
- data/lib/fog/vcloud/collection.rb +0 -30
- data/lib/fog/vcloud/generators.rb +0 -33
- data/lib/fog/vcloud/mock_data_classes.rb +0 -767
- data/lib/fog/vcloud/model.rb +0 -22
- data/lib/fog/vcloud/models/vdc.rb +0 -26
- data/lib/fog/vcloud/models/vdcs.rb +0 -35
- data/lib/fog/vcloud/requests/get_network.rb +0 -47
- data/lib/fog/vcloud/requests/get_organization.rb +0 -47
- data/lib/fog/vcloud/requests/get_vdc.rb +0 -82
- data/lib/fog/vcloud/requests/get_versions.rb +0 -34
- data/lib/fog/vcloud/requests/login.rb +0 -46
- data/lib/fog/vcloud/terremark/ecloud.rb +0 -187
- data/lib/fog/vcloud/terremark/ecloud/models/backup_internet_service.rb +0 -60
- data/lib/fog/vcloud/terremark/ecloud/models/backup_internet_services.rb +0 -36
- data/lib/fog/vcloud/terremark/ecloud/models/catalog.rb +0 -31
- data/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb +0 -31
- data/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb +0 -28
- data/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb +0 -34
- data/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb +0 -121
- data/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb +0 -36
- data/lib/fog/vcloud/terremark/ecloud/models/ip.rb +0 -51
- data/lib/fog/vcloud/terremark/ecloud/models/ips.rb +0 -35
- data/lib/fog/vcloud/terremark/ecloud/models/network.rb +0 -77
- data/lib/fog/vcloud/terremark/ecloud/models/networks.rb +0 -36
- data/lib/fog/vcloud/terremark/ecloud/models/node.rb +0 -47
- data/lib/fog/vcloud/terremark/ecloud/models/nodes.rb +0 -33
- data/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb +0 -25
- data/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb +0 -39
- data/lib/fog/vcloud/terremark/ecloud/models/server.rb +0 -211
- data/lib/fog/vcloud/terremark/ecloud/models/servers.rb +0 -57
- data/lib/fog/vcloud/terremark/ecloud/models/task.rb +0 -23
- data/lib/fog/vcloud/terremark/ecloud/models/tasks.rb +0 -33
- data/lib/fog/vcloud/terremark/ecloud/models/vdc.rb +0 -83
- data/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb +0 -42
- data/lib/fog/vcloud/terremark/ecloud/requests/add_backup_internet_service.rb +0 -111
- data/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb +0 -152
- data/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb +0 -64
- data/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb +0 -42
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb +0 -115
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb +0 -46
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb +0 -68
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb +0 -58
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb +0 -147
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb +0 -25
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb +0 -24
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb +0 -32
- data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb +0 -46
- data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb +0 -49
- data/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb +0 -24
- data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb +0 -13
- data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb +0 -13
- data/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb +0 -84
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb +0 -47
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb +0 -35
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb +0 -45
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb +0 -37
- data/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb +0 -42
- data/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb +0 -43
- data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb +0 -36
- data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb +0 -41
- data/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb +0 -13
- data/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb +0 -14
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb +0 -101
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb +0 -13
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb +0 -87
- data/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb +0 -144
- data/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb +0 -25
- data/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb +0 -25
- data/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb +0 -13
- data/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb +0 -13
- data/lib/fog/vcloud/terremark/vcloud.rb +0 -39
- data/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb +0 -57
- data/spec/vcloud/bin_spec.rb +0 -28
- data/spec/vcloud/models/vdc_spec.rb +0 -51
- data/spec/vcloud/models/vdcs_spec.rb +0 -1
- data/spec/vcloud/requests/get_network_spec.rb +0 -44
- data/spec/vcloud/requests/get_vdc_spec.rb +0 -62
- data/spec/vcloud/requests/get_versions_spec.rb +0 -54
- data/spec/vcloud/requests/login_spec.rb +0 -24
- data/tests/compute/requests/terremark_ecloud/catalog_tests.rb +0 -47
- data/tests/compute/requests/terremark_ecloud/helper.rb +0 -45
- data/tests/compute/requests/terremark_ecloud/network_tests.rb +0 -30
- data/tests/compute/requests/terremark_ecloud/organization_tests.rb +0 -28
- data/tests/compute/requests/terremark_ecloud/task_tests.rb +0 -39
- data/tests/compute/requests/terremark_ecloud/vdc_tests.rb +0 -60
@@ -1,25 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
class Vcloud
|
3
|
-
module Terremark
|
4
|
-
class Ecloud
|
5
|
-
|
6
|
-
class Real
|
7
|
-
basic_request :power_off, 202, 'POST'
|
8
|
-
end
|
9
|
-
|
10
|
-
class Mock
|
11
|
-
def power_off(vapp_uri)
|
12
|
-
if vapp = mock_data.virtual_machine_from_href(vapp_uri)
|
13
|
-
vapp.power_off!
|
14
|
-
|
15
|
-
builder = Builder::XmlMarkup.new
|
16
|
-
mock_it 200, builder.Task(xmlns)
|
17
|
-
else
|
18
|
-
mock_error 200, "401 Unauthorized"
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
class Vcloud
|
3
|
-
module Terremark
|
4
|
-
class Ecloud
|
5
|
-
|
6
|
-
class Real
|
7
|
-
basic_request :power_on, 202, 'POST'
|
8
|
-
end
|
9
|
-
|
10
|
-
class Mock
|
11
|
-
def power_on(vapp_uri)
|
12
|
-
if vapp = mock_data.virtual_machine_from_href(vapp_uri)
|
13
|
-
vapp.power_on!
|
14
|
-
|
15
|
-
builder = Builder::XmlMarkup.new
|
16
|
-
mock_it 200, builder.Task(xmlns)
|
17
|
-
else
|
18
|
-
mock_error 200, "401 Unauthorized"
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
@@ -1,39 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
class Vcloud
|
3
|
-
module Terremark
|
4
|
-
class Vcloud < Fog::Vcloud
|
5
|
-
request_path 'fog/vcloud/terremark/vcloud/requests'
|
6
|
-
request :get_vdc
|
7
|
-
|
8
|
-
class Real < Fog::Vcloud::Real
|
9
|
-
|
10
|
-
def initialize(options = {})
|
11
|
-
location = caller.first
|
12
|
-
warning = "[yellow][WARN] Fog::Vcloud::Terremark::Vcloud is deprecated, to be replaced with Vcloud 1.0 someday/maybe[/]"
|
13
|
-
warning << " [light_black](" << location << ")[/] "
|
14
|
-
Formatador.display_line(warning)
|
15
|
-
super
|
16
|
-
end
|
17
|
-
|
18
|
-
def supporting_versions
|
19
|
-
["0.8", "0.8a-ext1.6"]
|
20
|
-
end
|
21
|
-
|
22
|
-
end
|
23
|
-
|
24
|
-
class Mock < Fog::Vcloud::Mock
|
25
|
-
|
26
|
-
def initialize(options = {})
|
27
|
-
location = caller.first
|
28
|
-
warning = "[yellow][WARN] Fog::Vcloud::Terremark::Vcloud is deprecated, to be replaced with Vcloud 1.0 someday/maybe[/]"
|
29
|
-
warning << " [light_black](" << location << ")[/] "
|
30
|
-
Formatador.display_line(warning)
|
31
|
-
super
|
32
|
-
end
|
33
|
-
|
34
|
-
end
|
35
|
-
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
39
|
-
end
|
@@ -1,57 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
class Vcloud
|
3
|
-
module Terremark
|
4
|
-
class Vcloud
|
5
|
-
|
6
|
-
class Real
|
7
|
-
# Handled by the main Vcloud get_vdc
|
8
|
-
end
|
9
|
-
|
10
|
-
class Mock
|
11
|
-
#
|
12
|
-
#Based off of:
|
13
|
-
#https://community.vcloudexpress.terremark.com/en-us/product_docs/w/wiki/09-get-vdc.aspx
|
14
|
-
|
15
|
-
def get_vdc(vdc_uri)
|
16
|
-
vdc_uri = ensure_unparsed(vdc_uri)
|
17
|
-
if vdc = mock_data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:href] == vdc_uri }
|
18
|
-
xml = Builder::XmlMarkup.new
|
19
|
-
mock_it 200,
|
20
|
-
xml.Vdc(xmlns.merge(:href => vdc[:href], :name => vdc[:name])) {
|
21
|
-
xml.Link(:rel => "down",
|
22
|
-
:href => vdc[:href] + "/catalog",
|
23
|
-
:type => "application/vnd.vmware.vcloud.catalog+xml",
|
24
|
-
:name => vdc[:name])
|
25
|
-
xml.Link(:rel => "down",
|
26
|
-
:href => vdc[:href] + "/publicIps",
|
27
|
-
:type => "application/xml",
|
28
|
-
:name => "Public IPs")
|
29
|
-
xml.Link(:rel => "down",
|
30
|
-
:href => vdc[:href] + "/internetServices",
|
31
|
-
:type => "application/xml",
|
32
|
-
:name => "Internet Services")
|
33
|
-
xml.ResourceEntities {
|
34
|
-
vdc[:vms].each do |vm|
|
35
|
-
xml.ResourceEntity(:href => vm[:href],
|
36
|
-
:type => "application/vnd.vmware.vcloud.vApp+xml",
|
37
|
-
:name => vm[:name])
|
38
|
-
end
|
39
|
-
}
|
40
|
-
xml.AvailableNetworks {
|
41
|
-
vdc[:networks].each do |network|
|
42
|
-
xml.Network(:href => network[:href],
|
43
|
-
:type => "application/vnd.vmware.vcloud.network+xml",
|
44
|
-
:name => network[:name])
|
45
|
-
end
|
46
|
-
}
|
47
|
-
}, { 'Content-Type' => 'application/vnd.vmware.vcloud.vdc+xml'}
|
48
|
-
else
|
49
|
-
mock_error 200, "401 Unauthorized"
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
data/spec/vcloud/bin_spec.rb
DELETED
@@ -1,28 +0,0 @@
|
|
1
|
-
require 'vcloud/spec_helper'
|
2
|
-
|
3
|
-
describe Vcloud do
|
4
|
-
it { should be_initialized }
|
5
|
-
|
6
|
-
it { should have_at_least(1).services }
|
7
|
-
|
8
|
-
describe "#registered_services" do
|
9
|
-
subject { Vcloud.registered_services }
|
10
|
-
|
11
|
-
it { should have_at_least(1).services }
|
12
|
-
end
|
13
|
-
|
14
|
-
describe "when indexing it like an array" do
|
15
|
-
describe "with a service that exists" do
|
16
|
-
it "should return something when indexed with a configured service" do
|
17
|
-
Vcloud[:ecloud].should_not be_nil
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
describe "with a service that does not exist" do
|
22
|
-
it "should raise an ArgumentError" do
|
23
|
-
lambda {Vcloud[:foozle]}.should raise_error(ArgumentError)
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
end
|
28
|
-
end
|
@@ -1,51 +0,0 @@
|
|
1
|
-
require 'vcloud/spec_helper'
|
2
|
-
|
3
|
-
if Fog.mocking?
|
4
|
-
describe "Fog::Vcloud::Vdc", :type => :mock_vcloud_model do
|
5
|
-
|
6
|
-
describe :class do
|
7
|
-
subject { Fog::Vcloud::Vdc }
|
8
|
-
|
9
|
-
it { should have_identity(:href) }
|
10
|
-
|
11
|
-
it { should have_only_these_attributes([:href, :name, :type, :description, :other_links, :compute_capacity, :storage_capacity, :available_networks,
|
12
|
-
:resource_entities, :enabled, :vm_quota, :nic_quota, :network_quota, :allocation_model]) }
|
13
|
-
end
|
14
|
-
|
15
|
-
context "with no uri" do
|
16
|
-
|
17
|
-
subject { Fog::Vcloud::Vdc.new() }
|
18
|
-
|
19
|
-
it { should(have_all_attributes_be_nil) }
|
20
|
-
|
21
|
-
end
|
22
|
-
|
23
|
-
context "as a collection member" do
|
24
|
-
subject { @vcloud.vdcs[0].reload }
|
25
|
-
|
26
|
-
it { should be_an_instance_of(Fog::Vcloud::Vdc) }
|
27
|
-
|
28
|
-
its(:href) { should == @mock_vdc.href }
|
29
|
-
its(:identity) { should == @mock_vdc.href }
|
30
|
-
its(:name) { should == @mock_vdc.name }
|
31
|
-
its(:other_links) { should have(7).items }
|
32
|
-
its(:resource_entities) { should have(3).items }
|
33
|
-
its(:available_networks) { should have(2).items }
|
34
|
-
|
35
|
-
its(:compute_capacity) { should be_an_instance_of(Hash) }
|
36
|
-
its(:compute_capacity) { should == {:Cpu =>
|
37
|
-
{:Units => "Mhz", :Allocated => @mock_vdc.cpu_allocated.to_s, :Limit => @mock_vdc.cpu_allocated.to_s},
|
38
|
-
:Memory =>
|
39
|
-
{:Units => "MB", :Allocated => @mock_vdc.memory_allocated.to_s, :Limit => @mock_vdc.memory_allocated.to_s}} }
|
40
|
-
its(:storage_capacity) { should be_an_instance_of(Hash) }
|
41
|
-
its(:storage_capacity) { should == {:Limit => @mock_vdc.storage_allocated.to_s, :Units=>"MB", :Allocated => @mock_vdc.storage_allocated.to_s} }
|
42
|
-
|
43
|
-
its(:vm_quota) { should == "0" }
|
44
|
-
its(:nic_quota) { should == "0" }
|
45
|
-
its(:network_quota) { should == "0" }
|
46
|
-
|
47
|
-
its(:enabled) { should == "true" }
|
48
|
-
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|
@@ -1 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
@@ -1,44 +0,0 @@
|
|
1
|
-
require 'vcloud/spec_helper'
|
2
|
-
|
3
|
-
if Fog.mocking?
|
4
|
-
describe Fog::Vcloud, :type => :mock_vcloud_request do
|
5
|
-
subject { @vcloud }
|
6
|
-
|
7
|
-
it { should respond_to(:get_network) }
|
8
|
-
|
9
|
-
describe :get_network, :type => :vcloud_request do
|
10
|
-
context "with a valid network uri" do
|
11
|
-
before { @network = @vcloud.get_network(URI.parse(@mock_network.href)) }
|
12
|
-
subject { @network }
|
13
|
-
|
14
|
-
it_should_behave_like "all responses"
|
15
|
-
it { should have_headers_denoting_a_content_type_of("application/vnd.vmware.vcloud.network+xml") }
|
16
|
-
|
17
|
-
describe :body do
|
18
|
-
subject { @network.body }
|
19
|
-
|
20
|
-
it { should have(9).keys }
|
21
|
-
|
22
|
-
it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes" # 3 keys
|
23
|
-
it { should have_key_with_value(:type, "application/vnd.vmware.vcloud.network+xml") }
|
24
|
-
it { should have_key_with_value(:Features, {:FenceMode => "isolated"}) }
|
25
|
-
it { should have_key_with_value(:Description, @mock_network.name) }
|
26
|
-
it { should have_key_with_value(:href, @mock_network.href) }
|
27
|
-
it { should have_key_with_value(:name, @mock_network.name) }
|
28
|
-
it { should have_key_with_value(:Configuration, {:Gateway => @mock_network.gateway,
|
29
|
-
:Netmask => @mock_network.netmask,
|
30
|
-
:Dns => @mock_network.dns }) }
|
31
|
-
end
|
32
|
-
end
|
33
|
-
context "with a network uri that doesn't exist" do
|
34
|
-
subject { lambda { @vcloud.get_network(URI.parse('https://www.fakey.com/api/v0.8/network/999')) } }
|
35
|
-
it_should_behave_like("a request for a resource that doesn't exist")
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
39
|
-
else
|
40
|
-
|
41
|
-
describe Fog::Vcloud, :type => :vcloud_request do
|
42
|
-
end
|
43
|
-
|
44
|
-
end
|
@@ -1,62 +0,0 @@
|
|
1
|
-
require 'vcloud/spec_helper'
|
2
|
-
|
3
|
-
#
|
4
|
-
# WARNING: INCOMPLETE
|
5
|
-
#
|
6
|
-
|
7
|
-
if Fog.mocking?
|
8
|
-
describe Fog::Vcloud, :type => :mock_vcloud_request do
|
9
|
-
subject { @vcloud }
|
10
|
-
|
11
|
-
it { should respond_to(:get_vdc) }
|
12
|
-
|
13
|
-
describe :get_vdc, :type => :vcloud_request do
|
14
|
-
context "with a valid vdc uri" do
|
15
|
-
before { @vdc = @vcloud.get_vdc(URI.parse(@mock_vdc.href)) }
|
16
|
-
subject { @vdc }
|
17
|
-
|
18
|
-
it_should_behave_like "all responses"
|
19
|
-
it { should have_headers_denoting_a_content_type_of("application/vnd.vmware.vcloud.vdc+xml") }
|
20
|
-
|
21
|
-
describe :body do
|
22
|
-
subject { @vdc.body }
|
23
|
-
|
24
|
-
it { should have(16).items }
|
25
|
-
|
26
|
-
it_should_behave_like("it has the standard vcloud v0.8 xmlns attributes") # 3 keys
|
27
|
-
|
28
|
-
its(:name) { should == @mock_vdc.name }
|
29
|
-
its(:href) { should == @mock_vdc.href }
|
30
|
-
its(:VmQuota) { should == "0" }
|
31
|
-
its(:Description) { should == @mock_vdc.name + " VDC" }
|
32
|
-
its(:NicQuota) { should == "0" }
|
33
|
-
its(:IsEnabled) { should == "true" }
|
34
|
-
its(:NetworkQuota) { should == "0" }
|
35
|
-
its(:AllocationModel) { should == "AllocationPool" }
|
36
|
-
its(:Link) { should have(7).links }
|
37
|
-
its(:ResourceEntities) { should have(1).resource }
|
38
|
-
|
39
|
-
let(:resource_entities) { subject[:ResourceEntities][:ResourceEntity] }
|
40
|
-
specify { resource_entities.should have(3).vapps }
|
41
|
-
#FIXME: test for the resources
|
42
|
-
|
43
|
-
its(:ComputeCapacity) { should == {:Memory => { :Units => "MB", :Allocated => @mock_vdc.memory_allocated.to_s, :Limit => @mock_vdc.memory_allocated.to_s },
|
44
|
-
:Cpu => { :Units => "Mhz", :Allocated => @mock_vdc.cpu_allocated.to_s, :Limit => @mock_vdc.cpu_allocated.to_s } } }
|
45
|
-
|
46
|
-
its(:StorageCapacity) { should == {:Units => "MB", :Allocated => @mock_vdc.storage_allocated.to_s, :Limit => @mock_vdc.storage_allocated.to_s } }
|
47
|
-
|
48
|
-
let(:available_networks) { subject[:AvailableNetworks][:Network] }
|
49
|
-
specify { available_networks.should have(2).networks }
|
50
|
-
#FIXME :test the available networks
|
51
|
-
|
52
|
-
end
|
53
|
-
end
|
54
|
-
context "with a vdc uri that doesn't exist" do
|
55
|
-
subject { lambda { @vcloud.get_vdc(URI.parse('https://www.fakey.com/api/v0.8/vdc/999')) } }
|
56
|
-
it_should_behave_like("a request for a resource that doesn't exist")
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
|
62
|
-
|
@@ -1,54 +0,0 @@
|
|
1
|
-
require 'vcloud/spec_helper'
|
2
|
-
|
3
|
-
shared_examples_for "real or mock get_versions requests" do
|
4
|
-
|
5
|
-
subject { @vcloud }
|
6
|
-
|
7
|
-
it { should respond_to(:get_versions) }
|
8
|
-
|
9
|
-
describe "#get_versions" do
|
10
|
-
subject { @vcloud.get_versions( @vcloud.versions_uri ) }
|
11
|
-
|
12
|
-
it_should_behave_like "all responses"
|
13
|
-
|
14
|
-
describe "body" do
|
15
|
-
subject { @vcloud.get_versions( @vcloud.versions_uri ).body }
|
16
|
-
|
17
|
-
it { should have(4).keys }
|
18
|
-
it_should_behave_like "it has the standard xmlns attributes" # 2 keys
|
19
|
-
|
20
|
-
its(:xmlns) { should == "http://www.vmware.com/vcloud/versions" }
|
21
|
-
|
22
|
-
its(:VersionInfo) { should be_either_a_hash_or_array }
|
23
|
-
|
24
|
-
describe ":VersionInfo" do
|
25
|
-
subject { arrayify(@vcloud.get_versions( @vcloud.versions_uri ).body[:VersionInfo]) }
|
26
|
-
|
27
|
-
specify {
|
28
|
-
subject.each do |version_info|
|
29
|
-
version_info.should include(:LoginUrl)
|
30
|
-
version_info[:LoginUrl].should be_a_url
|
31
|
-
version_info.should include(:Version)
|
32
|
-
version_info[:Version].should be_an_instance_of(String)
|
33
|
-
end
|
34
|
-
}
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
if Fog.mocking?
|
41
|
-
describe Fog::Vcloud, :type => :mock_vcloud_request do
|
42
|
-
|
43
|
-
it_should_behave_like "real or mock get_versions requests"
|
44
|
-
|
45
|
-
describe "body" do
|
46
|
-
subject { @vcloud.get_versions( @vcloud.versions_uri ).body }
|
47
|
-
its(:VersionInfo) { should == { :LoginUrl => @mock_version.login_url , :Version => @mock_version.version } }
|
48
|
-
end
|
49
|
-
end
|
50
|
-
else
|
51
|
-
describe Fog::Vcloud, :type => :vcloud_request do
|
52
|
-
it_should_behave_like "real or mock get_versions requests"
|
53
|
-
end
|
54
|
-
end
|
@@ -1,24 +0,0 @@
|
|
1
|
-
require 'vcloud/spec_helper'
|
2
|
-
|
3
|
-
shared_examples_for "real or mock login requests" do
|
4
|
-
subject { @vcloud }
|
5
|
-
it_should_behave_like "all login requests"
|
6
|
-
end
|
7
|
-
|
8
|
-
if Fog.mocking?
|
9
|
-
describe Fog::Vcloud, :type => :mock_vcloud_request do
|
10
|
-
it_should_behave_like "real or mock login requests"
|
11
|
-
|
12
|
-
describe "#body" do
|
13
|
-
subject { @vcloud.login.body }
|
14
|
-
its(:Org) { should == { :type => "application/vnd.vmware.vcloud.org+xml",
|
15
|
-
:href => @mock_organization.href,
|
16
|
-
:name => @mock_organization.name} }
|
17
|
-
end
|
18
|
-
end
|
19
|
-
else
|
20
|
-
describe Fog::Vcloud, :type => :vcloud_request do
|
21
|
-
it_should_behave_like "real or mock login requests"
|
22
|
-
end
|
23
|
-
end
|
24
|
-
|