lorj_cloud 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18667a9e2559cedc572e479ea365835bc026849e
-  data.tar.gz: 823ba90cf29360f228c5ee561fec98f5d58e8f37
+  metadata.gz: 9a6728ac07fa2967a77fccc30673346724180474
+  data.tar.gz: 0eda6415e42c3438d42ddd65a7e7225cd2c6254a
 SHA512:
-  metadata.gz: 4c591e614887169d6badb2e8b434df750ed54f140900993b66c971499f556c3c432f9458c41ef978274e06d3eb0810fbafb9f3f9142ce7924347609a476b971a
-  data.tar.gz: 67dbe332d5b8719393a0c2f3af55f9a130a2e05d98da194d29b79be01ded3a3d9683c247df873940a679ff36ebc453999fd61782a6bbcc9995c2d6fe0cb82c39
+  metadata.gz: dd1430bfbc8595a5b8d1300b73e29ddec98ee2ecde43a41863d167efeeaa96a7bcc8afc6b752ff4911b8f147052738dbad10db0a823972ccb064fc68ec8d304e
+  data.tar.gz: 9a7910cfb451762e16e04977b6e0e63c11d7500768eac414ef22f5aa03096a1a3d00fa9574145f0492f2025842fc42e0865a6b3394389324946bac2cf4d7c545

data/lib/lorj_cloud/version.rb

@@ -1,5 +1,5 @@
 # LorjCloud module
 module LorjCloud
-  VERSION = '0.1.2'
-  DATE = '2015-06-15'
+  VERSION = '0.1.3'
+  DATE = '2015-06-22'
 end

data/lib/process/cloud/process/server.rb

@@ -26,6 +26,8 @@ class CloudProcess
   def forj_get_or_create_server(sCloudObj, hParams)
     server_name = hParams[:server_name]
     PrcLib.state("Searching for server '%s'", server_name)
+
+    config[:search_for] = server_name
     servers = forj_query_server(sCloudObj, { :name => server_name }, hParams)
     if servers.length > 0
       # Get server details
@@ -103,6 +105,7 @@ class Lorj::BaseDefinition
 
   def_attribute :image_id
   def_attribute :key_name
+  def_attribute :meta_data
 end
 
 # Internal Process function

data/lib/process/cloud/providers/hpcloud/hpcloud.rb

@@ -100,6 +100,7 @@ class Hpcloud
   # ************************************ SERVER Object
   define_obj :server
   def_attr_mapping :private_ip_addresses, [:addresses, '{key}', [:addr]]
+  def_attr_mapping :meta_data, :metadata
   def_attr_mapping :status, :state
   attr_value_mapping :create,   'BUILD'
   attr_value_mapping :boot,     :boot
@@ -394,12 +395,30 @@ class HpcloudController # rubocop: disable Metrics/ClassLength
                        "Valid one are : '%s'",
                        key[0], oControlerObject.class,
                        def_attributes unless def_attributes.include?(key[0])
-      attributes.rh_get(key)
+      return attributes.rh_get(key) if attributes.rh_exist?(key)
+      _get_instance_attr(oControlerObject, key)
     end
   rescue => e
     controller_error "Unable to map '%s'. %s", key, e.message
   end
 
+  def _server_metadata_get(oControlerObject)
+    ret = {}
+    oControlerObject.metadata.each do |m|
+      k = m.attributes[:key]
+      v = m.attributes[:value]
+      ret[k] = v
+    end
+    ret
+  end
+
+  def _get_instance_attr(oControlerObject, key)
+    return _server_metadata_get(oControlerObject) if key[0] == :metadata
+    return nil if oControlerObject.send(key[0]).nil?
+    return oControlerObject.send(key[0]) if key.length == 1
+    oControlerObject.send(key[0]).rh_get(key[1..-1])
+  end
+
   def set_attr(oControlerObject, key, value)
     controller_class = oControlerObject.class
 

data/lib/process/cloud/providers/openstack/openstack.rb

@@ -222,6 +222,7 @@ class Openstack
                    [:addresses, '{/.*/}',
                     '<%= data["OS-EXT-IPS:type"] == "floating" %>|addr']
   def_attr_mapping :image_id, [:image, 'id']
+  def_attr_mapping :meta_data, :metadata
 
   define_obj :router
   obj_needs_optional
@@ -355,7 +356,21 @@ class OpenstackController
     controller_error "==>Unable to map '%s'. %s", key, e.message
   end
 
+  def _server_metadata_get(oControlerObject)
+    ret = {}
+    oControlerObject.metadata.each do |m|
+      k = m.attributes[:key]
+      v = m.attributes[:value]
+      ret[k] = v
+    end
+    ret
+  end
+
   def _get_instance_attr(oControlerObject, key)
+    if key[0] == :metadata &&
+       oControlerObject.class == Fog::Compute::OpenStack::Server
+      return _server_metadata_get(oControlerObject)
+    end
     return nil if oControlerObject.send(key[0]).nil?
     return oControlerObject.send(key[0]) if key.length == 1
     oControlerObject.send(key[0]).rh_get(key[1..-1])

data/lib/process/cloud/providers/openstack/openstack_query.rb

@@ -16,81 +16,61 @@
 
 # Defined Openstack object query.
 class OpenstackController
-  def self.def_basic_query(connection, name, property_name = nil)
-    property_name = property_name.nil? ? name.to_s + 's' : property_name.to_s
-
-    define_method("query_#{name}") do |hParams, _query|
-      required?(hParams, connection)
-      hParams[connection].send(property_name).all
-    end
-  end
-
-  # Implementation of API supporting query Hash
-  def self.def_simple_query(connection, name, property_name = nil)
-    property_name = property_name.nil? ? name.to_s + 's' : property_name.to_s
-
-    define_method("query_#{name}") do |hParams, query|
-      required?(hParams, connection)
-      hParams[connection].send(property_name).all query
-    end
-  end
-
   # Implementation of API NOT supporting query Hash
   # The function will filter itself.
-  def self.def_complex_query(connection, name, property_name = nil)
+  # It must support
+  # - Regexp
+  # - simple value equality
+  def self.def_query(requires, name, property_name = nil)
     property_name = property_name.nil? ? name.to_s + 's' : property_name.to_s
 
     define_method("query_#{name}") do |hParams, query|
-      required?(hParams, connection)
-
-      key_pairs = hParams[connection].send(property_name).all
-      results = []
-      key_pairs.each do |sElem|
-        selected = true
-        attributes = sElem.instance_variable_get(:@attributes)
-        query.each do |key, value|
-          if attributes[key] != value
-            selected = false
-            break
-          end
-        end
-        results.push sElem if selected
+      requires = [requires] unless requires.is_a?(Array)
+      requires.each { |r| required?(hParams, r) }
+
+      connection = requires[0]
+
+      yield hParams, query if block_given?
+
+      func = hParams[connection].send(property_name).method(:all)
+      if func.parameters.length > 0
+        Lorj.debug(4, "'%s' uses Openstack API filter feature.", __method__)
+        objects = func.call ctrl_query_select(query, String)
+      else
+        objects = func.call
       end
-      results
+      # Uses :[] or :<key> to match object and query attr.
+      Lorj.debug(4, "'%s' gets %d records", __method__, objects.length)
+      ctrl_query_each objects, query # Return the select objects.
     end
   end
 
-  def_simple_query :compute_connection, :tenant
-
-  def_simple_query :compute_connection, :image
+  def_query :compute_connection, :tenant
 
-  def_simple_query :compute_connection, :flavor
+  def_query :compute_connection, :image
 
-  def_simple_query :compute_connection, :server
+  def_query :compute_connection, :flavor
 
-  def_simple_query :network_connection, :network
+  def_query :compute_connection, :server
 
-  def_simple_query :network_connection, :subnetwork, :subnets
+  def_query :network_connection, :network
 
-  def_simple_query :network_connection, :router
+  def_query :network_connection, :subnetwork, :subnets
 
-  def_simple_query :network_connection, :port
+  def_query :network_connection, :router
 
-  # def_simple_query :network_connection, :security_groups, :security_groups
+  def_query :network_connection, :port
 
-  def_simple_query :network_connection, :rule, :security_group_rules
-
-  def_complex_query :compute_connection, :keypairs, :key_pairs
+  def_query([:network_connection, :tenants],
+            :security_groups, :security_groups) do |hParams, query|
+    query[:tenant_id] = hParams[:tenants].id
+  end
 
-  def_complex_query :compute_connection, :public_ip, :addresses
+  def_query :network_connection, :rule, :security_group_rules
 
-  def_complex_query :compute_connection, :tenants, :tenants
+  def_query :compute_connection, :keypairs, :key_pairs
 
-  def query_security_groups(hParams, query)
-    required?(hParams, :network_connection)
-    required?(hParams, :tenants)
+  def_query :compute_connection, :public_ip, :addresses
 
-    query[:tenant_id] = hParams[:tenants].id
-    hParams[:network_connection].send(:security_groups).all query
-  end
+  def_query :compute_connection, :tenants, :tenants
 end

data/lorj_cloud.gemspec

@@ -19,15 +19,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-#  if spec.respond_to?(:metadata)
-#    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-#  end
-
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  
-  spec.add_runtime_dependency "lorj", ">= 1.0.12"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
+
+  spec.add_runtime_dependency "lorj", ">= 1.0.13"
   spec.add_runtime_dependency 'subhash', '>= 0.1.3'
   spec.add_runtime_dependency "fog", "~> 1.30.0"
-  spec.add_development_dependency "rspec", "~> 3.1.0"
+
+  # Ruby 1.8 restrictions - BEGIN - To be removed at next major release.
+  # NOTE that gemspec is used at build time. Do not use RUBY_VERSION check
+  # for runtime dependency. It will influence the content of the package.
+  spec.add_runtime_dependency "mime-types", '< 2.0'
+  spec.add_runtime_dependency "nokogiri", '< 1.6'
+  # Ruby 1.8 restrictions - END
 end

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: lorj_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Christophe Larsonneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: lorj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.12
+        version: 1.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.12
+        version: 1.0.13
 - !ruby/object:Gem::Dependency
   name: subhash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.30.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: 'simplify cloud management, thanks to predefined process to manage cloud
   obj and make it work. '
 email:
@@ -102,10 +130,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitreview
-- .rspec
-- .rubocop.yml
+- ".gitignore"
+- ".gitreview"
+- ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -158,17 +186,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Lorj cloud process.