fog 1.24.0 → 1.25.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -13
- data/CHANGELOG.md +184 -1
- data/CONTRIBUTORS.md +23 -0
- data/README.md +17 -9
- data/Rakefile +4 -0
- data/fog.gemspec +18 -6
- data/lib/fog.rb +1 -1
- data/lib/fog/aws/auto_scaling.rb +12 -12
- data/lib/fog/aws/beanstalk.rb +12 -10
- data/lib/fog/aws/cdn.rb +0 -1
- data/lib/fog/aws/cloud_formation.rb +13 -11
- data/lib/fog/aws/cloud_watch.rb +14 -11
- data/lib/fog/aws/compute.rb +19 -19
- data/lib/fog/aws/core.rb +21 -0
- data/lib/fog/aws/dns.rb +0 -1
- data/lib/fog/aws/elasticache.rb +13 -9
- data/lib/fog/aws/elb.rb +23 -14
- data/lib/fog/aws/emr.rb +11 -9
- data/lib/fog/aws/iam.rb +14 -11
- data/lib/fog/aws/models/compute/security_group.rb +41 -0
- data/lib/fog/aws/models/elb/load_balancer.rb +31 -0
- data/lib/fog/aws/models/glacier/archive.rb +3 -1
- data/lib/fog/aws/models/iam/role.rb +1 -1
- data/lib/fog/aws/models/iam/roles.rb +1 -1
- data/lib/fog/aws/models/storage/file.rb +1 -1
- data/lib/fog/aws/parsers/compute/describe_security_groups.rb +68 -53
- data/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb +7 -0
- data/lib/fog/aws/parsers/elb/describe_tags.rb +26 -0
- data/lib/fog/aws/parsers/elb/tag_list_parser.rb +57 -0
- data/lib/fog/aws/parsers/storage/get_bucket_website.rb +5 -1
- data/lib/fog/aws/rds.rb +13 -11
- data/lib/fog/aws/region_methods.rb +1 -1
- data/lib/fog/aws/requests/dynamodb/put_item.rb +1 -1
- data/lib/fog/aws/requests/elb/add_tags.rb +46 -0
- data/lib/fog/aws/requests/elb/create_load_balancer.rb +4 -1
- data/lib/fog/aws/requests/elb/describe_load_balancer_attributes.rb +3 -0
- data/lib/fog/aws/requests/elb/describe_tags.rb +56 -0
- data/lib/fog/aws/requests/elb/modify_load_balancer_attributes.rb +9 -3
- data/lib/fog/aws/requests/elb/remove_tags.rb +46 -0
- data/lib/fog/aws/requests/storage/copy_object.rb +1 -1
- data/lib/fog/aws/requests/storage/delete_object.rb +4 -3
- data/lib/fog/aws/requests/storage/post_object_hidden_fields.rb +23 -5
- data/lib/fog/aws/requests/storage/post_object_restore.rb +1 -1
- data/lib/fog/aws/requests/storage/put_bucket_website.rb +46 -18
- data/lib/fog/aws/ses.rb +1 -2
- data/lib/fog/aws/signaturev4.rb +62 -15
- data/lib/fog/aws/simpledb.rb +0 -1
- data/lib/fog/aws/sns.rb +12 -9
- data/lib/fog/aws/sqs.rb +14 -10
- data/lib/fog/aws/storage.rb +102 -78
- data/lib/fog/aws/sts.rb +10 -9
- data/lib/fog/bare_metal_cloud/compute.rb +0 -1
- data/lib/fog/bin.rb +1 -0
- data/lib/fog/bin/brightbox.rb +3 -1
- data/lib/fog/bin/rackspace.rb +4 -0
- data/lib/fog/bluebox/models/compute/server.rb +1 -0
- data/lib/fog/cloudstack/models/compute/server.rb +12 -1
- data/lib/fog/cloudstack/models/compute/snapshots.rb +3 -2
- data/lib/fog/cloudstack/models/compute/volume.rb +5 -0
- data/lib/fog/cloudstack/models/compute/volumes.rb +3 -2
- data/lib/fog/core/parser.rb +2 -112
- data/lib/fog/dnsmadeeasy/dns.rb +0 -1
- data/lib/fog/dynect/core.rb +0 -1
- data/lib/fog/dynect/dns.rb +11 -3
- data/lib/fog/ecloud/compute.rb +0 -1
- data/lib/fog/ecloud/core.rb +1 -1
- data/lib/fog/fogdocker/compute.rb +4 -1
- data/lib/fog/fogdocker/core.rb +1 -7
- data/lib/fog/fogdocker/errors.rb +9 -0
- data/lib/fog/fogdocker/models/compute/images.rb +4 -0
- data/lib/fog/fogdocker/models/compute/server.rb +18 -1
- data/lib/fog/fogdocker/requests/compute/container_action.rb +53 -3
- data/lib/fog/fogdocker/requests/compute/container_get.rb +31 -12
- data/lib/fog/fogdocker/requests/compute/image_search.rb +29 -0
- data/lib/fog/google/dns.rb +46 -12
- data/lib/fog/google/examples/dns/project.rb +8 -0
- data/lib/fog/google/examples/dns/zones.rb +43 -0
- data/lib/fog/google/models/compute/images.rb +2 -1
- data/lib/fog/google/models/dns/change.rb +40 -0
- data/lib/fog/google/models/dns/changes.rb +52 -0
- data/lib/fog/google/models/dns/project.rb +75 -0
- data/lib/fog/google/models/dns/projects.rb +25 -0
- data/lib/fog/google/models/dns/record.rb +112 -0
- data/lib/fog/google/models/dns/records.rb +52 -0
- data/lib/fog/google/models/dns/zone.rb +74 -0
- data/lib/fog/google/models/dns/zones.rb +34 -0
- data/lib/fog/google/models/storage/file.rb +1 -1
- data/lib/fog/google/models/storage/files.rb +1 -5
- data/lib/fog/google/requests/dns/create_change.rb +64 -0
- data/lib/fog/google/requests/dns/create_managed_zone.rb +64 -31
- data/lib/fog/google/requests/dns/delete_managed_zone.rb +20 -24
- data/lib/fog/google/requests/dns/get_change.rb +42 -0
- data/lib/fog/google/requests/dns/get_managed_zone.rb +22 -16
- data/lib/fog/google/requests/dns/get_project.rb +42 -0
- data/lib/fog/google/requests/dns/list_changes.rb +41 -0
- data/lib/fog/google/requests/dns/list_managed_zones.rb +15 -10
- data/lib/fog/google/requests/dns/list_resource_record_sets.rb +50 -0
- data/lib/fog/google/storage.rb +0 -1
- data/lib/fog/hp/storage.rb +1 -1
- data/lib/fog/internet_archive/storage.rb +0 -1
- data/lib/fog/libvirt/models/compute/server.rb +17 -7
- data/lib/fog/opennebula/models/compute/flavor.rb +46 -8
- data/lib/fog/opennebula/models/compute/flavors.rb +7 -0
- data/lib/fog/opennebula/models/compute/interface.rb +1 -1
- data/lib/fog/opennebula/models/compute/network.rb +1 -0
- data/lib/fog/opennebula/models/compute/networks.rb +5 -1
- data/lib/fog/opennebula/requests/compute/list_networks.rb +34 -25
- data/lib/fog/opennebula/requests/compute/template_pool.rb +47 -5
- data/lib/fog/openstack/compute.rb +2 -2
- data/lib/fog/openstack/docs/storage.md +18 -0
- data/lib/fog/openstack/identity.rb +1 -1
- data/lib/fog/openstack/image.rb +1 -1
- data/lib/fog/openstack/metering.rb +1 -1
- data/lib/fog/openstack/models/compute/server.rb +1 -0
- data/lib/fog/openstack/models/storage/directory.rb +8 -2
- data/lib/fog/openstack/network.rb +1 -1
- data/lib/fog/openstack/orchestration.rb +1 -1
- data/lib/fog/openstack/requests/compute/create_security_group.rb +1 -1
- data/lib/fog/openstack/requests/storage/public_url.rb +28 -0
- data/lib/fog/openstack/requests/storage/put_container.rb +1 -0
- data/lib/fog/openstack/storage.rb +1 -0
- data/lib/fog/openstack/volume.rb +1 -1
- data/lib/fog/ovirt/compute.rb +1 -0
- data/lib/fog/ovirt/models/compute/server.rb +5 -0
- data/lib/fog/ovirt/requests/compute/update_volume.rb +39 -0
- data/lib/fog/rackspace.rb +1 -0
- data/lib/fog/rackspace/core.rb +1 -0
- data/lib/fog/rackspace/docs/networking.md +315 -0
- data/lib/fog/rackspace/mock_data.rb +1 -2
- data/lib/fog/rackspace/models/dns/zones.rb +2 -1
- data/lib/fog/rackspace/models/load_balancers/node.rb +7 -0
- data/lib/fog/rackspace/models/networking/network.rb +27 -0
- data/lib/fog/rackspace/models/networking/networks.rb +23 -0
- data/lib/fog/rackspace/models/networking/virtual_interface.rb +85 -0
- data/lib/fog/rackspace/models/networking/virtual_interfaces.rb +45 -0
- data/lib/fog/rackspace/models/queues/queue.rb +1 -1
- data/lib/fog/rackspace/networking.rb +192 -0
- data/lib/fog/rackspace/requests/load_balancers/create_node.rb +3 -0
- data/lib/fog/rackspace/requests/load_balancers/update_node.rb +3 -0
- data/lib/fog/rackspace/requests/networking/create_network.rb +36 -0
- data/lib/fog/rackspace/requests/networking/create_virtual_interface.rb +30 -0
- data/lib/fog/rackspace/requests/networking/delete_network.rb +21 -0
- data/lib/fog/rackspace/requests/networking/delete_virtual_interface.rb +23 -0
- data/lib/fog/rackspace/requests/networking/get_network.rb +21 -0
- data/lib/fog/rackspace/requests/networking/list_networks.rb +18 -0
- data/lib/fog/rackspace/requests/networking/list_virtual_interfaces.rb +22 -0
- data/lib/fog/vcloud/compute.rb +0 -1
- data/lib/fog/vcloud/core.rb +1 -0
- data/lib/fog/vcloud_director/compute.rb +1 -1
- data/lib/fog/version.rb +1 -1
- data/lib/fog/vsphere/compute.rb +38 -1
- data/lib/fog/vsphere/requests/compute/list_clusters.rb +31 -1
- data/lib/fog/vsphere/requests/compute/modify_vm_interface.rb +1 -1
- data/lib/fog/zerigo/dns.rb +0 -1
- data/lib/tasks/changelog_task.rb +1 -0
- data/tests/aws/models/elb/model_tests.rb +6 -0
- data/tests/aws/models/elb/tagging_tests.rb +15 -0
- data/tests/aws/models/iam/access_keys_tests.rb +1 -1
- data/tests/aws/models/iam/policies_tests.rb +2 -1
- data/tests/aws/models/iam/users_tests.rb +7 -4
- data/tests/aws/models/storage/url_tests.rb +5 -9
- data/tests/aws/requests/compute/tag_tests.rb +2 -0
- data/tests/aws/requests/elb/load_balancer_tests.rb +5 -1
- data/tests/aws/requests/storage/bucket_tests.rb +15 -1
- data/tests/aws/signaturev4_tests.rb +47 -0
- data/tests/bluebox/requests/compute/block_tests.rb +2 -1
- data/tests/compute/helper.rb +0 -10
- data/tests/compute/models/flavors_tests.rb +1 -1
- data/tests/fogdocker/compute_tests.rb +1 -1
- data/tests/fogdocker/models/compute/server_tests.rb +13 -3
- data/tests/fogdocker/requests/compute/container_action_tests.rb +19 -8
- data/tests/fogdocker/requests/compute/image_search_tests.rb +11 -0
- data/tests/google/models/dns/change_tests.rb +28 -0
- data/tests/google/models/dns/changes_tests.rb +36 -0
- data/tests/google/models/dns/projects_tests.rb +12 -0
- data/tests/google/models/dns/record_tests.rb +42 -0
- data/tests/google/models/dns/records_tests.rb +36 -0
- data/tests/google/models/dns/zone_tests.rb +28 -0
- data/tests/google/models/dns/zones_tests.rb +14 -0
- data/tests/google/requests/dns/change_tests.rb +86 -0
- data/tests/google/requests/dns/managed_zone_tests.rb +1 -1
- data/tests/google/requests/dns/project_tests.rb +29 -0
- data/tests/google/requests/dns/record_tests.rb +49 -0
- data/tests/helper.rb +1 -1
- data/tests/helpers/mock_helper.rb +2 -2
- data/tests/opennebula/models/compute/flavor_tests.rb +29 -0
- data/tests/opennebula/models/compute/flavors_tests.rb +17 -0
- data/tests/opennebula/models/compute/network_tests.rb +2 -2
- data/tests/opennebula/models/compute/networks_tests.rb +2 -0
- data/tests/openstack/requests/storage/object_tests.rb +10 -0
- data/tests/ovirt/compute_tests.rb +1 -1
- data/tests/ovirt/requests/compute/update_volume_tests.rb +20 -0
- data/tests/rackspace/models/networking/network_tests.rb +10 -0
- data/tests/rackspace/models/networking/networks_tests.rb +10 -0
- data/tests/rackspace/models/networking/virtual_interface_tests.rb +33 -0
- data/tests/rackspace/models/networking/virtual_interfaces_tests.rb +24 -0
- data/tests/rackspace/models/queues/queue_tests.rb +9 -0
- data/tests/rackspace/networking_tests.rb +118 -0
- data/tests/rackspace/requests/networking/network_tests.rb +49 -0
- data/tests/rackspace/requests/networking/virtual_interface_tests.rb +49 -0
- data/tests/vsphere/requests/compute/list_clusters_tests.rb +11 -0
- metadata +228 -180
- data/lib/fog/bin/terremark.rb +0 -29
- data/lib/fog/bin/vmfusion.rb +0 -58
- data/lib/fog/bin/voxel.rb +0 -29
- data/lib/fog/terremark.rb +0 -11
- data/lib/fog/terremark/models/shared/address.rb +0 -25
- data/lib/fog/terremark/models/shared/addresses.rb +0 -45
- data/lib/fog/terremark/models/shared/image.rb +0 -19
- data/lib/fog/terremark/models/shared/images.rb +0 -41
- data/lib/fog/terremark/models/shared/internetservice.rb +0 -66
- data/lib/fog/terremark/models/shared/internetservices.rb +0 -39
- data/lib/fog/terremark/models/shared/network.rb +0 -31
- data/lib/fog/terremark/models/shared/networks.rb +0 -48
- data/lib/fog/terremark/models/shared/nodeservice.rb +0 -50
- data/lib/fog/terremark/models/shared/nodeservices.rb +0 -29
- data/lib/fog/terremark/models/shared/server.rb +0 -210
- data/lib/fog/terremark/models/shared/servers.rb +0 -50
- data/lib/fog/terremark/models/shared/task.rb +0 -46
- data/lib/fog/terremark/models/shared/tasks.rb +0 -54
- data/lib/fog/terremark/models/shared/vdc.rb +0 -40
- data/lib/fog/terremark/models/shared/vdcs.rb +0 -48
- data/lib/fog/terremark/parser.rb +0 -18
- data/lib/fog/terremark/parsers/shared/get_catalog.rb +0 -33
- data/lib/fog/terremark/parsers/shared/get_catalog_item.rb +0 -32
- data/lib/fog/terremark/parsers/shared/get_internet_services.rb +0 -57
- data/lib/fog/terremark/parsers/shared/get_keys_list.rb +0 -39
- data/lib/fog/terremark/parsers/shared/get_network_ips.rb +0 -24
- data/lib/fog/terremark/parsers/shared/get_node_services.rb +0 -32
- data/lib/fog/terremark/parsers/shared/get_organization.rb +0 -50
- data/lib/fog/terremark/parsers/shared/get_organizations.rb +0 -31
- data/lib/fog/terremark/parsers/shared/get_public_ips.rb +0 -26
- data/lib/fog/terremark/parsers/shared/get_tasks_list.rb +0 -35
- data/lib/fog/terremark/parsers/shared/get_vapp_template.rb +0 -31
- data/lib/fog/terremark/parsers/shared/get_vdc.rb +0 -87
- data/lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb +0 -26
- data/lib/fog/terremark/parsers/shared/internet_service.rb +0 -58
- data/lib/fog/terremark/parsers/shared/network.rb +0 -39
- data/lib/fog/terremark/parsers/shared/node_service.rb +0 -28
- data/lib/fog/terremark/parsers/shared/public_ip.rb +0 -22
- data/lib/fog/terremark/parsers/shared/task.rb +0 -25
- data/lib/fog/terremark/parsers/shared/vapp.rb +0 -61
- data/lib/fog/terremark/requests/shared/add_internet_service.rb +0 -54
- data/lib/fog/terremark/requests/shared/add_node_service.rb +0 -51
- data/lib/fog/terremark/requests/shared/configure_vapp.rb +0 -59
- data/lib/fog/terremark/requests/shared/create_internet_service.rb +0 -59
- data/lib/fog/terremark/requests/shared/delete_internet_service.rb +0 -21
- data/lib/fog/terremark/requests/shared/delete_node_service.rb +0 -21
- data/lib/fog/terremark/requests/shared/delete_public_ip.rb +0 -21
- data/lib/fog/terremark/requests/shared/delete_vapp.rb +0 -20
- data/lib/fog/terremark/requests/shared/deploy_vapp.rb +0 -33
- data/lib/fog/terremark/requests/shared/get_catalog.rb +0 -30
- data/lib/fog/terremark/requests/shared/get_catalog_item.rb +0 -33
- data/lib/fog/terremark/requests/shared/get_internet_services.rb +0 -34
- data/lib/fog/terremark/requests/shared/get_keys_list.rb +0 -34
- data/lib/fog/terremark/requests/shared/get_network.rb +0 -69
- data/lib/fog/terremark/requests/shared/get_network_ips.rb +0 -29
- data/lib/fog/terremark/requests/shared/get_node_services.rb +0 -29
- data/lib/fog/terremark/requests/shared/get_organization.rb +0 -82
- data/lib/fog/terremark/requests/shared/get_organizations.rb +0 -45
- data/lib/fog/terremark/requests/shared/get_public_ip.rb +0 -31
- data/lib/fog/terremark/requests/shared/get_public_ips.rb +0 -68
- data/lib/fog/terremark/requests/shared/get_task.rb +0 -37
- data/lib/fog/terremark/requests/shared/get_tasks_list.rb +0 -30
- data/lib/fog/terremark/requests/shared/get_vapp.rb +0 -40
- data/lib/fog/terremark/requests/shared/get_vapp_template.rb +0 -33
- data/lib/fog/terremark/requests/shared/get_vdc.rb +0 -121
- data/lib/fog/terremark/requests/shared/instantiate_vapp_template.rb +0 -79
- data/lib/fog/terremark/requests/shared/power_off.rb +0 -33
- data/lib/fog/terremark/requests/shared/power_on.rb +0 -33
- data/lib/fog/terremark/requests/shared/power_reset.rb +0 -33
- data/lib/fog/terremark/requests/shared/power_shutdown.rb +0 -22
- data/lib/fog/terremark/shared.rb +0 -304
- data/lib/fog/terremark/vcloud.rb +0 -129
- data/lib/fog/vmfusion.rb +0 -1
- data/lib/fog/vmfusion/compute.rb +0 -28
- data/lib/fog/vmfusion/core.rb +0 -9
- data/lib/fog/vmfusion/models/compute/server.rb +0 -256
- data/lib/fog/vmfusion/models/compute/servers.rb +0 -36
- data/lib/fog/voxel.rb +0 -1
- data/lib/fog/voxel/compute.rb +0 -122
- data/lib/fog/voxel/core.rb +0 -16
- data/lib/fog/voxel/models/compute/image.rb +0 -13
- data/lib/fog/voxel/models/compute/images.rb +0 -27
- data/lib/fog/voxel/models/compute/server.rb +0 -73
- data/lib/fog/voxel/models/compute/servers.rb +0 -29
- data/lib/fog/voxel/parsers/compute/basic.rb +0 -27
- data/lib/fog/voxel/parsers/compute/devices_list.rb +0 -107
- data/lib/fog/voxel/parsers/compute/images_list.rb +0 -55
- data/lib/fog/voxel/parsers/compute/voxcloud_create.rb +0 -36
- data/lib/fog/voxel/parsers/compute/voxcloud_delete.rb +0 -27
- data/lib/fog/voxel/parsers/compute/voxcloud_status.rb +0 -42
- data/lib/fog/voxel/requests/compute/devices_list.rb +0 -22
- data/lib/fog/voxel/requests/compute/devices_power.rb +0 -20
- data/lib/fog/voxel/requests/compute/images_list.rb +0 -29
- data/lib/fog/voxel/requests/compute/voxcloud_create.rb +0 -20
- data/lib/fog/voxel/requests/compute/voxcloud_delete.rb +0 -18
- data/lib/fog/voxel/requests/compute/voxcloud_status.rb +0 -22
- data/lib/fog/xml.rb +0 -4
- data/lib/fog/xml/connection.rb +0 -24
- data/lib/fog/xml/sax_parser_connection.rb +0 -45
- data/tests/core/connection_tests.rb +0 -26
- data/tests/voxel/requests/compute/image_tests.rb +0 -52
- data/tests/voxel/requests/compute/server_tests.rb +0 -123
@@ -1,79 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Terremark
|
3
|
-
module Shared
|
4
|
-
module Real
|
5
|
-
# Instatiate a vapp template
|
6
|
-
#
|
7
|
-
# ==== Parameters
|
8
|
-
# * name<~String>: Name of the resulting vapp .. must start with letter, up to 15 chars alphanumeric.
|
9
|
-
# * options<~Hash>:
|
10
|
-
# * cpus<~Integer>: Number of cpus in [1, 2, 4, 8], defaults to 1
|
11
|
-
# * memory<~Integer>: Amount of memory either 512 or a multiple of 1024, defaults to 512
|
12
|
-
# * vapp_template<~String>: id of the vapp template to be instantiated
|
13
|
-
# ==== Returns
|
14
|
-
# * response<~Excon::Response>:
|
15
|
-
# * body<~Hash>:
|
16
|
-
# * 'Links;<~Array> (e.g. up to vdc)
|
17
|
-
# * 'href'<~String> Link to the resulting vapp
|
18
|
-
# * 'name'<~String> - name of item
|
19
|
-
# * 'type'<~String> - type of item
|
20
|
-
# * 'status'<~String> - 0(pending) --> 2(off) -->4(on)
|
21
|
-
def instantiate_vapp_template(name, vapp_template, options = {})
|
22
|
-
unless name.length < 15
|
23
|
-
raise ArgumentError.new('Name must be fewer than 15 characters')
|
24
|
-
end
|
25
|
-
unless vapp_template
|
26
|
-
raise ArgumentError.new("vApp Image Template is a compulsary parameter")
|
27
|
-
end
|
28
|
-
options['ssh_key_fingerprint'] ||= default_ssh_key["FingerPrint"]
|
29
|
-
options['cpus'] ||= 1
|
30
|
-
options['memory'] ||= 512
|
31
|
-
options['network_id'] ||= default_network_id
|
32
|
-
options['vdc_id'] ||= default_vdc_id
|
33
|
-
options['primary_dns'] ||= '208.67.222.222'
|
34
|
-
options['secondary_dns'] ||= '208.67.220.220'
|
35
|
-
|
36
|
-
data = <<-DATA
|
37
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
38
|
-
<InstantiateVAppTemplateParams name="#{name}" xmlns="http://www.vmware.com/vcloud/v0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 http://services.vcloudexpress.terremark.com/api/v0.8/ns/vcloud.xsd">
|
39
|
-
<VAppTemplate href="#{@scheme}://#{@host}/#{@path}/vAppTemplate/#{vapp_template}" />
|
40
|
-
<InstantiationParams xmlns:vmw="http://www.vmware.com/schema/ovf">
|
41
|
-
<ProductSection xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:q1="http://www.vmware.com/vcloud/v0.8">
|
42
|
-
<Property xmlns="http://schemas.dmtf.org/ovf/envelope/1" ovf:key="primaryDNS" ovf:value="#{options['primary_dns']}" />
|
43
|
-
<Property xmlns="http://schemas.dmtf.org/ovf/envelope/1" ovf:key="secondaryDNS" ovf:value="#{options['secondary_dns']}" />
|
44
|
-
<Property xmlns="http://schemas.dmtf.org/ovf/envelope/1" ovf:key="sshKeyFingerprint" ovf:value="#{options['ssh_key_fingerprint']}" />
|
45
|
-
</ProductSection>
|
46
|
-
<VirtualHardwareSection xmlns:q1="http://www.vmware.com/vcloud/v0.8">
|
47
|
-
<Item xmlns="http://schemas.dmtf.org/ovf/envelope/1">
|
48
|
-
<InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID>
|
49
|
-
<ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType>
|
50
|
-
<VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">#{options['cpus']}</VirtualQuantity>
|
51
|
-
</Item>
|
52
|
-
<Item xmlns="http://schemas.dmtf.org/ovf/envelope/1">
|
53
|
-
<InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID>
|
54
|
-
<ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType>
|
55
|
-
<VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">#{options['memory']}</VirtualQuantity>
|
56
|
-
</Item>
|
57
|
-
</VirtualHardwareSection>
|
58
|
-
<NetworkConfigSection>
|
59
|
-
<NetworkConfig>
|
60
|
-
<NetworkAssociation href="#{@scheme}://#{@host}/#{@path}/network/#{options['network_id']}"/>
|
61
|
-
</NetworkConfig>
|
62
|
-
</NetworkConfigSection>
|
63
|
-
</InstantiationParams>
|
64
|
-
</InstantiateVAppTemplateParams>
|
65
|
-
DATA
|
66
|
-
|
67
|
-
request(
|
68
|
-
:body => data,
|
69
|
-
:expects => 200,
|
70
|
-
:headers => { 'Content-Type' => 'application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml' },
|
71
|
-
:method => 'POST',
|
72
|
-
:parser => Fog::Parsers::Terremark::Shared::InstantiateVappTemplate.new,
|
73
|
-
:path => "vdc/#{options['vdc_id']}/action/instantiatevAppTemplate"
|
74
|
-
)
|
75
|
-
end
|
76
|
-
end
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Terremark
|
3
|
-
module Shared
|
4
|
-
module Real
|
5
|
-
# Power off a vapp
|
6
|
-
#
|
7
|
-
# ==== Parameters
|
8
|
-
# * vapp_id<~Integer> - Id of vapp to power off
|
9
|
-
#
|
10
|
-
# ==== Returns
|
11
|
-
# * response<~Excon::Response>:
|
12
|
-
# * body<~Hash>:
|
13
|
-
# * 'endTime'<~String> - endTime of task
|
14
|
-
# * 'href'<~String> - link to task
|
15
|
-
# * 'startTime'<~String> - startTime of task
|
16
|
-
# * 'status'<~String> - status of task
|
17
|
-
# * 'type'<~String> - type of task
|
18
|
-
# * 'Owner'<~String> -
|
19
|
-
# * 'href'<~String> - href of owner
|
20
|
-
# * 'name'<~String> - name of owner
|
21
|
-
# * 'type'<~String> - type of owner
|
22
|
-
def power_off(vapp_id)
|
23
|
-
request(
|
24
|
-
:expects => 202,
|
25
|
-
:method => 'POST',
|
26
|
-
:parser => Fog::Parsers::Terremark::Shared::Task.new,
|
27
|
-
:path => "vApp/#{vapp_id}/power/action/powerOff"
|
28
|
-
)
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Terremark
|
3
|
-
module Shared
|
4
|
-
module Real
|
5
|
-
# Power on a vapp
|
6
|
-
#
|
7
|
-
# ==== Parameters
|
8
|
-
# * vapp_id<~Integer> - Id of vapp to power on
|
9
|
-
#
|
10
|
-
# ==== Returns
|
11
|
-
# * response<~Excon::Response>:
|
12
|
-
# * body<~Hash>:
|
13
|
-
# * 'endTime'<~String> - endTime of task
|
14
|
-
# * 'href'<~String> - link to task
|
15
|
-
# * 'startTime'<~String> - startTime of task
|
16
|
-
# * 'status'<~String> - status of task
|
17
|
-
# * 'type'<~String> - type of task
|
18
|
-
# * 'Owner'<~String> -
|
19
|
-
# * 'href'<~String> - href of owner
|
20
|
-
# * 'name'<~String> - name of owner
|
21
|
-
# * 'type'<~String> - type of owner
|
22
|
-
def power_on(vapp_id)
|
23
|
-
request(
|
24
|
-
:expects => 202,
|
25
|
-
:method => 'POST',
|
26
|
-
:parser => Fog::Parsers::Terremark::Shared::Task.new,
|
27
|
-
:path => "vApp/#{vapp_id}/power/action/powerOn"
|
28
|
-
)
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
@@ -1,33 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Terremark
|
3
|
-
module Shared
|
4
|
-
module Real
|
5
|
-
# Reset a vapp
|
6
|
-
#
|
7
|
-
# ==== Parameters
|
8
|
-
# * vapp_id<~Integer> - Id of vapp to reset
|
9
|
-
#
|
10
|
-
# ==== Returns
|
11
|
-
# * response<~Excon::Response>:
|
12
|
-
# * body<~Hash>:
|
13
|
-
# * 'endTime'<~String> - endTime of task
|
14
|
-
# * 'href'<~String> - link to task
|
15
|
-
# * 'startTime'<~String> - startTime of task
|
16
|
-
# * 'status'<~String> - status of task
|
17
|
-
# * 'type'<~String> - type of task
|
18
|
-
# * 'Owner'<~String> -
|
19
|
-
# * 'href'<~String> - href of owner
|
20
|
-
# * 'name'<~String> - name of owner
|
21
|
-
# * 'type'<~String> - type of owner
|
22
|
-
def power_reset(vapp_id)
|
23
|
-
request(
|
24
|
-
:expects => 202,
|
25
|
-
:method => 'POST',
|
26
|
-
:parser => Fog::Parsers::Terremark::Shared::Task.new,
|
27
|
-
:path => "vApp/#{vapp_id}/power/action/reset"
|
28
|
-
)
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
@@ -1,22 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Terremark
|
3
|
-
module Shared
|
4
|
-
module Real
|
5
|
-
# Shutdown a vapp
|
6
|
-
#
|
7
|
-
# ==== Parameters
|
8
|
-
# * vapp_id<~Integer> - Id of vapp to shutdown
|
9
|
-
#
|
10
|
-
# ==== Returns
|
11
|
-
# Nothing
|
12
|
-
def power_shutdown(vapp_id)
|
13
|
-
request(
|
14
|
-
:expects => 204,
|
15
|
-
:method => 'POST',
|
16
|
-
:path => "vApp/#{vapp_id}/power/action/shutdown"
|
17
|
-
)
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
data/lib/fog/terremark/shared.rb
DELETED
@@ -1,304 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Terremark
|
3
|
-
module Shared
|
4
|
-
# Commond methods shared by Real and Mock
|
5
|
-
module Common
|
6
|
-
def default_organization_id
|
7
|
-
@default_organization_id ||= begin
|
8
|
-
org_list = get_organizations.body['OrgList']
|
9
|
-
if org_list.length == 1
|
10
|
-
org_list.first['href'].split('/').last.to_i
|
11
|
-
else
|
12
|
-
nil
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
module Parser
|
19
|
-
def parse(data)
|
20
|
-
case data['type']
|
21
|
-
when 'application/vnd.vmware.vcloud.vApp+xml'
|
22
|
-
servers.new(data.merge!(:service => self))
|
23
|
-
else
|
24
|
-
data
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
module Real
|
30
|
-
include Common
|
31
|
-
|
32
|
-
private
|
33
|
-
|
34
|
-
def auth_token
|
35
|
-
response = @connection.request({
|
36
|
-
:expects => 200,
|
37
|
-
:headers => {
|
38
|
-
'Authorization' => "Basic #{Base64.encode64("#{@terremark_username}:#{@terremark_password}").chomp!}",
|
39
|
-
'Content-Type' => "application/vnd.vmware.vcloud.orgList+xml"
|
40
|
-
},
|
41
|
-
:host => @host,
|
42
|
-
:method => 'POST',
|
43
|
-
:parser => Fog::Parsers::Terremark::Shared::GetOrganizations.new,
|
44
|
-
:path => "#{@path}/login"
|
45
|
-
})
|
46
|
-
response.headers['Set-Cookie']
|
47
|
-
end
|
48
|
-
|
49
|
-
def reload
|
50
|
-
@connection.reset
|
51
|
-
end
|
52
|
-
|
53
|
-
def request(params)
|
54
|
-
unless @cookie
|
55
|
-
@cookie = auth_token
|
56
|
-
end
|
57
|
-
begin
|
58
|
-
do_request(params)
|
59
|
-
rescue Excon::Errors::Unauthorized
|
60
|
-
@cookie = auth_token
|
61
|
-
do_request(params)
|
62
|
-
end
|
63
|
-
end
|
64
|
-
|
65
|
-
def do_request(params)
|
66
|
-
headers = {}
|
67
|
-
if @cookie
|
68
|
-
headers.merge!('Cookie' => @cookie)
|
69
|
-
end
|
70
|
-
if params[:path]
|
71
|
-
if params[:override_path] == true
|
72
|
-
path = params[:path]
|
73
|
-
else
|
74
|
-
path = "#{@path}/#{params[:path]}"
|
75
|
-
end
|
76
|
-
else
|
77
|
-
path = "#{@path}"
|
78
|
-
end
|
79
|
-
@connection.request({
|
80
|
-
:body => params[:body],
|
81
|
-
:expects => params[:expects],
|
82
|
-
:headers => headers.merge!(params[:headers] || {}),
|
83
|
-
:host => @host,
|
84
|
-
:method => params[:method],
|
85
|
-
:parser => params[:parser],
|
86
|
-
:path => path
|
87
|
-
})
|
88
|
-
end
|
89
|
-
end
|
90
|
-
|
91
|
-
module Mock
|
92
|
-
include Common
|
93
|
-
|
94
|
-
def self.mock_data
|
95
|
-
{
|
96
|
-
:organizations =>
|
97
|
-
[
|
98
|
-
{
|
99
|
-
:info => {
|
100
|
-
:name => "Boom Inc.",
|
101
|
-
:id => 1
|
102
|
-
},
|
103
|
-
:vdcs => [
|
104
|
-
{ :id => 21,
|
105
|
-
:name => "Boomstick",
|
106
|
-
:storage => { :used => 105, :allocated => 200 },
|
107
|
-
:cpu => { :allocated => 10000 },
|
108
|
-
:memory => { :allocated => 20480 },
|
109
|
-
:networks => [
|
110
|
-
{ :id => 31,
|
111
|
-
:name => "1.2.3.0/24",
|
112
|
-
:subnet => "1.2.3.0/24",
|
113
|
-
:gateway => "1.2.3.1",
|
114
|
-
:netmask => "255.255.255.0",
|
115
|
-
:fencemode => "isolated"
|
116
|
-
},
|
117
|
-
{ :id => 32,
|
118
|
-
:name => "4.5.6.0/24",
|
119
|
-
:subnet => "4.5.6.0/24",
|
120
|
-
:gateway => "4.5.6.1",
|
121
|
-
:netmask => "255.255.255.0",
|
122
|
-
:fencemode => "isolated"
|
123
|
-
},
|
124
|
-
],
|
125
|
-
:vms => [
|
126
|
-
{ :id => 41,
|
127
|
-
:name => "Broom 1"
|
128
|
-
},
|
129
|
-
{ :id => 42,
|
130
|
-
:name => "Broom 2"
|
131
|
-
},
|
132
|
-
{ :id => 43,
|
133
|
-
:name => "Email!"
|
134
|
-
}
|
135
|
-
],
|
136
|
-
:public_ips => [
|
137
|
-
{ :id => 51,
|
138
|
-
:name => "99.1.2.3"
|
139
|
-
},
|
140
|
-
{ :id => 52,
|
141
|
-
:name => "99.1.2.4"
|
142
|
-
},
|
143
|
-
{ :id => 53,
|
144
|
-
:name => "99.1.9.7"
|
145
|
-
}
|
146
|
-
]
|
147
|
-
},
|
148
|
-
{ :id => 22,
|
149
|
-
:storage => { :used => 40, :allocated => 150 },
|
150
|
-
:cpu => { :allocated => 1000 },
|
151
|
-
:memory => { :allocated => 2048 },
|
152
|
-
:name => "Rock-n-Roll",
|
153
|
-
:networks => [
|
154
|
-
{ :id => 33,
|
155
|
-
:name => "7.8.9.0/24",
|
156
|
-
:subnet => "7.8.9.0/24",
|
157
|
-
:gateway => "7.8.9.1",
|
158
|
-
:netmask => "255.255.255.0",
|
159
|
-
:fencemode => "isolated"
|
160
|
-
}
|
161
|
-
],
|
162
|
-
:vms => [
|
163
|
-
{ :id => 44,
|
164
|
-
:name => "Master Blaster"
|
165
|
-
}
|
166
|
-
],
|
167
|
-
:public_ips => [
|
168
|
-
{ :id => 54,
|
169
|
-
:name => "99.99.99.99"
|
170
|
-
}
|
171
|
-
]
|
172
|
-
}
|
173
|
-
]
|
174
|
-
}
|
175
|
-
]
|
176
|
-
}
|
177
|
-
end
|
178
|
-
|
179
|
-
def self.error_headers
|
180
|
-
{"X-Powered-By"=>"ASP.NET",
|
181
|
-
"Date"=> Time.now.to_s,
|
182
|
-
"Content-Type"=>"text/html",
|
183
|
-
"Content-Length"=>"0",
|
184
|
-
"Server"=>"Microsoft-IIS/7.0",
|
185
|
-
"Cache-Control"=>"private"}
|
186
|
-
end
|
187
|
-
|
188
|
-
def self.unathorized_status
|
189
|
-
401
|
190
|
-
end
|
191
|
-
|
192
|
-
def self.headers(body, content_type)
|
193
|
-
{"X-Powered-By"=>"ASP.NET",
|
194
|
-
"Date"=> Time.now.to_s,
|
195
|
-
"Content-Type"=> content_type,
|
196
|
-
"Content-Length"=> body.to_s.length,
|
197
|
-
"Server"=>"Microsoft-IIS/7.0",
|
198
|
-
"Set-Cookie"=>"vcloud-token=ecb37bfc-56f0-421d-97e5-bf2gdf789457; path=/",
|
199
|
-
"Cache-Control"=>"private"}
|
200
|
-
end
|
201
|
-
|
202
|
-
def self.status
|
203
|
-
200
|
204
|
-
end
|
205
|
-
|
206
|
-
def initialize(options={})
|
207
|
-
self.class.instance_eval '
|
208
|
-
def self.data
|
209
|
-
@data ||= Hash.new do |hash, key|
|
210
|
-
hash[key] = Fog::Terremark::Shared::Mock.mock_data
|
211
|
-
end
|
212
|
-
end'
|
213
|
-
self.class.instance_eval '
|
214
|
-
def self.reset
|
215
|
-
@data = nil
|
216
|
-
end
|
217
|
-
|
218
|
-
def self.reset_data(keys=data.keys)
|
219
|
-
for key in [*keys]
|
220
|
-
data.delete(key)
|
221
|
-
end
|
222
|
-
end'
|
223
|
-
end
|
224
|
-
end
|
225
|
-
|
226
|
-
def check_shared_options(options)
|
227
|
-
%w{ecloud vcloud}.each do |cloud|
|
228
|
-
cloud_option_keys = options.keys.select { |key| key.to_s =~ /^terremark_#{cloud}_.*/ }
|
229
|
-
unless cloud_option_keys.length == 0 || cloud_option_keys.length == 2
|
230
|
-
raise ArgumentError.new("terremark_#{cloud}_username and terremark_#{cloud}_password required to access teremark")
|
231
|
-
end
|
232
|
-
end
|
233
|
-
end
|
234
|
-
|
235
|
-
def shared_requires
|
236
|
-
require 'fog/terremark/models/shared/address'
|
237
|
-
require 'fog/terremark/models/shared/addresses'
|
238
|
-
require 'fog/terremark/models/shared/network'
|
239
|
-
require 'fog/terremark/models/shared/networks'
|
240
|
-
require 'fog/terremark/models/shared/server'
|
241
|
-
require 'fog/terremark/models/shared/servers'
|
242
|
-
require 'fog/terremark/models/shared/image'
|
243
|
-
require 'fog/terremark/models/shared/images'
|
244
|
-
require 'fog/terremark/models/shared/task'
|
245
|
-
require 'fog/terremark/models/shared/tasks'
|
246
|
-
require 'fog/terremark/models/shared/vdc'
|
247
|
-
require 'fog/terremark/models/shared/vdcs'
|
248
|
-
require 'fog/terremark/models/shared/internetservice'
|
249
|
-
require 'fog/terremark/models/shared/internetservices'
|
250
|
-
require 'fog/terremark/models/shared/nodeservice'
|
251
|
-
require 'fog/terremark/models/shared/nodeservices'
|
252
|
-
require 'fog/terremark/parsers/shared/get_catalog'
|
253
|
-
require 'fog/terremark/parsers/shared/get_catalog_item'
|
254
|
-
require 'fog/terremark/parsers/shared/get_internet_services'
|
255
|
-
require 'fog/terremark/parsers/shared/get_network_ips'
|
256
|
-
require 'fog/terremark/parsers/shared/get_node_services'
|
257
|
-
require 'fog/terremark/parsers/shared/get_organization'
|
258
|
-
require 'fog/terremark/parsers/shared/get_organizations'
|
259
|
-
require 'fog/terremark/parsers/shared/get_public_ips'
|
260
|
-
require 'fog/terremark/parsers/shared/get_tasks_list'
|
261
|
-
require 'fog/terremark/parsers/shared/get_keys_list'
|
262
|
-
require 'fog/terremark/parsers/shared/get_vapp_template'
|
263
|
-
require 'fog/terremark/parsers/shared/get_vdc'
|
264
|
-
require 'fog/terremark/parsers/shared/instantiate_vapp_template'
|
265
|
-
require 'fog/terremark/parsers/shared/internet_service'
|
266
|
-
require 'fog/terremark/parsers/shared/network'
|
267
|
-
require 'fog/terremark/parsers/shared/node_service'
|
268
|
-
require 'fog/terremark/parsers/shared/public_ip'
|
269
|
-
require 'fog/terremark/parsers/shared/task'
|
270
|
-
require 'fog/terremark/parsers/shared/vapp'
|
271
|
-
require 'fog/terremark/requests/shared/add_internet_service'
|
272
|
-
require 'fog/terremark/requests/shared/add_node_service'
|
273
|
-
require 'fog/terremark/requests/shared/create_internet_service'
|
274
|
-
require 'fog/terremark/requests/shared/delete_internet_service'
|
275
|
-
require 'fog/terremark/requests/shared/delete_public_ip'
|
276
|
-
require 'fog/terremark/requests/shared/delete_node_service'
|
277
|
-
require 'fog/terremark/requests/shared/delete_vapp'
|
278
|
-
require 'fog/terremark/requests/shared/deploy_vapp'
|
279
|
-
require 'fog/terremark/requests/shared/get_catalog'
|
280
|
-
require 'fog/terremark/requests/shared/get_catalog_item'
|
281
|
-
require 'fog/terremark/requests/shared/get_internet_services'
|
282
|
-
require 'fog/terremark/requests/shared/get_network'
|
283
|
-
require 'fog/terremark/requests/shared/get_network_ips'
|
284
|
-
require 'fog/terremark/requests/shared/get_node_services'
|
285
|
-
require 'fog/terremark/requests/shared/get_organization'
|
286
|
-
require 'fog/terremark/requests/shared/get_organizations'
|
287
|
-
require 'fog/terremark/requests/shared/get_public_ip'
|
288
|
-
require 'fog/terremark/requests/shared/get_public_ips'
|
289
|
-
require 'fog/terremark/requests/shared/get_task'
|
290
|
-
require 'fog/terremark/requests/shared/get_tasks_list'
|
291
|
-
require 'fog/terremark/requests/shared/get_keys_list'
|
292
|
-
require 'fog/terremark/requests/shared/get_vapp'
|
293
|
-
require 'fog/terremark/requests/shared/get_vapp_template'
|
294
|
-
require 'fog/terremark/requests/shared/get_vdc'
|
295
|
-
require 'fog/terremark/requests/shared/instantiate_vapp_template'
|
296
|
-
require 'fog/terremark/requests/shared/configure_vapp'
|
297
|
-
require 'fog/terremark/requests/shared/power_off'
|
298
|
-
require 'fog/terremark/requests/shared/power_on'
|
299
|
-
require 'fog/terremark/requests/shared/power_reset'
|
300
|
-
require 'fog/terremark/requests/shared/power_shutdown'
|
301
|
-
end
|
302
|
-
end
|
303
|
-
end
|
304
|
-
end
|