fog-terremark 0.0.4 → 0.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +3 -0
- data/Gemfile +1 -1
- data/README.md +3 -3
- data/Rakefile +4 -4
- data/fog-terremark.gemspec +4 -1
- data/gemfiles/Gemfile.1.9.2- +5 -5
- data/gemfiles/Gemfile.1.9.3+ +4 -4
- data/lib/fog/compute/terremark.rb +6 -6
- data/lib/fog/compute/terremark/mock.rb +4 -4
- data/lib/fog/compute/terremark/models/address.rb +2 -2
- data/lib/fog/compute/terremark/models/addresses.rb +1 -1
- data/lib/fog/compute/terremark/models/image.rb +1 -1
- data/lib/fog/compute/terremark/models/images.rb +2 -2
- data/lib/fog/compute/terremark/models/internetservice.rb +5 -5
- data/lib/fog/compute/terremark/models/network.rb +2 -2
- data/lib/fog/compute/terremark/models/networks.rb +1 -1
- data/lib/fog/compute/terremark/models/nodeservice.rb +7 -9
- data/lib/fog/compute/terremark/models/server.rb +8 -8
- data/lib/fog/compute/terremark/models/servers.rb +2 -2
- data/lib/fog/compute/terremark/models/task.rb +12 -12
- data/lib/fog/compute/terremark/models/tasks.rb +2 -2
- data/lib/fog/compute/terremark/models/vdc.rb +1 -1
- data/lib/fog/compute/terremark/models/vdcs.rb +2 -2
- data/lib/fog/compute/terremark/parser.rb +5 -5
- data/lib/fog/compute/terremark/requests/add_internet_service.rb +18 -18
- data/lib/fog/compute/terremark/requests/add_node_service.rb +18 -18
- data/lib/fog/compute/terremark/requests/configure_vapp.rb +9 -9
- data/lib/fog/compute/terremark/requests/create_internet_service.rb +14 -14
- data/lib/fog/compute/terremark/requests/delete_internet_service.rb +4 -4
- data/lib/fog/compute/terremark/requests/delete_node_service.rb +4 -4
- data/lib/fog/compute/terremark/requests/delete_public_ip.rb +4 -4
- data/lib/fog/compute/terremark/requests/delete_vapp.rb +3 -3
- data/lib/fog/compute/terremark/requests/deploy_vapp.rb +13 -13
- data/lib/fog/compute/terremark/requests/get_catalog.rb +10 -10
- data/lib/fog/compute/terremark/requests/get_catalog_item.rb +10 -10
- data/lib/fog/compute/terremark/requests/get_internet_services.rb +11 -11
- data/lib/fog/compute/terremark/requests/get_keys_list.rb +11 -11
- data/lib/fog/compute/terremark/requests/get_network.rb +12 -12
- data/lib/fog/compute/terremark/requests/get_network_ips.rb +4 -4
- data/lib/fog/compute/terremark/requests/get_node_services.rb +5 -5
- data/lib/fog/compute/terremark/requests/get_organization.rb +18 -18
- data/lib/fog/compute/terremark/requests/get_organizations.rb +5 -4
- data/lib/fog/compute/terremark/requests/get_public_ip.rb +7 -7
- data/lib/fog/compute/terremark/requests/get_public_ips.rb +15 -15
- data/lib/fog/compute/terremark/requests/get_task.rb +17 -17
- data/lib/fog/compute/terremark/requests/get_tasks_list.rb +10 -10
- data/lib/fog/compute/terremark/requests/get_vapp.rb +17 -17
- data/lib/fog/compute/terremark/requests/get_vapp_template.rb +10 -10
- data/lib/fog/compute/terremark/requests/get_vdc.rb +50 -50
- data/lib/fog/compute/terremark/requests/instantiate_vapp_template.rb +15 -15
- data/lib/fog/compute/terremark/requests/power_off.rb +13 -13
- data/lib/fog/compute/terremark/requests/power_on.rb +13 -13
- data/lib/fog/compute/terremark/requests/power_reset.rb +13 -13
- data/lib/fog/compute/terremark/requests/power_shutdown.rb +3 -3
- data/lib/fog/parsers/terremark.rb +20 -20
- data/lib/fog/parsers/terremark/get_catalog.rb +9 -9
- data/lib/fog/parsers/terremark/get_catalog_item.rb +10 -10
- data/lib/fog/parsers/terremark/get_internet_services.rb +30 -30
- data/lib/fog/parsers/terremark/get_keys_list.rb +14 -14
- data/lib/fog/parsers/terremark/get_network_ips.rb +6 -6
- data/lib/fog/parsers/terremark/get_node_services.rb +14 -14
- data/lib/fog/parsers/terremark/get_organization.rb +23 -23
- data/lib/fog/parsers/terremark/get_organizations.rb +3 -3
- data/lib/fog/parsers/terremark/get_public_ips.rb +8 -8
- data/lib/fog/parsers/terremark/get_tasks_list.rb +11 -11
- data/lib/fog/parsers/terremark/get_vapp_template.rb +9 -9
- data/lib/fog/parsers/terremark/get_vdc.rb +57 -57
- data/lib/fog/parsers/terremark/instantiate_vapp_template.rb +7 -7
- data/lib/fog/parsers/terremark/internet_service.rb +33 -33
- data/lib/fog/parsers/terremark/network.rb +13 -13
- data/lib/fog/parsers/terremark/node_service.rb +10 -10
- data/lib/fog/parsers/terremark/public_ip.rb +4 -4
- data/lib/fog/parsers/terremark/task.rb +6 -6
- data/lib/fog/parsers/terremark/vapp.rb +36 -36
- data/lib/fog/terremark.rb +6 -6
- data/lib/fog/terremark/vcloud.rb +5 -5
- data/lib/fog/terremark/vcloud/real.rb +8 -8
- data/lib/fog/terremark/version.rb +1 -1
- data/spec/cassettes/get_login_token.yml +2 -2
- data/spec/minitest_helper.rb +2 -2
- metadata +2 -3
- data/.hound.yml +0 -20
@@ -3,40 +3,40 @@ module Fog
|
|
3
3
|
module Terremark
|
4
4
|
class GetOrganization < Base
|
5
5
|
def reset
|
6
|
-
@response = {
|
6
|
+
@response = { "Links" => [] }
|
7
7
|
end
|
8
8
|
|
9
9
|
def start_element(name, attributes)
|
10
10
|
super
|
11
11
|
case name
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
end
|
12
|
+
when "Link"
|
13
|
+
link = extract_attributes(attributes)
|
14
|
+
until attributes.empty?
|
15
|
+
if attributes.first.is_a?(Array)
|
16
|
+
attribute = attributes.shift
|
17
|
+
link[attribute.first] = attribute.last
|
18
|
+
else
|
19
|
+
link[attributes.shift] = attributes.shift
|
21
20
|
end
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
21
|
+
end
|
22
|
+
@response["Links"] << link
|
23
|
+
when "Org"
|
24
|
+
org = extract_attributes(attributes)
|
25
|
+
until attributes.empty?
|
26
|
+
if attributes.first.is_a?(Array)
|
27
|
+
attribute = attributes.shift
|
28
|
+
org[attribute.first] = attribute.last
|
29
|
+
else
|
30
|
+
org[attributes.shift] = attributes.shift
|
32
31
|
end
|
33
|
-
|
34
|
-
|
32
|
+
end
|
33
|
+
@response["href"] = org["href"]
|
34
|
+
@response["name"] = org["name"]
|
35
35
|
end
|
36
36
|
end
|
37
37
|
|
38
38
|
def end_element(name)
|
39
|
-
if name ==
|
39
|
+
if name == "Description"
|
40
40
|
@response[name] = value
|
41
41
|
end
|
42
42
|
end
|
@@ -3,12 +3,12 @@ module Fog
|
|
3
3
|
module Terremark
|
4
4
|
class GetOrganizations < Base
|
5
5
|
def reset
|
6
|
-
@response = {
|
6
|
+
@response = { "OrgList" => [] }
|
7
7
|
end
|
8
8
|
|
9
9
|
def start_element(name, attributes)
|
10
10
|
super
|
11
|
-
if name ==
|
11
|
+
if name == "Org"
|
12
12
|
organization = extract_attributes(attributes)
|
13
13
|
until attributes.empty?
|
14
14
|
if attributes.first.is_a?(Array)
|
@@ -18,7 +18,7 @@ module Fog
|
|
18
18
|
organization[attributes.shift] = attributes.shift
|
19
19
|
end
|
20
20
|
end
|
21
|
-
@response[
|
21
|
+
@response["OrgList"] << organization
|
22
22
|
end
|
23
23
|
end
|
24
24
|
end
|
@@ -4,18 +4,18 @@ module Fog
|
|
4
4
|
class GetPublicIps< Base
|
5
5
|
def reset
|
6
6
|
@ip_address = {}
|
7
|
-
@response = {
|
7
|
+
@response = { "PublicIpAddresses" => [] }
|
8
8
|
end
|
9
9
|
|
10
10
|
def end_element(name)
|
11
11
|
case name
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
12
|
+
when "Href", "Name"
|
13
|
+
@ip_address[name.downcase] = value
|
14
|
+
when "Id"
|
15
|
+
@ip_address["id"] = value.to_i
|
16
|
+
when "PublicIPAddress"
|
17
|
+
@response["PublicIpAddresses"] << @ip_address
|
18
|
+
@ip_address = {}
|
19
19
|
end
|
20
20
|
end
|
21
21
|
end
|
@@ -3,27 +3,27 @@ module Fog
|
|
3
3
|
module Terremark
|
4
4
|
class GetTasksList < Base
|
5
5
|
def reset
|
6
|
-
@response = {
|
6
|
+
@response = { "Tasks" => [] }
|
7
7
|
@task = {}
|
8
8
|
end
|
9
9
|
|
10
10
|
def start_element(name, attributes)
|
11
11
|
super
|
12
12
|
case name
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
13
|
+
when "Owner", "Result"
|
14
|
+
data = extract_templates(attributes)
|
15
|
+
@task[name] = data
|
16
|
+
when "Task"
|
17
|
+
@task = extract_templates(attributes)
|
18
|
+
when "TasksList"
|
19
|
+
tasks_list = extract_templates(attributes)
|
20
|
+
@response["href"] = tasks_list["href"]
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
24
24
|
def end_element(name)
|
25
|
-
if name ==
|
26
|
-
@response[
|
25
|
+
if name == "Task"
|
26
|
+
@response["Tasks"] << @task
|
27
27
|
@task = {}
|
28
28
|
end
|
29
29
|
end
|
@@ -3,24 +3,24 @@ module Fog
|
|
3
3
|
module Terremark
|
4
4
|
class GetVappTemplate < Base
|
5
5
|
def reset
|
6
|
-
@response = {
|
6
|
+
@response = { "Links" => [] }
|
7
7
|
end
|
8
8
|
|
9
9
|
def start_element(name, attributes)
|
10
10
|
super
|
11
11
|
case name
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
12
|
+
when "Link"
|
13
|
+
link = extract_attributes(attributes)
|
14
|
+
@response["Links"] << link
|
15
|
+
when "VAppTemplate"
|
16
|
+
vapp_template = extract_attributes(attributes)
|
17
|
+
@response["name"] = vapp_template["name"]
|
18
18
|
end
|
19
19
|
end
|
20
20
|
|
21
21
|
def end_element(name)
|
22
|
-
if name ==
|
23
|
-
@response[
|
22
|
+
if name == "Description"
|
23
|
+
@response["Description"] = value
|
24
24
|
end
|
25
25
|
end
|
26
26
|
end
|
@@ -9,74 +9,74 @@ module Fog
|
|
9
9
|
@in_instantiated_vms_quota = false
|
10
10
|
@in_deployed_vms_quota = false
|
11
11
|
@response = {
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
12
|
+
"links" => [],
|
13
|
+
"AvailableNetworks" => [],
|
14
|
+
"ComputeCapacity" => {
|
15
|
+
"Cpu" => {},
|
16
|
+
"DeployedVmsQuota" => {},
|
17
|
+
"InstantiatedVmsQuota" => {},
|
18
|
+
"Memory" => {}
|
19
|
+
},
|
20
|
+
"StorageCapacity" => {},
|
21
|
+
"ResourceEntities" => []
|
22
22
|
}
|
23
23
|
end
|
24
24
|
|
25
25
|
def start_element(name, attributes)
|
26
26
|
super
|
27
27
|
case name
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
28
|
+
when "Cpu"
|
29
|
+
@in_cpu = true
|
30
|
+
when "DeployedVmsQuota"
|
31
|
+
@in_deployed_vms_quota = true
|
32
|
+
when "InstantiatedVmsQuota"
|
33
|
+
@in_instantiated_vms_quota = true
|
34
|
+
when "Link"
|
35
|
+
link = extract_attributes(attributes)
|
36
|
+
@response["links"] << link
|
37
|
+
when "Memory"
|
38
|
+
@in_memory = true
|
39
|
+
when "Network"
|
40
|
+
network = extract_attributes(attributes)
|
41
|
+
@response["AvailableNetworks"] << network
|
42
|
+
when "ResourceEntity"
|
43
|
+
resource_entity = extract_attributes(attributes)
|
44
|
+
@response["ResourceEntities"] << resource_entity
|
45
|
+
when "StorageCapacity"
|
46
|
+
@in_storage_capacity = true
|
47
|
+
when "Vdc"
|
48
|
+
vdc = extract_attributes(attributes)
|
49
|
+
@response["href"] = vdc["href"]
|
50
|
+
@response["name"] = vdc["name"]
|
51
51
|
end
|
52
52
|
end
|
53
53
|
|
54
54
|
def end_element(name)
|
55
55
|
case name
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
56
|
+
when "Allocated", "Limit", "Units", "Used"
|
57
|
+
if @in_cpu
|
58
|
+
@response["ComputeCapacity"]["Cpu"][name] = value
|
59
|
+
elsif @in_deployed_vms_quota
|
60
|
+
@response["ComputeCapacity"]["DeployedVmsQuota"][name] = value
|
61
|
+
elsif @in_instantiated_vms_quota
|
62
|
+
@response["ComputeCapacity"]["InstantiatedVmsQuota"][name] = value
|
63
|
+
elsif @in_memory
|
64
|
+
@response["ComputeCapacity"]["Memory"][name] = value
|
65
|
+
elsif @in_storage_capacity
|
66
|
+
@response["StorageCapacity"][name] = value
|
67
|
+
end
|
68
|
+
when "Cpu"
|
69
|
+
@in_cpu = false
|
70
|
+
when "DeployedVmsQuota"
|
71
|
+
@in_deployed_vms_quota = false
|
72
|
+
when "InstantiatedVmsQuota"
|
73
|
+
@in_instantiated_vms_quota = false
|
74
|
+
when "Memory"
|
75
|
+
@in_memory = false
|
76
|
+
when "StorageCapacity"
|
77
|
+
@in_storage_capacity = false
|
78
|
+
when "Type"
|
79
|
+
@response[name] = value
|
80
80
|
end
|
81
81
|
end
|
82
82
|
end
|
@@ -4,18 +4,18 @@ module Fog
|
|
4
4
|
class InstantiateVappTemplate < Base
|
5
5
|
def reset
|
6
6
|
@property_key
|
7
|
-
@response = {
|
7
|
+
@response = { "Links" => [] }
|
8
8
|
end
|
9
9
|
|
10
10
|
def start_element(name, attributes)
|
11
11
|
super
|
12
12
|
case name
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
13
|
+
when "Link"
|
14
|
+
link = extract_attributes(attributes)
|
15
|
+
@response["Links"] << link
|
16
|
+
when "VApp"
|
17
|
+
vapp_template = extract_attributes(attributes)
|
18
|
+
@response.merge!(vapp_template.reject { |key, _value| !["href", "name", "size", "status", "type"].include?(key) })
|
19
19
|
end
|
20
20
|
end
|
21
21
|
end
|
@@ -4,50 +4,50 @@ module Fog
|
|
4
4
|
class InternetService < Base
|
5
5
|
def reset
|
6
6
|
@in_public_ip_address = false
|
7
|
-
@response = {
|
7
|
+
@response = { "PublicIpAddress" => {} }
|
8
8
|
end
|
9
9
|
|
10
10
|
def start_element(name, attributes)
|
11
11
|
super
|
12
12
|
case name
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
13
|
+
when "Href"
|
14
|
+
data = extract_attributes(attributes)
|
15
|
+
if @in_public_ip_address
|
16
|
+
@response["PublicIpAddress"][name] = data
|
17
|
+
else
|
18
|
+
@response[name] = data
|
19
|
+
end
|
20
|
+
when "PublicIpAddress"
|
21
|
+
@in_public_ip_address = true
|
22
22
|
end
|
23
23
|
end
|
24
24
|
|
25
25
|
def end_element(name)
|
26
26
|
case name
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
@response[name] = value.to_i
|
40
|
-
end
|
41
|
-
when 'Name'
|
42
|
-
if @in_public_ip_address
|
43
|
-
@response['PublicIpAddress'][name] = value
|
44
|
-
else
|
45
|
-
@response[name] = value
|
46
|
-
end
|
47
|
-
when 'Port', 'Timeout'
|
27
|
+
when "Description", "Protocol"
|
28
|
+
@response[name] = value
|
29
|
+
when "Enabled"
|
30
|
+
if value == "false"
|
31
|
+
@response[name] = false
|
32
|
+
else
|
33
|
+
@response[name] = true
|
34
|
+
end
|
35
|
+
when "Id"
|
36
|
+
if @in_public_ip_address
|
37
|
+
@response["PublicIpAddress"][name] = value.to_i
|
38
|
+
else
|
48
39
|
@response[name] = value.to_i
|
49
|
-
|
50
|
-
|
40
|
+
end
|
41
|
+
when "Name"
|
42
|
+
if @in_public_ip_address
|
43
|
+
@response["PublicIpAddress"][name] = value
|
44
|
+
else
|
45
|
+
@response[name] = value
|
46
|
+
end
|
47
|
+
when "Port", "Timeout"
|
48
|
+
@response[name] = value.to_i
|
49
|
+
when "PublicIpAddress"
|
50
|
+
@in_public_ip_address = false
|
51
51
|
end
|
52
52
|
end
|
53
53
|
end
|
@@ -11,24 +11,24 @@ module Fog
|
|
11
11
|
def start_element(name,attributes=[])
|
12
12
|
super
|
13
13
|
case name
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
14
|
+
when "Network"
|
15
|
+
@response = extract_attributes(attributes)
|
16
|
+
if @response.key?("name")
|
17
|
+
@response["subnet"] = @response["name"]
|
18
|
+
end
|
19
|
+
if @response.key?("href")
|
20
|
+
@response["id"] = @response["href"].split("/").last
|
21
|
+
end
|
22
|
+
when "Link"
|
23
|
+
link = extract_attributes(attributes)
|
24
|
+
@response["links"] << link
|
25
25
|
end
|
26
26
|
end
|
27
27
|
|
28
28
|
def end_element(name)
|
29
29
|
case name
|
30
|
-
|
31
|
-
|
30
|
+
when "Gateway", "Netmask", "FenceMode"
|
31
|
+
@response[name.downcase] = value
|
32
32
|
end
|
33
33
|
end
|
34
34
|
end
|