deltacloud-core 1.0.1 → 1.0.2
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +99 -141
- data/bin/deltacloudd +4 -1
- data/config.ru +13 -6
- data/config/drivers/aruba.yaml +8 -0
- data/config/drivers/fgcp.yaml +3 -2
- data/deltacloud-core.gemspec +13 -9
- data/lib/cimi/collections/cloud_entry_point.rb +1 -1
- data/lib/cimi/models.rb +1 -7
- data/lib/cimi/models/base.rb +1 -4
- data/lib/cimi/models/cloud_entry_point.rb +14 -0
- data/lib/cimi/models/machine.rb +4 -4
- data/lib/cimi/models/machine_admin.rb +1 -0
- data/lib/cimi/models/machine_configuration.rb +4 -4
- data/lib/cimi/models/schema.rb +17 -14
- data/lib/cimi/models/volume_image.rb +1 -1
- data/lib/cimi/server.rb +1 -1
- data/lib/deltacloud/api.rb +55 -3
- data/lib/deltacloud/collections/addresses.rb +1 -1
- data/lib/deltacloud/collections/buckets.rb +12 -10
- data/lib/deltacloud/collections/firewalls.rb +2 -1
- data/lib/deltacloud/collections/hardware_profiles.rb +1 -1
- data/lib/deltacloud/collections/images.rb +2 -2
- data/lib/deltacloud/collections/instance_states.rb +6 -3
- data/lib/deltacloud/collections/instances.rb +2 -1
- data/lib/deltacloud/collections/keys.rb +6 -2
- data/lib/deltacloud/collections/load_balancers.rb +8 -7
- data/lib/deltacloud/collections/metrics.rb +2 -1
- data/lib/deltacloud/collections/realms.rb +1 -1
- data/lib/deltacloud/collections/storage_snapshots.rb +2 -1
- data/lib/deltacloud/collections/storage_volumes.rb +2 -2
- data/lib/deltacloud/core_ext.rb +1 -7
- data/lib/deltacloud/core_ext/hash.rb +7 -5
- data/lib/deltacloud/core_ext/string.rb +1 -0
- data/lib/deltacloud/drivers/aruba/aruba_driver.rb +469 -0
- data/lib/deltacloud/drivers/base_driver.rb +12 -17
- data/lib/deltacloud/drivers/ec2/ec2_driver.rb +50 -22
- data/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb +1 -1
- data/lib/deltacloud/drivers/exceptions.rb +12 -2
- data/lib/deltacloud/drivers/features.rb +8 -0
- data/lib/deltacloud/drivers/fgcp/fgcp_client.rb +21 -6
- data/lib/deltacloud/drivers/fgcp/fgcp_driver.rb +169 -57
- data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb +1 -1
- data/lib/deltacloud/drivers/mock/mock_client.rb +2 -0
- data/lib/deltacloud/drivers/mock/mock_driver.rb +101 -13
- data/lib/deltacloud/drivers/opennebula/occi_client.rb +12 -6
- data/lib/deltacloud/drivers/opennebula/opennebula_driver.rb +10 -18
- data/lib/deltacloud/drivers/openstack/openstack_driver.rb +46 -1
- data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb +17 -17
- data/lib/deltacloud/drivers/vsphere/vsphere_driver.rb +4 -4
- data/lib/deltacloud/helpers.rb +4 -4
- data/lib/deltacloud/helpers/blob_stream_helper.rb +4 -6
- data/lib/deltacloud/helpers/deltacloud_helper.rb +17 -1
- data/lib/deltacloud/helpers/driver_helper.rb +7 -3
- data/lib/deltacloud/helpers/url_helper.rb +4 -4
- data/lib/deltacloud/models/address.rb +1 -1
- data/lib/deltacloud/models/base_model.rb +0 -14
- data/lib/deltacloud/models/bucket.rb +0 -10
- data/lib/deltacloud/models/hardware_profile.rb +5 -26
- data/lib/deltacloud/models/image.rb +0 -12
- data/lib/deltacloud/models/instance.rb +6 -22
- data/lib/deltacloud/models/key.rb +2 -2
- data/lib/deltacloud/models/metric.rb +1 -1
- data/lib/deltacloud/models/storage_snapshot.rb +4 -0
- data/lib/deltacloud/server.rb +8 -2
- data/lib/deltacloud_rack.rb +40 -10
- data/lib/ec2/query_parser.rb +9 -4
- data/lib/ec2/server.rb +1 -1
- data/lib/ec2/views/create_key_pair.haml +3 -0
- data/lib/ec2/views/delete_key_pair.haml +1 -0
- data/lib/ec2/views/describe_availability_zones.haml +6 -0
- data/lib/ec2/views/describe_images.haml +10 -0
- data/lib/ec2/views/describe_instance_set.haml +24 -0
- data/lib/ec2/views/describe_instances.haml +9 -0
- data/lib/ec2/views/describe_key_pairs.haml +5 -0
- data/lib/ec2/views/error.haml +4 -0
- data/lib/ec2/views/instance_action.haml +9 -0
- data/lib/ec2/views/reboot_instances.haml +1 -0
- data/lib/ec2/views/run_instances.haml +7 -0
- data/lib/ec2/views/start_instances.haml +1 -0
- data/lib/ec2/views/stop_instances.haml +1 -0
- data/lib/ec2/views/terminate_instances.haml +9 -0
- data/lib/sinatra.rb +0 -1
- data/lib/sinatra/rack_accept.rb +1 -1
- data/lib/sinatra/rack_driver_select.rb +2 -2
- data/lib/sinatra/rack_etag.rb +5 -1
- data/lib/sinatra/rack_logger.rb +127 -0
- data/lib/sinatra/rack_matrix_params.rb +1 -1
- data/tests/cimi/collections/cloud_entry_point_test.rb +46 -0
- data/tests/cimi/collections/common.rb +17 -0
- data/tests/cimi/collections/machine_images_test.rb +44 -0
- data/tests/cimi/collections/machines_test.rb +41 -0
- data/tests/cimi/spec/cimi/model/machine_admin_spec.rb +35 -0
- data/tests/cimi/spec/cimi/model/machine_configuration_spec.rb +31 -0
- data/tests/cimi/spec/cimi/model/machine_image_spec.rb +33 -0
- data/tests/cimi/spec/cimi/model/machine_spec.rb +32 -0
- data/tests/cimi/spec/cimi/model/machine_template_spec.rb +32 -0
- data/tests/cimi/spec/cimi/model/schema_spec.rb +245 -0
- data/tests/cimi/spec/cimi/model/volume_configuration_spec.rb +34 -0
- data/tests/cimi/spec/cimi/model/volume_image_spec.rb +33 -0
- data/tests/cimi/spec/cimi/model/volume_spec.rb +32 -0
- data/tests/cimi/spec/cimi/model/volume_template_spec.rb +32 -0
- data/tests/cimi/spec/spec_helper.rb +136 -0
- data/tests/deltacloud/base_collection_test.rb +30 -0
- data/tests/deltacloud/collections/buckets_collection_test.rb +65 -0
- data/tests/deltacloud/collections/drivers_collection_test.rb +37 -0
- data/tests/deltacloud/collections/hardware_profiles_collection_test.rb +53 -0
- data/tests/deltacloud/collections/images_collection_test.rb +59 -0
- data/tests/deltacloud/collections/instance_states_collection_test.rb +34 -0
- data/tests/deltacloud/collections/instances_collection_test.rb +63 -0
- data/tests/deltacloud/collections/keys_collection_test.rb +63 -0
- data/tests/deltacloud/collections_test.rb +35 -0
- data/tests/deltacloud/common.rb +14 -0
- data/tests/deltacloud/deltacloud_helper_test.rb +55 -0
- data/tests/deltacloud/drivers_test.rb +73 -0
- data/tests/deltacloud/rack_test.rb +51 -0
- data/tests/deltacloud/server_test.rb +149 -0
- data/tests/{api → deprecated/api}/common.rb +0 -0
- data/tests/{api → deprecated/api}/driver_test.rb +0 -0
- data/tests/deprecated/api/library_test.rb +6 -0
- data/tests/{cimi → deprecated/cimi}/features/step_definitions/common_steps.rb +0 -0
- data/tests/{cimi → deprecated/cimi}/features/step_definitions/machine_images_steps.rb +0 -0
- data/tests/{cimi → deprecated/cimi}/features/step_definitions/machines_steps.rb +0 -0
- data/tests/{cimi → deprecated/cimi}/features/step_definitions/volumes_steps.rb +0 -0
- data/tests/{cimi → deprecated/cimi}/features/support/env.rb +0 -0
- data/tests/{common.rb → deprecated/common.rb} +0 -0
- data/tests/{core_ext → deprecated/core_ext}/string.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/ec2/api_test.rb +0 -0
- data/tests/deprecated/drivers/ec2/common.rb +23 -0
- data/tests/{drivers → deprecated/drivers}/ec2/drivers_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/ec2/hardware_profiles_test.rb +0 -0
- data/tests/deprecated/drivers/ec2/images_test.rb +230 -0
- data/tests/{drivers → deprecated/drivers}/ec2/instances_test.rb +0 -0
- data/tests/deprecated/drivers/ec2/keys_test.rb +181 -0
- data/tests/deprecated/drivers/ec2/realms_test.rb +146 -0
- data/tests/{drivers → deprecated/drivers}/fgcp/api_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/fgcp/hardware_profiles_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/fgcp/realms_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/fgcp/setup.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/google/api_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/google/buckets_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/google/common.rb +2 -2
- data/tests/{drivers → deprecated/drivers}/mock/api_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/mock/buckets_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/mock/common.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/mock/drivers_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/mock/hardware_profiles_test.rb +0 -0
- data/tests/deprecated/drivers/mock/images_test.rb +197 -0
- data/tests/deprecated/drivers/mock/instances_test.rb +343 -0
- data/tests/deprecated/drivers/mock/keys_test.rb +161 -0
- data/tests/deprecated/drivers/mock/realms_test.rb +132 -0
- data/tests/deprecated/drivers/mock/storage_snapshots_test.rb +114 -0
- data/tests/deprecated/drivers/mock/storage_volumes_test.rb +122 -0
- data/tests/{drivers → deprecated/drivers}/openstack/api_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/openstack/common.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/openstack/hardware_profiles_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/openstack/images_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/openstack/instances_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/openstack/realms_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rackspace/api_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rackspace/buckets_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rackspace/common.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rackspace/hardware_profiles_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rackspace/images_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rackspace/instances_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rackspace/realms_test.rb +0 -0
- data/tests/{drivers → deprecated/drivers}/rhevm/api_test.rb +0 -0
- data/tests/deprecated/drivers/rhevm/common.rb +21 -0
- data/tests/{drivers → deprecated/drivers}/rhevm/hardware_profiles_test.rb +0 -0
- data/tests/deprecated/drivers/rhevm/images_test.rb +48 -0
- data/tests/{drivers → deprecated/drivers}/rhevm/instances_test.rb +0 -0
- data/tests/deprecated/drivers/rhevm/realms_test.rb +40 -0
- data/tests/{minitest_common.rb → deprecated/minitest_common.rb} +0 -0
- data/tests/{minitest_common_api_test.rb → deprecated/minitest_common_api_test.rb} +0 -0
- data/tests/{rabbit_test.rb → deprecated/rabbit_test.rb} +0 -0
- data/tests/drivers/base/base_driver_test.rb +124 -0
- data/tests/{api → drivers/base}/library_test.rb +2 -8
- data/tests/drivers/ec2/common.rb +23 -15
- data/tests/drivers/ec2/images_test.rb +30 -211
- data/tests/drivers/ec2/instance_test.rb +104 -0
- data/tests/drivers/ec2/keys_test.rb +32 -161
- data/tests/drivers/ec2/realms_test.rb +26 -128
- data/tests/drivers/ec2/storage_snapshots_test.rb +54 -0
- data/tests/drivers/mock/images_test.rb +37 -179
- data/tests/drivers/mock/instances_test.rb +103 -340
- data/tests/drivers/mock/keys_test.rb +30 -145
- data/tests/drivers/mock/realms_test.rb +23 -118
- data/tests/drivers/mock/storage_snapshots_test.rb +23 -100
- data/tests/drivers/mock/storage_volumes_test.rb +41 -104
- data/tests/drivers/models/address_test.rb +18 -0
- data/tests/drivers/models/base_test.rb +33 -0
- data/tests/drivers/models/blob_test.rb +18 -0
- data/tests/drivers/models/hardware_profile_test.rb +52 -0
- data/tests/drivers/models/instance_address_test.rb +24 -0
- data/tests/drivers/models/instance_profile_test.rb +21 -0
- data/tests/drivers/models/instance_test.rb +29 -0
- data/tests/drivers/models/keys_test.rb +25 -0
- data/tests/drivers/models/metrics_test.rb +20 -0
- data/tests/drivers/rhevm/common.rb +15 -15
- data/tests/drivers/rhevm/images_test.rb +61 -36
- data/tests/drivers/rhevm/instance_test.rb +104 -0
- data/tests/drivers/rhevm/provider_test.rb +48 -0
- data/tests/drivers/rhevm/realms_test.rb +40 -37
- data/tests/ec2/common.rb +24 -0
- data/tests/ec2/query_parser_test.rb +98 -0
- data/tests/ec2/server_test.rb +45 -0
- data/tests/helpers/core_ext/array_test.rb +24 -0
- data/tests/helpers/core_ext/hash_test.rb +42 -0
- data/tests/helpers/core_ext/integer_test.rb +19 -0
- data/tests/helpers/core_ext/string_test.rb +74 -0
- data/tests/test_helper.rb +66 -0
- data/views/api/show.html.haml +1 -2
- data/views/api/show.xml.haml +1 -2
- data/views/blobs/show.xml.haml +1 -2
- data/views/keys/new.html.haml +9 -2
- data/views/load_balancers/new.html.haml +35 -34
- data/views/metrics/index.html.haml +1 -1
- data/views/metrics/show.html.haml +2 -2
- data/views/metrics/show.xml.haml +6 -2
- data/views/storage_volumes/attach.html.haml +1 -1
- data/views/storage_volumes/show.html.haml +1 -1
- metadata +853 -544
- data/lib/sinatra/accept_media_types.rb +0 -154
@@ -0,0 +1,41 @@
|
|
1
|
+
require 'rubygems'
|
2
|
+
require 'require_relative' if RUBY_VERSION < '1.9'
|
3
|
+
require 'minitest/autorun'
|
4
|
+
require_relative './common.rb'
|
5
|
+
|
6
|
+
describe CIMI::Collections::Machines do
|
7
|
+
|
8
|
+
before do
|
9
|
+
def app; CIMI::API; end
|
10
|
+
authorize 'mockuser', 'mockpassword'
|
11
|
+
@collection = CIMI::Collections.collection(:machines)
|
12
|
+
end
|
13
|
+
|
14
|
+
it 'has index operation' do
|
15
|
+
@collection.operation(:index).must_equal Sinatra::Rabbit::MachinesCollection::IndexOperation
|
16
|
+
end
|
17
|
+
|
18
|
+
it 'has show operation' do
|
19
|
+
@collection.operation(:show).must_equal Sinatra::Rabbit::MachinesCollection::ShowOperation
|
20
|
+
end
|
21
|
+
|
22
|
+
it 'returns list of machines in various formats with index operation' do
|
23
|
+
formats.each do |format|
|
24
|
+
header 'Accept', format
|
25
|
+
get root_url + '/machines'
|
26
|
+
status.must_equal 200
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
it 'should allow to retrieve the single machine' do
|
31
|
+
get root_url '/machines/inst1'
|
32
|
+
status.must_equal 200
|
33
|
+
xml.root.name.must_equal 'Machine'
|
34
|
+
end
|
35
|
+
|
36
|
+
it 'should not return non-existing machine' do
|
37
|
+
get root_url '/machines/unknown-machine'
|
38
|
+
status.must_equal 404
|
39
|
+
end
|
40
|
+
|
41
|
+
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
|
+
|
17
|
+
require 'rubygems'
|
18
|
+
require 'require_relative' if RUBY_VERSION < '1.9'
|
19
|
+
|
20
|
+
if require 'minitest/autorun'
|
21
|
+
require_relative '../../spec_helper.rb'
|
22
|
+
end
|
23
|
+
|
24
|
+
describe "MachineAdmin model" do
|
25
|
+
|
26
|
+
before do
|
27
|
+
@xml = IO::read(File::join(DATA_DIR, "machine_admin.xml"))
|
28
|
+
@json = IO::read(File::join(DATA_DIR, "machine_admin.json"))
|
29
|
+
end
|
30
|
+
|
31
|
+
it "can be constructed from XML and JSON" do
|
32
|
+
should_properly_serialize_model CIMI::Model::MachineAdmin, @xml, @json
|
33
|
+
end
|
34
|
+
|
35
|
+
end
|
@@ -0,0 +1,31 @@
|
|
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
|
+
require 'rubygems'
|
17
|
+
require 'require_relative' if RUBY_VERSION < '1.9'
|
18
|
+
require_relative '../../spec_helper.rb' if require 'minitest/autorun'
|
19
|
+
|
20
|
+
describe "MachineConfiguration model" do
|
21
|
+
|
22
|
+
before do
|
23
|
+
@xml = IO::read(File::join(DATA_DIR, "machine_configuration.xml"))
|
24
|
+
@json = IO::read(File::join(DATA_DIR, "machine_configuration.json"))
|
25
|
+
end
|
26
|
+
|
27
|
+
it "can be constructed from XML and JSON" do
|
28
|
+
should_properly_serialize_model CIMI::Model::MachineConfiguration, @xml, @json
|
29
|
+
end
|
30
|
+
|
31
|
+
end
|
@@ -0,0 +1,33 @@
|
|
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
|
+
require 'rubygems'
|
17
|
+
require 'require_relative' if RUBY_VERSION < '1.9'
|
18
|
+
|
19
|
+
require_relative '../../spec_helper.rb' if require 'minitest/autorun'
|
20
|
+
|
21
|
+
describe "MachineImage model" do
|
22
|
+
|
23
|
+
before do
|
24
|
+
@xml = IO::read(File::join(DATA_DIR, "machine_image.xml"))
|
25
|
+
@json = IO::read(File::join(DATA_DIR, "machine_image.json"))
|
26
|
+
end
|
27
|
+
|
28
|
+
it "can be constructed from XML and JSON" do
|
29
|
+
should_properly_serialize_model CIMI::Model::MachineImage, @xml, @json
|
30
|
+
end
|
31
|
+
|
32
|
+
|
33
|
+
end
|
@@ -0,0 +1,32 @@
|
|
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
|
+
require 'rubygems'
|
17
|
+
require 'require_relative' if RUBY_VERSION < '1.9'
|
18
|
+
|
19
|
+
require_relative '../../spec_helper.rb' if require 'minitest/autorun'
|
20
|
+
|
21
|
+
describe "Machine model" do
|
22
|
+
|
23
|
+
before do
|
24
|
+
@xml = IO::read(File::join(DATA_DIR, "machine.xml"))
|
25
|
+
@json = IO::read(File::join(DATA_DIR, "machine.json"))
|
26
|
+
end
|
27
|
+
|
28
|
+
it "can be constructed from XML and JSON" do
|
29
|
+
should_properly_serialize_model CIMI::Model::Machine, @xml, @json
|
30
|
+
end
|
31
|
+
|
32
|
+
end
|
@@ -0,0 +1,32 @@
|
|
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
|
+
require 'rubygems'
|
17
|
+
require 'require_relative' if RUBY_VERSION < '1.9'
|
18
|
+
|
19
|
+
require_relative '../../spec_helper.rb' if require 'minitest/autorun'
|
20
|
+
|
21
|
+
describe "MachineTemplate model" do
|
22
|
+
|
23
|
+
before do
|
24
|
+
@xml = IO::read(File::join(DATA_DIR, "machine_template.xml"))
|
25
|
+
@json = IO::read(File::join(DATA_DIR, "machine_template.json"))
|
26
|
+
end
|
27
|
+
|
28
|
+
it "can be constructed from XML and JSON" do
|
29
|
+
should_properly_serialize_model CIMI::Model::MachineTemplate, @xml, @json
|
30
|
+
end
|
31
|
+
|
32
|
+
end
|
@@ -0,0 +1,245 @@
|
|
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
|
+
require 'rubygems'
|
17
|
+
require 'require_relative' if RUBY_VERSION < '1.9'
|
18
|
+
|
19
|
+
require_relative '../../spec_helper.rb' if require 'minitest/autorun'
|
20
|
+
|
21
|
+
describe "Schema" do
|
22
|
+
before do
|
23
|
+
@schema = CIMI::Model::Schema.new
|
24
|
+
end
|
25
|
+
|
26
|
+
it "does not allow adding attributes after being used for conversion" do
|
27
|
+
@schema.scalar(:before)
|
28
|
+
@schema.from_json({})
|
29
|
+
lambda { @schema.scalar(:after) }.must_raise RuntimeError, 'The schema has already been used to convert objects'
|
30
|
+
end
|
31
|
+
|
32
|
+
describe "scalars" do
|
33
|
+
before(:each) do
|
34
|
+
@schema.scalar(:attr)
|
35
|
+
@schema.text(:camel_hump)
|
36
|
+
|
37
|
+
@schema.attribute_names.must_equal [:attr, :camel_hump]
|
38
|
+
end
|
39
|
+
|
40
|
+
let :sample_xml do
|
41
|
+
parse_xml("<camelHump>bumpy</camelHump>", :keep_root => true)
|
42
|
+
end
|
43
|
+
|
44
|
+
it "should camel case attribute names for JSON" do
|
45
|
+
obj = @schema.from_json("camelHump" => "bumpy")
|
46
|
+
obj.wont_be_nil
|
47
|
+
obj[:camel_hump].must_equal "bumpy"
|
48
|
+
|
49
|
+
json = @schema.to_json(obj)
|
50
|
+
json['camelHump'].must_equal "bumpy"
|
51
|
+
end
|
52
|
+
|
53
|
+
it "should camel case attribute names for XML" do
|
54
|
+
obj = @schema.from_xml(sample_xml)
|
55
|
+
|
56
|
+
obj.wont_be_nil
|
57
|
+
obj[:camel_hump].must_equal "bumpy"
|
58
|
+
|
59
|
+
xml = @schema.to_xml(obj)
|
60
|
+
|
61
|
+
xml['camelHump'].must_equal [{ "content" => "bumpy" }]
|
62
|
+
end
|
63
|
+
|
64
|
+
it "should allow aliasing the XML and JSON name" do
|
65
|
+
@schema.scalar :aliased, :xml_name => "xml", :json_name => "json"
|
66
|
+
obj = @schema.from_xml({"aliased" => "no", "xml" => "yes"}, {})
|
67
|
+
obj[:aliased].must_equal "yes"
|
68
|
+
|
69
|
+
obj = @schema.from_json({"aliased" => "no", "json" => "yes"}, {})
|
70
|
+
obj[:aliased].must_equal "yes"
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
describe "hrefs" do
|
75
|
+
before do
|
76
|
+
@schema.href(:meter)
|
77
|
+
end
|
78
|
+
|
79
|
+
it "should extract the href attribute from XML" do
|
80
|
+
xml = parse_xml("<meter href='http://example.org/'/>")
|
81
|
+
|
82
|
+
obj = @schema.from_xml(xml)
|
83
|
+
check obj
|
84
|
+
@schema.to_xml(obj).must_equal xml
|
85
|
+
end
|
86
|
+
|
87
|
+
it "should extract the href attribute from JSON" do
|
88
|
+
json = { "meter" => { "href" => "http://example.org/" } }
|
89
|
+
|
90
|
+
obj = @schema.from_json(json)
|
91
|
+
check obj
|
92
|
+
@schema.to_json(obj).must_equal json
|
93
|
+
end
|
94
|
+
|
95
|
+
def check(obj)
|
96
|
+
obj.wont_be_nil
|
97
|
+
obj[:meter].href.must_equal 'http://example.org/'
|
98
|
+
end
|
99
|
+
end
|
100
|
+
|
101
|
+
describe "structs" do
|
102
|
+
before do
|
103
|
+
@schema.struct(:struct, :content => :scalar) do
|
104
|
+
scalar :href
|
105
|
+
end
|
106
|
+
@schema.attribute_names.must_equal [:struct]
|
107
|
+
end
|
108
|
+
|
109
|
+
let(:sample_json) do
|
110
|
+
{ "struct" => { "scalar" => "v1", "href" => "http://example.org/" } }
|
111
|
+
end
|
112
|
+
|
113
|
+
let (:sample_xml) do
|
114
|
+
parse_xml("<struct href='http://example.org/'>v1</struct>")
|
115
|
+
end
|
116
|
+
|
117
|
+
let (:sample_xml_no_href) do
|
118
|
+
parse_xml("<struct>v1</struct>")
|
119
|
+
end
|
120
|
+
|
121
|
+
describe "JSON conversion" do
|
122
|
+
it "should convert empty hash" do
|
123
|
+
model = @schema.from_json({ })
|
124
|
+
check_empty_struct model
|
125
|
+
@schema.to_json(model).keys.must_be_empty
|
126
|
+
end
|
127
|
+
|
128
|
+
it "should convert empty body" do
|
129
|
+
model = @schema.from_json({ "struct" => { } })
|
130
|
+
check_empty_struct model
|
131
|
+
@schema.to_json(model).keys.must_be_empty
|
132
|
+
end
|
133
|
+
|
134
|
+
it "should convert values" do
|
135
|
+
model = @schema.from_json(sample_json)
|
136
|
+
check_struct model
|
137
|
+
@schema.to_json(model).must_equal sample_json
|
138
|
+
end
|
139
|
+
end
|
140
|
+
|
141
|
+
describe "XML conversion" do
|
142
|
+
it "should convert empty hash" do
|
143
|
+
model = @schema.from_xml({ })
|
144
|
+
check_empty_struct model
|
145
|
+
@schema.to_xml(model).keys.must_be_empty
|
146
|
+
end
|
147
|
+
|
148
|
+
it "should convert empty body" do
|
149
|
+
model = @schema.from_json({ "struct" => { } })
|
150
|
+
check_empty_struct model
|
151
|
+
@schema.to_xml(model).keys.must_be_empty
|
152
|
+
end
|
153
|
+
|
154
|
+
it "should convert values" do
|
155
|
+
model = @schema.from_xml(sample_xml)
|
156
|
+
check_struct model
|
157
|
+
@schema.to_xml(model).must_equal sample_xml
|
158
|
+
end
|
159
|
+
|
160
|
+
it "should handle missing attributes" do
|
161
|
+
model = @schema.from_xml(sample_xml_no_href)
|
162
|
+
check_struct model, :nil_href => true
|
163
|
+
@schema.to_xml(model).must_equal sample_xml_no_href
|
164
|
+
end
|
165
|
+
end
|
166
|
+
|
167
|
+
def check_struct(obj, opts = {})
|
168
|
+
obj.wont_be_nil
|
169
|
+
obj[:struct].wont_be_nil
|
170
|
+
obj[:struct].scalar.must_equal "v1"
|
171
|
+
if opts[:nil_href]
|
172
|
+
obj[:struct].href.must_be_nil
|
173
|
+
else
|
174
|
+
obj[:struct].href.must_equal "http://example.org/"
|
175
|
+
end
|
176
|
+
end
|
177
|
+
|
178
|
+
def check_empty_struct(obj)
|
179
|
+
obj.wont_be_nil
|
180
|
+
obj[:struct].wont_be_nil
|
181
|
+
obj[:struct].scalar.must_be_nil
|
182
|
+
obj[:struct].href.must_be_nil
|
183
|
+
end
|
184
|
+
end
|
185
|
+
|
186
|
+
describe "arrays" do
|
187
|
+
before do
|
188
|
+
@schema.array(:structs, :content => :scalar) do
|
189
|
+
scalar :href
|
190
|
+
end
|
191
|
+
end
|
192
|
+
|
193
|
+
let(:sample_json) do
|
194
|
+
{ "structs" => [{ "scalar" => "v1", "href" => "http://example.org/1" },
|
195
|
+
{ "scalar" => "v2", "href" => "http://example.org/2" }] }
|
196
|
+
end
|
197
|
+
|
198
|
+
let (:sample_xml) do
|
199
|
+
parse_xml("<wrapper>
|
200
|
+
<struct href='http://example.org/1'>v1</struct>
|
201
|
+
<struct href='http://example.org/2'>v2</struct>
|
202
|
+
</wrapper>", :keep_root => false)
|
203
|
+
end
|
204
|
+
|
205
|
+
it "should convert missing array from JSON" do
|
206
|
+
obj = @schema.from_json({})
|
207
|
+
|
208
|
+
obj.wont_be_nil
|
209
|
+
obj[:structs].must_be_empty
|
210
|
+
@schema.to_json(obj).keys.must_be_empty
|
211
|
+
end
|
212
|
+
|
213
|
+
it "should convert empty array from JSON" do
|
214
|
+
obj = @schema.from_json("structs" => [])
|
215
|
+
|
216
|
+
obj.wont_be_nil
|
217
|
+
obj[:structs].must_be_empty
|
218
|
+
@schema.to_json(obj).keys.must_be_empty
|
219
|
+
end
|
220
|
+
|
221
|
+
it "should convert arrays from JSON" do
|
222
|
+
obj = @schema.from_json(sample_json)
|
223
|
+
|
224
|
+
check_structs(obj)
|
225
|
+
@schema.to_json(obj).must_equal sample_json
|
226
|
+
end
|
227
|
+
|
228
|
+
it "should convert arrays from XML" do
|
229
|
+
obj = @schema.from_xml(sample_xml)
|
230
|
+
|
231
|
+
check_structs(obj)
|
232
|
+
@schema.to_xml(obj).must_equal sample_xml
|
233
|
+
end
|
234
|
+
|
235
|
+
def check_structs(obj)
|
236
|
+
obj.wont_be_nil
|
237
|
+
obj[:structs].size.must_equal 2
|
238
|
+
obj[:structs][0].scalar.must_equal "v1"
|
239
|
+
obj[:structs][0].href.must_equal "http://example.org/1"
|
240
|
+
obj[:structs][1].scalar.must_equal "v2"
|
241
|
+
obj[:structs][1].href.must_equal "http://example.org/2"
|
242
|
+
end
|
243
|
+
end
|
244
|
+
|
245
|
+
end
|