fog 0.2.30 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile.lock +8 -8
- data/README.rdoc +15 -6
- data/Rakefile +12 -19
- data/bin/fog +12 -10
- data/fog.gemspec +298 -286
- data/lib/fog.rb +22 -12
- data/lib/fog/attributes.rb +2 -6
- data/lib/fog/aws.rb +10 -5
- data/lib/fog/aws/bin.rb +29 -65
- data/lib/fog/aws/compute.rb +220 -0
- data/lib/fog/aws/ec2.rb +9 -216
- data/lib/fog/aws/elb.rb +9 -12
- data/lib/fog/aws/models/{ec2 → compute}/address.rb +3 -3
- data/lib/fog/aws/models/{ec2 → compute}/addresses.rb +3 -11
- data/lib/fog/aws/models/{ec2 → compute}/flavor.rb +2 -2
- data/lib/fog/aws/models/compute/flavors.rb +39 -0
- data/lib/fog/aws/models/compute/image.rb +44 -0
- data/lib/fog/aws/models/{ec2 → compute}/images.rb +3 -9
- data/lib/fog/aws/models/compute/key_pair.rb +44 -0
- data/lib/fog/aws/models/{ec2 → compute}/key_pairs.rb +3 -9
- data/lib/fog/aws/models/{ec2 → compute}/security_group.rb +28 -6
- data/lib/fog/aws/models/{ec2 → compute}/security_groups.rb +3 -9
- data/lib/fog/aws/models/{ec2 → compute}/server.rb +65 -38
- data/lib/fog/aws/models/compute/servers.rb +80 -0
- data/lib/fog/aws/models/{ec2 → compute}/snapshot.rb +7 -7
- data/lib/fog/aws/models/{ec2 → compute}/snapshots.rb +5 -13
- data/lib/fog/aws/models/{ec2 → compute}/volume.rb +8 -8
- data/lib/fog/aws/models/{ec2 → compute}/volumes.rb +3 -11
- data/lib/fog/aws/models/{s3 → storage}/directories.rb +3 -9
- data/lib/fog/aws/models/{s3 → storage}/directory.rb +5 -5
- data/lib/fog/aws/models/{s3 → storage}/file.rb +9 -9
- data/lib/fog/aws/models/{s3 → storage}/files.rb +13 -8
- data/lib/fog/aws/parsers/{ec2 → compute}/allocate_address.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/attach_volume.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/basic.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/create_image.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/create_key_pair.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/create_snapshot.rb +2 -2
- data/lib/fog/aws/parsers/{ec2 → compute}/create_volume.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/deregister_image.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_addresses.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_availability_zones.rb +2 -2
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_images.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_key_pairs.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_regions.rb +2 -2
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_reserved_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_security_groups.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_snapshots.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_volumes.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/detach_volume.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/get_console_output.rb +2 -2
- data/lib/fog/aws/parsers/compute/import_key_pair.rb +20 -0
- data/lib/fog/aws/parsers/{ec2 → compute}/register_image.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/run_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/start_stop_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/terminate_instances.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/access_control_list.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/copy_object.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_location.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_logging.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_object_versions.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_versioning.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_request_payment.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_service.rb +1 -1
- data/lib/fog/aws/requests/{ec2 → compute}/allocate_address.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/associate_address.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/attach_volume.rb +6 -6
- data/lib/fog/aws/requests/{ec2 → compute}/authorize_security_group_ingress.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_image.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_key_pair.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/create_security_group.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_snapshot.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_volume.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/delete_key_pair.rb +2 -2
- data/lib/fog/aws/requests/{ec2 → compute}/delete_security_group.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/delete_snapshot.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/delete_volume.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/deregister_image.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_addresses.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_availability_zones.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_images.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/describe_instances.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_key_pairs.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_regions.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_reserved_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/describe_security_groups.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_snapshots.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_volumes.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/detach_volume.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/disassociate_address.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/get_console_output.rb +4 -4
- data/lib/fog/aws/requests/compute/import_key_pair.rb +54 -0
- data/lib/fog/aws/requests/{ec2 → compute}/modify_image_attributes.rb +2 -2
- data/lib/fog/aws/requests/{ec2 → compute}/modify_snapshot_attribute.rb +2 -2
- data/lib/fog/aws/requests/{ec2 → compute}/reboot_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/register_image.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/release_address.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/revoke_security_group_ingress.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/run_instances.rb +4 -3
- data/lib/fog/aws/requests/{ec2 → compute}/start_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/stop_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/terminate_instances.rb +4 -4
- data/lib/fog/aws/requests/elb/create_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/delete_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/describe_instance_health.rb +1 -1
- data/lib/fog/aws/requests/elb/describe_load_balancers.rb +1 -1
- data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/create_domain.rb +1 -1
- data/lib/fog/aws/requests/simpledb/delete_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/delete_domain.rb +1 -1
- data/lib/fog/aws/requests/simpledb/domain_metadata.rb +1 -1
- data/lib/fog/aws/requests/simpledb/get_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/list_domains.rb +1 -1
- data/lib/fog/aws/requests/simpledb/put_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/select.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/copy_object.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/delete_bucket.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/delete_object.rb +2 -2
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_acl.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_location.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_logging.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_object_versions.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_versioning.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_object.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/get_object_acl.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_object_torrent.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/get_object_url.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/get_request_payment.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_service.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/head_object.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket_acl.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket_logging.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket_versioning.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_object.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_object_url.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_request_payment.rb +1 -1
- data/lib/fog/aws/s3.rb +8 -205
- data/lib/fog/aws/simpledb.rb +10 -13
- data/lib/fog/aws/storage.rb +209 -0
- data/lib/fog/bin.rb +59 -50
- data/lib/fog/bluebox.rb +9 -78
- data/lib/fog/bluebox/bin.rb +10 -28
- data/lib/fog/bluebox/compute.rb +87 -0
- data/lib/fog/bluebox/models/compute/flavor.rb +45 -0
- data/lib/fog/bluebox/models/compute/flavors.rb +28 -0
- data/lib/fog/bluebox/models/compute/image.rb +19 -0
- data/lib/fog/bluebox/models/compute/images.rb +28 -0
- data/lib/fog/bluebox/models/compute/server.rb +81 -0
- data/lib/fog/bluebox/models/compute/servers.rb +29 -0
- data/lib/fog/bluebox/requests/compute/create_block.rb +41 -0
- data/lib/fog/bluebox/requests/compute/destroy_block.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_block.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_blocks.rb +36 -0
- data/lib/fog/bluebox/requests/compute/get_product.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_products.rb +33 -0
- data/lib/fog/bluebox/requests/compute/get_template.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_templates.rb +34 -0
- data/lib/fog/bluebox/requests/compute/reboot_block.rb +35 -0
- data/lib/fog/go_grid.rb +9 -88
- data/lib/fog/go_grid/bin.rb +17 -22
- data/lib/fog/go_grid/compute.rb +96 -0
- data/lib/fog/go_grid/requests/compute/common_lookup_list.rb +36 -0
- data/lib/fog/go_grid/requests/compute/grid_image_list.rb +39 -0
- data/lib/fog/go_grid/requests/compute/grid_ip_list.rb +38 -0
- data/lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb +36 -0
- data/lib/fog/go_grid/requests/compute/grid_server_add.rb +44 -0
- data/lib/fog/go_grid/requests/compute/grid_server_delete.rb +33 -0
- data/lib/fog/go_grid/requests/compute/grid_server_get.rb +33 -0
- data/lib/fog/go_grid/requests/compute/grid_server_list.rb +38 -0
- data/lib/fog/go_grid/requests/compute/grid_server_power.rb +34 -0
- data/lib/fog/linode.rb +10 -71
- data/lib/fog/linode/bin.rb +17 -22
- data/lib/fog/linode/compute.rb +79 -0
- data/lib/fog/linode/requests/compute/avail_datacenters.rb +31 -0
- data/lib/fog/linode/requests/compute/avail_distributions.rb +38 -0
- data/lib/fog/linode/requests/compute/avail_kernels.rb +36 -0
- data/lib/fog/linode/requests/compute/avail_linodeplans.rb +35 -0
- data/lib/fog/linode/requests/compute/avail_stackscripts.rb +37 -0
- data/lib/fog/linode/requests/compute/linode_create.rb +41 -0
- data/lib/fog/linode/requests/compute/linode_delete.rb +36 -0
- data/lib/fog/linode/requests/compute/linode_list.rb +38 -0
- data/lib/fog/linode/requests/compute/linode_reboot.rb +36 -0
- data/lib/fog/local.rb +10 -51
- data/lib/fog/local/bin.rb +17 -26
- data/lib/fog/local/models/storage/directories.rb +33 -0
- data/lib/fog/local/models/storage/directory.rb +52 -0
- data/lib/fog/local/models/storage/file.rb +60 -0
- data/lib/fog/local/models/storage/files.rb +73 -0
- data/lib/fog/local/storage.rb +58 -0
- data/lib/fog/model.rb +1 -1
- data/lib/fog/new_servers.rb +9 -80
- data/lib/fog/new_servers/bin.rb +17 -22
- data/lib/fog/new_servers/compute.rb +88 -0
- data/lib/fog/new_servers/requests/compute/add_server.rb +41 -0
- data/lib/fog/new_servers/requests/compute/cancel_server.rb +38 -0
- data/lib/fog/new_servers/requests/compute/get_server.rb +44 -0
- data/lib/fog/new_servers/requests/compute/list_images.rb +35 -0
- data/lib/fog/new_servers/requests/compute/list_plans.rb +38 -0
- data/lib/fog/new_servers/requests/compute/list_servers.rb +44 -0
- data/lib/fog/new_servers/requests/compute/reboot_server.rb +32 -0
- data/lib/fog/provider.rb +18 -0
- data/lib/fog/rackspace.rb +8 -3
- data/lib/fog/rackspace/bin.rb +26 -41
- data/lib/fog/rackspace/compute.rb +107 -0
- data/lib/fog/rackspace/files.rb +9 -130
- data/lib/fog/rackspace/models/{servers → compute}/flavor.rb +1 -1
- data/lib/fog/rackspace/models/{servers → compute}/flavors.rb +4 -10
- data/lib/fog/rackspace/models/{servers → compute}/image.rb +4 -4
- data/lib/fog/rackspace/models/{servers → compute}/images.rb +4 -12
- data/lib/fog/rackspace/models/{servers → compute}/server.rb +20 -16
- data/lib/fog/rackspace/models/{servers → compute}/servers.rb +5 -11
- data/lib/fog/rackspace/models/{files → storage}/directories.rb +4 -10
- data/lib/fog/rackspace/models/{files → storage}/directory.rb +4 -4
- data/lib/fog/rackspace/models/{files → storage}/file.rb +6 -6
- data/lib/fog/rackspace/models/{files → storage}/files.rb +11 -15
- data/lib/fog/rackspace/requests/{servers → compute}/create_image.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/create_server.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/delete_image.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/delete_server.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/get_flavor_details.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/get_image_details.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/get_server_details.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_addresses.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_flavors.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_flavors_detail.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_images.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_images_detail.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_private_addresses.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_public_addresses.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_servers.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_servers_detail.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/reboot_server.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/update_server.rb +2 -2
- data/lib/fog/rackspace/requests/{files → storage}/delete_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/delete_object.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/get_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/get_containers.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/get_object.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/head_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/head_containers.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/head_object.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/put_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/put_object.rb +1 -1
- data/lib/fog/rackspace/servers.rb +9 -104
- data/lib/fog/rackspace/storage.rb +151 -0
- data/lib/fog/service.rb +111 -59
- data/lib/fog/slicehost.rb +9 -83
- data/lib/fog/slicehost/bin.rb +17 -34
- data/lib/fog/slicehost/compute.rb +91 -0
- data/lib/fog/slicehost/models/compute/flavor.rb +45 -0
- data/lib/fog/slicehost/models/compute/flavors.rb +28 -0
- data/lib/fog/slicehost/models/compute/image.rb +17 -0
- data/lib/fog/slicehost/models/compute/images.rb +27 -0
- data/lib/fog/slicehost/models/compute/server.rb +64 -0
- data/lib/fog/slicehost/models/compute/servers.rb +31 -0
- data/lib/fog/slicehost/parsers/compute/create_slice.rb +31 -0
- data/lib/fog/slicehost/parsers/compute/get_backups.rb +32 -0
- data/lib/fog/slicehost/parsers/compute/get_flavor.rb +26 -0
- data/lib/fog/slicehost/parsers/compute/get_flavors.rb +30 -0
- data/lib/fog/slicehost/parsers/compute/get_image.rb +26 -0
- data/lib/fog/slicehost/parsers/compute/get_images.rb +30 -0
- data/lib/fog/slicehost/parsers/compute/get_slice.rb +31 -0
- data/lib/fog/slicehost/parsers/compute/get_slices.rb +35 -0
- data/lib/fog/slicehost/requests/compute/create_slice.rb +49 -0
- data/lib/fog/slicehost/requests/compute/delete_slice.rb +45 -0
- data/lib/fog/slicehost/requests/compute/get_backups.rb +37 -0
- data/lib/fog/slicehost/requests/compute/get_flavor.rb +40 -0
- data/lib/fog/slicehost/requests/compute/get_flavors.rb +37 -0
- data/lib/fog/slicehost/requests/compute/get_image.rb +38 -0
- data/lib/fog/slicehost/requests/compute/get_images.rb +35 -0
- data/lib/fog/slicehost/requests/compute/get_slice.rb +46 -0
- data/lib/fog/slicehost/requests/compute/get_slices.rb +43 -0
- data/lib/fog/slicehost/requests/compute/reboot_slice.rb +44 -0
- data/lib/fog/ssh.rb +16 -7
- data/lib/fog/terremark/bin.rb +25 -33
- data/lib/fog/terremark/models/shared/address.rb +1 -1
- data/lib/fog/terremark/models/shared/task.rb +6 -6
- data/lib/fog/vcloud.rb +60 -36
- data/lib/fog/vcloud/bin.rb +2 -2
- data/lib/fog/vcloud/collection.rb +1 -1
- data/lib/fog/vcloud/generators.rb +1 -1
- data/lib/fog/vcloud/model.rb +1 -1
- data/lib/fog/vcloud/models/vdc.rb +1 -1
- data/lib/fog/vcloud/models/vdcs.rb +3 -9
- data/lib/fog/vcloud/requests/get_network.rb +1 -1
- data/lib/fog/vcloud/requests/get_organization.rb +1 -1
- data/lib/fog/vcloud/requests/get_vdc.rb +1 -1
- data/lib/fog/vcloud/requests/get_versions.rb +1 -1
- data/lib/fog/vcloud/requests/login.rb +1 -1
- data/lib/fog/vcloud/terremark/ecloud.rb +19 -14
- data/lib/fog/vcloud/terremark/ecloud/models/catalog.rb +2 -2
- data/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb +4 -8
- data/lib/fog/vcloud/terremark/ecloud/models/ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/models/ips.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/network.rb +2 -2
- data/lib/fog/vcloud/terremark/ecloud/models/networks.rb +4 -8
- data/lib/fog/vcloud/terremark/ecloud/models/node.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/nodes.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb +4 -14
- data/lib/fog/vcloud/terremark/ecloud/models/server.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/models/servers.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/task.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/tasks.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/vdc.rb +2 -2
- data/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb +25 -15
- data/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb +4 -4
- data/lib/fog/vcloud/terremark/vcloud.rb +9 -5
- data/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb +4 -4
- data/spec/aws/models/{ec2 → compute}/address_spec.rb +12 -12
- data/spec/aws/models/compute/addresses_spec.rb +70 -0
- data/spec/aws/models/{ec2 → compute}/flavors_spec.rb +2 -2
- data/spec/aws/models/{ec2 → compute}/key_pair_spec.rb +12 -12
- data/spec/aws/models/compute/key_pairs_spec.rb +71 -0
- data/spec/aws/models/{ec2 → compute}/security_group_spec.rb +12 -12
- data/spec/aws/models/compute/security_groups_spec.rb +71 -0
- data/spec/aws/models/{ec2 → compute}/server_spec.rb +9 -9
- data/spec/aws/models/{ec2 → compute}/servers_spec.rb +2 -2
- data/spec/aws/models/{ec2 → compute}/snapshot_spec.rb +7 -7
- data/spec/aws/models/{ec2 → compute}/snapshots_spec.rb +12 -12
- data/spec/aws/models/{ec2 → compute}/volume_spec.rb +16 -16
- data/spec/aws/models/compute/volumes_spec.rb +71 -0
- data/spec/aws/models/storage/directories_spec.rb +49 -0
- data/spec/aws/models/{s3 → storage}/directory_spec.rb +13 -13
- data/spec/aws/models/{s3 → storage}/file_spec.rb +6 -6
- data/spec/aws/models/{s3 → storage}/files_spec.rb +6 -6
- data/spec/aws/requests/{ec2 → compute}/describe_images_spec.rb +4 -4
- data/spec/aws/requests/s3/copy_object_spec.rb +12 -12
- data/spec/aws/requests/s3/delete_bucket_spec.rb +9 -9
- data/spec/aws/requests/s3/delete_object_spec.rb +9 -9
- data/spec/aws/requests/s3/get_bucket_location_spec.rb +5 -5
- data/spec/aws/requests/s3/get_bucket_spec.rb +13 -13
- data/spec/aws/requests/s3/get_object_spec.rb +10 -10
- data/spec/aws/requests/s3/get_request_payment_spec.rb +5 -5
- data/spec/aws/requests/s3/get_service_spec.rb +6 -6
- data/spec/aws/requests/s3/head_object_spec.rb +6 -6
- data/spec/aws/requests/s3/put_bucket_spec.rb +4 -4
- data/spec/aws/requests/s3/put_object_spec.rb +12 -12
- data/spec/aws/requests/s3/put_request_payment_spec.rb +5 -5
- data/spec/{rackspace/models/servers → bluebox/models/compute}/flavors_spec.rb +3 -3
- data/spec/bluebox/models/{server_spec.rb → compute/server_spec.rb} +4 -4
- data/spec/bluebox/models/{servers_spec.rb → compute/servers_spec.rb} +4 -4
- data/spec/rackspace/models/compute/flavors_spec.rb +14 -0
- data/spec/rackspace/models/{servers → compute}/server_spec.rb +4 -4
- data/spec/rackspace/models/compute/servers_spec.rb +22 -0
- data/spec/rackspace/requests/{files → storage}/delete_container_spec.rb +5 -5
- data/spec/rackspace/requests/storage/delete_object_spec.rb +37 -0
- data/spec/rackspace/requests/{files → storage}/get_container_spec.rb +9 -9
- data/spec/rackspace/requests/{files → storage}/get_containers_spec.rb +4 -4
- data/spec/rackspace/requests/storage/get_object_spec.rb +21 -0
- data/spec/rackspace/requests/storage/head_container_spec.rb +30 -0
- data/spec/rackspace/requests/storage/head_containers_spec.rb +19 -0
- data/spec/rackspace/requests/storage/head_object_spec.rb +21 -0
- data/spec/rackspace/requests/{files → storage}/put_container_spec.rb +3 -3
- data/spec/rackspace/requests/storage/put_object_spec.rb +20 -0
- data/spec/slicehost/models/compute/flavors_spec.rb +14 -0
- data/spec/slicehost/models/{server_spec.rb → compute/server_spec.rb} +8 -8
- data/spec/{rackspace/models/servers → slicehost/models/compute}/servers_spec.rb +4 -4
- data/spec/spec_helper.rb +14 -14
- data/spec/vcloud/models/vdc_spec.rb +1 -1
- data/spec/vcloud/spec_helper.rb +7 -7
- data/spec/vcloud/terremark/ecloud/models/internet_service_spec.rb +1 -1
- data/tests/aws/helper.rb +8 -8
- data/tests/aws/models/storage/directory_tests.rb +8 -0
- data/tests/aws/requests/compute/address_tests.rb +80 -0
- data/tests/aws/requests/{ec2 → compute}/availability_zone_tests.rb +5 -5
- data/tests/aws/requests/{ec2 → compute}/instance_tests.rb +17 -17
- data/tests/aws/requests/{ec2 → compute}/key_pair_tests.rb +12 -12
- data/tests/aws/requests/{ec2 → compute}/region_tests.rb +5 -5
- data/tests/aws/requests/{ec2 → compute}/security_group_tests.rb +31 -31
- data/tests/aws/requests/{ec2 → compute}/snapshot_tests.rb +12 -12
- data/tests/aws/requests/{ec2 → compute}/volume_tests.rb +23 -23
- data/tests/bluebox/helper.rb +13 -9
- data/tests/bluebox/requests/{block_tests.rb → compute/block_tests.rb} +16 -17
- data/tests/bluebox/requests/compute/product_tests.rb +25 -0
- data/tests/bluebox/requests/{template_tests.rb → compute/template_tests.rb} +5 -5
- data/tests/linode/helper.rb +12 -8
- data/tests/linode/requests/{datacenter_tests.rb → compute/datacenter_tests.rb} +3 -3
- data/tests/linode/requests/{distribution_tests.rb → compute/distribution_tests.rb} +4 -4
- data/tests/linode/requests/{linode_tests.rb → compute/linode_tests.rb} +13 -13
- data/tests/linode/requests/{linodeplans_tests.rb → compute/linodeplans_tests.rb} +4 -4
- data/tests/rackspace/helper.rb +5 -13
- data/tests/rackspace/requests/compute/address_tests.rb +40 -0
- data/tests/rackspace/requests/compute/flavor_tests.rb +34 -0
- data/tests/rackspace/requests/compute/image_tests.rb +62 -0
- data/tests/rackspace/requests/{servers → compute}/server_tests.rb +20 -20
- data/tests/slicehost/helper.rb +3 -3
- data/tests/slicehost/requests/{backup_tests.rb → compute/backup_tests.rb} +2 -2
- data/tests/slicehost/requests/{flavor_tests.rb → compute/flavor_tests.rb} +4 -4
- data/tests/slicehost/requests/{image_tests.rb → compute/image_tests.rb} +4 -4
- data/tests/slicehost/requests/{slice_tests.rb → compute/slice_tests.rb} +12 -12
- metadata +304 -290
- data/lib/fog/aws/models/ec2/flavors.rb +0 -43
- data/lib/fog/aws/models/ec2/image.rb +0 -44
- data/lib/fog/aws/models/ec2/key_pair.rb +0 -34
- data/lib/fog/aws/models/ec2/servers.rb +0 -49
- data/lib/fog/bluebox/models/flavor.rb +0 -43
- data/lib/fog/bluebox/models/flavors.rb +0 -32
- data/lib/fog/bluebox/models/image.rb +0 -17
- data/lib/fog/bluebox/models/images.rb +0 -34
- data/lib/fog/bluebox/models/server.rb +0 -79
- data/lib/fog/bluebox/models/servers.rb +0 -33
- data/lib/fog/bluebox/requests/create_block.rb +0 -39
- data/lib/fog/bluebox/requests/destroy_block.rb +0 -32
- data/lib/fog/bluebox/requests/get_block.rb +0 -32
- data/lib/fog/bluebox/requests/get_blocks.rb +0 -34
- data/lib/fog/bluebox/requests/get_product.rb +0 -32
- data/lib/fog/bluebox/requests/get_products.rb +0 -31
- data/lib/fog/bluebox/requests/get_template.rb +0 -32
- data/lib/fog/bluebox/requests/get_templates.rb +0 -32
- data/lib/fog/bluebox/requests/reboot_block.rb +0 -33
- data/lib/fog/go_grid/requests/common_lookup_list.rb +0 -34
- data/lib/fog/go_grid/requests/grid_image_list.rb +0 -37
- data/lib/fog/go_grid/requests/grid_ip_list.rb +0 -36
- data/lib/fog/go_grid/requests/grid_loadbalancer_list.rb +0 -34
- data/lib/fog/go_grid/requests/grid_server_add.rb +0 -42
- data/lib/fog/go_grid/requests/grid_server_delete.rb +0 -31
- data/lib/fog/go_grid/requests/grid_server_get.rb +0 -31
- data/lib/fog/go_grid/requests/grid_server_list.rb +0 -36
- data/lib/fog/go_grid/requests/grid_server_power.rb +0 -32
- data/lib/fog/linode/requests/avail_datacenters.rb +0 -29
- data/lib/fog/linode/requests/avail_distributions.rb +0 -36
- data/lib/fog/linode/requests/avail_kernels.rb +0 -34
- data/lib/fog/linode/requests/avail_linodeplans.rb +0 -33
- data/lib/fog/linode/requests/avail_stackscripts.rb +0 -35
- data/lib/fog/linode/requests/linode_create.rb +0 -39
- data/lib/fog/linode/requests/linode_delete.rb +0 -34
- data/lib/fog/linode/requests/linode_list.rb +0 -36
- data/lib/fog/linode/requests/linode_reboot.rb +0 -34
- data/lib/fog/local/models/directories.rb +0 -37
- data/lib/fog/local/models/directory.rb +0 -50
- data/lib/fog/local/models/file.rb +0 -58
- data/lib/fog/local/models/files.rb +0 -74
- data/lib/fog/new_servers/requests/add_server.rb +0 -39
- data/lib/fog/new_servers/requests/cancel_server.rb +0 -36
- data/lib/fog/new_servers/requests/get_server.rb +0 -42
- data/lib/fog/new_servers/requests/list_images.rb +0 -33
- data/lib/fog/new_servers/requests/list_plans.rb +0 -36
- data/lib/fog/new_servers/requests/list_servers.rb +0 -43
- data/lib/fog/new_servers/requests/reboot_server.rb +0 -30
- data/lib/fog/slicehost/models/flavor.rb +0 -43
- data/lib/fog/slicehost/models/flavors.rb +0 -31
- data/lib/fog/slicehost/models/image.rb +0 -15
- data/lib/fog/slicehost/models/images.rb +0 -33
- data/lib/fog/slicehost/models/server.rb +0 -62
- data/lib/fog/slicehost/models/servers.rb +0 -35
- data/lib/fog/slicehost/parsers/create_slice.rb +0 -29
- data/lib/fog/slicehost/parsers/get_backups.rb +0 -30
- data/lib/fog/slicehost/parsers/get_flavor.rb +0 -24
- data/lib/fog/slicehost/parsers/get_flavors.rb +0 -28
- data/lib/fog/slicehost/parsers/get_image.rb +0 -24
- data/lib/fog/slicehost/parsers/get_images.rb +0 -28
- data/lib/fog/slicehost/parsers/get_slice.rb +0 -29
- data/lib/fog/slicehost/parsers/get_slices.rb +0 -33
- data/lib/fog/slicehost/requests/create_slice.rb +0 -47
- data/lib/fog/slicehost/requests/delete_slice.rb +0 -43
- data/lib/fog/slicehost/requests/get_backups.rb +0 -35
- data/lib/fog/slicehost/requests/get_flavor.rb +0 -38
- data/lib/fog/slicehost/requests/get_flavors.rb +0 -35
- data/lib/fog/slicehost/requests/get_image.rb +0 -36
- data/lib/fog/slicehost/requests/get_images.rb +0 -33
- data/lib/fog/slicehost/requests/get_slice.rb +0 -44
- data/lib/fog/slicehost/requests/get_slices.rb +0 -41
- data/lib/fog/slicehost/requests/reboot_slice.rb +0 -42
- data/lib/fog/vcloud/extension.rb +0 -37
- data/spec/aws/models/ec2/addresses_spec.rb +0 -70
- data/spec/aws/models/ec2/key_pairs_spec.rb +0 -71
- data/spec/aws/models/ec2/security_groups_spec.rb +0 -71
- data/spec/aws/models/ec2/volumes_spec.rb +0 -71
- data/spec/aws/models/s3/directories_spec.rb +0 -49
- data/spec/bluebox/models/flavors_spec.rb +0 -14
- data/spec/rackspace/requests/files/delete_object_spec.rb +0 -37
- data/spec/rackspace/requests/files/get_object_spec.rb +0 -21
- data/spec/rackspace/requests/files/head_container_spec.rb +0 -30
- data/spec/rackspace/requests/files/head_containers_spec.rb +0 -19
- data/spec/rackspace/requests/files/head_object_spec.rb +0 -21
- data/spec/rackspace/requests/files/put_object_spec.rb +0 -20
- data/spec/slicehost/models/flavors_spec.rb +0 -14
- data/spec/slicehost/models/servers_spec.rb +0 -22
- data/tests/aws/models/s3/directory_tests.rb +0 -8
- data/tests/aws/requests/ec2/address_tests.rb +0 -80
- data/tests/bluebox/requests/product_tests.rb +0 -25
- data/tests/rackspace/requests/servers/address_tests.rb +0 -40
- data/tests/rackspace/requests/servers/flavor_tests.rb +0 -34
- data/tests/rackspace/requests/servers/image_tests.rb +0 -59
@@ -0,0 +1,107 @@
|
|
1
|
+
module Fog
|
2
|
+
module Rackspace
|
3
|
+
class Compute < Fog::Service
|
4
|
+
|
5
|
+
requires :rackspace_api_key, :rackspace_username
|
6
|
+
|
7
|
+
model_path 'fog/rackspace/models/compute'
|
8
|
+
model :flavor
|
9
|
+
collection :flavors
|
10
|
+
model :image
|
11
|
+
collection :images
|
12
|
+
model :server
|
13
|
+
collection :servers
|
14
|
+
|
15
|
+
request_path 'fog/rackspace/requests/compute'
|
16
|
+
request :create_image
|
17
|
+
request :create_server
|
18
|
+
request :delete_image
|
19
|
+
request :delete_server
|
20
|
+
request :get_flavor_details
|
21
|
+
request :get_image_details
|
22
|
+
request :get_server_details
|
23
|
+
request :list_addresses
|
24
|
+
request :list_private_addresses
|
25
|
+
request :list_public_addresses
|
26
|
+
request :list_flavors
|
27
|
+
request :list_flavors_detail
|
28
|
+
request :list_images
|
29
|
+
request :list_images_detail
|
30
|
+
request :list_servers
|
31
|
+
request :list_servers_detail
|
32
|
+
request :reboot_server
|
33
|
+
request :update_server
|
34
|
+
|
35
|
+
class Mock
|
36
|
+
|
37
|
+
def self.data
|
38
|
+
@data ||= Hash.new do |hash, key|
|
39
|
+
hash[key] = {
|
40
|
+
:last_modified => {
|
41
|
+
:images => {},
|
42
|
+
:servers => {}
|
43
|
+
},
|
44
|
+
:images => {},
|
45
|
+
:servers => {}
|
46
|
+
}
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def self.reset_data(keys=data.keys)
|
51
|
+
for key in [*keys]
|
52
|
+
data.delete(key)
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
def initialize(options={})
|
57
|
+
@rackspace_username = options[:rackspace_username]
|
58
|
+
@data = self.class.data[@rackspace_username]
|
59
|
+
end
|
60
|
+
|
61
|
+
end
|
62
|
+
|
63
|
+
class Real
|
64
|
+
|
65
|
+
def initialize(options={})
|
66
|
+
credentials = Fog::Rackspace.authenticate(options)
|
67
|
+
@auth_token = credentials['X-Auth-Token']
|
68
|
+
uri = URI.parse(credentials['X-Server-Management-Url'])
|
69
|
+
@host = uri.host
|
70
|
+
@path = uri.path
|
71
|
+
@port = uri.port
|
72
|
+
@scheme = uri.scheme
|
73
|
+
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
|
74
|
+
end
|
75
|
+
|
76
|
+
def reload
|
77
|
+
@connection.reset
|
78
|
+
end
|
79
|
+
|
80
|
+
def request(params)
|
81
|
+
begin
|
82
|
+
response = @connection.request(params.merge!({
|
83
|
+
:headers => {
|
84
|
+
'Content-Type' => 'application/json',
|
85
|
+
'X-Auth-Token' => @auth_token
|
86
|
+
}.merge!(params[:headers] || {}),
|
87
|
+
:host => @host,
|
88
|
+
:path => "#{@path}/#{params[:path]}"
|
89
|
+
}))
|
90
|
+
rescue Excon::Errors::Error => error
|
91
|
+
raise case error
|
92
|
+
when Excon::Errors::NotFound
|
93
|
+
Fog::Rackspace::Compute::NotFound.slurp(error)
|
94
|
+
else
|
95
|
+
error
|
96
|
+
end
|
97
|
+
end
|
98
|
+
unless response.body.empty?
|
99
|
+
response.body = JSON.parse(response.body)
|
100
|
+
end
|
101
|
+
response
|
102
|
+
end
|
103
|
+
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
data/lib/fog/rackspace/files.rb
CHANGED
@@ -1,136 +1,15 @@
|
|
1
1
|
module Fog
|
2
2
|
module Rackspace
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
model 'file'
|
12
|
-
model 'files'
|
13
|
-
|
14
|
-
request_path 'fog/rackspace/requests/files'
|
15
|
-
request 'delete_container'
|
16
|
-
request 'delete_object'
|
17
|
-
request 'get_container'
|
18
|
-
request 'get_containers'
|
19
|
-
request 'get_object'
|
20
|
-
request 'head_container'
|
21
|
-
request 'head_containers'
|
22
|
-
request 'head_object'
|
23
|
-
request 'put_container'
|
24
|
-
request 'put_object'
|
25
|
-
|
26
|
-
module Utils
|
27
|
-
|
28
|
-
def parse_data(data)
|
29
|
-
metadata = {
|
30
|
-
:body => nil,
|
31
|
-
:headers => {}
|
32
|
-
}
|
33
|
-
|
34
|
-
if data.is_a?(String)
|
35
|
-
metadata[:body] = data
|
36
|
-
metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
|
37
|
-
else
|
38
|
-
filename = ::File.basename(data.path)
|
39
|
-
unless (mime_types = MIME::Types.of(filename)).empty?
|
40
|
-
metadata[:headers]['Content-Type'] = mime_types.first.content_type
|
41
|
-
end
|
42
|
-
metadata[:body] = data.read
|
43
|
-
metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
|
44
|
-
end
|
45
|
-
# metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
|
46
|
-
metadata
|
47
|
-
end
|
48
|
-
|
3
|
+
class Files
|
4
|
+
|
5
|
+
def self.new(attributes = {})
|
6
|
+
location = caller.first
|
7
|
+
warning = "[yellow][WARN] Fog::Rackspace::Files#new is deprecated, use Fog::Rackspace::Storage#new instead[/]"
|
8
|
+
warning << " [light_black](" << location << ")[/] "
|
9
|
+
Formatador.display_line(warning)
|
10
|
+
Fog::Rackspace::Storage.new(attributes)
|
49
11
|
end
|
50
12
|
|
51
|
-
class Mock
|
52
|
-
include Collections
|
53
|
-
include Utils
|
54
|
-
|
55
|
-
def self.data
|
56
|
-
@data ||= Hash.new do |hash, key|
|
57
|
-
hash[key] = {}
|
58
|
-
end
|
59
|
-
end
|
60
|
-
|
61
|
-
def self.reset_data(keys=data.keys)
|
62
|
-
for key in [*keys]
|
63
|
-
data.delete(key)
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
def initialize(options={})
|
68
|
-
@rackspace_username = options[:rackspace_username]
|
69
|
-
@data = self.class.data[@rackspace_username]
|
70
|
-
end
|
71
|
-
|
72
|
-
end
|
73
|
-
|
74
|
-
class Real
|
75
|
-
include Collections
|
76
|
-
include Utils
|
77
|
-
|
78
|
-
def initialize(options={})
|
79
|
-
credentials = Fog::Rackspace.authenticate(options)
|
80
|
-
@auth_token = credentials['X-Auth-Token']
|
81
|
-
|
82
|
-
if(credentials['X-CDN-Management-Url'])
|
83
|
-
cdn_uri = URI.parse(credentials['X-CDN-Management-Url'])
|
84
|
-
@cdn_host = cdn_uri.host
|
85
|
-
@cdn_path = cdn_uri.path
|
86
|
-
@cdn_port = cdn_uri.port
|
87
|
-
@cdn_scheme = cdn_uri.scheme
|
88
|
-
@cdn_connection = Fog::Connection.new("#{@cdn_scheme}://#{@cdn_host}:#{@cdn_port}", options[:persistent])
|
89
|
-
end
|
90
|
-
|
91
|
-
storage_uri = URI.parse(credentials['X-Storage-Url'])
|
92
|
-
@storage_host = storage_uri.host
|
93
|
-
@storage_path = storage_uri.path
|
94
|
-
@storage_port = storage_uri.port
|
95
|
-
@storage_scheme = storage_uri.scheme
|
96
|
-
@storage_connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}", options[:persistent])
|
97
|
-
end
|
98
|
-
|
99
|
-
def reload
|
100
|
-
@connection.reset
|
101
|
-
end
|
102
|
-
|
103
|
-
def cdn_request(params)
|
104
|
-
response = @cdn_connection.request(params.merge!({
|
105
|
-
:headers => {
|
106
|
-
'Content-Type' => 'application/json',
|
107
|
-
'X-Auth-Token' => @auth_token
|
108
|
-
}.merge!(params[:headers] || {}),
|
109
|
-
:host => @cdn_host,
|
110
|
-
:path => "#{@cdn_path}/#{params[:path]}",
|
111
|
-
}))
|
112
|
-
if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
|
113
|
-
response.body = JSON.parse(response.body)
|
114
|
-
end
|
115
|
-
response
|
116
|
-
end
|
117
|
-
|
118
|
-
def storage_request(params, parse_json = true, &block)
|
119
|
-
response = @storage_connection.request(params.merge!({
|
120
|
-
:headers => {
|
121
|
-
'Content-Type' => 'application/json',
|
122
|
-
'X-Auth-Token' => @auth_token
|
123
|
-
}.merge!(params[:headers] || {}),
|
124
|
-
:host => @storage_host,
|
125
|
-
:path => "#{@storage_path}/#{params[:path]}",
|
126
|
-
}), &block)
|
127
|
-
if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
|
128
|
-
response.body = JSON.parse(response.body)
|
129
|
-
end
|
130
|
-
response
|
131
|
-
end
|
132
|
-
|
133
|
-
end
|
134
13
|
end
|
135
14
|
end
|
136
|
-
end
|
15
|
+
end
|
@@ -1,19 +1,13 @@
|
|
1
1
|
require 'fog/collection'
|
2
|
-
require 'fog/rackspace/models/
|
2
|
+
require 'fog/rackspace/models/compute/flavor'
|
3
3
|
|
4
4
|
module Fog
|
5
5
|
module Rackspace
|
6
|
-
|
7
|
-
|
8
|
-
module Collections
|
9
|
-
def flavors
|
10
|
-
Fog::Rackspace::Servers::Flavors.new(:connection => self)
|
11
|
-
end
|
12
|
-
end
|
6
|
+
class Compute
|
13
7
|
|
14
8
|
class Flavors < Fog::Collection
|
15
9
|
|
16
|
-
model Fog::Rackspace::
|
10
|
+
model Fog::Rackspace::Compute::Flavor
|
17
11
|
|
18
12
|
def all
|
19
13
|
data = connection.list_flavors_detail.body['flavors']
|
@@ -23,7 +17,7 @@ module Fog
|
|
23
17
|
def get(flavor_id)
|
24
18
|
data = connection.get_flavor_details(flavor_id).body['flavor']
|
25
19
|
new(data)
|
26
|
-
rescue Fog::Rackspace::
|
20
|
+
rescue Fog::Rackspace::Compute::NotFound
|
27
21
|
nil
|
28
22
|
end
|
29
23
|
|
@@ -2,18 +2,18 @@ require 'fog/model'
|
|
2
2
|
|
3
3
|
module Fog
|
4
4
|
module Rackspace
|
5
|
-
|
5
|
+
class Compute
|
6
6
|
|
7
7
|
class Image < Fog::Model
|
8
8
|
|
9
9
|
identity :id
|
10
10
|
|
11
11
|
attribute :name
|
12
|
-
attribute :created_at, 'created'
|
13
|
-
attribute :updated_at, 'updated'
|
12
|
+
attribute :created_at, :aliases => 'created'
|
13
|
+
attribute :updated_at, :aliases => 'updated'
|
14
14
|
attribute :progress
|
15
15
|
attribute :status
|
16
|
-
attribute :server_id, 'serverId'
|
16
|
+
attribute :server_id, :aliases => 'serverId'
|
17
17
|
|
18
18
|
def server=(new_server)
|
19
19
|
requires :id
|
@@ -1,21 +1,13 @@
|
|
1
1
|
require 'fog/collection'
|
2
|
-
require 'fog/rackspace/models/
|
2
|
+
require 'fog/rackspace/models/compute/image'
|
3
3
|
|
4
4
|
module Fog
|
5
5
|
module Rackspace
|
6
|
-
|
7
|
-
|
8
|
-
module Collections
|
9
|
-
def images(attributes = {})
|
10
|
-
Fog::Rackspace::Servers::Images.new({
|
11
|
-
:connection => self
|
12
|
-
}.merge!(attributes))
|
13
|
-
end
|
14
|
-
end
|
6
|
+
class Compute
|
15
7
|
|
16
8
|
class Images < Fog::Collection
|
17
9
|
|
18
|
-
model Fog::Rackspace::
|
10
|
+
model Fog::Rackspace::Compute::Image
|
19
11
|
|
20
12
|
attribute :server
|
21
13
|
|
@@ -30,7 +22,7 @@ module Fog
|
|
30
22
|
def get(image_id)
|
31
23
|
data = connection.get_image_details(image_id).body['image']
|
32
24
|
new(data)
|
33
|
-
rescue Fog::Rackspace::
|
25
|
+
rescue Fog::Rackspace::Compute::NotFound
|
34
26
|
nil
|
35
27
|
end
|
36
28
|
|
@@ -2,23 +2,23 @@ require 'fog/model'
|
|
2
2
|
|
3
3
|
module Fog
|
4
4
|
module Rackspace
|
5
|
-
|
5
|
+
class Compute
|
6
6
|
|
7
7
|
class Server < Fog::Model
|
8
8
|
|
9
9
|
identity :id
|
10
10
|
|
11
11
|
attribute :addresses
|
12
|
-
attribute :flavor_id, 'flavorId'
|
13
|
-
attribute :host_id, 'hostId'
|
14
|
-
attribute :image_id, 'imageId'
|
12
|
+
attribute :flavor_id, :aliases => 'flavorId'
|
13
|
+
attribute :host_id, :aliases => 'hostId'
|
14
|
+
attribute :image_id, :aliases => 'imageId'
|
15
15
|
attribute :metadata
|
16
16
|
attribute :name
|
17
17
|
attribute :personality
|
18
18
|
attribute :progress
|
19
19
|
attribute :status
|
20
20
|
|
21
|
-
attr_accessor :password, :private_key_path, :public_key_path
|
21
|
+
attr_accessor :password, :private_key_path, :public_key_path, :username
|
22
22
|
|
23
23
|
def initialize(attributes={})
|
24
24
|
@flavor_id ||= 1
|
@@ -57,11 +57,11 @@ module Fog
|
|
57
57
|
end
|
58
58
|
|
59
59
|
def private_key_path
|
60
|
-
@private_key_path
|
60
|
+
@private_key_path ||= Fog.credentials[:private_key_path]
|
61
61
|
end
|
62
62
|
|
63
63
|
def public_key_path
|
64
|
-
@public_key_path
|
64
|
+
@public_key_path ||= Fog.credentials[:public_key_path]
|
65
65
|
end
|
66
66
|
|
67
67
|
def save
|
@@ -77,15 +77,9 @@ module Fog
|
|
77
77
|
true
|
78
78
|
end
|
79
79
|
|
80
|
-
def
|
81
|
-
requires :addresses, :identity, :
|
82
|
-
|
83
|
-
@ssh.run(commands)
|
84
|
-
end
|
85
|
-
|
86
|
-
def setup
|
87
|
-
requires :addresses, :identity, :password, :public_key_path
|
88
|
-
Fog::SSH.new(@addresses['public'].first, 'root', :password => password).run([
|
80
|
+
def setup(credentials = {})
|
81
|
+
requires :addresses, :identity, :public_key_path, :username
|
82
|
+
Fog::SSH.new(addresses['public'].first, username, credentials).run([
|
89
83
|
%{mkdir .ssh},
|
90
84
|
%{echo "#{File.read(File.expand_path(public_key_path))}" >> ~/.ssh/authorized_keys},
|
91
85
|
%{passwd -l root},
|
@@ -97,6 +91,16 @@ module Fog
|
|
97
91
|
retry
|
98
92
|
end
|
99
93
|
|
94
|
+
def ssh(commands)
|
95
|
+
requires :addresses, :identity, :private_key_path, :username
|
96
|
+
@ssh ||= Fog::SSH.new(addresses['public'].first, username, :keys => [private_key_path])
|
97
|
+
@ssh.run(commands)
|
98
|
+
end
|
99
|
+
|
100
|
+
def username
|
101
|
+
@username ||= root
|
102
|
+
end
|
103
|
+
|
100
104
|
private
|
101
105
|
|
102
106
|
def adminPass=(new_admin_pass)
|
@@ -1,19 +1,13 @@
|
|
1
1
|
require 'fog/collection'
|
2
|
-
require 'fog/rackspace/models/
|
2
|
+
require 'fog/rackspace/models/compute/server'
|
3
3
|
|
4
4
|
module Fog
|
5
5
|
module Rackspace
|
6
|
-
|
7
|
-
|
8
|
-
module Collections
|
9
|
-
def servers
|
10
|
-
Fog::Rackspace::Servers::Servers.new(:connection => self)
|
11
|
-
end
|
12
|
-
end
|
6
|
+
class Compute
|
13
7
|
|
14
8
|
class Servers < Fog::Collection
|
15
9
|
|
16
|
-
model Fog::Rackspace::
|
10
|
+
model Fog::Rackspace::Compute::Server
|
17
11
|
|
18
12
|
def all
|
19
13
|
data = connection.list_servers_detail.body['servers']
|
@@ -23,7 +17,7 @@ module Fog
|
|
23
17
|
def bootstrap(new_attributes = {})
|
24
18
|
server = create(new_attributes)
|
25
19
|
server.wait_for { ready? }
|
26
|
-
server.setup
|
20
|
+
server.setup(:password => server.password)
|
27
21
|
server
|
28
22
|
end
|
29
23
|
|
@@ -31,7 +25,7 @@ module Fog
|
|
31
25
|
if server = connection.get_server_details(server_id).body['server']
|
32
26
|
new(server)
|
33
27
|
end
|
34
|
-
rescue Fog::Rackspace::
|
28
|
+
rescue Fog::Rackspace::Compute::NotFound
|
35
29
|
nil
|
36
30
|
end
|
37
31
|
|