occi 2.5.3 → 2.5.4

data/Gemfile

@@ -10,6 +10,7 @@ gem "builder"
 gem "activesupport"
 gem "rake"
 gem "httparty"
+gem "i18n"
 
 # development related gems
 group :development do

data/Gemfile.lock

@@ -45,6 +45,7 @@ DEPENDENCIES
   builder
   hashie
   httparty
+  i18n
   json
   nokogiri
   rake

data/README.md

@@ -77,7 +77,11 @@ To get all resources (as a list of OCCI::Resources) currently managed by the end
 
     client.get resources
 
-To get only compute, storage or network resources use get_compute_resources, ...
+To get only compute, storage or network resources use
+
+    client.get compute
+    client.get storage
+    client.get network
 
 To get the location of all resources use
 

data/bin/occi

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+require 'rubygems'
+require 'occi'
+require 'pp'
+require 'logger'
+
+include OCCI::DSL
+
+begin
+  puts "This is an OCCI client utility."
+rescue Exception => ex
+  puts "An error occurred!"
+  exit!
+end

data/examples/dsl_example.rb

@@ -0,0 +1,158 @@
+require 'rubygems'
+require 'pp'
+
+# load and include rOCCI client DSL
+require 'occi'
+extend OCCI::DSL
+
+                              ## options
+use_os_temlate = true         # use OS_TEMPLATE or NETWORK + STORAGE + INSTANCE TYPE
+OS_TEMPLATE    = 'monitoring' # name of the VM template in ON
+
+clean_up_compute = true       # issue DELETE <RESOURCE> after we are done
+
+USER_CERT          = ENV['HOME'] + '/.globus/usercred.pem'
+USER_CERT_PASSWORD = 'mypassphrase'
+CA_PATH            = '/etc/grid-security/certificates'
+ENDPOINT           = 'https://localhost:3300'
+
+## establish a connection
+connect(ENDPOINT,
+        { :type               => "x509",
+          :user_cert          => USER_CERT,
+          :user_cert_password => USER_CERT_PASSWORD,
+          :ca_path            => CA_PATH },
+        { :out   => STDERR,
+          :level => OCCI::Log::DEBUG })
+
+puts "\n\nListing all available resource types:"
+resource_types.each do |type|
+  puts "\n#{type}"
+end
+
+puts "\n\nListing all available resource type identifiers:"
+resource_type_identifiers.each do |type_id|
+  puts "\n#{type_id}"
+end
+
+puts "\n\nListing all available mixin types:"
+mixin_types.each do |mixin_type|
+  puts "\n#{mixin_type}"
+end
+
+puts "\n\nListing all available mixin type identifiers:"
+mixin_type_identifiers.each do |mixin_typeid|
+  puts "\n#{mixin_typeid}"
+end
+
+puts "\n\nListing all available mixins:"
+mixins.each do |mixin|
+  puts "\n#{mixin}"
+end
+
+samples = [OS_TEMPLATE, "medium", "large", "small"]
+
+puts "\n\nFind mixins using their names:"
+samples.each do |mxn|
+  puts "\n#{mxn}:\n"
+  pp mixin mxn
+end
+
+puts "\n\nFind mixins using their names and a type:"
+samples.each do |mxn|
+  puts "\n#{mxn}:\n"
+  pp mixin(mxn, "os_tpl")
+end
+
+puts "\n\nFind mixins using their names and a type:"
+samples.each do |mxn|
+  puts "\n#{mxn}:\n"
+  pp mixin(mxn, "resource_tpl")
+end
+
+puts "\n\nFind mixins using their names (showing detailed descriptions):"
+samples.each do |mxn|
+  puts "\n#{mxn}:\n"
+  pp mixin(mxn, nil, true)
+end
+
+## get links of all available resources
+puts "\n\nListing storage resources"
+pp list "storage"
+
+puts "\n\nListing network resources"
+pp list "network"
+
+puts "\n\nListing compute resources"
+pp list "compute"
+
+## get detailed information about all available resources
+puts "\n\nDescribing storage resources"
+pp describe "storage"
+
+puts "\n\nDescribing compute resources"
+pp describe "compute"
+
+puts "\n\nDescribing network resources"
+pp describe "network"
+
+## create a compute resource using the chosen method (os_tpl|strg+ntwrk)
+puts "\n\nCreate compute resources"
+cmpt = resource "compute"
+
+unless use_os_temlate
+  ## without OS template, we have to manually select and attach
+  ## network, storage and resource template (instance type)
+
+  ## select instance type medium
+  cmpt.mixins << mixin('medium', "resource_tpl")
+
+  ## list network/storage locations and select the appropriate ones (the first ones in this case)
+  puts "\nUsing:"
+  pp storage_loc = list("storage")[0]
+  pp network_loc = list("network")[0]
+
+  ## create links and attach them to the compure resource
+  puts "\n Connecting to our compute:"
+  storagelink cmpt, storage_loc
+  networkinterface cmpt, network_loc
+else
+  ## with OS template, we have to find the template by name
+  ## optionally we can change its "size" by choosing an instance type
+  puts "\nUsing:"
+  pp os = mixin(OS_TEMPLATE, "os_tpl")
+  pp size = mixin('medium', "resource_tpl")
+
+  ## attach chosen resources to the compute resource
+  cmpt.mixins << os << size
+  ## we can change some of the values manually
+  cmpt.attributes.occi!.core!.title = "My rOCCI x509 VM"
+end
+
+## create the compute resource and print its location
+cmpt_loc = create cmpt
+pp "Location of new compute resource: #{cmpt_loc}"
+
+## get links of all available compute resouces again
+puts "\n\nListing locations of compute resources (should now contain #{cmpt_loc})"
+pp list "compute"
+
+## get detailed information about the new compute resource
+puts "\n\nListing information about compute resource #{cmpt_loc}"
+cmpt_data = describe cmpt_loc
+pp cmpt_data
+
+## wait until the resource is "active"
+while cmpt_data.resources.first.attributes.occi.compute.state == "inactive"
+  puts "\nCompute resource #{cmpt_loc} is inactive, waiting ..."
+  sleep 1
+  cmpt_data = describe cmpt_loc
+end
+
+puts "\nCompute resource #{cmpt_loc} is #{cmpt_data.resources.first.attributes.occi.compute.state}"
+
+## delete the resource and exit
+if clean_up_compute
+  puts "\n\nDeleting compute resource #{cmpt_loc}"
+  pp delete cmpt_loc
+end

data/examples/x509auth_example.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'occi'
 require 'pp'
-require 'hashie/mash'
 
 ## options
 use_os_temlate = true # use OS_TEMPLATE or NETWORK + STORAGE + INSTANCE TYPE
@@ -9,88 +8,121 @@ OS_TEMPLATE = 'monitoring' # name of the VM template in ON
 
 clean_up_compute = true # issue DELETE <RESOURCE> after we are done
 
-USER_CERT           = ENV['HOME'] + '/.globus/usercert.pem'
+USER_CERT           = ENV['HOME'] + '/.globus/usercred.pem'
 USER_CERT_PASSWORD = 'mypassphrase'
 CA_PATH             = '/etc/grid-security/certificates'
 
 ## get an OCCI::Client instance
 client = OCCI::Client.new('https://localhost:3300',
-                          { :type               => "x509",
-                            :user_cert          => USER_CERT,
-                            :user_cert_password => USER_CERT_PASSWORD,
-                            :ca_path            => CA_PATH })
+                                 { :type               => "x509",
+                                   :user_cert          => USER_CERT,
+                                   :user_cert_password => USER_CERT_PASSWORD,
+                                   :ca_path            => CA_PATH },
+                                 { :out                => STDERR,
+                                   :level              => OCCI::Log::DEBUG})
+
+puts "\n\nListing all available resource types:"
+client.get_resource_types.each do |type|
+  puts "\n#{type}"
+end
 
-## get detailed information about all available resources
-## then query each resource category in turn
-puts "\n\nPrinting all resources"
-pp client.get resources
+puts "\n\nListing all available resource type identifiers:"
+client.get_resource_type_identifiers.each do |type_id|
+  puts "\n#{type_id}"
+end
 
-puts "\n\nPrinting storage resources"
-pp client.get storage
+puts "\n\nListing all available mixin types:"
+client.get_mixin_types.each do |mixin_type|
+  puts "\n#{mixin_type}"
+end
 
-puts "\n\nPrinting network resources"
-pp client.get network
+puts "\n\nListing all available mixin type identifiers:"
+client.get_mixin_type_identifiers.each do |mixin_typeid|
+  puts "\n#{mixin_typeid}"
+end
 
-puts "\n\nPrinting compute resources"
-pp client.get compute
+puts "\n\nListing all available mixins:"
+client.get_mixins.each do |mixin|
+  puts "\n#{mixin}"
+end
+
+samples = [OS_TEMPLATE, "medium", "large", "small"]
+
+puts "\n\nFind mixins using their names:"
+samples.each do |mixin|
+  puts "\n#{mixin}:\n"
+  pp client.find_mixin mixin
+end
+
+puts "\n\nFind mixins using their names and a type:"
+samples.each do |mixin|
+  puts "\n#{mixin}:\n"
+  pp client.find_mixin(mixin, "os_tpl")
+end
+
+puts "\n\nFind mixins using their names and a type:"
+samples.each do |mixin|
+  puts "\n#{mixin}:\n"
+  pp client.find_mixin(mixin, "resource_tpl")
+end
+
+puts "\n\nFind mixins using their names (showing detailed descriptions):"
+samples.each do |mixin|
+  puts "\n#{mixin}:\n"
+  pp client.find_mixin(mixin, nil, true)
+end
 
 ## get links of all available resources
-## then get links for each category in turn
-puts "\n\nPrinting locations of all resources"
-pp client.list resources
+puts "\n\nListing storage resources"
+pp client.list "storage"
 
-puts "\n\nPrinting locations of storage resources"
-pp client.list storage
+puts "\n\nListing network resources"
+pp client.list "network"
 
-puts "\n\nPrinting locations of compute resources"
-pp client.list compute
+puts "\n\nListing compute resources"
+pp client.list "compute"
 
-puts "\n\nPrinting locations of network resources"
-pp client.list network
+## get detailed information about all available resources
+puts "\n\nDescribing storage resources"
+pp client.describe "storage"
 
-## get detailed information about available OS templates (== VM templates in ON)
-## and resource templates (== INSTANCE TYPES, e.g. small, medium, large etc.)
-puts "\n\nPrinting OS templates"
-pp client.get_os_templates
+puts "\n\nDescribing compute resources"
+pp client.describe "compute"
 
-puts "\n\nPrinting resource templates"
-pp client.get_resource_templates
+puts "\n\nDescribing network resources"
+pp client.describe "network"
 
-## create a compute resource using the chosen method
+## create a compute resource using the chosen method (os_tpl|strg+ntwrk)
 puts "\n\nCreate compute resources"
-
-cmpt = OCCI::Core::Resource.new compute
+cmpt = client.get_resource "compute"
 
 unless use_os_temlate
   ## without OS template, we have to manually select and attach
   ## network, storage and resource template (instance type)
 
   ## select instance type medium
-  cmpt.mixins << 'http://my.occi.service//occi/infrastructure/resource_tpl#medium'
+  cmpt.mixins << client.find_mixin('medium', "resource_tpl")
 
-  ## list network/storage locations and select the appropriate ones (the first ones in this case) 
-  puts "\nUsing"
-  pp storage_loc = client.list(storage)[0]
-  pp network_loc = client.list(network)[0]
+  ## list network/storage locations and select the appropriate ones (the first ones in this case)
+  puts "\nUsing:"
+  pp storage_loc = client.list("storage")[0]
+  pp network_loc = client.list("network")[0]
 
   ## create links and attach them to the compure resource
+  puts "\n Connecting to our compute:"
   client.storagelink cmpt, storage_loc
   client.networkinterface cmpt, network_loc
 else
   ## with OS template, we have to find the template by name
-  ## optionally we can change its "size" by choosing an instance type 
-  puts "\nUsing"
-  pp os = client.get_os_templates.select { |template| template.term.include? OS_TEMPLATE }
-  pp size = client.get_resource_templates.select { |template| template.term.include? 'medium' }
-  
-  puts "\nGetting identifiers"
-  pp os_id = os.first.type_identifier
-  pp size_id = size.first.type_identifier
+  ## optionally we can change its "size" by choosing an instance type
+  puts "\nUsing:"
+  pp os = client.find_mixin(OS_TEMPLATE, "os_tpl")
+  pp size = client.find_mixin('medium', "resource_tpl")
 
   ## attach chosen resources to the compute resource
-  cmpt.mixins << os_id << size_id
+  cmpt.mixins << os << size
   ## we can change some of the values manually
-  cmpt.attributes.occi!.core!.title = "My rOCCI VM"
+  cmpt.attributes.occi!.core!.title = "My rOCCI x509 VM"
 end
 
 ## create the compute resource and print its location
@@ -98,27 +130,25 @@ cmpt_loc = client.create cmpt
 pp "Location of new compute resource: #{cmpt_loc}"
 
 ## get links of all available compute resouces again
-puts "\n\nPrinting locations of compute resources (should now contain #{cmpt_loc})"
-pp client.list compute
+puts "\n\nListing locations of compute resources (should now contain #{cmpt_loc})"
+pp client.list "compute"
 
 ## get detailed information about the new compute resource
-## using Hashie simplifies access to its attributes
-puts "\n\nPrinting information about compute resource #{cmpt_loc}"
-cmpt_data = client.get cmpt_loc.to_s.split('/')[3] + '/' + cmpt_loc.to_s.split('/')[4]
-pp cmpt_hashie = Hashie::Mash.new(JSON.parse(cmpt_data.to_json))
+puts "\n\nListing information about compute resource #{cmpt_loc}"
+cmpt_data = client.describe cmpt_loc
+pp cmpt_data
 
 ## wait until the resource is "active"
-while cmpt_hashie.resources.first.attributes.occi.compute.state == "inactive"
+while cmpt_data.resources.first.attributes.occi.compute.state == "inactive"
   puts "\nCompute resource #{cmpt_loc} is inactive, waiting ..."
   sleep 1
-  cmpt_data = client.get cmpt_loc.to_s.split('/')[3] + '/' + cmpt_loc.to_s.split('/')[4]
-  cmpt_hashie = Hashie::Mash.new(JSON.parse(cmpt_data.to_json))
+  cmpt_data = client.describe cmpt_loc
 end
 
-puts "\nCompute resource #{cmpt_loc} is #{cmpt_hashie.resources.first.attributes.occi.compute.state}"
+puts "\nCompute resource #{cmpt_loc} is #{cmpt_data.resources.first.attributes.occi.compute.state}"
 
 ## delete the resource and exit
 if clean_up_compute
   puts "\n\nDeleting compute resource #{cmpt_loc}"
-  pp client.delete cmpt_loc.to_s.split('/')[3] + '/' + cmpt_loc.to_s.split('/')[4]
+  pp client.delete cmpt_loc
 end

data/lib/occi.rb

@@ -1,18 +1,31 @@
+require 'hashie/mash'
+
+require 'active_support/json'
+require 'active_support/inflector'
+require 'active_support/notifications'
+
+require 'logger'
+
+require 'uuidtools'
+
+require 'httparty'
+
+require 'nokogiri'
+
+require 'rubygems/package'
+
+require 'zlib'
+
+require 'tempfile'
+
 require 'occi/version'
 require 'occi/parser'
 require 'occi/model'
 require 'occi/log'
-require 'occi/client'
+require 'occi/api/dsl'
+require 'occi/api/client'
 require 'occi/collection'
-require 'occi/core/action'
-require 'occi/core/attribute_properties'
-require 'occi/core/attributes'
-require 'occi/core/category'
-require 'occi/core/entity'
-require 'occi/core/kind'
-require 'occi/core/link'
-require 'occi/core/mixin'
-require 'occi/core/resource'
+require 'occi/core'
 
 require 'occiantlr/OCCIANTLRLexer'
 require 'occiantlr/OCCIANTLRParser'