occi-core 5.0.0.alpha.1 → 5.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d36511dceaecabc4508ec2db62c83920e63fff0
-  data.tar.gz: e9f542fefa3da8fabe0e6aaecaa822b7d1d25233
+  metadata.gz: 196f824b580d6a90fe2da14cbf85b99deb088d93
+  data.tar.gz: 8b06f630a141c702742c019529bf11184e8ce87f
 SHA512:
-  metadata.gz: b96ea07c5b9c28b5933e47f0874946abb38df81ceed4461a188c0b96ca3ae3ed56bf43842b1eddbca21c058c6884816683900e35a7e3fbe720da8ce86672eee8
-  data.tar.gz: a3b0c5dbb6b998df32495b6b2d474f7b7ab8dafe95264953410fe58ac3e1e07c1ea1bac21a5c4dff21142a5704cb180b2196083c78d08bd48173c8f2eca540c8
+  metadata.gz: db0db57a71621cf8beb45e2682659831a8aff23356efbdf26d6b1160f4a36d8e69ef9ecb94b55819d7584825dbc74034f6c1a155bf62d374c98722602a8d2f52
+  data.tar.gz: 93ef6536c47a7d0b3225f0ffb5280eaacc2b6b5611c4d902bcb5374bbf0cf162abfdbee0fdb58e35d0c914a514786a36ee8719ecd881c953afff81cc0b60e070

data/.rubocop.yml

@@ -21,6 +21,7 @@ Metrics/AbcSize:
   - 'lib/occi/core/parsers/text/*'
   - 'lib/occi/core/parsers/json/*'
   - 'lib/occi/core/helpers/parser_dereferencer.rb'
+  - 'lib/occi/core/helpers/instance_attribute_resetter.rb'
 
 Metrics/LineLength:
   Max: 120

data/examples/rendering/categories.json

@@ -1,78 +1,8 @@
 {
   "mixins": [
-    {
-      "applies": [
-        "http://schemas.ogf.org/occi/infrastructure#network"
-      ],
-      "attributes": {
-        "occi.network.address": {
-          "description": "IP address (v4 or v6) assigned to this instance.",
-          "mutable": true,
-          "required": false,
-          "type": "string"
-        },
-        "occi.network.allocation": {
-          "default": "static",
-          "description": "Network address allocation mechanism.",
-          "mutable": true,
-          "pattern": "(?-mix:^(dynamic|static)$)",
-          "required": false,
-          "type": "string"
-        },
-        "occi.network.gateway": {
-          "description": "IP address (v4 or v6) of the pre-configured gateway.",
-          "mutable": true,
-          "required": false,
-          "type": "string"
-        }
-      },
-      "location": "/mixin/ipnetwork/",
-      "scheme": "http://schemas.ogf.org/occi/infrastructure/network#",
-      "term": "ipnetwork",
-      "title": "OCCI IP Network mixin"
-    },
-    {
-      "applies": [
-        "http://schemas.ogf.org/occi/infrastructure#networkinterface"
-      ],
-      "attributes": {
-        "occi.networkinterface.address": {
-          "description": "IP address (v4 or v6) assigned to this instance.",
-          "mutable": true,
-          "required": false,
-          "type": "string"
-        },
-        "occi.networkinterface.allocation": {
-          "default": "static",
-          "description": "Network address allocation mechanism.",
-          "mutable": true,
-          "pattern": "(?-mix:^(dynamic|static)$)",
-          "required": false,
-          "type": "string"
-        },
-        "occi.networkinterface.gateway": {
-          "description": "IP address (v4 or v6) of the pre-configured gateway.",
-          "mutable": true,
-          "required": false,
-          "type": "string"
-        }
-      },
-      "location": "/mixin/ipnetworkinterface/",
-      "scheme": "http://schemas.ogf.org/occi/infrastructure/networkinterface#",
-      "term": "ipnetworkinterface",
-      "title": "OCCI IP NetworkInterface mixin"
-    },
-    {
-      "location": "/mixin/os_tpl/",
-      "scheme": "http://schemas.ogf.org/occi/infrastructure#",
-      "term": "os_tpl",
-      "title": "OS or Appliance template (parent mixin)"
-    },
-    {
-      "location": "/mixin/resource_tpl/",
-      "scheme": "http://schemas.ogf.org/occi/infrastructure#",
-      "term": "resource_tpl",
-      "title": "Resource template providing flavor/sizing information (parent mixin)"
-    }
+    "http://schemas.ogf.org/occi/infrastructure/network#ipnetwork",
+    "http://schemas.ogf.org/occi/infrastructure/networkinterface#ipnetworkinterface",
+    "http://schemas.ogf.org/occi/infrastructure#os_tpl",
+    "http://schemas.ogf.org/occi/infrastructure#resource_tpl"
   ]
 }

data/examples/rendering/categories.txt

@@ -1,4 +1,4 @@
-Category: resource_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="resource template";location="/mixin/resource_tpl/"
-Category: os_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin";title="operating system template";location="/mixin/os_tpl/"
-Category: ipnetwork;scheme="http://schemas.ogf.org/occi/infrastructure/network#";class="mixin";title="IP network mixin";location="/mixin/ipnetwork/";attributes="occi.network.address occi.network.gateway occi.network.allocation"
-Category: ipnetworkinterface;scheme="http://schemas.ogf.org/occi/infrastructure/networkinterface#";class="mixin";title="IP network interface mixin";location="/mixin/ipnetworkinterface/";attributes="occi.networkinterface.address occi.networkinterface.gateway occi.networkinterface.allocation"
+Category: resource_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin"
+Category: os_tpl;scheme="http://schemas.ogf.org/occi/infrastructure#";class="mixin"
+Category: ipnetwork;scheme="http://schemas.ogf.org/occi/infrastructure/network#";class="mixin"
+Category: ipnetworkinterface;scheme="http://schemas.ogf.org/occi/infrastructure/networkinterface#";class="mixin"

data/lib/occi/core/helpers/argument_validator.rb

@@ -8,6 +8,7 @@ module Occi
       module ArgumentValidator
         # :nodoc:
         def default_args!(args)
+          logger.debug "#{self.class}: Merging given args #{args.inspect} with defaults #{defaults.inspect}"
           args.merge!(defaults) { |_, oldval, _| oldval }
           sufficient_args!(args)
         end

data/lib/occi/core/helpers/instance_attribute_resetter.rb

@@ -51,7 +51,11 @@ module Occi
         # @return [Hash] updated attribute hash
         def remove_undef_attributes
           name_cache = attribute_names
-          attributes.keep_if { |key, value| name_cache.include?(key) && value && value.attribute_definition }
+          attributes.keep_if do |key, value|
+            defined = name_cache.include?(key) && value && value.attribute_definition
+            logger.debug "#{self.class}: Removing undefined attribute #{key.inspect}" unless defined
+            defined
+          end
         end
 
         # Collects all available attribute names into a list. Without definitions
@@ -118,8 +122,10 @@ module Occi
         # @param force [TrueClass, FalseClass] forcibly change attribute value to default
         def reset_attribute(name, definition, force)
           if attributes[name]
+            logger.debug "#{self.class}: Setting attribute definition for existing #{name.inspect}"
             attributes[name].attribute_definition = definition
           else
+            logger.debug "#{self.class}: Creating attribute definition for new #{name.inspect}"
             attributes[name] = Attribute.new(nil, definition)
           end
 

data/lib/occi/core/helpers/parser_dereferencer.rb

@@ -44,6 +44,7 @@ module Occi
         # @param derefd [Array] list of all available category instances
         # @param parsed_actions [Array] textual representation of needed actions
         def lookup_action_references!(cat, derefd, parsed_actions)
+          logger.debug "#{self}: Dereferencing actions #{parsed_actions.inspect} for #{cat.identifier.inspect}"
           return if parsed_actions.blank?
           parsed_actions.each { |action| cat.actions << first_or_die(derefd, action) }
         end
@@ -53,6 +54,7 @@ module Occi
         # @param parsed_rel [Array] textual representation of needed parent(s)
         def lookup_parent_references!(kind, derefd, parsed_rel)
           return if parsed_rel.blank? || kind.parent.is_a?(Occi::Core::Kind)
+          logger.debug "#{self}: Dereferencing parent #{parsed_rel.inspect} for #{kind.identifier.inspect}"
           if parsed_rel.is_a?(Enumerable)
             if parsed_rel.count > 1
               raise Occi::Core::Errors::ParsingError,
@@ -83,6 +85,7 @@ module Occi
         # @param what [String] identifier of the desired item
         # @return [Object] desired item from `where`
         def first_or_die(where, what)
+          logger.debug "#{self}: Looking for #{what.inspect} in #{where.class}"
           found = where.detect { |elm| elm.identifier == what }
           unless found
             raise Occi::Core::Errors::ParsingError,

data/lib/occi/core/helpers/yaml_summoner.rb

@@ -25,6 +25,7 @@ module Occi
           raise 'This method cannot be invoked on instances' unless is_a? Class
           allowed_classes = respond_to?(:allowed_yaml_classes, true) ? allowed_yaml_classes : []
 
+          logger.debug "#{self}: Loading YAML definition from #{path.inspect}"
           object_args = YAML.safe_load(File.read(path), allowed_classes)
           object_args.symbolize_keys!
           object_args.dereference_with!(self, model, attribute_definitions) if needs_dereferencing?

data/lib/occi/core/instance_builder.rb

@@ -42,6 +42,7 @@ module Occi
       # @return [Object] constructed instance
       # @return [NilClass] if such an instance could not be constructed
       def build(identifier, args = {})
+        logger.debug "#{self.class}: Building instance of #{identifier.inspect} with #{args.inspect}"
         k_args = args_with_kind(identifier, args)
         klass(identifier, parent_klass(k_args[:kind])).new k_args
       end
@@ -77,19 +78,23 @@ module Occi
 
       # Looks up the appropriate candidate class for the given identifier. If no class
       # is found in static tables, the last known ancestor is returned. For Core, this
-      # method ALWAYS returns the last known ancestor given as `last_ancestor`, for
+      # method ALWAYS returns the last known ancestor given as `known_ancestor`, for
       # compatibility reasons.
       #
       # @param identifier [String] identifier of the category
-      # @param last_ancestor [Class] expected ancestor
+      # @param known_ancestor [Class] expected ancestor
       # @return [Class] pre-defined class or given last ancestor
-      def klass(identifier, last_ancestor)
-        found_last_ancestor = self.class.klass_map[identifier]
-        if found_last_ancestor && !found_last_ancestor.ancestors.include?(last_ancestor)
+      def klass(identifier, known_ancestor)
+        found_klass = self.class.klass_map[identifier]
+        return known_ancestor unless found_klass
+
+        unless found_klass.ancestors.include?(known_ancestor)
           raise Occi::Core::Errors::InstanceValidationError,
-                "#{found_last_ancestor.inspect} is not a sub-type of #{last_ancestor.inspect}"
+                "#{found_klass} is not a sub-type of #{known_ancestor}"
         end
-        found_last_ancestor || last_ancestor
+
+        logger.debug "#{self.class}: Found #{found_klass} for #{identifier.inspect}"
+        found_klass
       end
 
       # Looks up the given identifier in the model. Returns `Occi::Core::Kind` instance if
@@ -98,7 +103,7 @@ module Occi
       #
       # @param identifier [String] identifier of the category
       # @return [Occi::Core::Kind] full category definition from the model
-      def kind(identifier)
+      def kind_instance(identifier)
         kind = model.find_by_identifier!(identifier)
         unless kind.is_a? Occi::Core::Kind
           raise Occi::Core::Errors::CategoryValidationError, "#{identifier.inspect} " \
@@ -113,13 +118,15 @@ module Occi
       # @param kind [Occi::Core::Kind] kind instance to evaluate
       # @return [Class] located known parent class
       def parent_klass(kind)
-        if kind.related? kind(Occi::Core::Constants::RESOURCE_KIND)
+        if kind.related? kind_instance(Occi::Core::Constants::RESOURCE_KIND)
+          logger.debug "#{self.class}: Identified #{kind.identifier} as Resource"
           Occi::Core::Resource
-        elsif kind.related? kind(Occi::Core::Constants::LINK_KIND)
+        elsif kind.related? kind_instance(Occi::Core::Constants::LINK_KIND)
+          logger.debug "#{self.class}: Identified #{kind.identifier} as Link"
           Occi::Core::Link
         else
           raise Occi::Core::Errors::ModelLookupError,
-                "Could not identify #{kind.identifier.inspect} as a Link or Resource"
+                "Could not identify #{kind.identifier} as a Link or Resource"
         end
       end
 
@@ -153,8 +160,8 @@ module Occi
       # :nodoc:
       def args_with_kind(identifier, args)
         k_args = args.clone
-        k_args[:kind] = kind(identifier)
-        k_args[:rel] = kind(k_args[:rel]) if k_args[:rel]
+        k_args[:kind] = kind_instance(identifier)
+        k_args[:rel] = kind_instance(k_args[:rel]) if k_args[:rel]
         k_args
       end
     end

data/lib/occi/core/model.rb

@@ -242,6 +242,7 @@ module Occi
       #    model = Occi::Core::Model.new
       #    model.load_core!
       def load_core!
+        logger.debug "#{self.class}: Loading Core from Warehouse"
         Occi::Core::Warehouse.bootstrap! self
       end
 

data/lib/occi/core/parsers/json/category.rb

@@ -33,13 +33,10 @@ module Occi
             #
             # @param body [String] JSON body for parsing
             # @param model [Occi::Core::Model] model with existing categories
-            # @param full [Boolean] dereference categories
             # @return [Occi::Core::Model] model with all known category instances
-            def json(body, model, full = true)
+            def json(body, model)
               parsed = raw_hash(body)
-
               instantiate_hashes! parsed, model
-              return model unless full
 
               raw_categories = [parsed[:kinds], parsed[:mixins]].flatten.compact
               dereference_identifiers! model.categories, raw_categories

data/lib/occi/core/parsers/json/validator/category-identifiers.json

@@ -0,0 +1,3 @@
+{
+	"$ref": "occi-schema.json#/definitions/category_identifiers"
+}

data/lib/occi/core/parsers/json/validator/occi-schema.json

@@ -13,52 +13,49 @@
 				"kind": { "type": "string" }
 			}
 		},
-		"resource": {
-			"id": "#resource",
+		"attributes": {
+			"id": "#attributes",
 			"type": "object",
-			"required": ["kind", "id", "attributes"],
-			"additionalProperties": false,
-			"properties": {
-				"kind": { "type": "string" },
-				"mixins": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
-				"attributes": { "$ref": "#/definitions/attributes" },
-				"actions": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
-				"id": { "type": "string" },
-				"links": {
-					"type": "array",
-					"minItems": 1,
-					"items": {
-						"$ref": "#/definitions/link"
-					}
-				},
-				"summary": { "type": "string" },
-				"title": { "type": "string" }
+			"additionalProperties": {
+				"oneOf": [
+					{ "type": "number" },
+					{ "type": "boolean" },
+					{ "type": "string" },
+					{ "type": "object" },
+					{ "type": "array" }
+				]
 			}
 		},
-		"action_instance": {
-			"id": "#action_instance",
+		"attribute_definition": {
+			"id": "#attribute_definition",
 			"type": "object",
-			"required": ["action"],
 			"additionalProperties": false,
+			"required": ["type", "mutable", "required"],
 			"properties": {
-				"action": { "type": "string" },
-				"attributes": { "$ref": "#/definitions/attributes" }
+				"mutable": { "type": "boolean" },
+				"required": { "type": "boolean" },
+				"type": { "type": "string" },
+				"default": {
+					"oneOf": [
+						{ "type": "number" },
+						{ "type": "string" },
+						{ "type": "boolean" },
+						{ "type": "object" },
+						{ "type": "array" }
+					]
+				},
+				"description": { "type": "string" },
+				"pattern": { "type": "string" }
 			}
 		},
-		"link": {
-			"id": "#link",
+		"attribute_definitions": {
+			"id": "#attribute_definitions",
 			"type": "object",
-			"required": ["kind", "id", "target", "source", "attributes"],
 			"additionalProperties": false,
-			"properties": {
-				"kind": { "type": "string" },
-				"mixins": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
-				"attributes": { "$ref": "#/definitions/attributes" },
-				"actions": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
-				"id": { "type": "string" },
-				"source": { "$ref": "#/definitions/kinded_uri" },
-				"target": { "$ref": "#/definitions/kinded_uri" },
-				"title": { "type": "string" }
+			"patternProperties": {
+				".+": {
+					"$ref": "#/definitions/attribute_definition"
+				}
 			}
 		},
 		"kind": {
@@ -104,6 +101,54 @@
 				"attributes": { "$ref": "#/definitions/attribute_definitions" }
 			}
 		},
+		"action_instance": {
+			"id": "#action_instance",
+			"type": "object",
+			"required": ["action"],
+			"additionalProperties": false,
+			"properties": {
+				"action": { "type": "string" },
+				"attributes": { "$ref": "#/definitions/attributes" }
+			}
+		},
+		"resource": {
+			"id": "#resource",
+			"type": "object",
+			"required": ["kind", "id", "attributes"],
+			"additionalProperties": false,
+			"properties": {
+				"kind": { "type": "string" },
+				"mixins": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
+				"attributes": { "$ref": "#/definitions/attributes" },
+				"actions": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
+				"id": { "type": "string" },
+				"links": {
+					"type": "array",
+					"minItems": 1,
+					"items": {
+						"$ref": "#/definitions/link"
+					}
+				},
+				"summary": { "type": "string" },
+				"title": { "type": "string" }
+			}
+		},
+		"link": {
+			"id": "#link",
+			"type": "object",
+			"required": ["kind", "id", "target", "source", "attributes"],
+			"additionalProperties": false,
+			"properties": {
+				"kind": { "type": "string" },
+				"mixins": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
+				"attributes": { "$ref": "#/definitions/attributes" },
+				"actions": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
+				"id": { "type": "string" },
+				"source": { "$ref": "#/definitions/kinded_uri" },
+				"target": { "$ref": "#/definitions/kinded_uri" },
+				"title": { "type": "string" }
+			}
+		},
 		"resource_collection": {
 			"id": "#resource_collection",
 			"type": "object",
@@ -155,94 +200,41 @@
 				}
 			}
 		},
-		"kind_collection": {
-			"id": "#kind_collection",
+		"mixin_identifiers": {
+			"id": "#mixin_identifiers",
 			"type": "object",
-			"required": ["kinds"],
+			"required": ["mixins"],
 			"additionalProperties": false,
 			"properties": {
-				"kinds": {
-					"type": "array",
-					"minItems": 1,
-					"items": {
-						"$ref": "#/definitions/kind"
-					}
-				}
+				"mixins": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" }
 			}
 		},
-		"mixin_collection": {
-			"id": "#mixin_collection",
+		"kind_identifiers": {
+			"id": "#kind_identifiers",
 			"type": "object",
-			"required": ["mixins"],
+			"required": ["kinds"],
 			"additionalProperties": false,
 			"properties": {
-				"mixins": {
-					"type": "array",
-					"minItems": 1,
-					"items": {
-						"$ref": "#/definitions/mixin"
-					}
-				}
+				"kinds": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" }
 			}
 		},
-		"action_collection": {
-			"id": "#action_collection",
+		"action_identifiers": {
+			"id": "#action_identifiers",
 			"type": "object",
 			"required": ["actions"],
 			"additionalProperties": false,
 			"properties": {
-				"actions": {
-					"type": "array",
-					"minItems": 1,
-					"items": {
-						"$ref": "#/definitions/action"
-					}
-				}
+				"actions": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" }
 			}
 		},
-		"attributes": {
-			"id": "#attributes",
-			"type": "object",
-			"additionalProperties": {
-				"oneOf": [
-					{ "type": "number" },
-					{ "type": "boolean" },
-					{ "type": "string" },
-					{ "type": "object" },
-					{ "type": "array" }
-				]
-			}
-		},
-		"attribute_definition": {
-			"id": "#attribute_definition",
+		"category_identifiers": {
+			"id": "#category_identifiers",
 			"type": "object",
 			"additionalProperties": false,
-			"required": ["type", "mutable", "required"],
 			"properties": {
-				"mutable": { "type": "boolean" },
-				"required": { "type": "boolean" },
-				"type": { "type": "string" },
-				"default": {
-					"oneOf": [
-						{ "type": "number" },
-						{ "type": "string" },
-						{ "type": "boolean" },
-						{ "type": "object" },
-						{ "type": "array" }
-					]
-				},
-				"description": { "type": "string" },
-				"pattern": { "type": "string" }
-			}
-		},
-		"attribute_definitions": {
-			"id": "#attribute_definitions",
-			"type": "object",
-			"additionalProperties": false,
-			"patternProperties": {
-				".+": {
-					"$ref": "#/definitions/attribute_definition"
-				}
+				"mixins": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
+				"kinds": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" },
+				"actions": { "$ref": "http://json-schema.org/draft-04/schema#/definitions/stringArray" }
 			}
 		},
 		"model": {

data/lib/occi/core/parsers/json/validator.rb

@@ -27,18 +27,18 @@ module Occi
             end
 
             # :nodoc:
-            def validate_model!(json)
-              validate! json, :model
+            def validate_locations!(json)
+              validate! json, :locations
             end
 
             # :nodoc:
-            def validate_resource!(json)
-              validate! json, :resource
+            def validate_category_identifiers!(json)
+              validate! json, :'category-identifiers'
             end
 
             # :nodoc:
-            def validate_link!(json)
-              validate! json, :link
+            def validate_model!(json)
+              validate! json, :model
             end
 
             # :nodoc:
@@ -47,28 +47,18 @@ module Occi
             end
 
             # :nodoc:
-            def validate_entity_collection!(json)
-              validate! json, :'entity-collection'
-            end
-
-            # :nodoc:
-            def validate_link_collection!(json)
-              validate! json, :'link-collection'
-            end
-
-            # :nodoc:
-            def validate_resource_collection!(json)
-              validate! json, :'resource-collection'
+            def validate_resource!(json)
+              validate! json, :resource
             end
 
             # :nodoc:
-            def validate_mixin_collection!(json)
-              validate! json, :'mixin-collection'
+            def validate_link!(json)
+              validate! json, :link
             end
 
             # :nodoc:
-            def validate_locations!(json)
-              validate! json, :locations
+            def validate_entity_collection!(json)
+              validate! json, :'entity-collection'
             end
 
             # :nodoc:

data/lib/occi/core/parsers/json_parser.rb

@@ -67,8 +67,13 @@ module Occi
         # @return [Set] set of instances
         def categories(body, _headers = nil, expectation = nil)
           expectation ||= Occi::Core::Category
-          Json::Validator.validate_model! body
-          Json::Category.json(body, Set.new, false).map { |c| lookup c.identifier, expectation }.to_set
+          Json::Validator.validate_category_identifiers! body
+
+          cats = Set.new
+          hsh = handle(Occi::Core::Errors::ParsingError) { JSON.parse(body) }
+          hsh.values.flatten.each { |cat_id| cats << lookup(cat_id, expectation) }
+
+          cats
         end
 
         # :nodoc:
@@ -79,8 +84,8 @@ module Occi
             begin
               Json::Validator.validate! body, type
               found = type
-            rescue
-              logger.debug "#{self.class}: Body isn't #{type}"
+            rescue => ex
+              logger.debug "#{self.class}: Body isn't #{type} - #{ex.message}"
             end
           end
           raise Occi::Core::Errors::ParsingError, "#{self.class} -> No entity sub-type instance found" unless found

data/lib/occi/core/version.rb

@@ -3,7 +3,7 @@ module Occi
     MAJOR_VERSION = 5                # Major update constant
     MINOR_VERSION = 0                # Minor update constant
     PATCH_VERSION = 0                # Patch/Fix version constant
-    STAGE_VERSION = 'alpha.1'.freeze # use `nil` for production releases
+    STAGE_VERSION = 'alpha.4'.freeze # use `nil` for production releases
 
     unless defined?(::Occi::Core::VERSION)
       VERSION = [

data/lib/occi/core/warehouse.rb

@@ -29,6 +29,7 @@ module Occi
         #
         # @param model [Occi::Core::Model] model to be bootstrapped
         def bootstrap!(model)
+          logger.debug "#{self}: Bootstrapping#{model.empty? ? ' empty' : ''} model"
           actions! model
           kinds! model
           mixins! model
@@ -66,6 +67,7 @@ module Occi
         def kinds!(model)
           attribute_definitions = attribute_definitions_for(kinds_path)
           yamls_in(kinds_path).each do |file|
+            logger.debug "#{self}: Loading kind from #{file.inspect}"
             model << Occi::Core::Kind.from_yaml(file, model, attribute_definitions)
           end
         end
@@ -74,6 +76,7 @@ module Occi
         def mixins!(model)
           attribute_definitions = attribute_definitions_for(mixins_path)
           yamls_in(mixins_path).each do |file|
+            logger.debug "#{self}: Loading mixin from #{file.inspect}"
             model << Occi::Core::Mixin.from_yaml(file, model, attribute_definitions)
           end
         end
@@ -83,6 +86,7 @@ module Occi
           # TODO: work with separate attribute definitions
           attribute_definitions = {}
           yamls_in(actions_path).each do |file|
+            logger.debug "#{self}: Loading action from #{file.inspect}"
             model << Occi::Core::Action.from_yaml(file, model, attribute_definitions)
           end
         end
@@ -94,6 +98,7 @@ module Occi
           attr_defs_path = File.join(categories_path, ATTRIBS)
           yamls_in(attr_defs_path).each do |file|
             name = attribute_name_from(file)
+            logger.debug "#{self}: Loading attribute definition for #{name.inspect} from #{file.inspect}"
             attribute_definitions[name] = Occi::Core::AttributeDefinition.from_yaml(file)
           end
 

data/lib/occi/infrastructure/model.rb

@@ -10,6 +10,7 @@ module Occi
       #    model = Occi::Infrastructure::Model.new
       #    model.load_infrastructure!
       def load_infrastructure!
+        logger.debug "#{self.class}: Loading Infrastructure from Warehouse"
         Occi::Infrastructure::Warehouse.bootstrap! self
         self << Occi::Infrastructure::Mixins::OsTpl.new
         self << Occi::Infrastructure::Mixins::ResourceTpl.new
@@ -22,6 +23,20 @@ module Occi
       def instance_builder
         Occi::Infrastructure::InstanceBuilder.new(model: self)
       end
+
+      # Returns all mixins dependent on the base `os_tpl` mixin defined by OGF.
+      #
+      # @return [Set] set of mixins dependent on `os_tpl`
+      def find_os_tpls
+        find_dependent Occi::Infrastructure::Mixins::OsTpl.new
+      end
+
+      # Returns all mixins dependent on the base `resource_tpl` mixin defined by OGF.
+      #
+      # @return [Set] set of mixins dependent on `resource_tpl`
+      def find_resource_tpls
+        find_dependent Occi::Infrastructure::Mixins::ResourceTpl.new
+      end
     end
   end
 end

data/lib/occi/infrastructure_ext/model.rb

@@ -10,6 +10,7 @@ module Occi
       #    model = Occi::InfrastructureExt::Model.new
       #    model.load_infrastructure_ext!
       def load_infrastructure_ext!
+        logger.debug "#{self.class}: Loading InfrastructureExt from Warehouse"
         Occi::InfrastructureExt::Warehouse.bootstrap! self
         self << Occi::InfrastructureExt::Mixins::AvailabilityZone.new
         nil
@@ -21,6 +22,13 @@ module Occi
       def instance_builder
         Occi::InfrastructureExt::InstanceBuilder.new(model: self)
       end
+
+      # Returns all mixins dependent on the base `availability_zone` mixin defined by OGF.
+      #
+      # @return [Set] set of mixins dependent on `availability_zone`
+      def find_availability_zones
+        find_dependent Occi::InfrastructureExt::Mixins::AvailabilityZone.new
+      end
     end
   end
 end

data/occi-core.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'ox', '>= 2.4', '< 3'
   gem.add_runtime_dependency 'json', '>= 1.8', '< 3'
   gem.add_runtime_dependency 'activesupport', '>= 4.0', '< 6'
   gem.add_runtime_dependency 'json-schema', '>= 2.5', '< 3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha.1
+  version: 5.0.0.alpha.4
 platform: ruby
 authors:
 - Boris Parak
@@ -10,28 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ox
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -409,14 +389,12 @@ files:
 - lib/occi/core/parsers/json/validator.rb
 - lib/occi/core/parsers/json/validator/.gitkeep
 - lib/occi/core/parsers/json/validator/action-instance.json
+- lib/occi/core/parsers/json/validator/category-identifiers.json
 - lib/occi/core/parsers/json/validator/entity-collection.json
-- lib/occi/core/parsers/json/validator/link-collection.json
 - lib/occi/core/parsers/json/validator/link.json
 - lib/occi/core/parsers/json/validator/locations.json
-- lib/occi/core/parsers/json/validator/mixin-collection.json
 - lib/occi/core/parsers/json/validator/model.json
 - lib/occi/core/parsers/json/validator/occi-schema.json
-- lib/occi/core/parsers/json/validator/resource-collection.json
 - lib/occi/core/parsers/json/validator/resource.json
 - lib/occi/core/parsers/json_parser.rb
 - lib/occi/core/parsers/text/.gitkeep
@@ -588,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The rOCCI toolkit

data/lib/occi/core/parsers/json/validator/link-collection.json

@@ -1,3 +0,0 @@
-{
-	"$ref": "occi-schema.json#/definitions/link_collection"
-}

data/lib/occi/core/parsers/json/validator/mixin-collection.json

@@ -1,3 +0,0 @@
-{
-	"$ref": "occi-schema.json#/definitions/mixin_collection"
-}

data/lib/occi/core/parsers/json/validator/resource-collection.json

@@ -1,3 +0,0 @@
-{
-	"$ref": "occi-schema.json#/definitions/resource_collection"
-}