occi-core 4.3.6 → 5.0.0.alpha.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.fasterer.yml +3 -0
- data/.gitignore +9 -16
- data/.rspec +1 -1
- data/.rubocop.yml +69 -0
- data/.travis.yml +27 -0
- data/AUTHORS +8 -6
- data/CHANGELOG.md +0 -0
- data/Gemfile +1 -1
- data/LICENSE +1 -1
- data/README.md +25 -170
- data/Rakefile +25 -17
- data/examples/initialize_model.rb +10 -0
- data/examples/parse_action_instance_json.rb +15 -0
- data/examples/parse_action_instance_text.rb +15 -0
- data/examples/parse_categories_json.rb +15 -0
- data/examples/parse_categories_text.rb +15 -0
- data/examples/parse_instance_json.rb +15 -0
- data/examples/parse_instance_text.rb +15 -0
- data/examples/parse_model_json.rb +9 -0
- data/examples/parse_model_text.rb +9 -0
- data/examples/render_action_instance_json.rb +17 -0
- data/examples/render_action_instance_text.rb +17 -0
- data/examples/render_instance_json.rb +20 -0
- data/examples/render_instance_text.rb +20 -0
- data/examples/render_model_json.rb +12 -0
- data/examples/render_model_text.rb +12 -0
- data/examples/rendering/action_instance.json +6 -0
- data/examples/rendering/action_instance.txt +2 -0
- data/examples/rendering/categories.json +78 -0
- data/examples/rendering/categories.txt +4 -0
- data/examples/rendering/instance.json +70 -0
- data/examples/rendering/instance.txt +12 -0
- data/examples/rendering/model.alt.json +1716 -0
- data/examples/rendering/model.json +785 -0
- data/examples/rendering/model.txt +68 -0
- data/lib/occi/core/action.rb +12 -26
- data/lib/occi/core/action_instance.rb +109 -65
- data/lib/occi/core/attribute.rb +136 -0
- data/lib/occi/core/attribute_definition.rb +269 -0
- data/lib/occi/core/category.rb +110 -83
- data/lib/occi/core/collection.rb +255 -0
- data/lib/occi/core/constants.rb +14 -0
- data/lib/occi/core/entity.rb +301 -195
- data/lib/occi/core/errors/.gitkeep +0 -0
- data/lib/occi/core/errors/attribute_definition_error.rb +11 -0
- data/lib/occi/core/errors/attribute_validation_error.rb +13 -0
- data/lib/occi/core/errors/category_validation_error.rb +13 -0
- data/lib/occi/core/errors/collection_lookup_error.rb +11 -0
- data/lib/occi/core/errors/instance_validation_error.rb +13 -0
- data/lib/occi/core/errors/mandatory_argument_error.rb +11 -0
- data/lib/occi/core/errors/model_lookup_error.rb +11 -0
- data/lib/occi/core/errors/parser_error.rb +11 -0
- data/lib/occi/core/errors/parsing_error.rb +11 -0
- data/lib/occi/core/errors/renderer_error.rb +11 -0
- data/lib/occi/core/errors/rendering_error.rb +11 -0
- data/lib/occi/core/errors/validation_error.rb +11 -0
- data/lib/occi/core/errors.rb +9 -0
- data/lib/occi/core/helpers/.gitkeep +0 -0
- data/lib/occi/core/helpers/argument_validator.rb +27 -0
- data/lib/occi/core/helpers/attributes_accessor.rb +22 -0
- data/lib/occi/core/helpers/error_handler.rb +29 -0
- data/lib/occi/core/helpers/hash_dereferencer.rb +149 -0
- data/lib/occi/core/helpers/identifier_validator.rb +135 -0
- data/lib/occi/core/helpers/instance_attribute_resetter.rb +131 -0
- data/lib/occi/core/helpers/instance_attributes_accessor.rb +30 -0
- data/lib/occi/core/helpers/locatable.rb +40 -0
- data/lib/occi/core/helpers/parser_dereferencer.rb +96 -0
- data/lib/occi/core/helpers/raw_json_parser.rb +18 -0
- data/lib/occi/core/helpers/renderable.rb +93 -0
- data/lib/occi/core/helpers/yaml_summoner.rb +44 -0
- data/lib/occi/core/helpers.rb +13 -0
- data/lib/occi/core/instance_builder.rb +162 -0
- data/lib/occi/core/kind.rb +100 -132
- data/lib/occi/core/link.rb +47 -72
- data/lib/occi/core/mixin.rb +76 -61
- data/lib/occi/core/model.rb +341 -0
- data/lib/occi/core/parsers/.gitkeep +0 -0
- data/lib/occi/core/parsers/base_parser.rb +168 -0
- data/lib/occi/core/parsers/json/.gitkeep +0 -0
- data/lib/occi/core/parsers/json/action_instance.rb +36 -0
- data/lib/occi/core/parsers/json/category.rb +113 -0
- data/lib/occi/core/parsers/json/entity.rb +156 -0
- data/lib/occi/core/parsers/json/validator/.gitkeep +0 -0
- data/lib/occi/core/parsers/json/validator/action-instance.json +3 -0
- data/lib/occi/core/parsers/json/validator/entity-collection.json +3 -0
- data/lib/occi/core/parsers/json/validator/link-collection.json +3 -0
- data/lib/occi/core/parsers/json/validator/link.json +3 -0
- data/lib/occi/core/parsers/json/validator/locations.json +3 -0
- data/lib/occi/core/parsers/json/validator/mixin-collection.json +3 -0
- data/lib/occi/core/parsers/json/validator/model.json +3 -0
- data/lib/occi/core/parsers/json/validator/occi-schema.json +277 -0
- data/lib/occi/core/parsers/json/validator/resource-collection.json +3 -0
- data/lib/occi/core/parsers/json/validator/resource.json +3 -0
- data/lib/occi/core/parsers/json/validator.rb +87 -0
- data/lib/occi/core/parsers/json_parser.rb +128 -0
- data/lib/occi/core/parsers/text/.gitkeep +0 -0
- data/lib/occi/core/parsers/text/category.rb +183 -0
- data/lib/occi/core/parsers/text/constants.rb +89 -0
- data/lib/occi/core/parsers/text/entity.rb +257 -0
- data/lib/occi/core/parsers/text/location.rb +48 -0
- data/lib/occi/core/parsers/text_parser.rb +257 -0
- data/lib/occi/core/parsers.rb +18 -0
- data/lib/occi/core/renderer_factory.rb +213 -0
- data/lib/occi/core/renderers/.gitkeep +0 -0
- data/lib/occi/core/renderers/base_renderer.rb +81 -0
- data/lib/occi/core/renderers/json/.gitkeep +0 -0
- data/lib/occi/core/renderers/json/action_instance.rb +24 -0
- data/lib/occi/core/renderers/json/attributes.rb +50 -0
- data/lib/occi/core/renderers/json/base.rb +46 -0
- data/lib/occi/core/renderers/json/category.rb +85 -0
- data/lib/occi/core/renderers/json/collection.rb +52 -0
- data/lib/occi/core/renderers/json/instance.rb +39 -0
- data/lib/occi/core/renderers/json/link.rb +48 -0
- data/lib/occi/core/renderers/json/model.rb +26 -0
- data/lib/occi/core/renderers/json/resource.rb +27 -0
- data/lib/occi/core/renderers/json_renderer.rb +72 -0
- data/lib/occi/core/renderers/text/.gitkeep +0 -0
- data/lib/occi/core/renderers/text/action_instance.rb +36 -0
- data/lib/occi/core/renderers/text/attributes.rb +87 -0
- data/lib/occi/core/renderers/text/base.rb +82 -0
- data/lib/occi/core/renderers/text/category.rb +183 -0
- data/lib/occi/core/renderers/text/collection.rb +65 -0
- data/lib/occi/core/renderers/text/instance.rb +44 -0
- data/lib/occi/core/renderers/text/link.rb +40 -0
- data/lib/occi/core/renderers/text/model.rb +41 -0
- data/lib/occi/core/renderers/text/resource.rb +109 -0
- data/lib/occi/core/renderers/text_renderer.rb +72 -0
- data/lib/occi/core/renderers.rb +20 -0
- data/lib/occi/core/resource.rb +93 -57
- data/lib/occi/core/utils/.gitkeep +0 -0
- data/lib/occi/core/version.rb +17 -0
- data/lib/occi/core/warehouse/actions/.gitkeep +0 -0
- data/lib/occi/core/warehouse/actions/attributes/.gitkeep +0 -0
- data/lib/occi/core/warehouse/kinds/.gitkeep +0 -0
- data/lib/occi/core/warehouse/kinds/attributes/.gitkeep +0 -0
- data/lib/occi/core/warehouse/kinds/attributes/occi.core.id.yml +7 -0
- data/lib/occi/core/warehouse/kinds/attributes/occi.core.source.yml +7 -0
- data/lib/occi/core/warehouse/kinds/attributes/occi.core.summary.yml +7 -0
- data/lib/occi/core/warehouse/kinds/attributes/occi.core.target.yml +7 -0
- data/lib/occi/core/warehouse/kinds/attributes/occi.core.title.yml +7 -0
- data/lib/occi/core/warehouse/kinds/entity.yml +10 -0
- data/lib/occi/core/warehouse/kinds/link.yml +10 -0
- data/lib/occi/core/warehouse/kinds/resource.yml +9 -0
- data/lib/occi/core/warehouse/mixins/.gitkeep +0 -0
- data/lib/occi/core/warehouse/mixins/attributes/.gitkeep +0 -0
- data/lib/occi/core/warehouse.rb +115 -0
- data/lib/occi/core.rb +59 -23
- data/lib/occi/infrastructure/compute.rb +5 -122
- data/lib/occi/infrastructure/constants.rb +25 -0
- data/lib/occi/infrastructure/instance_builder.rb +24 -0
- data/lib/occi/infrastructure/mixins/.gitkeep +0 -0
- data/lib/occi/infrastructure/mixins/os_tpl.rb +19 -0
- data/lib/occi/infrastructure/mixins/resource_tpl.rb +19 -0
- data/lib/occi/infrastructure/mixins.rb +12 -0
- data/lib/occi/infrastructure/model.rb +27 -0
- data/lib/occi/infrastructure/network.rb +5 -104
- data/lib/occi/infrastructure/networkinterface.rb +5 -100
- data/lib/occi/infrastructure/storage.rb +5 -59
- data/lib/occi/infrastructure/storagelink.rb +5 -54
- data/lib/occi/infrastructure/version.rb +5 -0
- data/lib/occi/infrastructure/warehouse/actions/.gitkeep +0 -0
- data/lib/occi/infrastructure/warehouse/actions/attributes/.gitkeep +0 -0
- data/lib/occi/infrastructure/warehouse/actions/compute_restart.yml +12 -0
- data/lib/occi/infrastructure/warehouse/actions/compute_save.yml +19 -0
- data/lib/occi/infrastructure/warehouse/actions/compute_start.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/compute_stop.yml +12 -0
- data/lib/occi/infrastructure/warehouse/actions/compute_suspend.yml +12 -0
- data/lib/occi/infrastructure/warehouse/actions/network_down.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/network_up.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/networkinterface_down.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/networkinterface_up.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/storage_backup.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/storage_offline.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/storage_online.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/storage_resize.yml +12 -0
- data/lib/occi/infrastructure/warehouse/actions/storage_snapshot.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/storagelink_offline.yml +4 -0
- data/lib/occi/infrastructure/warehouse/actions/storagelink_online.yml +4 -0
- data/lib/occi/infrastructure/warehouse/kinds/.gitkeep +0 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/.gitkeep +0 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.architecture.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.cores.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.hostname.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.memory.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.speed.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.compute.state.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.network.label.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.network.state.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.network.vlan.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.networkinterface.interface.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.networkinterface.mac.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.networkinterface.state.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storage.size.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storage.state.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storagelink.deviceid.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storagelink.mountpoint.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/attributes/occi.storagelink.state.yml +7 -0
- data/lib/occi/infrastructure/warehouse/kinds/compute.yml +19 -0
- data/lib/occi/infrastructure/warehouse/kinds/network.yml +13 -0
- data/lib/occi/infrastructure/warehouse/kinds/networkinterface.yml +13 -0
- data/lib/occi/infrastructure/warehouse/kinds/storage.yml +15 -0
- data/lib/occi/infrastructure/warehouse/kinds/storagelink.yml +13 -0
- data/lib/occi/infrastructure/warehouse/mixins/.gitkeep +0 -0
- data/lib/occi/infrastructure/warehouse/mixins/attributes/.gitkeep +0 -0
- data/lib/occi/infrastructure/warehouse/mixins/attributes/occi.network.address.yml +7 -0
- data/lib/occi/infrastructure/warehouse/mixins/attributes/occi.network.allocation.yml +7 -0
- data/lib/occi/infrastructure/warehouse/mixins/attributes/occi.network.gateway.yml +7 -0
- data/lib/occi/infrastructure/warehouse/mixins/attributes/occi.networkinterface.address.yml +7 -0
- data/lib/occi/infrastructure/warehouse/mixins/attributes/occi.networkinterface.allocation.yml +7 -0
- data/lib/occi/infrastructure/warehouse/mixins/attributes/occi.networkinterface.gateway.yml +7 -0
- data/lib/occi/infrastructure/warehouse/mixins/ipnetwork.yml +11 -0
- data/lib/occi/infrastructure/warehouse/mixins/ipnetworkinterface.yml +11 -0
- data/lib/occi/infrastructure/warehouse.rb +20 -0
- data/lib/occi/infrastructure-ext.rb +35 -0
- data/lib/occi/infrastructure.rb +34 -19
- data/lib/occi/infrastructure_ext/constants.rb +20 -0
- data/lib/occi/infrastructure_ext/instance_builder.rb +22 -0
- data/lib/occi/infrastructure_ext/ipreservation.rb +9 -0
- data/lib/occi/infrastructure_ext/mixins/.gitkeep +0 -0
- data/lib/occi/infrastructure_ext/mixins/availability_zone.rb +19 -0
- data/lib/occi/infrastructure_ext/mixins.rb +12 -0
- data/lib/occi/infrastructure_ext/model.rb +26 -0
- data/lib/occi/infrastructure_ext/securitygroup.rb +9 -0
- data/lib/occi/infrastructure_ext/securitygrouplink.rb +9 -0
- data/lib/occi/infrastructure_ext/version.rb +5 -0
- data/lib/occi/infrastructure_ext/warehouse/actions/.gitkeep +0 -0
- data/lib/occi/infrastructure_ext/warehouse/actions/attributes/.gitkeep +0 -0
- data/lib/occi/infrastructure_ext/warehouse/actions/ipreservation_down.yml +4 -0
- data/lib/occi/infrastructure_ext/warehouse/actions/ipreservation_up.yml +4 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/.gitkeep +0 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/.gitkeep +0 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.ipreservation.address.yml +7 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.ipreservation.state.yml +7 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.ipreservation.used.yml +7 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.securitygroup.rules.yml +7 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.securitygroup.state.yml +7 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/attributes/occi.securitygrouplink.state.yml +7 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/ipreservation.yml +13 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/securitygroup.yml +9 -0
- data/lib/occi/infrastructure_ext/warehouse/kinds/securitygrouplink.yml +8 -0
- data/lib/occi/infrastructure_ext/warehouse/mixins/.gitkeep +0 -0
- data/lib/occi/infrastructure_ext/warehouse/mixins/attributes/.gitkeep +0 -0
- data/lib/occi/infrastructure_ext/warehouse.rb +20 -0
- data/lib/occi/monkey_island/boolean.rb +6 -0
- data/lib/occi/monkey_island/hash.rb +4 -0
- data/occi-core.gemspec +26 -26
- metadata +312 -243
- data/.yardopts +0 -1
- data/config/occi.yml +0 -4
- data/lib/occi/collection.rb +0 -265
- data/lib/occi/core/actions.rb +0 -21
- data/lib/occi/core/attributes.rb +0 -411
- data/lib/occi/core/categories.rb +0 -64
- data/lib/occi/core/dependencies.rb +0 -7
- data/lib/occi/core/entities.rb +0 -48
- data/lib/occi/core/kinds.rb +0 -22
- data/lib/occi/core/links.rb +0 -37
- data/lib/occi/core/mixins.rb +0 -37
- data/lib/occi/core/properties.rb +0 -108
- data/lib/occi/core/resources.rb +0 -14
- data/lib/occi/errors/attribute_definitions_converted_error.rb +0 -5
- data/lib/occi/errors/attribute_missing_error.rb +0 -5
- data/lib/occi/errors/attribute_name_invalid_error.rb +0 -5
- data/lib/occi/errors/attribute_not_defined_error.rb +0 -5
- data/lib/occi/errors/attribute_property_type_error.rb +0 -5
- data/lib/occi/errors/attribute_type_error.rb +0 -5
- data/lib/occi/errors/category_not_defined_error.rb +0 -5
- data/lib/occi/errors/kind_not_defined_error.rb +0 -5
- data/lib/occi/errors/parser_input_error.rb +0 -5
- data/lib/occi/errors/parser_type_error.rb +0 -5
- data/lib/occi/errors.rb +0 -1
- data/lib/occi/extensions/hashie.rb +0 -25
- data/lib/occi/helpers/comparators/action_instance.rb +0 -22
- data/lib/occi/helpers/comparators/attributes.rb +0 -22
- data/lib/occi/helpers/comparators/categories.rb +0 -22
- data/lib/occi/helpers/comparators/category.rb +0 -22
- data/lib/occi/helpers/comparators/collection.rb +0 -40
- data/lib/occi/helpers/comparators/entities.rb +0 -22
- data/lib/occi/helpers/comparators/entity.rb +0 -22
- data/lib/occi/helpers/comparators/properties.rb +0 -26
- data/lib/occi/helpers/comparators.rb +0 -1
- data/lib/occi/helpers/inspect.rb +0 -12
- data/lib/occi/infrastructure/network/ipnetwork.rb +0 -28
- data/lib/occi/infrastructure/networkinterface/ipnetworkinterface.rb +0 -28
- data/lib/occi/infrastructure/os_tpl.rb +0 -20
- data/lib/occi/infrastructure/resource_tpl.rb +0 -20
- data/lib/occi/log.rb +0 -71
- data/lib/occi/model.rb +0 -87
- data/lib/occi/parser/json.rb +0 -38
- data/lib/occi/parser/text/constants.rb +0 -89
- data/lib/occi/parser/text.rb +0 -280
- data/lib/occi/parser.rb +0 -144
- data/lib/occi/settings.rb +0 -10
- data/lib/occi/version.rb +0 -3
- data/lib/occi-core.rb +0 -53
- data/spec/helpers/to_plain.rb +0 -39
- data/spec/helpers/yaml_hash.rb +0 -32
- data/spec/occi/collection_samples/collection1.json +0 -1
- data/spec/occi/collection_samples/directory2/collection2.json +0 -1
- data/spec/occi/collection_spec.rb +0 -1003
- data/spec/occi/core/action_instance_spec.rb +0 -317
- data/spec/occi/core/action_spec.rb +0 -71
- data/spec/occi/core/attributes_spec.rb +0 -665
- data/spec/occi/core/categories_spec.rb +0 -28
- data/spec/occi/core/category_spec.rb +0 -216
- data/spec/occi/core/entities_spec.rb +0 -160
- data/spec/occi/core/entity_spec.rb +0 -374
- data/spec/occi/core/kind_spec.rb +0 -182
- data/spec/occi/core/link_spec.rb +0 -52
- data/spec/occi/core/links_spec.rb +0 -132
- data/spec/occi/core/mixin_spec.rb +0 -38
- data/spec/occi/core/mixins_spec.rb +0 -107
- data/spec/occi/core/properties_spec.rb +0 -171
- data/spec/occi/core/resource_spec.rb +0 -42
- data/spec/occi/core_spec.rb +0 -12
- data/spec/occi/infrastructure/compute_spec.rb +0 -229
- data/spec/occi/infrastructure/network_spec.rb +0 -96
- data/spec/occi/infrastructure/networkinterface_spec.rb +0 -96
- data/spec/occi/infrastructure/storage_spec.rb +0 -33
- data/spec/occi/infrastructure/storagelink_spec.rb +0 -45
- data/spec/occi/log_spec.rb +0 -117
- data/spec/occi/model_spec.rb +0 -256
- data/spec/occi/parser/json_samples/test.json +0 -49
- data/spec/occi/parser/text_samples/occi_categories.body_plain.expected +0 -2
- data/spec/occi/parser/text_samples/occi_categories.expected +0 -2
- data/spec/occi/parser/text_samples/occi_categories.parse_headers.expected +0 -2
- data/spec/occi/parser/text_samples/occi_categories.text +0 -2
- data/spec/occi/parser/text_samples/occi_compute_rocci_server.expected +0 -11
- data/spec/occi/parser/text_samples/occi_compute_rocci_server.text +0 -10
- data/spec/occi/parser/text_samples/occi_link_resource_instance.body_plain.expected +0 -7
- data/spec/occi/parser/text_samples/occi_link_resource_instance.expected +0 -7
- data/spec/occi/parser/text_samples/occi_link_resource_instance.parse.expected +0 -7
- data/spec/occi/parser/text_samples/occi_link_resource_instance.text +0 -7
- data/spec/occi/parser/text_samples/occi_link_simple.expected +0 -7
- data/spec/occi/parser/text_samples/occi_link_simple.text +0 -1
- data/spec/occi/parser/text_samples/occi_link_w_attributes.expected +0 -7
- data/spec/occi/parser/text_samples/occi_link_w_attributes.text +0 -7
- data/spec/occi/parser/text_samples/occi_link_w_category.expected +0 -7
- data/spec/occi/parser/text_samples/occi_link_w_category.text +0 -3
- data/spec/occi/parser/text_samples/occi_model_categories.expected +0 -3
- data/spec/occi/parser/text_samples/occi_model_rocci_server.text +0 -51
- data/spec/occi/parser/text_samples/occi_network_rocci_server.body_plain.expected +0 -11
- data/spec/occi/parser/text_samples/occi_network_rocci_server.expected +0 -11
- data/spec/occi/parser/text_samples/occi_network_rocci_server.resource.header.expected +0 -9
- data/spec/occi/parser/text_samples/occi_network_rocci_server.resource.rack.expected +0 -9
- data/spec/occi/parser/text_samples/occi_network_rocci_server.text +0 -11
- data/spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.parse.expected +0 -15
- data/spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.text +0 -15
- data/spec/occi/parser/text_samples/occi_resource_w_attributes.text +0 -11
- data/spec/occi/parser/text_samples/occi_resource_w_inline_links.expected +0 -1
- data/spec/occi/parser/text_samples/occi_resource_w_inline_links.text +0 -16
- data/spec/occi/parser/text_samples/occi_resource_w_inline_links_only.text +0 -13
- data/spec/occi/parser/text_samples/occi_storage_rocci_server.expected +0 -9
- data/spec/occi/parser/text_samples/occi_storage_rocci_server.text +0 -9
- data/spec/occi/parser/text_spec.rb +0 -320
- data/spec/occi/parser_spec.rb +0 -259
- data/spec/occi-core_spec.rb +0 -31
- data/spec/spec_helper.rb +0 -18
@@ -0,0 +1,19 @@
|
|
1
|
+
---
|
2
|
+
term: compute
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure#
|
4
|
+
title: OCCI Infrastructure Compute
|
5
|
+
parent: http://schemas.ogf.org/occi/core#resource
|
6
|
+
location: /compute/
|
7
|
+
attributes:
|
8
|
+
- occi.compute.architecture
|
9
|
+
- occi.compute.cores
|
10
|
+
- occi.compute.hostname
|
11
|
+
- occi.compute.memory
|
12
|
+
- occi.compute.speed
|
13
|
+
- occi.compute.state
|
14
|
+
actions:
|
15
|
+
- http://schemas.ogf.org/occi/infrastructure/compute/action#start
|
16
|
+
- http://schemas.ogf.org/occi/infrastructure/compute/action#stop
|
17
|
+
- http://schemas.ogf.org/occi/infrastructure/compute/action#restart
|
18
|
+
- http://schemas.ogf.org/occi/infrastructure/compute/action#suspend
|
19
|
+
- http://schemas.ogf.org/occi/infrastructure/compute/action#save
|
@@ -0,0 +1,13 @@
|
|
1
|
+
---
|
2
|
+
term: network
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure#
|
4
|
+
title: OCCI Infrastructure Network
|
5
|
+
parent: http://schemas.ogf.org/occi/core#resource
|
6
|
+
location: /network/
|
7
|
+
attributes:
|
8
|
+
- occi.network.vlan
|
9
|
+
- occi.network.label
|
10
|
+
- occi.network.state
|
11
|
+
actions:
|
12
|
+
- http://schemas.ogf.org/occi/infrastructure/network/action#up
|
13
|
+
- http://schemas.ogf.org/occi/infrastructure/network/action#down
|
@@ -0,0 +1,13 @@
|
|
1
|
+
---
|
2
|
+
term: networkinterface
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure#
|
4
|
+
title: OCCI Infrastructure NetworkInterface
|
5
|
+
parent: http://schemas.ogf.org/occi/core#link
|
6
|
+
location: /link/networkinterface/
|
7
|
+
attributes:
|
8
|
+
- occi.networkinterface.interface
|
9
|
+
- occi.networkinterface.mac
|
10
|
+
- occi.networkinterface.state
|
11
|
+
actions:
|
12
|
+
- http://schemas.ogf.org/occi/infrastructure/networkinterface/action#up
|
13
|
+
- http://schemas.ogf.org/occi/infrastructure/networkinterface/action#down
|
@@ -0,0 +1,15 @@
|
|
1
|
+
---
|
2
|
+
term: storage
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure#
|
4
|
+
title: OCCI Infrastructure Storage
|
5
|
+
parent: http://schemas.ogf.org/occi/core#resource
|
6
|
+
location: /storage/
|
7
|
+
attributes:
|
8
|
+
- occi.storage.size
|
9
|
+
- occi.storage.state
|
10
|
+
actions:
|
11
|
+
- http://schemas.ogf.org/occi/infrastructure/storage/action#online
|
12
|
+
- http://schemas.ogf.org/occi/infrastructure/storage/action#offline
|
13
|
+
- http://schemas.ogf.org/occi/infrastructure/storage/action#backup
|
14
|
+
- http://schemas.ogf.org/occi/infrastructure/storage/action#snapshot
|
15
|
+
- http://schemas.ogf.org/occi/infrastructure/storage/action#resize
|
@@ -0,0 +1,13 @@
|
|
1
|
+
---
|
2
|
+
term: storagelink
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure#
|
4
|
+
title: OCCI Infrastructure StorageLink
|
5
|
+
parent: http://schemas.ogf.org/occi/core#link
|
6
|
+
location: /link/storagelink/
|
7
|
+
attributes:
|
8
|
+
- occi.storagelink.deviceid
|
9
|
+
- occi.storagelink.mountpoint
|
10
|
+
- occi.storagelink.state
|
11
|
+
actions:
|
12
|
+
- http://schemas.ogf.org/occi/infrastructure/storagelink/action#online
|
13
|
+
- http://schemas.ogf.org/occi/infrastructure/storagelink/action#offline
|
File without changes
|
File without changes
|
@@ -0,0 +1,11 @@
|
|
1
|
+
---
|
2
|
+
term: ipnetwork
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure/network#
|
4
|
+
title: OCCI IP Network mixin
|
5
|
+
attributes:
|
6
|
+
- occi.network.address
|
7
|
+
- occi.network.allocation
|
8
|
+
- occi.network.gateway
|
9
|
+
location: /mixin/ipnetwork/
|
10
|
+
applies:
|
11
|
+
- http://schemas.ogf.org/occi/infrastructure#network
|
@@ -0,0 +1,11 @@
|
|
1
|
+
---
|
2
|
+
term: ipnetworkinterface
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure/networkinterface#
|
4
|
+
title: OCCI IP NetworkInterface mixin
|
5
|
+
attributes:
|
6
|
+
- occi.networkinterface.address
|
7
|
+
- occi.networkinterface.allocation
|
8
|
+
- occi.networkinterface.gateway
|
9
|
+
location: /mixin/ipnetworkinterface/
|
10
|
+
applies:
|
11
|
+
- http://schemas.ogf.org/occi/infrastructure#networkinterface
|
@@ -0,0 +1,20 @@
|
|
1
|
+
module Occi
|
2
|
+
module Infrastructure
|
3
|
+
# Extended loader for static categories defined in the OCCI Infra Standard
|
4
|
+
# published by OGF's OCCI WG. This warehouse is meant to be used as a
|
5
|
+
# quick bootstrap tools for `Occi::Core::Model` instances. Instances passed
|
6
|
+
# to this warehouse MUST be already boostrapped by `Occi::Core::Warehouse`.
|
7
|
+
#
|
8
|
+
# @author Boris Parak <parak@cesnet.cz>
|
9
|
+
class Warehouse < Occi::Core::Warehouse
|
10
|
+
class << self
|
11
|
+
protected
|
12
|
+
|
13
|
+
# :nodoc:
|
14
|
+
def whereami
|
15
|
+
File.expand_path(File.dirname(__FILE__))
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,35 @@
|
|
1
|
+
# internal deps
|
2
|
+
require 'occi/infrastructure'
|
3
|
+
|
4
|
+
# Contains all OCCI-related classes and modules. This module
|
5
|
+
# does not provide any additional functionality aside from
|
6
|
+
# acting as a wrapper and a namespace-defining mechanisms.
|
7
|
+
# Please, defer to specific classes and modules within this
|
8
|
+
# namespace for details and functionality descriptions.
|
9
|
+
#
|
10
|
+
# @author Boris Parak <parak@cesnet.cz>
|
11
|
+
module Occi
|
12
|
+
# Contains all OCCI-Infra-Ext-related classes and modules. This
|
13
|
+
# module does not provide any additional functionality aside
|
14
|
+
# from acting as a wrapped, a namespace-defining mechanism,
|
15
|
+
# and versioning wrapper. Please, defer to specific classes
|
16
|
+
# and modules within this namespace for details and
|
17
|
+
# functionality descriptions.
|
18
|
+
#
|
19
|
+
# @author Boris Parak <parak@cesnet.cz>
|
20
|
+
module InfrastructureExt
|
21
|
+
autoload :Constants, 'occi/infrastructure_ext/constants'
|
22
|
+
autoload :Mixins, 'occi/infrastructure_ext/mixins'
|
23
|
+
|
24
|
+
autoload :SecurityGroup, 'occi/infrastructure_ext/securitygroup'
|
25
|
+
autoload :IPReservation, 'occi/infrastructure_ext/ipreservation'
|
26
|
+
autoload :SecurityGroupLink, 'occi/infrastructure_ext/securitygrouplink'
|
27
|
+
|
28
|
+
autoload :Model, 'occi/infrastructure_ext/model'
|
29
|
+
autoload :Warehouse, 'occi/infrastructure_ext/warehouse'
|
30
|
+
autoload :InstanceBuilder, 'occi/infrastructure_ext/instance_builder'
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
# Explicitly pull in versioning information
|
35
|
+
require 'occi/infrastructure_ext/version'
|
data/lib/occi/infrastructure.rb
CHANGED
@@ -1,25 +1,40 @@
|
|
1
|
-
|
2
|
-
require 'occi/
|
3
|
-
require 'occi/infrastructure/storagelink'
|
4
|
-
require 'occi/infrastructure/network'
|
5
|
-
require 'occi/infrastructure/networkinterface'
|
1
|
+
# internal deps
|
2
|
+
require 'occi/core'
|
6
3
|
|
4
|
+
# Contains all OCCI-related classes and modules. This module
|
5
|
+
# does not provide any additional functionality aside from
|
6
|
+
# acting as a wrapper and a namespace-defining mechanisms.
|
7
|
+
# Please, defer to specific classes and modules within this
|
8
|
+
# namespace for details and functionality descriptions.
|
9
|
+
#
|
10
|
+
# @author Boris Parak <parak@cesnet.cz>
|
7
11
|
module Occi
|
12
|
+
# Contains all OCCI-Infra-related classes and modules. This
|
13
|
+
# module does not provide any additional functionality aside
|
14
|
+
# from acting as a wrapped, a namespace-defining mechanism,
|
15
|
+
# and versioning wrapper. Please, defer to specific classes
|
16
|
+
# and modules within this namespace for details and
|
17
|
+
# functionality descriptions.
|
18
|
+
#
|
19
|
+
# @author Boris Parak <parak@cesnet.cz>
|
8
20
|
module Infrastructure
|
21
|
+
autoload :Constants, 'occi/infrastructure/constants'
|
22
|
+
autoload :Mixins, 'occi/infrastructure/mixins'
|
9
23
|
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
end
|
19
|
-
|
20
|
-
def self.actions
|
21
|
-
Occi::Infrastructure::Compute.actions + Occi::Infrastructure::Storage.actions + Occi::Infrastructure::Network.actions + Occi::Infrastructure::Networkinterface.actions + Occi::Infrastructure::Storagelink.actions
|
22
|
-
end
|
24
|
+
autoload :Compute, 'occi/infrastructure/compute'
|
25
|
+
autoload :Network, 'occi/infrastructure/network'
|
26
|
+
autoload :Storage, 'occi/infrastructure/storage'
|
27
|
+
autoload :SecurityGroup, 'occi/infrastructure/securitygroup'
|
28
|
+
autoload :IPReservation, 'occi/infrastructure/ipreservation'
|
29
|
+
autoload :Networkinterface, 'occi/infrastructure/networkinterface'
|
30
|
+
autoload :Storagelink, 'occi/infrastructure/storagelink'
|
31
|
+
autoload :SecurityGroupLink, 'occi/infrastructure/securitygrouplink'
|
23
32
|
|
33
|
+
autoload :Model, 'occi/infrastructure/model'
|
34
|
+
autoload :Warehouse, 'occi/infrastructure/warehouse'
|
35
|
+
autoload :InstanceBuilder, 'occi/infrastructure/instance_builder'
|
24
36
|
end
|
25
|
-
end
|
37
|
+
end
|
38
|
+
|
39
|
+
# Explicitly pull in versioning information
|
40
|
+
require 'occi/infrastructure/version'
|
@@ -0,0 +1,20 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
# Module containing important constats defined in OGF's Infrastructure Extension documents.
|
4
|
+
# Here, you can find commonly used kind identifiers for `SecurityGroup`, `SecurityGroupLink`,
|
5
|
+
# `IPReservation`, and others.
|
6
|
+
#
|
7
|
+
# @author Boris Parak <parak@cesnet.cz>
|
8
|
+
module Constants
|
9
|
+
# Resource sub-types
|
10
|
+
SECURITY_GROUP_KIND = 'http://schemas.ogf.org/occi/infrastructure#securitygroup'.freeze
|
11
|
+
IPRESERVATION_KIND = 'http://schemas.ogf.org/occi/infrastructure#ipreservation'.freeze
|
12
|
+
|
13
|
+
# Link sub-types
|
14
|
+
SECURITY_GROUP_LINK_KIND = 'http://schemas.ogf.org/occi/infrastructure#securitygrouplink'.freeze
|
15
|
+
|
16
|
+
# Mixins
|
17
|
+
AVAILABILITY_ZONE_MIXIN = 'http://schemas.ogf.org/occi/infrastructure#availability_zone'.freeze
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
# See `Occi::infrastructure::InstanceBuilder` for details.
|
4
|
+
#
|
5
|
+
# @attr model [Occi::InfrastructureExt::Model] model filled with known category definitions
|
6
|
+
#
|
7
|
+
# @author Boris Parak <parak@cesnet.cz>
|
8
|
+
class InstanceBuilder < Occi::Infrastructure::InstanceBuilder
|
9
|
+
class << self
|
10
|
+
# :nodoc:
|
11
|
+
def klass_map
|
12
|
+
ns = Occi::InfrastructureExt
|
13
|
+
super.merge(
|
14
|
+
ns::Constants::SECURITY_GROUP_KIND => ns::SecurityGroup,
|
15
|
+
ns::Constants::IPRESERVATION_KIND => ns::IPReservation,
|
16
|
+
ns::Constants::SECURITY_GROUP_LINK_KIND => ns::SecurityGroupLink
|
17
|
+
)
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
# Dummy sub-class of `Occi::Infrastructure::Network` meant to simplify handling
|
4
|
+
# of known instances of the given sub-class. Does not contain any functionality.
|
5
|
+
#
|
6
|
+
# @author Boris Parak <parak@cesnet.cz>
|
7
|
+
class IPReservation < Occi::Infrastructure::Network; end
|
8
|
+
end
|
9
|
+
end
|
File without changes
|
@@ -0,0 +1,19 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
module Mixins
|
4
|
+
# A helper class for manipulation with `availability_zone` parent mixin. Doesn't
|
5
|
+
# provide any additional functionality aside from the class name.
|
6
|
+
#
|
7
|
+
# @author Boris Parak <parak@cesnet.cz>
|
8
|
+
class AvailabilityZone < Occi::Core::Mixin
|
9
|
+
TITLE = 'OCCI Availability Zone mixin'.freeze
|
10
|
+
|
11
|
+
# See `Occi::Core::Mixin` and `Occi::Core::Category`
|
12
|
+
def initialize
|
13
|
+
schema, term = Occi::InfrastructureExt::Constants::AVAILABILITY_ZONE_MIXIN.split('#')
|
14
|
+
super term: term, schema: "#{schema}#", title: TITLE
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,12 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
# Contains various INFRA-Ext-specific `Occi::Core::Mixin` sub-classes with pre-set
|
4
|
+
# attributes (OCCI attributes and Ruby attributes). For details, see documentation
|
5
|
+
# for the particular class.
|
6
|
+
#
|
7
|
+
# @author Boris Parak <parak@cesnet.cz>
|
8
|
+
module Mixins; end
|
9
|
+
end
|
10
|
+
end
|
11
|
+
|
12
|
+
Dir[File.join(File.dirname(__FILE__), 'mixins', '*.rb')].each { |file| require file.gsub('.rb', '') }
|
@@ -0,0 +1,26 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
# See `Occi::Infrastructure::Model` for details.
|
4
|
+
#
|
5
|
+
# @author Boris Parak <parak@cesnet.cz>
|
6
|
+
class Model < Occi::Infrastructure::Model
|
7
|
+
# Loads OGF's OCCI Infrastructure Ext Standard from `Occi::InfrastructureExt::Warehouse`.
|
8
|
+
#
|
9
|
+
# @example
|
10
|
+
# model = Occi::InfrastructureExt::Model.new
|
11
|
+
# model.load_infrastructure_ext!
|
12
|
+
def load_infrastructure_ext!
|
13
|
+
Occi::InfrastructureExt::Warehouse.bootstrap! self
|
14
|
+
self << Occi::InfrastructureExt::Mixins::AvailabilityZone.new
|
15
|
+
nil
|
16
|
+
end
|
17
|
+
|
18
|
+
# Returns an instance of `Occi::InfrastructureExt::InstanceBuilder` associated with this model.
|
19
|
+
#
|
20
|
+
# @return [Occi::InfrastructureExt::InstanceBuilder] instance of IB
|
21
|
+
def instance_builder
|
22
|
+
Occi::InfrastructureExt::InstanceBuilder.new(model: self)
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
# Dummy sub-class of `Occi::Core::Resource` meant to simplify handling
|
4
|
+
# of known instances of the given sub-class. Does not contain any functionality.
|
5
|
+
#
|
6
|
+
# @author Boris Parak <parak@cesnet.cz>
|
7
|
+
class SecurityGroup < Occi::Core::Resource; end
|
8
|
+
end
|
9
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
module Occi
|
2
|
+
module InfrastructureExt
|
3
|
+
# Dummy sub-class of `Occi::Core::Link` meant to simplify handling
|
4
|
+
# of known instances of the given sub-class. Does not contain any functionality.
|
5
|
+
#
|
6
|
+
# @author Boris Parak <parak@cesnet.cz>
|
7
|
+
class SecurityGroupLink < Occi::Core::Link; end
|
8
|
+
end
|
9
|
+
end
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -0,0 +1,13 @@
|
|
1
|
+
---
|
2
|
+
term: ipreservation
|
3
|
+
schema: http://schemas.ogf.org/occi/infrastructure#
|
4
|
+
title: OCCI Infrastructure IP Reservation
|
5
|
+
parent: http://schemas.ogf.org/occi/infrastructure#network
|
6
|
+
location: /ipreservation/
|
7
|
+
attributes:
|
8
|
+
- occi.ipreservation.address
|
9
|
+
- occi.ipreservation.used
|
10
|
+
- occi.ipreservation.state
|
11
|
+
actions:
|
12
|
+
- http://schemas.ogf.org/occi/infrastructure/ipreservation/action#up
|
13
|
+
- http://schemas.ogf.org/occi/infrastructure/ipreservation/action#down
|