occi 2.5.19 → 3.0.0.beta.0

data/spec/occi/test.json

@@ -1,66 +1,30 @@
 {
-    "resources": [
+    "resources":[
         {
-            "links": [
-                {
-                    "kind": "http://schemas.ogf.org/occi/infrastructure#storagelink",
-                    "attributes": {
-                        "occi": {
-                            "core": {
-                                "id": "34cb5bce-d31a-11e1-a11a-a4b197fffef3",
-                                "title": "lamp",
-                                "target": "http://example.com/lamp.vmdk"
-                            }
-                        }
-                    }
-                }
-            ],
-            "kind": "http://schemas.ogf.org/occi/infrastructure#storage",
-            "attributes": {
-                "occi": {
-                    "core": {
-                        "id": "34c88188-d31a-11e1-a11a-a4b197fffef3",
-                        "title": "lamp"
-                    }
-                }
-            }
-        },
-        {
-            "kind": "http://schemas.ogf.org/occi/infrastructure#network",
-            "attributes": {
-                "occi": {
-                    "core": {
-                        "id": "34cb6830-d31a-11e1-a11a-a4b197fffef3",
-                        "title": "VM Network"
+            "kind":"http://schemas.ogf.org/occi/infrastructure#compute",
+            "attributes":{
+                "occi":{
+                    "core":{
+                        "summary":""
+                    },
+                    "compute":{
+                        "cores":1,
+                        "memory":256
                     }
                 }
-            }
-        },
+            },
+            "links":["/storagelink/34cbb948-d31a-11e1-a11a-a4b197fffef3"]
+        }
+    ],
+    "links":[
         {
-            "links": [
-                {
-                    "kind": "http://schemas.ogf.org/occi/infrastructure#storagelink",
-                    "attributes": {
-                        "occi": {
-                            "core": {
-                                "id": "34cbb948-d31a-11e1-a11a-a4b197fffef3",
-                                "title": "Harddisk 1",
-                                "target": "/storage/34c88188-d31a-11e1-a11a-a4b197fffef3"
-                            }
-                        }
-                    }
-                }
-            ],
-            "kind": "http://schemas.ogf.org/occi/infrastructure#compute",
-            "attributes": {
-                "occi": {
-                    "core": {
-                        "id": "34cb6f60-d31a-11e1-a11a-a4b197fffef3",
-                        "summary": ""
-                    },
-                    "compute": {
-                        "cores": 1,
-                        "memory": 256
+            "kind":"http://schemas.ogf.org/occi/infrastructure#storagelink",
+            "attributes":{
+                "occi":{
+                    "core":{
+                        "id":"urn:uuid:34cbb948-d31a-11e1-a11a-a4b197fffef3",
+                        "title":"Harddisk 1",
+                        "target":"/storage/34c88188-d31a-11e1-a11a-a4b197fffef3"
                     }
                 }
             }

data/spec/occiantlr/parser_spec.rb

@@ -3,12 +3,11 @@ require 'hashie'
 
 require 'occiantlr/OCCIANTLRParser'
 
-module OCCI
-  module ANTLR
+module OCCIANTLR
     describe Parser do
       describe "#Category" do
         it "is parsed successful" do
-          ATTRIBUTE                       = { :Mutable => true, :Required => false, :Type => "string" }
+          ATTRIBUTE                       = { :mutable => true, :required => false, :type => "string" }
           term                            = 'entity'
           scheme                          = 'http://schemas.ogf.org/occi/core#'
           class_type                      = 'kind'
@@ -16,7 +15,7 @@ module OCCI
           rel                             = ['http://schemas.ogf.org/occi/core#resource#']
           location                        = '/storage/'
           attributes                      = Hashie::Mash.new
-          attributes.occi!.storage!.size  = { :Mutable => false, :Required => false, :Type => "string" }
+          attributes.occi!.storage!.size  = { :mutable => false, :required => false, :type => "string" }
           attributes.occi!.storage!.state = ATTRIBUTE
           attributes_string               = 'occi.storage.size{immutable} occi.storage.state'
           actions                         = Array.new
@@ -42,7 +41,7 @@ module OCCI
           target                                       = '/network/123'
           rel                                          = 'http://schemas.ogf.org/occi/infrastructure#network'
           self_location                                = '/link/networkinterface/456'
-          kind                                     = 'http://schemas.ogf.org/occi/infrastructure#networkinterface'
+          kind                                         = 'http://schemas.ogf.org/occi/infrastructure#networkinterface'
           attributes                                   = Hashie::Mash.new
           attributes.occi!.networkinterface!.interface = 'eth0'
           attributes.occi!.networkinterface!.mac       = '00:11:22:33:44:55'
@@ -54,7 +53,7 @@ module OCCI
           link[:target].should == target
           link[:rel].should == rel
           link[:self].should == self_location
-          link[:kind].should == kind
+          link[:categories].first.should == kind
           link[:attributes].should == attributes
         end
       end
@@ -81,4 +80,3 @@ module OCCI
       end
     end
   end
-end

data/spec/spec_helper.rb

@@ -1,6 +1,16 @@
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start
-  # For rails applications use
-  # SimpleCov.start 'rails'
-end
+end
+
+require 'vcr'
+
+VCR.configure do |c|
+  c.hook_into :webmock
+  c.cassette_library_dir = 'spec/cassettes'
+  c.default_cassette_options = { :record => :new_episodes }
+end
+
+RSpec.configure do |c|
+    c.extend VCR::RSpec::Macros
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: occi
 version: !ruby/object:Gem::Version
-  version: 2.5.19
-  prerelease: 
+  version: 3.0.0.beta.0
+  prerelease: 6
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -156,6 +156,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OCCI is a collection of classes to simplify the implementation of the
   Open Cloud Computing API in Ruby
 email:
@@ -176,33 +192,70 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Test Results - discovery_interface.html
 - bin/occi
-- etc/model/infrastructure/compute.json
-- etc/model/infrastructure/ipnetwork.json
-- etc/model/infrastructure/ipnetworkinterface.json
-- etc/model/infrastructure/network.json
-- etc/model/infrastructure/networkinterface.json
-- etc/model/infrastructure/os_template.json
-- etc/model/infrastructure/resource_template.json
-- etc/model/infrastructure/storage.json
-- etc/model/infrastructure/storagelink.json
 - examples/dsl_example.rb
 - examples/x509auth_example.rb
+- features/common/step_definitions/common_steps.rb
+- features/occi/core/create/create.feature
+- features/occi/core/create/step_definitions/create_steps.rb
+- features/occi/core/delete/delete.feature
+- features/occi/core/delete/step_definitions/delete_steps.rb
+- features/occi/core/discovery_interface/discovery_interface.feature
+- features/occi/core/discovery_interface/step_definitions/discovery_interface_steps.rb
+- features/occi/core/miscellaneous/miscellaneous.feature
+- features/occi/core/miscellaneous/step_definitions/miscellaneous_steps.rb
+- features/occi/core/read/read.feature
+- features/occi/core/read/step_definitions/read_steps.rb
+- features/occi/core/update/step_definitions/update_steps.rb
+- features/occi/core/update/update.feature
+- features/occi/infrastructure/create/create.feature
+- features/occi/infrastructure/create/step_definitions/create_steps.rb
+- features/support/env.rb
 - lib/occi.rb
-- lib/occi/api/client.rb
+- lib/occi/api/client/client_amqp.rb
+- lib/occi/api/client/client_http.rb
+- lib/occi/api/client/http/httparty_fix.rb
+- lib/occi/api/client/http/net_http_fix.rb
 - lib/occi/api/dsl.rb
-- lib/occi/client/occiopts.rb
+- lib/occi/bin/helpers.rb
+- lib/occi/bin/occi_opts.rb
+- lib/occi/bin/resource_output_factory.rb
+- lib/occi/bin/templates/compute.erb
+- lib/occi/bin/templates/network.erb
+- lib/occi/bin/templates/os_tpl.erb
+- lib/occi/bin/templates/resource_tpl.erb
+- lib/occi/bin/templates/storage.erb
 - lib/occi/collection.rb
 - lib/occi/core.rb
 - lib/occi/core/action.rb
+- lib/occi/core/action_instance.rb
+- lib/occi/core/actions.rb
 - lib/occi/core/attribute_properties.rb
 - lib/occi/core/attributes.rb
+- lib/occi/core/categories.rb
 - lib/occi/core/category.rb
+- lib/occi/core/entities.rb
 - lib/occi/core/entity.rb
 - lib/occi/core/kind.rb
+- lib/occi/core/kinds.rb
 - lib/occi/core/link.rb
+- lib/occi/core/links.rb
 - lib/occi/core/mixin.rb
+- lib/occi/core/mixins.rb
+- lib/occi/core/related.rb
 - lib/occi/core/resource.rb
+- lib/occi/core/resources.rb
+- lib/occi/infrastructure.rb
+- lib/occi/infrastructure/compute.rb
+- lib/occi/infrastructure/network.rb
+- lib/occi/infrastructure/network/ipnetwork.rb
+- lib/occi/infrastructure/networkinterface.rb
+- lib/occi/infrastructure/networkinterface/ipnetworkinterface.rb
+- lib/occi/infrastructure/os_tpl.rb
+- lib/occi/infrastructure/resource_tpl.rb
+- lib/occi/infrastructure/storage.rb
+- lib/occi/infrastructure/storagelink.rb
 - lib/occi/log.rb
 - lib/occi/model.rb
 - lib/occi/parser.rb
@@ -214,8 +267,17 @@ files:
 - lib/occiantlr/OCCIANTLRParser.rb
 - lib/occiantlr/README.md
 - occi.gemspec
-- spec/occi/client_spec.rb
+- spec/cassettes/client_http_text_plain.yml
+- spec/occi/api/client/client_amqp_spec.rb
+- spec/occi/api/client/client_http_0.5_spec.rb
+- spec/occi/api/client/client_http_spec.rb
+- spec/occi/api/dsl_spec.rb
 - spec/occi/collection_spec.rb
+- spec/occi/core/categories_spec.rb
+- spec/occi/core/category_spec.rb
+- spec/occi/core/entity_spec.rb
+- spec/occi/core/resource_spec.rb
+- spec/occi/infrastructure/compute_spec.rb
 - spec/occi/log_spec.rb
 - spec/occi/model_spec.rb
 - spec/occi/parser_spec.rb
@@ -239,14 +301,49 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OCCI toolkit
-test_files: []
+test_files:
+- features/common/step_definitions/common_steps.rb
+- features/occi/core/create/create.feature
+- features/occi/core/create/step_definitions/create_steps.rb
+- features/occi/core/delete/delete.feature
+- features/occi/core/delete/step_definitions/delete_steps.rb
+- features/occi/core/discovery_interface/discovery_interface.feature
+- features/occi/core/discovery_interface/step_definitions/discovery_interface_steps.rb
+- features/occi/core/miscellaneous/miscellaneous.feature
+- features/occi/core/miscellaneous/step_definitions/miscellaneous_steps.rb
+- features/occi/core/read/read.feature
+- features/occi/core/read/step_definitions/read_steps.rb
+- features/occi/core/update/step_definitions/update_steps.rb
+- features/occi/core/update/update.feature
+- features/occi/infrastructure/create/create.feature
+- features/occi/infrastructure/create/step_definitions/create_steps.rb
+- features/support/env.rb
+- spec/cassettes/client_http_text_plain.yml
+- spec/occi/api/client/client_amqp_spec.rb
+- spec/occi/api/client/client_http_0.5_spec.rb
+- spec/occi/api/client/client_http_spec.rb
+- spec/occi/api/dsl_spec.rb
+- spec/occi/collection_spec.rb
+- spec/occi/core/categories_spec.rb
+- spec/occi/core/category_spec.rb
+- spec/occi/core/entity_spec.rb
+- spec/occi/core/resource_spec.rb
+- spec/occi/infrastructure/compute_spec.rb
+- spec/occi/log_spec.rb
+- spec/occi/model_spec.rb
+- spec/occi/parser_spec.rb
+- spec/occi/test.json
+- spec/occi/test.ova
+- spec/occi/test.ovf
+- spec/occiantlr/parser_spec.rb
+- spec/spec_helper.rb
 has_rdoc: 

data/etc/model/infrastructure/compute.json

@@ -1,108 +0,0 @@
-{
-    "kinds":[
-        {
-            "term":"compute",
-            "scheme":"http://schemas.ogf.org/occi/infrastructure#",
-            "title":"Compute Resource",
-            "related":[
-                "http://schemas.ogf.org/occi/core#resource"
-            ],
-            "attributes":{
-                "occi":{
-                    "compute":{
-                        "architecture":{
-                            "Mutable":true,
-                            "Required":false,
-                            "Type":"string",
-                            "Pattern":"x86|x64"
-                        },
-                        "cores":{
-                            "Mutable":true,
-                            "Required":false,
-                            "Type":"number"
-                        },
-                        "hostname":{
-                            "Mutable":true,
-                            "Required":false,
-                            "Type":"string",
-                            "Pattern":"(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*"
-                        },
-                        "speed":{
-                            "Mutable":true,
-                            "Required":false,
-                            "Type":"number"
-                        },
-                        "memory":{
-                            "Mutable":true,
-                            "Required":false,
-                            "Type":"number"
-                        },
-                        "state":{
-                            "Mutable":false,
-                            "Required":false,
-                            "Type":"string",
-                            "Pattern":"inactive|active|suspended|error",
-                            "Default":"inactive"
-                        }
-                    }
-                }
-            },
-            "actions":[
-                "http://schemas.ogf.org/occi/infrastructure/compute/action#start",
-                "http://schemas.ogf.org/occi/infrastructure/compute/action#stop",
-                "http://schemas.ogf.org/occi/infrastructure/compute/action#restart",
-                "http://schemas.ogf.org/occi/infrastructure/compute/action#suspend"
-            ],
-            "location":"/compute/"
-        }
-    ],
-    "actions":[
-        {
-            "term":"start",
-            "scheme":"http://schemas.ogf.org/occi/infrastructure/compute/action#",
-            "title":"Start Compute instance"
-        },
-        {
-            "term":"stop",
-            "scheme":"http://schemas.ogf.org/occi/infrastructure/compute/action#",
-            "title":"Stop Compute instance",
-            "attributes":{
-                "method":{
-                    "Mutable":true,
-                    "Required":false,
-                    "Type":"string",
-                    "Pattern":"graceful|acpioff|poweroff",
-                    "Default":"poweroff"
-                }
-            }
-        },
-        {
-            "term":"restart",
-            "scheme":"http://schemas.ogf.org/occi/infrastructure/compute/action#",
-            "title":"Restart Compute instance",
-            "attributes":{
-                "method":{
-                    "Mutable":true,
-                    "Required":false,
-                    "Type":"string",
-                    "Pattern":"graceful|warm|cold",
-                    "Default":"cold"
-                }
-            }
-        },
-        {
-            "term":"suspend",
-            "scheme":"http://schemas.ogf.org/occi/infrastructure/compute/action#",
-            "title":"Suspend Compute instance",
-            "attributes":{
-                "method":{
-                    "Mutable":true,
-                    "Required":false,
-                    "Type":"string",
-                    "Pattern":"hibernate|suspend",
-                    "Default":"suspend"
-                }
-            }
-        }
-    ]
-}