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
@@ -1,177 +0,0 @@
|
|
1
|
-
%h1 View/Edit machine
|
2
|
-
|
3
|
-
%form{ :action => machines_url }
|
4
|
-
%input{ :name => :id, :type => :hidden, :value => @dmtfitem["uri"] }/
|
5
|
-
%input{ :name => :xmlRootNode, :type => :hidden, :value => @xml_root_node }/
|
6
|
-
%input{ :name => :refreshURI, :type => :hidden, :value => machines_url }/
|
7
|
-
%p
|
8
|
-
%label
|
9
|
-
Name:
|
10
|
-
%p
|
11
|
-
%input{ :name => :name, :size => 50, :value => @dmtfitem["name"], :style => "width:50%;" }
|
12
|
-
%input{ :name => :created, :type => :hidden, :size => 50, :value => @dmtfitem["created"] }
|
13
|
-
%p
|
14
|
-
%br
|
15
|
-
%label
|
16
|
-
Description:
|
17
|
-
%p
|
18
|
-
%textarea{ :name => :description, :cols => 50, :rows => 4, :style => "width:50%;" } #{@dmtfitem['description']}
|
19
|
-
%p
|
20
|
-
%br
|
21
|
-
%label
|
22
|
-
Properties:
|
23
|
-
%p
|
24
|
-
%table{ :style => "width:50%;", :id => "propertyTable"}
|
25
|
-
- if @dmtfitem["property"]
|
26
|
-
- if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
|
27
|
-
- property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
|
28
|
-
- else
|
29
|
-
- property_object = @dmtfitem["property"]
|
30
|
-
|
31
|
-
- iter = -1
|
32
|
-
- property_object.each_pair do |key, value|
|
33
|
-
- iter += 1
|
34
|
-
%tr
|
35
|
-
%td
|
36
|
-
%input{ :name => "param_name_" + iter.to_s, :size => 25, :value => key }
|
37
|
-
%td
|
38
|
-
%input{ :name => "param_value_" + iter.to_s, :size => 25, :value => value["content"] }
|
39
|
-
%td
|
40
|
-
%input{ :type => :button, :value => "Remove", :onClick => "return removeProperty(this)" }
|
41
|
-
%input{ :type => :button, :name => "commit", :value => "Add new property", :onClick => "return AddNewPproperty('propertyTable')" }
|
42
|
-
%p
|
43
|
-
%br
|
44
|
-
%label
|
45
|
-
Status:
|
46
|
-
%p
|
47
|
-
%input{ :name => :status, :size => 50, :value => @dmtfitem["status"], :style => "width:50%;" }
|
48
|
-
%p
|
49
|
-
%br
|
50
|
-
%label
|
51
|
-
CPU:
|
52
|
-
%p
|
53
|
-
%input{ :name => :cpu, :size => 50, :value => @dmtfitem["cpu"], :style => "width:50%;" }
|
54
|
-
%br
|
55
|
-
%label
|
56
|
-
Memory:
|
57
|
-
%p
|
58
|
-
%input{ :name => :memory_quantity, :size => 20, :value => @dmtfitem["memory"]["quantity"], :style => "width:10%;" }
|
59
|
-
%input{ :name => :memory_units, :size => 20, :value => @dmtfitem["memory"]["units"], :style => "width:10%;" }
|
60
|
-
%br
|
61
|
-
%label
|
62
|
-
Disk:
|
63
|
-
%p
|
64
|
-
%table{ :style => "width:50%;", :id => "diskTable"}
|
65
|
-
- if @dmtfitem["disk"]
|
66
|
-
- if @dmtfitem["disk"].kind_of?(Array)
|
67
|
-
- property_object = @dmtfitem["disk"]
|
68
|
-
- else
|
69
|
-
- property_object = [@dmtfitem["disk"]]
|
70
|
-
|
71
|
-
- iter = -1
|
72
|
-
%tr
|
73
|
-
%td
|
74
|
-
%label
|
75
|
-
Quantity
|
76
|
-
%td
|
77
|
-
%label
|
78
|
-
Units
|
79
|
-
%td
|
80
|
-
%label
|
81
|
-
GuestInterface
|
82
|
-
%td
|
83
|
-
- property_object.each do |disk|
|
84
|
-
- iter += 1
|
85
|
-
%tr
|
86
|
-
%td
|
87
|
-
%input{ :name => "disk_quantity_" + iter.to_s, :size => 10, :value => disk["capacity"]["quantity"] }
|
88
|
-
%td
|
89
|
-
%input{ :name => "disk_units_" + iter.to_s, :size => 10, :value => disk["capacity"]["units"] }
|
90
|
-
%td
|
91
|
-
%input{ :name => "disk_guestInterface_" + iter.to_s, :size => 20, :value => disk["guestInterface"] }
|
92
|
-
%td
|
93
|
-
%input{ :type => :button, :value => "Remove", :onClick => "return removeProperty(this)" }
|
94
|
-
%input{ :type => :button, :name => "commit", :value => "Add new disk", :onClick => "return addDiskRow('diskTable')" }
|
95
|
-
|
96
|
-
%br
|
97
|
-
%label
|
98
|
-
EntityMetadata:
|
99
|
-
%br
|
100
|
-
%label
|
101
|
-
TODO Need to handle volumes:
|
102
|
-
%p
|
103
|
-
%br
|
104
|
-
%label
|
105
|
-
TODO Need to handle network interfaces:
|
106
|
-
|
107
|
-
:javascript
|
108
|
-
function fixupXml(theNode) {
|
109
|
-
var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
|
110
|
-
xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
|
111
|
-
xmlData += getStandardData(theNode);
|
112
|
-
xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
|
113
|
-
xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value + "' units='";
|
114
|
-
xmlData += $(theNode.form).attr("memory_units").value + "' />"
|
115
|
-
|
116
|
-
var index=0;
|
117
|
-
subDisk = ""
|
118
|
-
while ($(theNode.form).attr("disk_quantity_" + index)) {
|
119
|
-
if ($(theNode.form).attr("disk_quantity_" + index).value != null &&
|
120
|
-
$(theNode.form).attr("disk_quantity_" + index).value.length > 0) {
|
121
|
-
subDisk += "<capacity quantity='" + $(theNode.form).attr("disk_quantity_" + index).value + "' units='" +
|
122
|
-
$(theNode.form).attr("disk_units_" + index).value + "' />";
|
123
|
-
subDisk += "<guestInterface>" + $(theNode.form).attr("disk_guestInterface_" + index).value + "</guestInterface>";
|
124
|
-
}
|
125
|
-
index++;
|
126
|
-
}
|
127
|
-
if (subDisk.length > 0) {
|
128
|
-
xmlData += "<disk>" + subDisk + "</disk>";
|
129
|
-
}
|
130
|
-
|
131
|
-
//we handle entityMetadata here
|
132
|
-
if ($(theNode.form).attr("entityMetadata").value) {
|
133
|
-
xmlData += $(theNode.form).attr("entityMetadata").value
|
134
|
-
}
|
135
|
-
|
136
|
-
xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
|
137
|
-
|
138
|
-
return xmlData;
|
139
|
-
}
|
140
|
-
|
141
|
-
function addDiskRow(tableId) {
|
142
|
-
var tbl = document.getElementById(tableId);
|
143
|
-
var lastRow = tbl.rows.length;
|
144
|
-
// if there's no header row in the table, then iteration = lastRow + 1
|
145
|
-
var iteration = lastRow - 1;
|
146
|
-
var row = tbl.insertRow(lastRow);
|
147
|
-
|
148
|
-
elNames = ['disk_quantity_', 'disk_units_', 'disk_guestInterface_'];
|
149
|
-
elSizes = [10, 10, 20]
|
150
|
-
elValues = ["200", "megabyte", ""]
|
151
|
-
|
152
|
-
for (var index=0; index<elNames.length; index++) {
|
153
|
-
var aCellTD = row.insertCell(index);
|
154
|
-
var aCell = document.createElement('input');
|
155
|
-
aCell.type = 'text';
|
156
|
-
aCell.name = elNames[index] + iteration;
|
157
|
-
aCell.id = aCell.name;
|
158
|
-
aCell.size = elSizes[index];
|
159
|
-
aCell.value = elValues[index];
|
160
|
-
aCellTD.appendChild(aCell);
|
161
|
-
}
|
162
|
-
|
163
|
-
// select cell
|
164
|
-
var cellRightBut = row.insertCell(elNames.length);
|
165
|
-
var er = document.createElement('input');
|
166
|
-
er.type = 'button';
|
167
|
-
er.name = 'param_remove' + iteration;
|
168
|
-
er.id = 'param_remove' + iteration;
|
169
|
-
er.value = "Remove";
|
170
|
-
er.tableRow = row
|
171
|
-
$(er).click(function() {
|
172
|
-
removeProperty(this);
|
173
|
-
})
|
174
|
-
|
175
|
-
cellRightBut.appendChild(er);
|
176
|
-
|
177
|
-
}
|
@@ -1,28 +0,0 @@
|
|
1
|
-
- unless defined?(partial)
|
2
|
-
!!! XML
|
3
|
-
%Machine{ :xmlns => CMWG_NAMESPACE }
|
4
|
-
%uri=machines_url + "/" + @dmtfitem["uri"]
|
5
|
-
%name=@dmtfitem["name"]
|
6
|
-
%description=@dmtfitem["description"]
|
7
|
-
%created=@dmtfitem["created"]
|
8
|
-
- if @dmtfitem["property"]
|
9
|
-
- if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
|
10
|
-
- property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
|
11
|
-
- else
|
12
|
-
- property_object = @dmtfitem["property"]
|
13
|
-
- property_object.each_pair do |key, value|
|
14
|
-
%property{ :name => key}=value["content"]
|
15
|
-
%status=@dmtfitem["status"]
|
16
|
-
%cpu=@dmtfitem["cpu"]
|
17
|
-
%memory{ :quantity => @dmtfitem["memory"]["quantity"], :units => @dmtfitem["memory"]["units"] }
|
18
|
-
- if @dmtfitem["disk"]
|
19
|
-
- if @dmtfitem["disk"].kind_of?(Array)
|
20
|
-
- property_object = @dmtfitem["disk"]
|
21
|
-
- else
|
22
|
-
- property_object = [@dmtfitem["disk"]]
|
23
|
-
- property_object.each do |disk|
|
24
|
-
%disk
|
25
|
-
%capacity{ :quantity => disk["capacity"]["quantity"], :units => disk["capacity"]["units"] }
|
26
|
-
%guestInterface= disk["guestInterface"]
|
27
|
-
%operation{ :rel => "edit", :href => machines_url + "/" + @dmtfitem["uri"] }
|
28
|
-
%operation{ :rel => "delete", :href => machines_url + "/" + @dmtfitem["uri"] }
|
@@ -1,68 +0,0 @@
|
|
1
|
-
%h1 View/Edit volume
|
2
|
-
|
3
|
-
%form{ :action => volumes_url }
|
4
|
-
%input{ :name => :id, :type => :hidden, :value => @dmtfitem["uri"] }/
|
5
|
-
%input{ :name => :xmlRootNode, :type => :hidden, :value => @xml_root_node }/
|
6
|
-
%input{ :name => :refreshURI, :type => :hidden, :value => volumes_url }/
|
7
|
-
%p
|
8
|
-
%label
|
9
|
-
Name:
|
10
|
-
%p
|
11
|
-
%input{ :name => :name, :size => 50, :value => @dmtfitem["name"], :style => "width:50%;" }
|
12
|
-
%input{ :name => :created, :type => :hidden, :size => 50, :value => @dmtfitem["created"] }
|
13
|
-
%p
|
14
|
-
%br
|
15
|
-
%label
|
16
|
-
Description:
|
17
|
-
%p
|
18
|
-
%textarea{ :name => :description, :cols => 50, :rows => 4, :style => "width:50%;" } #{@dmtfitem['description']}
|
19
|
-
%p
|
20
|
-
%br
|
21
|
-
%label
|
22
|
-
Properties:
|
23
|
-
%p
|
24
|
-
%table{ :style => "width:50%;", :id => "propertyTable"}
|
25
|
-
- if @dmtfitem["property"]
|
26
|
-
- if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
|
27
|
-
- property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
|
28
|
-
- else
|
29
|
-
- property_object = @dmtfitem["property"]
|
30
|
-
|
31
|
-
- iter = -1
|
32
|
-
- property_object.each_pair do |key, value|
|
33
|
-
- iter += 1
|
34
|
-
%tr
|
35
|
-
%td
|
36
|
-
%input{ :name => "param_name_" + iter.to_s, :size => 30, :value => key }
|
37
|
-
%td
|
38
|
-
%input{ :name => "param_value_" + iter.to_s, :size => 30, :value => value["content"] }
|
39
|
-
%td
|
40
|
-
%input{ :type => :button, :value => "Remove", :onClick => "return removeProperty(this)" }
|
41
|
-
%input{ :type => :button, :name => "commit", :value => "Add new property", :onClick => "return AddNewPproperty('propertyTable')" }
|
42
|
-
%p
|
43
|
-
%br
|
44
|
-
%label
|
45
|
-
Capacity:
|
46
|
-
%p
|
47
|
-
%input{ :name => :capacity_quantity, :size => 20, :value => @dmtfitem["capacity"]["quantity"], :style => "width:10%;" }
|
48
|
-
%input{ :name => :capacity_units, :size => 20, :value => @dmtfitem["capacity"]["units"], :style => "width:10%;" }
|
49
|
-
%br
|
50
|
-
%label
|
51
|
-
EntityMetadata:
|
52
|
-
%br
|
53
|
-
|
54
|
-
:javascript
|
55
|
-
function fixupXml(theNode) {
|
56
|
-
var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
|
57
|
-
xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
|
58
|
-
xmlData += getStandardData(theNode);
|
59
|
-
xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
|
60
|
-
xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value + "' units='";
|
61
|
-
xmlData += $(theNode.form).attr("memory_units").value + "' />"
|
62
|
-
|
63
|
-
var index=0;
|
64
|
-
|
65
|
-
xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
|
66
|
-
|
67
|
-
return xmlData;
|
68
|
-
}
|
@@ -1,17 +0,0 @@
|
|
1
|
-
- unless defined?(partial)
|
2
|
-
!!! XML
|
3
|
-
%Volume{ :xmlns => CMWG_NAMESPACE }
|
4
|
-
%uri=volumes_url + "/" + @dmtfitem["uri"]
|
5
|
-
%name=@dmtfitem["name"]
|
6
|
-
%description=@dmtfitem["description"]
|
7
|
-
%created=@dmtfitem["created"]
|
8
|
-
- if @dmtfitem["property"]
|
9
|
-
- if @dmtfitem["property"]["name"] && @dmtfitem["property"]["content"]
|
10
|
-
- property_object = {"#{@dmtfitem['property']['name']}" => {"content" => @dmtfitem["property"]["content"]}}
|
11
|
-
- else
|
12
|
-
- property_object = @dmtfitem["property"]
|
13
|
-
- property_object.each_pair do |key, value|
|
14
|
-
%property{ :name => key}=value["content"]
|
15
|
-
%capacity{ :quantity => @dmtfitem["capacity"]["quantity"], :units => @dmtfitem["capacity"]["units"]}
|
16
|
-
%operation{ :rel => "edit", :href => volumes_url + "/" + @dmtfitem["uri"] }
|
17
|
-
%operation{ :rel => "delete", :href => volumes_url + "/" + @dmtfitem["uri"] }
|
@@ -1,26 +0,0 @@
|
|
1
|
-
=header "Deltacloud API #{settings.version} documentation", :back => 'false'
|
2
|
-
=subheader @collection.name.to_s.titlecase
|
3
|
-
|
4
|
-
%div{ :'data-role' => :content, :'data-theme' => 'c'}
|
5
|
-
%ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
|
6
|
-
%li{ :'data-role' => 'list-divider'}
|
7
|
-
%h3
|
8
|
-
Collection description:
|
9
|
-
%li
|
10
|
-
%br
|
11
|
-
%p{ :'data-role' => 'fieldcontain'}=@collection.description
|
12
|
-
%li{ :'data-role' => 'list-divider', :'data-divider-theme' => 'a'}
|
13
|
-
%h3 Operations:
|
14
|
-
- @operations.keys.sort_by { |k| k.to_s }.each do |operation|
|
15
|
-
%li{ :'data-role' => 'list-divider'}
|
16
|
-
%a{:href => url_for("docs/#{@collection.name.to_s}/#{operation}"), :'data-ajax' => 'false'} #{operation}
|
17
|
-
%li
|
18
|
-
%br
|
19
|
-
%p=@operations[operation].description
|
20
|
-
%li{ :'data-role' => 'list-divider', :'data-divider-theme' => 'a'}
|
21
|
-
%h3 Defined features:
|
22
|
-
- @features.sort_by { |f| f.name.to_s }.each do |feature|
|
23
|
-
%li{ :'data-role' => 'list-divider'}=feature.name
|
24
|
-
%li
|
25
|
-
%br
|
26
|
-
%p=feature.description
|
@@ -1,14 +0,0 @@
|
|
1
|
-
%docs{:status => "unsupported"}
|
2
|
-
%collection{:url => url_for("docs/#{@collection.name}"), :name => "#{@collection.name}"}
|
3
|
-
%description #{@collection.description}
|
4
|
-
%operations
|
5
|
-
- @operations.keys.sort_by { |k| k.to_s }.each do |operation|
|
6
|
-
%operation{:url => url_for("#{@collection.name.to_s}"), :name => "#{operation}", :href => url_for("#{@operations[operation].path}"), :method => "#{@operations[operation].method}"}
|
7
|
-
%description #{@operations[operation].description}
|
8
|
-
- @operations[operation].each_param do |param|
|
9
|
-
%parameter{:name => "#{param.name}", :type => "#{param.type}"}
|
10
|
-
%class #{param.klass}
|
11
|
-
- unless param.options.empty?
|
12
|
-
%values
|
13
|
-
- param.options.each do |v|
|
14
|
-
%value #{v}
|
data/views/docs/index.html.haml
DELETED
@@ -1,11 +0,0 @@
|
|
1
|
-
=header "Deltacloud API #{settings.version} documentation", :back => 'false'
|
2
|
-
=subheader "Note: This documentation is autogenerated and thus not supported"
|
3
|
-
|
4
|
-
%div{ :'data-role' => :content, :'data-theme' => 'c'}
|
5
|
-
%ul{ :'data-role' => :listview, :'data-inset' => 'true'}
|
6
|
-
- collections.keys.sort_by { |k| k.to_s }.each do |collection|
|
7
|
-
%li
|
8
|
-
%a{:href => url_for("docs/#{collection}"), :'data-ajax' => 'false'}
|
9
|
-
%h3=collection.to_s.capitalize.tr('_', ' ')
|
10
|
-
%p=collections[collection].description
|
11
|
-
|
data/views/docs/index.xml.haml
DELETED
@@ -1,33 +0,0 @@
|
|
1
|
-
=header "Deltacloud API #{settings.version} documentation", :back => 'false'
|
2
|
-
=subheader "#{action_method(@operation.name, @collection.name).to_s.upcase} /api/#{@collection.name}/#{@operation.name}"
|
3
|
-
|
4
|
-
%div{ :'data-role' => :content, :'data-theme' => 'c'}
|
5
|
-
%ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
|
6
|
-
%li{ :'data-role' => 'list-divider'}
|
7
|
-
%h3
|
8
|
-
Description:
|
9
|
-
%li
|
10
|
-
%br
|
11
|
-
%p=@operation.description
|
12
|
-
|
13
|
-
%ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
|
14
|
-
%li{ :'data-role' => 'list-divider', :'data-divider-theme' => 'a'}
|
15
|
-
%h3 Parameters:
|
16
|
-
- @operation.each_param do |p|
|
17
|
-
%li{ :'data-role' => 'list-divider'}
|
18
|
-
=p.name
|
19
|
-
%span{ :class => 'ui-li-count'}
|
20
|
-
=[p.type,p.klass].join(',')
|
21
|
-
%li
|
22
|
-
%br
|
23
|
-
%p=p.description.empty? ? '<strong>FIXME:</strong> No description for this parameter' : p.description
|
24
|
-
- @features.sort { |a,b| a.name.to_s <=> b.name.to_s }.each do |f|
|
25
|
-
- f.decl.operation(@operation.name).each_param do |p|
|
26
|
-
%li{ :'data-role' => 'list-divider'}
|
27
|
-
=p.name
|
28
|
-
%span{ :class => 'ui-li-count'}
|
29
|
-
=[p.type,p.klass].join(',')
|
30
|
-
%li
|
31
|
-
%br
|
32
|
-
%p=p.description.empty? ? '<strong>FIXME:</strong> No description for this parameter' : p.description
|
33
|
-
|
@@ -1,10 +0,0 @@
|
|
1
|
-
%docs{:status => "unsupported"}
|
2
|
-
%operation{:url => url_for("docs/#{@collection.name.to_s}"), :name => "#{@operation.name.to_s}", :href => url_for("#{@operation.path}"), :method => "#{@operation.method}"}
|
3
|
-
%description #{@operation.description}
|
4
|
-
- @operation.each_param do |param|
|
5
|
-
%parameter{:name => "#{param.name}", :type => "#{param.type}"}
|
6
|
-
%class #{param.klass}
|
7
|
-
- unless param.options.empty?
|
8
|
-
%values
|
9
|
-
- param.options.each do |v|
|
10
|
-
%value #{v}
|
data/views/root/index.html.haml
DELETED