lorj_cloud 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6728ac07fa2967a77fccc30673346724180474
-  data.tar.gz: 0eda6415e42c3438d42ddd65a7e7225cd2c6254a
+  metadata.gz: 117a39e2598d4263f58768a8511b41748bb1fdae
+  data.tar.gz: 6d6b42bb3e7d2d4b68e5e7e0e23b2ae17e813a16
 SHA512:
-  metadata.gz: dd1430bfbc8595a5b8d1300b73e29ddec98ee2ecde43a41863d167efeeaa96a7bcc8afc6b752ff4911b8f147052738dbad10db0a823972ccb064fc68ec8d304e
-  data.tar.gz: 9a7910cfb451762e16e04977b6e0e63c11d7500768eac414ef22f5aa03096a1a3d00fa9574145f0492f2025842fc42e0865a6b3394389324946bac2cf4d7c545
+  metadata.gz: 2b8e84fca2d746bfcf44247ddf0254c05aa18b781bb097b0b3f854e38384f85655391766707d771b05b5802ee719dafe18b8d6dad480ee552ced2f3063e0aeb0
+  data.tar.gz: 552715dbf1cd40919058b2572ea01f639fb91b5a220d6ce773caf891072745aa37e17cd4610319178e78b232a2c6bacfd9a4b8ddf40b6f61dbe9693d00e72d02

data/lib/lorj_cloud/version.rb

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

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

@@ -50,7 +50,8 @@ class CloudProcess
   def forj_query_server(sCloudObj, sQuery, _hParams)
     ssl_error_obj = SSLErrorMgt.new
     begin
-      query_single(sCloudObj, sQuery, config[:search_for])
+      controller_query(sCloudObj, sQuery)
+      #  query_single(sCloudObj, sQuery, config[:search_for])
     rescue => e
       retry unless ssl_error_obj.error_detected(e.message, e.backtrace, e)
     end

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

@@ -24,21 +24,6 @@ module HPCompute
     oComputeConnect.addresses.all(sQuery)
   end
 
-  def self.query_server(oComputeConnect, sQuery)
-    oComputeConnect.servers.all(sQuery)
-  end
-
-  def self.query_image(oComputeConnect, sQuery)
-    # HP Fog query is exact matching. No way to filter with a Regexp
-    # Testing it and filtering it.
-    # TODO: Be able to support Regexp in queries then extract all and filter.
-    oComputeConnect.images.all(sQuery)
-  end
-
-  def self.query_flavor(oComputeConnect, sQuery)
-    oComputeConnect.flavors.all(sQuery)
-  end
-
   def self.create_server(oComputeConnect, options, oUser_data, oMeta_data)
     if oUser_data
       options[:user_data_encoded] = Base64.strict_encode64(oUser_data)
@@ -48,25 +33,6 @@ module HPCompute
     HPCompute.get_server(oComputeConnect, server.id) if server
   end
 
-  def self.query_server_assigned_addresses(oComputeConnect, _oServer, sQuery)
-    # CloudProcess used a simplified way to manage IPs.
-    # Following is the translation to get the public IPs for the server
-
-    result = []
-    addresses = oComputeConnect.addresses.all
-    addresses.each do |oElem|
-      is_found = true
-      sQuery.each do |key, value|
-        if !oElem.attributes.key?(key) || oElem.attributes[key] != value
-          is_found = false
-          break
-        end
-      end
-      result << oElem if is_found
-    end
-    result
-  end
-
   def self.get_server_assigned_address(oComputeConnect, id)
     addresses = oComputeConnect.addresses.all
     addresses.each { |oElem| return oElem if oElem.attributes['id'] == id }

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

@@ -21,164 +21,14 @@ require 'fog' # We use fog to access HPCloud
 
 hpcloud_path = File.expand_path(File.dirname(__FILE__))
 
+load File.join(hpcloud_path, 'hpcloud_declare.rb')
+load File.join(hpcloud_path, 'hpcloud_generic.rb')
+load File.join(hpcloud_path, 'hpcloud_query.rb')
+
 load File.join(hpcloud_path, 'compute.rb')
 load File.join(hpcloud_path, 'network.rb')
 load File.join(hpcloud_path, 'security_groups.rb')
 
-# Defines Meta HPCloud object
-class Hpcloud
-  define_obj :services
-  obj_needs :data, 'credentials#account_id',      :mapping => :hp_access_key
-  obj_needs :data, 'credentials#account_key',     :mapping => :hp_secret_key
-  obj_needs :data, 'credentials#auth_uri',        :mapping => :hp_auth_uri
-  obj_needs :data, 'credentials#tenant',          :mapping => :hp_tenant_id
-  obj_needs :data, ':excon_opts/:connect_timeout', :default_value => 30
-  obj_needs :data, ':excon_opts/:read_timeout',    :default_value => 240
-  obj_needs :data, ':excon_opts/:write_timeout',   :default_value => 240
-
-  # Defines Object structure and function stored on the Hpcloud class object.
-  # Compute Object
-  define_obj :compute_connection
-  # Defines Data used by compute.
-
-  obj_needs :data, 'credentials#account_id',  :mapping => :hp_access_key
-  obj_needs :data, 'credentials#account_key', :mapping => :hp_secret_key
-  obj_needs :data, 'credentials#auth_uri',    :mapping => :hp_auth_uri
-  obj_needs :data, 'credentials#tenant',      :mapping => :hp_tenant_id
-  obj_needs :data, 'services#compute',        :mapping => :hp_avl_zone
-
-  define_obj :network_connection
-  obj_needs :data, 'credentials#account_id',  :mapping => :hp_access_key
-  obj_needs :data, 'credentials#account_key', :mapping => :hp_secret_key
-  obj_needs :data, 'credentials#auth_uri',    :mapping => :hp_auth_uri
-  obj_needs :data, 'credentials#tenant',      :mapping => :hp_tenant_id
-  obj_needs :data, 'services#network',        :mapping => :hp_avl_zone
-
-  # Forj predefine following query mapping, used by ForjProcess
-  # id => id, name => name
-  # If we need to add another mapping, add
-  # query_mapping :id => :MyID
-  # If the query is not push through and Hash object, the Provider
-  # will needs to create his own mapping function.
-  define_obj :network
-  def_attr_mapping :external, :router_external
-
-  define_obj :rule
-  obj_needs :data, :dir,        :mapping => :direction
-  attr_value_mapping :IN,  'ingress'
-  attr_value_mapping :OUT, 'egress'
-
-  obj_needs :data, :proto,      :mapping => :protocol
-  obj_needs :data, :port_min,   :mapping => :port_range_min
-  obj_needs :data, :port_max,   :mapping => :port_range_max
-  obj_needs :data, :addr_map,   :mapping => :remote_ip_prefix
-  obj_needs :data, :sg_id,      :mapping => :security_group_id
-
-  def_attr_mapping :dir,      :direction
-  def_attr_mapping :proto,    :protocol
-  def_attr_mapping :port_min, :port_range_min
-  def_attr_mapping :port_max, :port_range_max
-  def_attr_mapping :addr_map, :remote_ip_prefix
-  def_attr_mapping :sg_id,    :security_group_id
-
-  define_obj :keypairs
-
-  undefine_attribute :id    # Do not return any predefined ID
-
-  # ************************************ Router Object
-  define_obj :router
-
-  obj_needs_optional
-  obj_needs :data,   :router_name,         :mapping => :name
-  # The FORJ gateway_network_id is extracted from
-  # Fog::HP::Network::Router[:external_gateway_info][:network_id]
-  obj_needs :data,   :external_gateway_id, :mapping => [:external_gateway_info,
-                                                        'network_id']
-
-  def_attr_mapping :gateway_network_id, [:external_gateway_info, 'network_id']
-
-  # ************************************ 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
-  attr_value_mapping :active,   'ACTIVE'
-  attr_value_mapping :error,    'ERROR'
-  attr_value_mapping :shutdown, 'SHUTOFF'
-
-  # ************************************ SERVER log Object
-  define_obj :server_log
-
-  # Excon::Response object type
-  def_attr_mapping :output,  'output'
-
-  # ************************************* Public IP Object
-  define_obj :public_ip
-  def_attr_mapping :server_id, :instance_id
-  def_attr_mapping :public_ip, :ip
-
-  # defines setup Cloud data (:account => true for setup)
-  define_data('credentials#account_id',
-              :account => true,
-              :desc => 'HPCloud Access Key (From horizon, user drop down, '\
-                       'manage keys)',
-              :validate => /^[A-Z0-9]*$/
-             )
-  define_data('credentials#account_key',
-              :account => true,
-              :desc => 'HPCloud secret Key (From horizon, user drop down, '\
-                       'manage keys)',
-              :encrypted => false,
-              :validate => /^.+/
-             )
-  define_data('credentials#auth_uri',
-              :account => true,
-              :desc => 'HPCloud Authentication service URL (default is HP '\
-                       'Public cloud)',
-              :validate => %r{^http(s)?://.*$},
-              :default_value => 'https://region-a.geo-1.identity.hpcloudsvc'\
-                                '.com:35357/v2.0/'
-             )
-  define_data('credentials#tenant',
-              :account => true,
-              :desc => 'HPCloud Tenant ID (from horizon, identity, projecs,'\
-                       ' Project ID)',
-              :validate => /^[0-9]+$/
-             )
-
-  define_data('services#compute',
-              :account => true,
-              :desc => 'HPCloud Compute service zone (Ex: region-a.geo-1)',
-              :list_values => {
-                :query_type => :controller_call,
-                :object => :services,
-                :query_call => :get_services,
-                :query_params => { :list_services => [:Compute, :compute] },
-                :validate => :list_strict
-              }
-             )
-
-  define_data('services#network',
-              :account => true,
-              :desc => 'HPCloud Network service zone (Ex: region-a.geo-1)',
-              :list_values => {
-                :query_type => :controller_call,
-                :object => :services,
-                :query_call => :get_services,
-                :query_params => { :list_services => [:Networking, :network] },
-                :validate => :list_strict
-              }
-             )
-
-  data_value_mapping 'xsmall', 'standard.xsmall'
-  data_value_mapping 'small',  'standard.small'
-  data_value_mapping 'medium', 'standard.medium'
-  data_value_mapping 'large',  'standard.large'
-  data_value_mapping 'xlarge', 'standard.xlarge'
-end
-
 # Following class describe how FORJ should handle HP Cloud objects.
 # Except Cloud connection, all HPCloud objects management are described/called
 # in HP* modules.
@@ -282,50 +132,6 @@ class HpcloudController # rubocop: disable Metrics/ClassLength
     end
   end
 
-  # This function return a collection which have to provide:
-  # functions: [], length, each
-  # Used by network process.
-  def query(sObjectType, sQuery, hParams)
-    case sObjectType
-    when :public_ip
-      required?(hParams, :compute_connection)
-      required?(hParams, :server)
-      HPCompute.query_server_assigned_addresses(hParams[:compute_connection],
-                                                hParams[:server], sQuery)
-    when :server
-      required?(hParams, :compute_connection)
-      HPCompute.query_server(hParams[:compute_connection], sQuery)
-    when :image
-      required?(hParams, :compute_connection)
-      HPCompute.query_image(hParams[:compute_connection], sQuery)
-    when :network
-      required?(hParams, :network_connection)
-      HPNetwork.query_network(hParams[:network_connection], sQuery)
-    when :subnetwork
-      required?(hParams, :network_connection)
-      HPNetwork.query_subnetwork(hParams[:network_connection], sQuery)
-    when :router
-      required?(hParams, :network_connection)
-      HPNetwork.query_router(hParams[:network_connection], sQuery)
-    when :port
-      required?(hParams, :network_connection)
-      HPNetwork.query_port(hParams[:network_connection], sQuery)
-    when :security_groups
-      required?(hParams, :network_connection)
-      HPSecurityGroups.query_sg(hParams[:network_connection], sQuery)
-    when :rule
-      required?(hParams, :network_connection)
-      HPSecurityGroups.query_rule(hParams[:network_connection], sQuery)
-    when :keypairs
-      required?(hParams, :compute_connection)
-      HPKeyPairs.query_keypair(hParams[:compute_connection], sQuery)
-    when :flavor
-      required?(hParams, :compute_connection)
-      HPCompute.query_flavor(hParams[:compute_connection], sQuery)
-    else
-      controller_error "'%s' is not a valid object for 'query'", sObjectType
-    end
-  end
   # rubocop: enable CyclomaticComplexity, MethodLength
 
   def delete(sObjectType, hParams)
@@ -389,34 +195,35 @@ class HpcloudController # rubocop: disable Metrics/ClassLength
     if oControlerObject.is_a?(Excon::Response)
       oControlerObject.data.rh_get(:body, key)
     else
-      attributes = oControlerObject.attributes
-      def_attributes = oControlerObject.class.attributes
-      controller_error "attribute '%s' is unknown in '%s'. "\
-                       "Valid one are : '%s'",
-                       key[0], oControlerObject.class,
-                       def_attributes unless def_attributes.include?(key[0])
-      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)
+  def _server_metadata_get(oControlerObject, key)
+    return [false, nil] unless key == :metadata
     ret = {}
     oControlerObject.metadata.each do |m|
       k = m.attributes[:key]
       v = m.attributes[:value]
       ret[k] = v
     end
-    ret
+    [true, 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])
+    found, ret = _server_metadata_get(oControlerObject, key[0])
+    found, ret = _get_from(oControlerObject, key[0]) unless found
+
+    unless found
+      Lorj.debug(4, "Unable to get '%s' from '%s'. Attribute inexistent.",
+                 key[0], oControlerObject.class)
+      return nil
+    end
+
+    return ret if key.length == 1 || !ret.is_a?(Hash)
+    ret.rh_get(key[1..-1])
   end
 
   def set_attr(oControlerObject, key, value)

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

@@ -0,0 +1,179 @@
+# encoding: UTF-8
+
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    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.
+
+# This class describes how to process some actions, and will do everything prior
+# this task to make it to work.
+
+# Defines Meta HPCloud object
+class Hpcloud
+  define_obj :services
+  obj_needs :data, 'credentials#account_id',      :mapping => :hp_access_key
+  obj_needs :data, 'credentials#account_key',     :mapping => :hp_secret_key
+  obj_needs :data, 'credentials#auth_uri',        :mapping => :hp_auth_uri
+  obj_needs :data, 'credentials#tenant',          :mapping => :hp_tenant_id
+  obj_needs :data, ':excon_opts/:connect_timeout', :default_value => 30
+  obj_needs :data, ':excon_opts/:read_timeout',    :default_value => 240
+  obj_needs :data, ':excon_opts/:write_timeout',   :default_value => 240
+
+  # Defines Object structure and function stored on the Hpcloud class object.
+  # Compute Object
+  define_obj :compute_connection
+  # Defines Data used by compute.
+
+  obj_needs :data, 'credentials#account_id',  :mapping => :hp_access_key
+  obj_needs :data, 'credentials#account_key', :mapping => :hp_secret_key
+  obj_needs :data, 'credentials#auth_uri',    :mapping => :hp_auth_uri
+  obj_needs :data, 'credentials#tenant',      :mapping => :hp_tenant_id
+  obj_needs :data, 'services#compute',        :mapping => :hp_avl_zone
+
+  define_obj :network_connection
+  obj_needs :data, 'credentials#account_id',  :mapping => :hp_access_key
+  obj_needs :data, 'credentials#account_key', :mapping => :hp_secret_key
+  obj_needs :data, 'credentials#auth_uri',    :mapping => :hp_auth_uri
+  obj_needs :data, 'credentials#tenant',      :mapping => :hp_tenant_id
+  obj_needs :data, 'services#network',        :mapping => :hp_avl_zone
+
+  # Forj predefine following query mapping, used by ForjProcess
+  # id => id, name => name
+  # If we need to add another mapping, add
+  # query_mapping :id => :MyID
+  # If the query is not push through and Hash object, the Provider
+  # will needs to create his own mapping function.
+  define_obj :network
+  def_attr_mapping :external, :router_external
+
+  define_obj :rule
+  obj_needs :data, :dir,        :mapping => :direction
+  attr_value_mapping :IN,  'ingress'
+  attr_value_mapping :OUT, 'egress'
+
+  obj_needs :data, :proto,      :mapping => :protocol
+  obj_needs :data, :port_min,   :mapping => :port_range_min
+  obj_needs :data, :port_max,   :mapping => :port_range_max
+  obj_needs :data, :addr_map,   :mapping => :remote_ip_prefix
+  obj_needs :data, :sg_id,      :mapping => :security_group_id
+
+  def_attr_mapping :dir,      :direction
+  def_attr_mapping :proto,    :protocol
+  def_attr_mapping :port_min, :port_range_min
+  def_attr_mapping :port_max, :port_range_max
+  def_attr_mapping :addr_map, :remote_ip_prefix
+  def_attr_mapping :sg_id,    :security_group_id
+
+  define_obj :keypairs
+
+  undefine_attribute :id    # Do not return any predefined ID
+
+  # ************************************ Router Object
+  define_obj :router
+
+  obj_needs_optional
+  obj_needs :data,   :router_name,         :mapping => :name
+  # The FORJ gateway_network_id is extracted from
+  # Fog::HP::Network::Router[:external_gateway_info][:network_id]
+  obj_needs :data,   :external_gateway_id, :mapping => [:external_gateway_info,
+                                                        'network_id']
+
+  def_attr_mapping :gateway_network_id, [:external_gateway_info, 'network_id']
+
+  # ************************************ SERVER Object
+  define_obj :server
+
+  def_attr_mapping :private_ip_addresses,
+                   [:addresses, '{/.*/}',
+                    '<%= data["OS-EXT-IPS:type"] == "fixed" %>|addr']
+  def_attr_mapping :public_ip_address,
+                   [:addresses, '{/.*/}',
+                    '<%= data["OS-EXT-IPS:type"] == "floating" %>|addr']
+  def_attr_mapping :meta_data, :metadata
+
+  def_attr_mapping :status, :state
+  attr_value_mapping :create,   'BUILD'
+  attr_value_mapping :boot,     :boot
+  attr_value_mapping :active,   'ACTIVE'
+  attr_value_mapping :error,    'ERROR'
+  attr_value_mapping :shutdown, 'SHUTOFF'
+
+  # ************************************ SERVER log Object
+  define_obj :server_log
+
+  # Excon::Response object type
+  def_attr_mapping :output,  'output'
+
+  # ************************************* Public IP Object
+  define_obj :public_ip
+  def_attr_mapping :server_id, :instance_id
+  def_attr_mapping :public_ip, :ip
+
+  # defines setup Cloud data (:account => true for setup)
+  define_data('credentials#account_id',
+              :account => true,
+              :desc => 'HPCloud Access Key (From horizon, user drop down, '\
+                       'manage keys)',
+              :validate => /^[A-Z0-9]*$/
+             )
+  define_data('credentials#account_key',
+              :account => true,
+              :desc => 'HPCloud secret Key (From horizon, user drop down, '\
+                       'manage keys)',
+              :encrypted => false,
+              :validate => /^.+/
+             )
+  define_data('credentials#auth_uri',
+              :account => true,
+              :desc => 'HPCloud Authentication service URL (default is HP '\
+                       'Public cloud)',
+              :validate => %r{^http(s)?://.*$},
+              :default_value => 'https://region-a.geo-1.identity.hpcloudsvc'\
+                                '.com:35357/v2.0/'
+             )
+  define_data('credentials#tenant',
+              :account => true,
+              :desc => 'HPCloud Tenant ID (from horizon, identity, projecs,'\
+                       ' Project ID)',
+              :validate => /^[0-9]+$/
+             )
+
+  define_data('services#compute',
+              :account => true,
+              :desc => 'HPCloud Compute service zone (Ex: region-a.geo-1)',
+              :list_values => {
+                :query_type => :controller_call,
+                :object => :services,
+                :query_call => :get_services,
+                :query_params => { :list_services => [:Compute, :compute] },
+                :validate => :list_strict
+              }
+             )
+
+  define_data('services#network',
+              :account => true,
+              :desc => 'HPCloud Network service zone (Ex: region-a.geo-1)',
+              :list_values => {
+                :query_type => :controller_call,
+                :object => :services,
+                :query_call => :get_services,
+                :query_params => { :list_services => [:Networking, :network] },
+                :validate => :list_strict
+              }
+             )
+
+  data_value_mapping 'xsmall', 'standard.xsmall'
+  data_value_mapping 'small',  'standard.small'
+  data_value_mapping 'medium', 'standard.medium'
+  data_value_mapping 'large',  'standard.large'
+  data_value_mapping 'xlarge', 'standard.xlarge'
+end

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

@@ -0,0 +1,85 @@
+# encoding: UTF-8
+
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    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.
+
+# Define the HPCloud controller interface with Lorj.
+# Lorj uses following functions:
+# - create(object_type, params)
+# - delete(object_type, params)
+# - get(object_type, id, param)
+# - query(object_type, query, params)
+# - update(object_type, object, param)
+#
+# The controller driver will need to dispatch the task to
+# the real FOG task.
+#
+# Currently, Hpcloud controller is moving a more generic ruby code.
+# and only query has been implemented that way, in order to use
+# Most of lorj and FOG features.
+class HpcloudController
+  def self.def_cruds(*crud_types)
+    crud_types.each do |crud_type|
+      case crud_type
+      when :create, :delete
+        base_method(crud_type)
+      when :query, :get
+        query_method(crud_type)
+      when :update
+        update_method(crud_type)
+      end
+    end
+  end
+
+  def self.update_method(crud_type)
+    define_method(crud_type) do |sObjectType, obj, hParams|
+      method_name = "#{crud_type}_#{sObjectType}"
+      if self.class.method_defined? method_name
+        send(method_name, obj, hParams)
+      else
+        controller_error "'%s' is not a valid object for '%s'",
+                         sObjectType, crud_type
+      end
+    end
+  end
+
+  def self.query_method(crud_type)
+    define_method(crud_type) do |sObjectType, sCondition, hParams|
+      method_name = "#{crud_type}_#{sObjectType}"
+      if self.class.method_defined? method_name
+        send(method_name, hParams, sCondition)
+      else
+        controller_error "'%s' is not a valid object for '%s'",
+                         sObjectType, crud_type
+      end
+    end
+  end
+
+  def self.base_method(crud_type)
+    define_method(crud_type) do |sObjectType, hParams|
+      method_name = "#{crud_type}_#{sObjectType}"
+      if self.class.method_defined? method_name
+        send(method_name, hParams)
+      else
+        controller_error "'%s' is not a valid object for '%s'",
+                         sObjectType, crud_type
+      end
+    end
+  end
+
+  # Define the Openstack controller handlers
+  # def_cruds :create, :delete, :get, :query, :update
+  # Moving to use the Openstack code model.
+  def_cruds :query
+end

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

@@ -0,0 +1,73 @@
+# encoding: UTF-8
+
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    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.
+
+# Defined HPCloud object query.
+class HpcloudController
+  # Implementation of API NOT supporting query Hash
+  # The function will filter itself.
+  # 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|
+      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 HPCloud API filter feature.", __method__)
+        objects = func.call ctrl_query_select(query, String)
+      else
+        objects = func.call
+      end
+      # 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_query :compute_connection, :tenant
+
+  def_query :compute_connection, :image
+
+  def_query :compute_connection, :flavor
+
+  def_query :compute_connection, :server
+
+  def_query :network_connection, :network
+
+  def_query :network_connection, :subnetwork, :subnets
+
+  def_query :network_connection, :router
+
+  def_query :network_connection, :port
+
+  def_query :network_connection, :security_groups, :security_groups
+
+  def_query :network_connection, :rule, :security_group_rules
+
+  def_query :compute_connection, :keypairs, :key_pairs
+
+  def_query :compute_connection, :public_ip, :addresses
+
+  def_query :compute_connection, :tenants, :tenants
+end

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

@@ -17,10 +17,6 @@
 # HPcloud network class
 module HPNetwork
   # Network driver
-  def self.query_network(oNetworkConnect, sQuery)
-    oNetworkConnect.networks.all(sQuery)
-  end
-
   def self.create_network(oNetworkConnect, name)
     oNetworkConnect.networks.create(:name => name)
   end
@@ -29,11 +25,6 @@ module HPNetwork
     oNetworkConnect.networks.get(oNetwork.id).destroy
   end
 
-  # SubNetwork driver
-  def self.query_subnetwork(oNetworkConnect, sQuery)
-    oNetworkConnect.subnets.all(sQuery)
-  end
-
   def self.create_subnetwork(oNetworkConnect, oNetwork, name)
     oNetworkConnect.subnets.create(
       :network_id => oNetwork.id,
@@ -90,9 +81,6 @@ module HPNetwork
   end
 
   # router driver
-  def self.query_router(oNetworkConnect, sQuery)
-    oNetworkConnect.routers.all(sQuery)
-  end
 
   def self.update_router(oRouters)
     oRouters.save
@@ -107,9 +95,4 @@ module HPNetwork
   def self.add_interface(oRouter, oSubNetwork)
     oRouter.add_interface(oSubNetwork.id, nil)
   end
-
-  # Port driver
-  def self.query_port(oNetworkConnect, sQuery)
-    oNetworkConnect.ports.all(sQuery)
-  end
 end

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

@@ -16,10 +16,6 @@
 
 # HPCloud security groups
 module HPSecurityGroups
-  def self.query_sg(oNetworkConnect, sQuery)
-    oNetworkConnect.security_groups.all(sQuery)
-  end
-
   def self.create_sg(oNetwork, name, description)
     params = { :name => name }
     params[:description] = description if description
@@ -30,10 +26,6 @@ module HPSecurityGroups
     oNetwork.security_group_rules.create(hData)
   end
 
-  def self.query_rule(oNetwork, sQuery)
-    oNetwork.security_group_rules.all(sQuery)
-  end
-
   def self.delete_rule(oNetwork, rule_id)
     oNetwork.security_group_rules.get(rule_id).destroy
   end
@@ -41,23 +33,6 @@ end
 
 # HPCloud keypairs
 module HPKeyPairs
-  def self.query_keypair(oComputeConnect, sQuery)
-    keypairs = oComputeConnect.key_pairs.all
-    results = []
-    keypairs.each do |sElem|
-      is_selected = true
-      attributes = sElem.instance_variable_get(:@attributes)
-      sQuery.each do |key, value|
-        if attributes[key] != value
-          is_selected = false
-          break
-        end
-      end
-      results.push sElem if is_selected
-    end
-    results
-  end
-
   def self.get_keypair(oComputeConnect, sId)
     oComputeConnect.key_pairs.get(sId)
   end

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

@@ -243,6 +243,10 @@ class Openstack
   def_attribute :network_id
 
   define_obj :public_ip
+  # Used by floating_ip if needed
+  obj_needs :CloudObject,  :network_connection, :for => [:create_e]
+  obj_needs :CloudObject,  :external_network,   :for => [:create_e]
+
   def_attr_mapping :server_id, :instance_id
   def_attr_mapping :public_ip, :ip
 

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

@@ -123,7 +123,8 @@ class OpenstackController
     compute_connect = hParams[:compute_connection]
     server = hParams[:server]
 
-    while server.state != 'ACTIVE'
+    Lorj.debug(3, "Waiting for server '%s' to become ready...", server.name)
+    until server.ready?
       sleep(5)
       server = compute_connect.servers.get(server.id)
 
@@ -133,37 +134,61 @@ class OpenstackController
       end
     end
 
-    addresses = compute_connect.addresses.all
+    # if 2 processes run in // to allocate a floating to different server
+    # openstack can re-allocate and the last who set the server win.
+    # So, we need to set it, and wait to see if the allocation is confirmed
+    # To the current server.
+    # This is required as there is no guarantee who did the last allocation
+    # of this IP.
+    # This should reduce strongly the risk but not completely.
+    # The best approach is that openstack MUST required to disassociate before
+    # associate...
+    # And if the second want to do the same, an error should be reported and
+    # a retry to be spawned.
     address = nil
-    # Search for an available IP
-    addresses.each do |elem|
-      if elem.fixed_ip.nil?
-        address = elem
-        break
-      end
+    loop do
+      address = addresses_all(hParams)
+      Lorj.debug(5, "Trying to associate '%s' to '%s'.",
+                 address.ip, server.name)
+
+      address.server = server # associate the server
+      sleep(1 + rand(3))
+      address.reload
+      break if address.instance_id == server.id
     end
+    Lorj.debug(4, "'%s' is confirmed to be associated to '%s'.",
+               address.ip, server.name)
+    address
+  end
+end
 
-    address = allocate_new_ip(compute_connect) if address.nil?
-    if address.nil?
-      controller_error("No Public IP to assign to server '%s'", server.name)
+# Internal functions
+class OpenstackController # :nodoc:
+  def addresses_all(hParams)
+    addresses = hParams[:compute_connection].addresses.all
+    # Search for an available IP
+    loop do
+      addresses.each { |elem| return elem if elem.fixed_ip.nil? }
+      # If no IP are available, create a new one.
+      Lorj.debug(3, 'No more Free IP. Allocate a new one.')
+      create_floating_ip(hParams)
+      addresses.reload
     end
-
-    address.server = server # associate the server
-    address.reload
-    # This function needs to returns a list of object.
-    # This list must support the each function.
-    address
   end
 
-  def allocate_new_ip(compute_connect)
+  def create_floating_ip(params)
+    required?(params, :network_connection)
+    required?(params, :external_network)
+
+    network = params[:network_connection]
+    ext_net = params[:external_network]
+
     # Create a new public IP to add in the pool.
-    pools = compute_connect.addresses.get_address_pools
-    controller_error('No IP Pool found') if pools.length == 0
-    # TODO: Be able to support choice of pool at setup time.
-    if pools.length > 1
-      Lorj.warning('Several pools found. Selecting the first one.')
+    begin
+      network.floating_ips.create(:floating_network_id => ext_net.id)
+    rescue => e
+      controller_error('Unable to get a new floating IP. %s', e)
     end
-    compute_connect.addresses.create 'pool' => pools[0]['name']
   end
 
   def get_next_subnet(oNetworkConnect)

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

@@ -33,16 +33,34 @@ class OpenstackController
       yield hParams, query if block_given?
 
       func = hParams[connection].send(property_name).method(:all)
+      objects = _compat_query(func, __method__, query)
+      # 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 _compat_query(func, cur_method, query)
+    # Ruby 1.9.2 introduce Method.parameters.
+    if RUBY_VERSION < '1.9.2'
+      Lorj.debug(4, "RUBY '%s': '%s' try Openstack API filter feature.",
+                 RUBY_VERSION, cur_method)
+      begin
+        objects = func.call ctrl_query_select(query, String)
+      rescue
+        Lorj.debug(4, "RUBY '%s': '%s' No filter parameter.",
+                   RUBY_VERSION, cur_method)
+        objects = func.call
+      end
+    else
       if func.parameters.length > 0
-        Lorj.debug(4, "'%s' uses Openstack API filter feature.", __method__)
+        Lorj.debug(4, "'%s' uses Openstack API filter feature.", cur_method)
         objects = func.call ctrl_query_select(query, String)
       else
         objects = func.call
       end
-      # 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
+    objects
   end
 
   def_query :compute_connection, :tenant

data/lorj_cloud.gemspec

@@ -33,4 +33,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "mime-types", '< 2.0'
   spec.add_runtime_dependency "nokogiri", '< 1.6'
   # Ruby 1.8 restrictions - END
+    if RUBY_VERSION.match(/1\.8/)
+    spec.add_development_dependency "ruby-debug"
+  elsif RUBY_VERSION.match(/1\.9/)
+    spec.add_development_dependency "debugger"
+    spec.add_development_dependency "rubocop", "~> 0.30.0"
+  else
+    spec.add_development_dependency "byebug"
+    spec.add_development_dependency "rubocop", "~> 0.30.0"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Christophe Larsonneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
 description: 'simplify cloud management, thanks to predefined process to manage cloud
   obj and make it work. '
 email:
@@ -162,6 +190,9 @@ files:
 - lib/process/cloud/process/subnetwork.rb
 - lib/process/cloud/providers/hpcloud/compute.rb
 - lib/process/cloud/providers/hpcloud/hpcloud.rb
+- lib/process/cloud/providers/hpcloud/hpcloud_declare.rb
+- lib/process/cloud/providers/hpcloud/hpcloud_generic.rb
+- lib/process/cloud/providers/hpcloud/hpcloud_query.rb
 - lib/process/cloud/providers/hpcloud/network.rb
 - lib/process/cloud/providers/hpcloud/security_groups.rb
 - lib/process/cloud/providers/mock/mock.rb