deltacloud-core 1.1.2 → 1.1.3
Sign up to get free protection for your applications and to get access to all the features.
- data/deltacloud-core.gemspec +4 -7
- data/lib/cimi/collections/address_templates.rb +4 -42
- data/lib/cimi/collections/addresses.rb +5 -43
- data/lib/cimi/collections/base.rb +11 -3
- data/lib/cimi/collections/cloud_entry_point.rb +1 -1
- data/lib/cimi/collections/credentials.rb +4 -43
- data/lib/cimi/collections/forwarding_group_templates.rb +2 -20
- data/lib/cimi/collections/forwarding_groups.rb +2 -21
- data/lib/cimi/collections/machine_configurations.rb +2 -20
- data/lib/cimi/collections/machine_images.rb +4 -42
- data/lib/cimi/collections/machine_templates.rb +4 -42
- data/lib/cimi/collections/machines.rb +14 -64
- data/lib/cimi/collections/network_configurations.rb +2 -20
- data/lib/cimi/collections/network_port_configurations.rb +2 -21
- data/lib/cimi/collections/network_port_templates.rb +2 -23
- data/lib/cimi/collections/network_ports.rb +6 -46
- data/lib/cimi/collections/network_templates.rb +2 -21
- data/lib/cimi/collections/networks.rb +4 -40
- data/lib/cimi/collections/resource_metadata.rb +2 -21
- data/lib/cimi/collections/system_templates.rb +4 -45
- data/lib/cimi/collections/systems.rb +65 -82
- data/lib/cimi/collections/volume_configurations.rb +4 -45
- data/lib/cimi/collections/volume_images.rb +4 -42
- data/lib/cimi/collections/volume_templates.rb +5 -44
- data/lib/cimi/collections/volumes.rb +4 -48
- data/lib/cimi/helpers.rb +1 -0
- data/lib/cimi/helpers/cimi_helper.rb +1 -1
- data/lib/cimi/helpers/cimi_rabbit_helper.rb +113 -0
- data/lib/cimi/helpers/database_helper.rb +1 -2
- data/lib/cimi/models.rb +12 -11
- data/lib/cimi/models/action.rb +0 -4
- data/lib/cimi/models/address.rb +0 -38
- data/lib/cimi/models/address_create.rb +0 -31
- data/lib/cimi/models/address_template.rb +0 -47
- data/lib/cimi/models/address_template_create.rb +0 -16
- data/lib/cimi/models/base.rb +2 -74
- data/lib/cimi/models/cloud_entry_point.rb +2 -30
- data/lib/cimi/models/collection.rb +8 -25
- data/lib/cimi/models/credential.rb +0 -34
- data/lib/cimi/models/credential_create.rb +0 -26
- data/lib/cimi/models/credential_template.rb +0 -2
- data/lib/cimi/models/disk.rb +0 -56
- data/lib/cimi/models/forwarding_group.rb +0 -8
- data/lib/cimi/models/forwarding_group_template.rb +0 -8
- data/lib/cimi/models/machine.rb +4 -129
- data/lib/cimi/models/machine_configuration.rb +0 -31
- data/lib/cimi/models/machine_create.rb +1 -29
- data/lib/cimi/models/machine_image.rb +0 -28
- data/lib/cimi/models/machine_image_create.rb +0 -19
- data/lib/cimi/models/machine_template.rb +5 -39
- data/lib/cimi/models/machine_template_create.rb +0 -12
- data/lib/cimi/models/machine_volume.rb +0 -65
- data/lib/cimi/models/network.rb +0 -32
- data/lib/cimi/models/network_configuration.rb +0 -15
- data/lib/cimi/models/network_create.rb +0 -23
- data/lib/cimi/models/network_port.rb +0 -73
- data/lib/cimi/models/network_port_configuration.rb +0 -8
- data/lib/cimi/models/network_port_template.rb +0 -8
- data/lib/cimi/models/network_template.rb +2 -12
- data/lib/cimi/models/resource.rb +0 -6
- data/lib/cimi/models/resource_metadata.rb +1 -95
- data/lib/cimi/models/schema.rb +28 -32
- data/lib/cimi/models/system.rb +15 -39
- data/lib/cimi/models/system_address.rb +26 -0
- data/lib/cimi/models/system_create.rb +20 -0
- data/lib/cimi/models/system_credential.rb +26 -0
- data/lib/cimi/models/system_forwarding_group.rb +26 -0
- data/lib/cimi/models/system_machine.rb +26 -0
- data/lib/cimi/models/system_network.rb +26 -0
- data/lib/cimi/models/system_network_port.rb +26 -0
- data/lib/cimi/models/system_system.rb +26 -0
- data/lib/cimi/models/system_template.rb +15 -31
- data/lib/cimi/models/system_volume.rb +26 -0
- data/lib/cimi/models/volume.rb +0 -59
- data/lib/cimi/models/volume_configuration.rb +1 -64
- data/lib/cimi/models/volume_configuration_create.rb +22 -0
- data/lib/cimi/models/volume_create.rb +0 -38
- data/lib/cimi/models/volume_image.rb +0 -30
- data/lib/cimi/models/volume_image_create.rb +0 -25
- data/lib/cimi/models/volume_template.rb +2 -43
- data/lib/cimi/models/volume_template_create.rb +0 -12
- data/lib/cimi/service.rb +82 -0
- data/lib/cimi/service/action.rb +21 -0
- data/lib/cimi/service/address.rb +56 -0
- data/lib/cimi/service/address_create.rb +45 -0
- data/lib/cimi/service/address_template.rb +71 -0
- data/lib/cimi/service/address_template_create.rb +34 -0
- data/lib/cimi/service/base.rb +266 -0
- data/lib/cimi/service/cloud_entry_point.rb +53 -0
- data/lib/cimi/service/credential.rb +52 -0
- data/lib/cimi/service/credential_create.rb +38 -0
- data/lib/cimi/service/credential_template.rb +20 -0
- data/lib/cimi/service/disk.rb +75 -0
- data/lib/cimi/service/forwarding_group.rb +26 -0
- data/lib/cimi/service/forwarding_group_template.rb +26 -0
- data/lib/cimi/service/machine.rb +154 -0
- data/lib/cimi/service/machine_configuration.rb +54 -0
- data/lib/cimi/service/machine_create.rb +49 -0
- data/lib/cimi/service/machine_image.rb +47 -0
- data/lib/cimi/service/machine_image_create.rb +35 -0
- data/lib/cimi/service/machine_template.rb +61 -0
- data/lib/cimi/service/machine_template_create.rb +29 -0
- data/lib/cimi/service/machine_volume.rb +74 -0
- data/lib/cimi/service/network.rb +51 -0
- data/lib/cimi/service/network_configuration.rb +36 -0
- data/lib/cimi/service/network_create.rb +39 -0
- data/lib/cimi/service/network_port.rb +97 -0
- data/lib/cimi/service/network_port_configuration.rb +26 -0
- data/lib/cimi/service/network_port_template.rb +26 -0
- data/lib/cimi/service/network_template.rb +28 -0
- data/lib/cimi/service/resource_metadata.rb +44 -0
- data/lib/cimi/service/system.rb +45 -0
- data/lib/cimi/service/system_address.rb +34 -0
- data/lib/cimi/service/system_create.rb +39 -0
- data/lib/cimi/service/system_credential.rb +34 -0
- data/lib/cimi/service/system_forwarding_group.rb +34 -0
- data/lib/cimi/service/system_machine.rb +34 -0
- data/lib/cimi/service/system_network.rb +34 -0
- data/lib/cimi/service/system_network_port.rb +34 -0
- data/lib/cimi/service/system_system.rb +34 -0
- data/lib/cimi/service/system_template.rb +32 -0
- data/lib/cimi/service/system_volume.rb +34 -0
- data/lib/cimi/service/volume.rb +81 -0
- data/lib/cimi/service/volume_configuration.rb +92 -0
- data/lib/cimi/service/volume_configuration_create.rb +29 -0
- data/lib/cimi/service/volume_create.rb +47 -0
- data/lib/cimi/service/volume_image.rb +44 -0
- data/lib/cimi/service/volume_image_create.rb +42 -0
- data/lib/cimi/service/volume_template.rb +61 -0
- data/lib/cimi/service/volume_template_create.rb +29 -0
- data/lib/db/entity.rb +16 -1
- data/lib/deltacloud/collections/addresses.rb +2 -2
- data/lib/deltacloud/collections/buckets.rb +16 -18
- data/lib/deltacloud/collections/drivers.rb +4 -4
- data/lib/deltacloud/collections/firewalls.rb +5 -5
- data/lib/deltacloud/collections/images.rb +3 -3
- data/lib/deltacloud/collections/instance_states.rb +4 -4
- data/lib/deltacloud/collections/instances.rb +22 -13
- data/lib/deltacloud/collections/keys.rb +2 -2
- data/lib/deltacloud/collections/load_balancers.rb +16 -13
- data/lib/deltacloud/collections/storage_snapshots.rb +3 -3
- data/lib/deltacloud/collections/storage_volumes.rb +5 -5
- data/lib/deltacloud/core_ext/ordered_hash.rb +0 -4
- data/lib/deltacloud/drivers/fgcp/fgcp_client.rb +8 -0
- data/lib/deltacloud/drivers/fgcp/fgcp_driver.rb +4 -3
- data/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb +266 -19
- data/lib/deltacloud/drivers/google/google_driver.rb +6 -0
- data/lib/deltacloud/drivers/mock/mock_driver.rb +2 -2
- data/lib/deltacloud/drivers/mock/mock_driver_cimi_methods.rb +166 -54
- data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb +2 -0
- data/lib/deltacloud/helpers/blob_stream_helper.rb +0 -2
- data/lib/deltacloud/helpers/deltacloud_helper.rb +22 -22
- data/lib/deltacloud/helpers/driver_helper.rb +4 -7
- data/lib/deltacloud/helpers/rabbit_helper.rb +5 -0
- data/lib/deltacloud/server.rb +4 -4
- data/lib/deltacloud/version.rb +1 -1
- data/lib/deltacloud_rack.rb +6 -1
- data/lib/ec2/server.rb +6 -1
- data/tests/cimi/collections/common.rb +33 -0
- data/tests/cimi/collections/machines_test.rb +19 -0
- data/tests/cimi/collections/system_templates_test.rb +47 -0
- data/tests/cimi/collections/volumes_test.rb +42 -0
- data/tests/cimi/db/database_helper_test.rb +7 -4
- data/tests/deltacloud/drivers_test.rb +1 -1
- data/tests/drivers/ec2/common.rb +4 -1
- data/tests/drivers/fgcp/common.rb +1 -2
- data/tests/drivers/gogrid/common.rb +1 -2
- data/tests/drivers/google/common.rb +1 -1
- data/tests/drivers/models/address_test.rb +2 -2
- data/tests/drivers/models/base_test.rb +2 -2
- data/tests/drivers/models/blob_test.rb +2 -2
- data/tests/drivers/models/instance_address_test.rb +8 -8
- data/tests/drivers/models/instance_profile_test.rb +2 -2
- data/tests/drivers/models/keys_test.rb +4 -4
- data/tests/drivers/models/metrics_test.rb +3 -3
- data/tests/drivers/openstack/common.rb +1 -2
- data/views/addresses/_address.html.haml +3 -3
- data/views/addresses/associate.html.haml +3 -3
- data/views/addresses/index.html.haml +2 -2
- data/views/addresses/index.xml.haml +2 -2
- data/views/addresses/show.html.haml +7 -7
- data/views/addresses/show.xml.haml +9 -9
- data/views/api/show.html.haml +2 -2
- data/views/api/show.xml.haml +1 -1
- data/views/blobs/new.html.haml +1 -1
- data/views/blobs/show.html.haml +8 -8
- data/views/blobs/show.xml.haml +7 -7
- data/views/buckets/index.html.haml +1 -1
- data/views/buckets/index.xml.haml +2 -2
- data/views/buckets/show.html.haml +7 -7
- data/views/buckets/show.xml.haml +6 -6
- data/views/drivers/index.html.haml +1 -1
- data/views/drivers/index.xml.haml +1 -1
- data/views/drivers/show.html.haml +6 -6
- data/views/drivers/show.xml.haml +5 -5
- data/views/error.html.haml +2 -2
- data/views/errors/backend_capability_failure.xml.haml +3 -3
- data/views/errors/common.html.haml +7 -7
- data/views/errors/common.xml.haml +5 -5
- data/views/firewalls/index.html.haml +1 -1
- data/views/firewalls/index.xml.haml +1 -1
- data/views/firewalls/new_rule.html.haml +1 -1
- data/views/firewalls/show.html.haml +8 -8
- data/views/firewalls/show.xml.haml +9 -9
- data/views/hardware_profiles/index.html.haml +1 -1
- data/views/hardware_profiles/index.xml.haml +2 -2
- data/views/hardware_profiles/show.html.haml +3 -3
- data/views/hardware_profiles/show.xml.haml +4 -4
- data/views/images/index.html.haml +1 -1
- data/views/images/index.xml.haml +2 -2
- data/views/images/new.html.haml +2 -2
- data/views/images/show.html.haml +14 -14
- data/views/images/show.xml.haml +14 -14
- data/views/instance_states/show.html.haml +1 -1
- data/views/instance_states/show.png.erb +2 -2
- data/views/instance_states/show.xml.haml +1 -1
- data/views/instances/index.html.haml +1 -1
- data/views/instances/index.xml.haml +2 -2
- data/views/instances/new.html.haml +22 -14
- data/views/instances/run.html.haml +2 -2
- data/views/instances/run.xml.haml +3 -3
- data/views/instances/run_command.html.haml +4 -4
- data/views/instances/show.html.haml +27 -27
- data/views/instances/show.xml.haml +37 -37
- data/views/keys/index.html.haml +1 -1
- data/views/keys/index.xml.haml +2 -2
- data/views/keys/show.html.haml +10 -10
- data/views/keys/show.xml.haml +12 -12
- data/views/load_balancers/index.html.haml +1 -1
- data/views/load_balancers/index.xml.haml +2 -2
- data/views/load_balancers/new.html.haml +1 -8
- data/views/load_balancers/show.html.haml +10 -10
- data/views/load_balancers/show.xml.haml +9 -9
- data/views/metrics/index.html.haml +1 -1
- data/views/metrics/index.xml.haml +2 -2
- data/views/metrics/show.html.haml +2 -2
- data/views/metrics/show.xml.haml +3 -3
- data/views/realms/index.html.haml +1 -1
- data/views/realms/index.xml.haml +2 -2
- data/views/realms/show.html.haml +6 -6
- data/views/realms/show.xml.haml +5 -5
- data/views/storage_snapshots/index.html.haml +1 -1
- data/views/storage_snapshots/index.xml.haml +2 -2
- data/views/storage_snapshots/show.html.haml +6 -6
- data/views/storage_snapshots/show.xml.haml +4 -4
- data/views/storage_volumes/attach.html.haml +2 -2
- data/views/storage_volumes/index.html.haml +1 -1
- data/views/storage_volumes/index.xml.haml +2 -2
- data/views/storage_volumes/show.html.haml +19 -19
- data/views/storage_volumes/show.xml.haml +21 -21
- metadata +77 -65
- data/views/cimi/cloudEntryPoint/index.html.haml +0 -5
- data/views/cimi/cloudEntryPoint/index.xml.haml +0 -9
- data/views/cimi/collection/index.html.haml +0 -45
- data/views/cimi/collection/response.xml.haml +0 -3
- data/views/cimi/error.html.haml +0 -31
- data/views/cimi/errors/400.xml.haml +0 -3
- data/views/cimi/errors/401.xml.haml +0 -2
- data/views/cimi/errors/403.xml.haml +0 -2
- data/views/cimi/errors/404.xml.haml +0 -2
- data/views/cimi/errors/405.xml.haml +0 -5
- data/views/cimi/errors/500.xml.haml +0 -6
- data/views/cimi/errors/502.xml.haml +0 -7
- data/views/cimi/layout.html.haml +0 -32
- data/views/cimi/machine_configurations/show.html.haml +0 -159
- data/views/cimi/machine_configurations/show.xml.haml +0 -27
- data/views/cimi/machine_images/show.html.haml +0 -79
- data/views/cimi/machine_images/show.xml.haml +0 -17
- data/views/cimi/machines/show.html.haml +0 -177
- data/views/cimi/machines/show.xml.haml +0 -28
- data/views/cimi/volumes/show.html.haml +0 -68
- data/views/cimi/volumes/show.xml.haml +0 -17
- data/views/docs/collection.html.haml +0 -26
- data/views/docs/collection.xml.haml +0 -14
- data/views/docs/index.html.haml +0 -11
- data/views/docs/index.xml.haml +0 -5
- data/views/docs/operation.html.haml +0 -33
- data/views/docs/operation.xml.haml +0 -10
- data/views/root/index.html.haml +0 -4
@@ -0,0 +1,75 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::Disk < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(instance, machine_config, context, id=:all)
|
19
|
+
if id == :all
|
20
|
+
name = instance.id+"_disk_" #assuming one disk for now...
|
21
|
+
|
22
|
+
if machine_config
|
23
|
+
mach_config_disks = machine_config.disks
|
24
|
+
return mach_config_disks.map do |d|
|
25
|
+
self.new(context, :values => {
|
26
|
+
:id => context.machine_url(instance.id) + "/disks/#{name}#{d[:capacity]}",
|
27
|
+
:name => "#{name}#{d[:capacity]}",
|
28
|
+
:description => "Disk for Machine #{instance.id}",
|
29
|
+
:created => instance.launch_time.nil? ?
|
30
|
+
Time.now.xmlschema : Time.parse(instance.launch_time).xmlschema,
|
31
|
+
:capacity => d[:capacity]
|
32
|
+
})
|
33
|
+
end
|
34
|
+
else
|
35
|
+
if instance.instance_profile.override? :storage
|
36
|
+
capacity = context.to_kibibyte(instance.instance_profile.storage, 'MB')
|
37
|
+
else
|
38
|
+
hw_profile = context.driver.hardware_profile(
|
39
|
+
context.credentials,
|
40
|
+
:id => instance.instance_profile.name
|
41
|
+
)
|
42
|
+
if hw_profile.storage
|
43
|
+
capacity = context.to_kibibyte(hw_profile.storage.value, 'MB')
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
return [] unless capacity
|
48
|
+
|
49
|
+
[self.new(context, :values => {
|
50
|
+
:id => context.machine_url(instance.id)+"/disks/#{name}#{capacity}",
|
51
|
+
:name => name + capacity.to_s,
|
52
|
+
:description => "Disk for Machine #{instance.id}",
|
53
|
+
:created => instance.launch_time.nil? ?
|
54
|
+
Time.now.xmlschema : Time.parse(instance.launch_time).xmlschema,
|
55
|
+
:capacity => capacity
|
56
|
+
})]
|
57
|
+
end
|
58
|
+
else
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
def self.collection_for_instance(instance_id, context)
|
63
|
+
instance = context.driver.instance(context.credentials, :id => instance_id)
|
64
|
+
disks = find(instance, nil, context)
|
65
|
+
CIMI::Model::Machine::DiskCollection.new(
|
66
|
+
:id => context.url("/machines/#{instance_id}/disks"),
|
67
|
+
:name => 'default',
|
68
|
+
:count => disks.size,
|
69
|
+
:description => "Disk collection for Machine #{instance_id}",
|
70
|
+
:entries => disks
|
71
|
+
)
|
72
|
+
end
|
73
|
+
|
74
|
+
|
75
|
+
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::ForwardingGroup < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
if id==:all
|
20
|
+
context.driver.forwarding_groups(context.credentials, {:env=>context})
|
21
|
+
else
|
22
|
+
context.driver.forwarding_groups(context.credentials, {:env=>context, :id=>id})
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::ForwardingGroupTemplate < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
if id==:all
|
20
|
+
context.driver.forwarding_group_templates(context.credentials, {:env=>context})
|
21
|
+
else
|
22
|
+
context.driver.forwarding_group_templates(context.credentials, {:env=>context, :id=>id})
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
end
|
@@ -0,0 +1,154 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::Machine < CIMI::Service::Base
|
17
|
+
|
18
|
+
metadata :realm,
|
19
|
+
:constraints => lambda { |c|
|
20
|
+
c.driver.realms(c.credentials).map { |r| r.id }
|
21
|
+
}
|
22
|
+
|
23
|
+
metadata :machine_image, :type => 'URI'
|
24
|
+
|
25
|
+
def self.find(id, context)
|
26
|
+
instances = []
|
27
|
+
if id == :all
|
28
|
+
instances = context.driver.instances(context.credentials)
|
29
|
+
instances.map { |instance| from_instance(instance, context) }.compact
|
30
|
+
else
|
31
|
+
instance = context.driver.instance(context.credentials, :id => id)
|
32
|
+
raise CIMI::Model::NotFound unless instance
|
33
|
+
from_instance(instance, context)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def perform(action, &block)
|
38
|
+
begin
|
39
|
+
op = action.operation
|
40
|
+
op = :reboot if op == :restart
|
41
|
+
puts "PERFORM #{op.inspect} on #{ref_id(id)}"
|
42
|
+
if context.driver.send(:"#{op}_instance", context.credentials, ref_id(id))
|
43
|
+
block.callback :success
|
44
|
+
else
|
45
|
+
raise "Operation #{op} failed to execute on given Machine #{ref_id(id)}"
|
46
|
+
end
|
47
|
+
rescue => e
|
48
|
+
raise
|
49
|
+
block.callback :failure, e.message
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
def self.delete!(id, context)
|
54
|
+
context.driver.destroy_instance(context.credentials, id)
|
55
|
+
new(context, :values => { :id => id }).destroy
|
56
|
+
end
|
57
|
+
|
58
|
+
#returns the newly attach machine_volume
|
59
|
+
def self.attach_volume(volume, location, context)
|
60
|
+
context.driver.attach_storage_volume(context.credentials,
|
61
|
+
{:id=>volume, :instance_id=>context.params[:id], :device=>location})
|
62
|
+
CIMI::Service::MachineVolume.find(context.params[:id], context, volume)
|
63
|
+
end
|
64
|
+
|
65
|
+
#returns the machine_volume_collection for the given machine
|
66
|
+
def self.detach_volume(volume, location, context)
|
67
|
+
context.driver.detach_storage_volume(context.credentials,
|
68
|
+
{:id=>volume, :instance_id=>context.params[:id], :device=>location})
|
69
|
+
CIMI::Service::MachineVolume.collection_for_instance(context.params[:id], context)
|
70
|
+
end
|
71
|
+
|
72
|
+
def self.from_instance(instance, context)
|
73
|
+
cpu = memory = (instance.instance_profile.id == "opaque")? "n/a" : nil
|
74
|
+
machine_conf = CIMI::Service::MachineConfiguration.find(instance.instance_profile.name, context)
|
75
|
+
machine_spec = {
|
76
|
+
:name => instance.name,
|
77
|
+
:created => instance.launch_time.nil? ? Time.now.xmlschema : Time.parse(instance.launch_time.to_s).xmlschema,
|
78
|
+
:description => "No description set for Machine #{instance.name}",
|
79
|
+
:id => context.machine_url(instance.id),
|
80
|
+
:state => convert_instance_state(instance.state),
|
81
|
+
:cpu => cpu || convert_instance_cpu(instance.instance_profile, context),
|
82
|
+
:memory => memory || convert_instance_memory(instance.instance_profile, context),
|
83
|
+
:disks => { :href => context.machine_url(instance.id)+"/disks"},
|
84
|
+
:volumes => { :href=>context.machine_url(instance.id)+"/volumes"},
|
85
|
+
:operations => convert_instance_actions(instance, context)
|
86
|
+
}
|
87
|
+
if context.expand? :disks
|
88
|
+
machine_spec[:disks] = CIMI::Service::Disk.find(instance, machine_conf, context, :all)
|
89
|
+
end
|
90
|
+
if context.expand? :volumes
|
91
|
+
machine_spec[:volumes] = CIMI::Service::MachineVolume.find(instance.id, context, :all)
|
92
|
+
end
|
93
|
+
machine_spec[:realm] = instance.realm_id if instance.realm_id
|
94
|
+
machine_spec[:machine_image] = { :href => context.machine_image_url(instance.image_id) } if instance.image_id
|
95
|
+
self.new(context, :values => machine_spec)
|
96
|
+
end
|
97
|
+
|
98
|
+
# FIXME: This will convert 'RUNNING' state to 'STARTED'
|
99
|
+
# which is defined in CIMI (p65)
|
100
|
+
#
|
101
|
+
def self.convert_instance_state(state)
|
102
|
+
case state
|
103
|
+
when "RUNNING" then "STARTED"
|
104
|
+
when "PENDING" then "CREATING" #aruba only exception... could be "STARTING" here
|
105
|
+
else state
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
109
|
+
def self.convert_instance_cpu(profile, context)
|
110
|
+
cpu_override = profile.overrides.find { |p, v| p == :cpu }
|
111
|
+
if cpu_override.nil?
|
112
|
+
CIMI::Service::MachineConfiguration.find(profile.id, context).cpu
|
113
|
+
else
|
114
|
+
cpu_override[1]
|
115
|
+
end
|
116
|
+
end
|
117
|
+
|
118
|
+
def self.convert_instance_memory(profile, context)
|
119
|
+
machine_conf = CIMI::Service::MachineConfiguration.find(profile.name, context)
|
120
|
+
memory_override = profile.overrides.find { |p, v| p == :memory }
|
121
|
+
memory_override.nil? ? machine_conf.memory.to_i : context.to_kibibyte(memory_override[1].to_i,"MB")
|
122
|
+
end
|
123
|
+
|
124
|
+
def self.convert_instance_addresses(instance)
|
125
|
+
(instance.public_addresses + instance.private_addresses).collect do |address|
|
126
|
+
{
|
127
|
+
:hostname => address.is_hostname? ? address : nil,
|
128
|
+
:mac_address => address.is_mac? ? address : nil,
|
129
|
+
:state => 'Active',
|
130
|
+
:protocol => 'IPv4',
|
131
|
+
:address => address.is_ipv4? ? address : nil,
|
132
|
+
:allocation => 'Static'
|
133
|
+
}
|
134
|
+
end
|
135
|
+
end
|
136
|
+
|
137
|
+
def self.convert_instance_actions(instance, context)
|
138
|
+
actions = instance.actions.collect do |action|
|
139
|
+
action = :restart if action == :reboot
|
140
|
+
name = action
|
141
|
+
name = :delete if action == :destroy # In CIMI destroy operation become delete
|
142
|
+
{ :href => context.send(:"#{action}_machine_url", instance.id), :rel => "http://schemas.dmtf.org/cimi/1/action/#{name}" }
|
143
|
+
end
|
144
|
+
actions << { :href => context.send(:"machine_images_url"), :rel => "http://schemas.dmtf.org/cimi/1/action/capture" } if instance.can_create_image?
|
145
|
+
actions
|
146
|
+
end
|
147
|
+
|
148
|
+
def self.convert_storage_volumes(instance, context)
|
149
|
+
instance.storage_volumes ||= [] #deal with nilpointers
|
150
|
+
instance.storage_volumes.map{|vol| {:href=>context.volume_url(vol.keys.first),
|
151
|
+
:initial_location=>vol.values.first} }
|
152
|
+
end
|
153
|
+
|
154
|
+
end
|
@@ -0,0 +1,54 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::MachineConfiguration < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
profiles = []
|
20
|
+
if id == :all
|
21
|
+
profiles = context.driver.hardware_profiles(context.credentials)
|
22
|
+
profiles.map { |profile| from_hardware_profile(profile, context) }.compact
|
23
|
+
else
|
24
|
+
profile = context.driver.hardware_profile(context.credentials, id)
|
25
|
+
from_hardware_profile(profile, context)
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
private
|
30
|
+
def self.from_hardware_profile(profile, context)
|
31
|
+
# We accept just profiles with all properties set
|
32
|
+
return unless profile.memory or profile.cpu or profile.storage
|
33
|
+
memory = profile.memory ?
|
34
|
+
context.to_kibibyte((profile.memory.value || profile.memory.default), profile.memory.unit) : nil
|
35
|
+
cpu = (profile.cpu ? (profile.cpu.value || profile.cpu.default) : nil )
|
36
|
+
storage = profile.storage ?
|
37
|
+
context.to_kibibyte((profile.storage.value || profile.storage.default), profile.storage.unit) : nil
|
38
|
+
machine_hash = {
|
39
|
+
:name => profile.name,
|
40
|
+
:description => "Machine Configuration with #{memory} KiB of memory and #{cpu} CPU",
|
41
|
+
:cpu => ( cpu.to_i.to_s if cpu ) ,
|
42
|
+
:created => Time.now.xmlschema, # FIXME: DC hardware_profile has no mention about created_at
|
43
|
+
:memory => (memory if memory),
|
44
|
+
:disks => ( [ {
|
45
|
+
:capacity => storage,
|
46
|
+
:format => (profile.storage.respond_to?(:format) ? profile.storage.format : "unknown") }
|
47
|
+
] if storage ), # no format attr for hwp - may be added if providers support...,
|
48
|
+
:id => context.machine_configuration_url(profile.id)
|
49
|
+
}
|
50
|
+
self.new(context, :values => machine_hash)
|
51
|
+
end
|
52
|
+
|
53
|
+
|
54
|
+
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::MachineCreate < CIMI::Service::Base
|
17
|
+
|
18
|
+
def create
|
19
|
+
params = {}
|
20
|
+
if machine_template.href
|
21
|
+
template = resolve(machine_template)
|
22
|
+
params[:hwp_id] = ref_id(template.machine_config.href)
|
23
|
+
params[:initial_state] = template.initial_state
|
24
|
+
image_id = ref_id(template.machine_image.href)
|
25
|
+
else
|
26
|
+
# FIXME: What if either of these href's isn't there ? What if the user
|
27
|
+
# tries to override some aspect of the machine_config/machine_image ?
|
28
|
+
params[:hwp_id] = ref_id(machine_template.machine_config.href)
|
29
|
+
params[:initial_state] = machine_template.initial_state
|
30
|
+
image_id = ref_id(machine_template.machine_image.href)
|
31
|
+
if machine_template.credential.href
|
32
|
+
params[:keyname] = ref_id(machine_template.credential.href)
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
params[:name] = name if name
|
37
|
+
params[:realm_id] = realm if realm
|
38
|
+
instance = context.driver.create_instance(context.credentials, image_id, params)
|
39
|
+
|
40
|
+
result = CIMI::Service::Machine::from_instance(instance, context)
|
41
|
+
result.name = name if name
|
42
|
+
result.description = description if description
|
43
|
+
result.property = property if property
|
44
|
+
result.save
|
45
|
+
result
|
46
|
+
end
|
47
|
+
|
48
|
+
|
49
|
+
end
|
@@ -0,0 +1,47 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::MachineImage < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
images = []
|
20
|
+
if id == :all
|
21
|
+
images = context.driver.images(context.credentials)
|
22
|
+
images.map { |image| from_image(image, context) }
|
23
|
+
else
|
24
|
+
image = context.driver.image(context.credentials, :id => id)
|
25
|
+
from_image(image, context)
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
def self.from_image(image, context)
|
30
|
+
self.new(context, :values => {
|
31
|
+
:id => context.machine_image_url(image.id),
|
32
|
+
:name => image.id,
|
33
|
+
:description => image.description,
|
34
|
+
:state => image.state || 'UNKNOWN',
|
35
|
+
:type => "IMAGE",
|
36
|
+
:created => image.creation_time.nil? ?
|
37
|
+
Time.now.xmlschema : Time.parse(image.creation_time.to_s).xmlschema
|
38
|
+
})
|
39
|
+
end
|
40
|
+
|
41
|
+
def self.delete!(image_id, context)
|
42
|
+
context.driver.destroy_image(context.credentials, image_id)
|
43
|
+
self.new(context, :values => { :id => image_id }).destroy
|
44
|
+
end
|
45
|
+
|
46
|
+
|
47
|
+
end
|
@@ -0,0 +1,35 @@
|
|
1
|
+
# Licensed to the Apache Software Foundation (ASF) under one or more
|
2
|
+
# contributor license agreements. See the NOTICE file distributed with
|
3
|
+
# this work for additional information regarding copyright ownership. The
|
4
|
+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
5
|
+
# "License"); you may not use this file except in compliance with the
|
6
|
+
# License. You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
12
|
+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
13
|
+
# License for the specific language governing permissions and limitations
|
14
|
+
# under the License.
|
15
|
+
|
16
|
+
class CIMI::Service::MachineImageCreate < CIMI::Service::Base
|
17
|
+
|
18
|
+
def create
|
19
|
+
params = {
|
20
|
+
:id => context.href_id(image_location, :machines),
|
21
|
+
:name => name,
|
22
|
+
:description => description
|
23
|
+
}
|
24
|
+
|
25
|
+
img = context.driver.create_image(context.credentials, params)
|
26
|
+
|
27
|
+
result = CIMI::Service::MachineImage.from_image(img, context)
|
28
|
+
result.name = name if name
|
29
|
+
result.description = description if description
|
30
|
+
result.property = property if property
|
31
|
+
result.save
|
32
|
+
result
|
33
|
+
end
|
34
|
+
|
35
|
+
end
|