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,61 @@
|
|
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::MachineTemplate < CIMI::Service::Base
|
17
|
+
|
18
|
+
metadata :realm, :constraints => lambda { |c| c.driver.realms(c.credentials).map { |r| r.id }}
|
19
|
+
|
20
|
+
class << self
|
21
|
+
def find(id, context)
|
22
|
+
if id == :all
|
23
|
+
current_db.machine_templates.map { |t| from_db(t, context) }
|
24
|
+
else
|
25
|
+
template = current_db.machine_templates_dataset.first(:id => id)
|
26
|
+
raise CIMI::Model::NotFound unless template
|
27
|
+
from_db(template, context)
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def delete!(id, context)
|
32
|
+
if mt = current_db.machine_templates_dataset.first(:id => id)
|
33
|
+
mt.destroy
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def from_db(model, context)
|
38
|
+
self.new(context, :values => {
|
39
|
+
:id => context.machine_template_url(model.id),
|
40
|
+
:name => model.name,
|
41
|
+
:description => model.description,
|
42
|
+
:machine_config => { :href => model.machine_config },
|
43
|
+
:machine_image => { :href => model.machine_image },
|
44
|
+
:realm => model.realm,
|
45
|
+
:property => (model.ent_properties ? JSON::parse(model.ent_properties) : nil),
|
46
|
+
:created => Time.parse(model.created_at.to_s).xmlschema,
|
47
|
+
:operations => [
|
48
|
+
{
|
49
|
+
:href => context.destroy_machine_template_url(model.id),
|
50
|
+
:rel => 'http://schemas.dmtf.org/cimi/1/action/delete'
|
51
|
+
}
|
52
|
+
]
|
53
|
+
})
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
protected
|
58
|
+
def attributes_to_copy
|
59
|
+
super + [ :machine_config, :machine_image ]
|
60
|
+
end
|
61
|
+
end
|
@@ -0,0 +1,29 @@
|
|
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::MachineTemplateCreate < CIMI::Service::Base
|
17
|
+
|
18
|
+
def create
|
19
|
+
new_template = self.class.current_db.add_machine_template(
|
20
|
+
:name => name,
|
21
|
+
:description => description,
|
22
|
+
:machine_config => machine_config.href,
|
23
|
+
:machine_image => machine_image.href,
|
24
|
+
:ent_properties => property.to_json
|
25
|
+
)
|
26
|
+
CIMI::Service::MachineTemplate.from_db(new_template, context)
|
27
|
+
end
|
28
|
+
|
29
|
+
end
|
@@ -0,0 +1,74 @@
|
|
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::MachineVolume < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(instance_id, context, id=:all)
|
19
|
+
if id == :all
|
20
|
+
volumes = context.driver.storage_volumes(context.credentials)
|
21
|
+
volumes.inject([]) do |attached, vol|
|
22
|
+
id = context.machine_url(instance_id)+"/volumes/#{vol.id}"
|
23
|
+
attached << self.new(context, :values => {
|
24
|
+
:id => id,
|
25
|
+
:name => vol.name || vol.id,
|
26
|
+
:description => "MachineVolume #{vol.id} for Machine #{instance_id}",
|
27
|
+
:created => vol.created.nil? ? nil : Time.parse(vol.created).xmlschema,
|
28
|
+
:initial_location => vol.device,
|
29
|
+
:volume => {:href=>context.volume_url(vol.id)},
|
30
|
+
:operations => [{:href=>id, :rel => "delete" }]
|
31
|
+
}) if vol.instance_id == instance_id
|
32
|
+
attached
|
33
|
+
end
|
34
|
+
else
|
35
|
+
vol = context.driver.storage_volume(context.credentials, {:id=>id})
|
36
|
+
id = context.machine_url(instance_id)+"/volumes/#{vol.id}"
|
37
|
+
raise CIMI::Model::NotFound unless vol.instance_id == instance_id
|
38
|
+
self.new(context, :values => {
|
39
|
+
:id => id,
|
40
|
+
:name => vol.name || vol.id,
|
41
|
+
:description => "MachineVolume #{vol.id} for Machine #{instance_id}",
|
42
|
+
:created => vol.created.nil? ? nil : Time.parse(vol.created).xmlschema,
|
43
|
+
:initial_location => vol.device,
|
44
|
+
:volume => {:href=>context.volume_url(vol.id)},
|
45
|
+
:operations => [{:href=>id, :rel => "delete" }]
|
46
|
+
})
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def self.find_to_attach_from_xml(xml_in, context)
|
51
|
+
xml = XmlSimple.xml_in(xml_in)
|
52
|
+
vol_id = xml["volume"].first["href"].split("/").last
|
53
|
+
location = xml["initialLocation"].first.strip
|
54
|
+
[vol_id, location]
|
55
|
+
end
|
56
|
+
|
57
|
+
def self.find_to_attach_from_json(json_in, context)
|
58
|
+
json = JSON.parse(json_in)
|
59
|
+
vol_id = json["volume"]["href"].split("/").last
|
60
|
+
location = json["initialLocation"]
|
61
|
+
[vol_id, location]
|
62
|
+
end
|
63
|
+
|
64
|
+
|
65
|
+
def self.collection_for_instance(instance_id, context)
|
66
|
+
machine_volumes = self.find(instance_id, context)
|
67
|
+
volumes_url = context.url("/machines/#{instance_id}/volumes")
|
68
|
+
# FIXME: Really ???
|
69
|
+
attach_url = volumes_url.singularize+"_attach"
|
70
|
+
CIMI::Model::MachineVolume.list(volumes_url, machine_volumes, :add_url => attach_url)
|
71
|
+
end
|
72
|
+
|
73
|
+
|
74
|
+
end
|
@@ -0,0 +1,51 @@
|
|
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::Network < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
networks=[]
|
20
|
+
if id==:all
|
21
|
+
networks = context.driver.networks(context.credentials, {:env=>context})
|
22
|
+
else
|
23
|
+
networks = context.driver.networks(context.credentials, {:id=>id, :env=>context})
|
24
|
+
end
|
25
|
+
if context.expand? :networkPorts
|
26
|
+
networks.each do |network|
|
27
|
+
network.network_ports = CIMI::Service::NetworkPort.collection_for_network(network.id, context)
|
28
|
+
end
|
29
|
+
end
|
30
|
+
networks
|
31
|
+
end
|
32
|
+
|
33
|
+
|
34
|
+
def self.delete!(id, context)
|
35
|
+
context.driver.delete_network(context.credentials, id)
|
36
|
+
end
|
37
|
+
|
38
|
+
def perform(action, context, &block)
|
39
|
+
begin
|
40
|
+
if context.driver.send(:"#{action.name}_network", context.credentials, self.name)
|
41
|
+
block.callback :success
|
42
|
+
else
|
43
|
+
raise "Operation #{action.name} failed to execute on the Network #{self.name} "
|
44
|
+
end
|
45
|
+
rescue => e
|
46
|
+
block.callback :failure, e.message
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
|
51
|
+
end
|
@@ -0,0 +1,36 @@
|
|
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::NetworkConfiguration < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
network_configs = []
|
20
|
+
if id==:all
|
21
|
+
network_configs = context.driver.network_configurations(context.credentials, {:env=>context})
|
22
|
+
else
|
23
|
+
network_configs = context.driver.network_configurations(context.credentials, {:env=>context, :id=>id})
|
24
|
+
end
|
25
|
+
network_configs
|
26
|
+
end
|
27
|
+
|
28
|
+
def self.create_from_xml(request_body, context)
|
29
|
+
warn "This method should go into NetworkConfigurationCreate model"
|
30
|
+
end
|
31
|
+
|
32
|
+
def self.create_from_json(request_body, context)
|
33
|
+
warn "This method should go into NetworkConfigurationCreate model"
|
34
|
+
end
|
35
|
+
|
36
|
+
end
|
@@ -0,0 +1,39 @@
|
|
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::NetworkCreate < CIMI::Service::Base
|
17
|
+
|
18
|
+
def create
|
19
|
+
if network_template.href?
|
20
|
+
template = resolve(network_template)
|
21
|
+
network_config = resolve(template.network_config)
|
22
|
+
forwarding_group = resolve(template.forwarding_group)
|
23
|
+
else
|
24
|
+
network_config = CIMI::Service::NetworkConfiguration.find(context.href_id(network_template.network_config.href, :network_configurations), context)
|
25
|
+
forwarding_group = CIMI::Service::ForwardingGroup.find(context.href_id(network_template.forwarding_group.href, :forwarding_groups), context)
|
26
|
+
end
|
27
|
+
params = {
|
28
|
+
:network_config => network_config,
|
29
|
+
:forwarding_group => forwarding_group,
|
30
|
+
:name => name,
|
31
|
+
:description => description,
|
32
|
+
:env => context # FIXME: We should not pass the context to the driver (!)
|
33
|
+
}
|
34
|
+
network = context.driver.create_network(context.credentials, params)
|
35
|
+
network.property = property if property
|
36
|
+
network.save
|
37
|
+
network
|
38
|
+
end
|
39
|
+
end
|
@@ -0,0 +1,97 @@
|
|
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::NetworkPort < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
if id==:all
|
20
|
+
context.driver.network_ports(context.credentials, {:env=>context})
|
21
|
+
else
|
22
|
+
context.driver.network_ports(context.credentials, {:id=>id, :env=>context})
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
# FIXME: This should go into NetworkPortCreate model
|
27
|
+
#
|
28
|
+
def self.create(request_body, context, type)
|
29
|
+
input = (type == :xml)? XmlSimple.xml_in(request_body, {"ForceArray"=>false, "NormaliseSpace"=>2}) : JSON.parse(request_body)
|
30
|
+
if input["networkPortTemplate"]["href"] #template by reference
|
31
|
+
network_port_config, network = get_by_reference(input, context)
|
32
|
+
else
|
33
|
+
if input["networkPortTemplate"]["networkPortConfig"]["href"] # configuration by reference
|
34
|
+
network_port_config = CIMI::Service::NetworkPortConfiguration.find(context.href_id(input["networkPortTemplate"]["networkPortConfig"]["href"],:network_port_configurations), context)
|
35
|
+
else #configuration by value
|
36
|
+
network_port_config = get_by_value(request_body, type)
|
37
|
+
end
|
38
|
+
network = CIMI::Service::Network.find(context.href_id(input["networkPortTemplate"]["network"]["href"], :networks), context)
|
39
|
+
end
|
40
|
+
params = {:network_port_config => network_port_config, :network => network, :name=>input["name"], :description=>input["description"], :env=>context}
|
41
|
+
raise CIMI::Model::BadRequest.new("Bad request - missing required parameters. Client sent: #{request_body} which produced #{params.inspect}") if params.has_value?(nil)
|
42
|
+
context.driver.create_network_port(context.credentials, params)
|
43
|
+
end
|
44
|
+
|
45
|
+
def self.delete!(id, context)
|
46
|
+
context.driver.delete_network_port(context.credentials, id)
|
47
|
+
end
|
48
|
+
|
49
|
+
def perform(action, context, &block)
|
50
|
+
begin
|
51
|
+
if context.driver.send(:"#{action.name}_network_port", context.credentials, self.name)
|
52
|
+
block.callback :success
|
53
|
+
else
|
54
|
+
raise "Operation #{action.name} failed to execute on the NetworkPort #{self.name} "
|
55
|
+
end
|
56
|
+
rescue => e
|
57
|
+
block.callback :failure, e.message
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
def self.collection_for_network(network_id, context)
|
62
|
+
net_url = context.network_url(network_id)
|
63
|
+
network_ports = CIMI::Service::NetworkPort.all(context)
|
64
|
+
ports_collection = network_ports.inject([]){|res, current| res << current if current.network.href == net_url ; res}
|
65
|
+
CIMI::Service::NetworkPortCollection.new(context, :values => {
|
66
|
+
:id => net_url+"/network_ports",
|
67
|
+
:name => 'default',
|
68
|
+
:created => Time.now,
|
69
|
+
:description => "#{context.driver.name.capitalize} NetworkPortCollection",
|
70
|
+
:count => ports_collection.size,
|
71
|
+
:network_ports => ports_collection
|
72
|
+
})
|
73
|
+
end
|
74
|
+
|
75
|
+
private
|
76
|
+
|
77
|
+
# FIXME: Are the methods below really needed???
|
78
|
+
|
79
|
+
def self.get_by_reference(input, context)
|
80
|
+
network_port_template = CIMI::Service::NetworkPortTemplate.find(context.href_id(input["networkPortTemplate"]["href"], :network_port_templates), context)
|
81
|
+
network_port_config = CIMI::Service::NetworkPortConfiguration.find(context.href_id(network_port_template.network_port_config.href, :network_port_configurations), context)
|
82
|
+
network = CIMI::Service::Network.find(context.href_id(network_port_template.network.href, :networks), context)
|
83
|
+
return network_port_config, network
|
84
|
+
end
|
85
|
+
|
86
|
+
def self.get_by_value(request_body, type)
|
87
|
+
if type == :xml
|
88
|
+
xml_arrays = XmlSimple.xml_in(request_body, {"NormaliseSpace"=>2})
|
89
|
+
network_port_config = CIMI::Service::NetworkPortConfiguration.from_xml(XmlSimple.xml_out(xml_arrays["networkPortTemplate"][0]["networkPortConfig"][0]))
|
90
|
+
else
|
91
|
+
json = JSON.parse(request_body)
|
92
|
+
network_port_config = CIMI::Service::NetworkPortConfiguration.from_json(JSON.generate(json["networkPortTemplate"]["networkPortConfig"]))
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
|
97
|
+
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::NetworkPortConfiguration < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
if id==:all
|
20
|
+
context.driver.network_port_configurations(context.credentials, {:env=>context})
|
21
|
+
else
|
22
|
+
context.driver.network_port_configurations(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::NetworkPortTemplate < CIMI::Service::Base
|
17
|
+
|
18
|
+
def self.find(id, context)
|
19
|
+
if id==:all
|
20
|
+
context.driver.network_port_templates(context.credentials, {:env=>context})
|
21
|
+
else
|
22
|
+
context.driver.network_port_templates(context.credentials, {:env=>context, :id=>id})
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
end
|