lorj_cloud 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c97d1a526cc33c76ce049d26943adab2c485c976
-  data.tar.gz: acfd3212f964e401b51dd8b03d6dabe631e6a1ac
+  metadata.gz: 18667a9e2559cedc572e479ea365835bc026849e
+  data.tar.gz: 823ba90cf29360f228c5ee561fec98f5d58e8f37
 SHA512:
-  metadata.gz: 7f84ffe8eb4fc5d91b8148e3d7779c3416d721f3021ca691b40ef97094ddb456368992f6dd1708d4d1ad42836bd9d848f96e90b5a3962b17decc2a2290c7e0b6
-  data.tar.gz: 9e0aecb2ca0c8c8a93b124d8ab4dbba4433b8bcc7b2647d2ffc24b1712f6b3fa2745cd2aae91c9ff884bccab832a4fbcd918d2158228fd68ca040ab7b39f9057
+  metadata.gz: 4c591e614887169d6badb2e8b434df750ed54f140900993b66c971499f556c3c432f9458c41ef978274e06d3eb0810fbafb9f3f9142ce7924347609a476b971a
+  data.tar.gz: 67dbe332d5b8719393a0c2f3af55f9a130a2e05d98da194d29b79be01ded3a3d9683c247df873940a679ff36ebc453999fd61782a6bbcc9995c2d6fe0cb82c39

data/lib/lorj_cloud/version.rb

@@ -1,5 +1,5 @@
 # LorjCloud module
 module LorjCloud
-  VERSION = '0.1.1'
-  DATE = '2015-05-20'
+  VERSION = '0.1.2'
+  DATE = '2015-06-15'
 end

data/lib/process/cloud/process/keypairs.rb

@@ -40,15 +40,22 @@ class CloudProcess
   #
   def forj_get_or_create_keypair(sCloudObj, hParams)
     keypair_name = hParams['credentials#keypair_name']
+
     PrcLib.state("Searching for keypair '%s'", keypair_name)
 
     keypair = forj_get_keypair(sCloudObj, keypair_name, hParams)
-    if keypair.empty?
+    if keypair.empty? &&
+       hParams.exist?(:keypair_path) && hParams.exist?(:keypair_base)
+
       loc_kpair = keypair_detect(keypair_name, hParams[:keypair_path],
                                  hParams[:keypair_base])
       keypair = keypair_import(hParams, loc_kpair)
     else
-      keypair_display(keypair)
+      if keypair.empty?
+        PrcLib.warning("keypair '%s' was not found.", keypair_name)
+      else
+        keypair_display(keypair)
+      end
     end
     keypair
   end
@@ -56,16 +63,18 @@ class CloudProcess
   # Query cloud keypairs and check coherence with local files
   # of same name in forj files located by :keypair_path
   def forj_query_keypairs(sCloudObj, sQuery, hParams)
-    keypair_path = File.expand_path(hParams[:keypair_path])
-    keypair_base = File.expand_path(hParams[:keypair_base])
-
     ssl_error_obj = SSLErrorMgt.new
     begin
       keypairs = controller_query(sCloudObj, sQuery)
     rescue => e
       retry unless ssl_error_obj.error_detected(e.message, e.backtrace, e)
     end
+    return keypairs unless hParams.exist?(:keypair_path) &&
+                           hParams.exist?(:keypair_base)
     # Looping on keypairs to identify if they have a valid local ssh key.
+    keypair_path = File.expand_path(hParams[:keypair_path])
+    keypair_base = File.expand_path(hParams[:keypair_base])
+
     keypairs.each do |keypair|
       loc_kpair = keypair_detect(keypair_name, keypair_path, keypair_base)
       keypair_files_detected(keypair, loc_kpair)
@@ -83,6 +92,7 @@ class CloudProcess
       retry unless ssl_error_obj.error_detected(e.message, e.backtrace, e)
     end
 
+    return keypair unless hParams.exist?(:keypair_path)
     keypair_path = File.expand_path(hParams[:keypair_path])
     loc_kpair = keypair_detect(keypair_name, keypair_path, keypair_name)
     keypair_files_detected(keypair, loc_kpair) unless keypair.empty?
@@ -103,11 +113,12 @@ class Lorj::BaseDefinition
 
   obj_needs :CloudObject,  :compute_connection
   obj_needs :data,         'credentials#keypair_name', :for => [:create_e]
+
+  obj_needs_optional
+  # By default optional. But required by the ssh case if needed.
   obj_needs :data,         :keypair_path
   obj_needs :data,         :keypair_base
-
   # By default optional. But required by the import case if needed.
-  obj_needs_optional
   obj_needs :data,         :public_key,          :for => [:create_e]
 
   def_attribute :public_key
@@ -120,6 +131,11 @@ class CloudProcess
   def keypair_display(keypair)
     PrcLib.info("Found keypair '%s'.", keypair[:name])
 
+    unless keypair.exist?(:keypair_path)
+      PrcLib.info('Unable to verify your keypair with your local files.'\
+                  ' :keypair_path is missing.')
+      return
+    end
     private_key_file = File.join(keypair[:keypair_path],
                                  keypair[:private_key_name])
     public_key_file = File.join(keypair[:keypair_path],

data/lib/process/cloud/process/public_ip.rb

@@ -71,8 +71,8 @@ end
 class Lorj::BaseDefinition
   define_obj(:public_ip,
              :create_e => :forj_get_or_assign_public_address,
-             :query_e => :forj_query_public_address
-            #      :get_e      => :forj_get_address
+             :query_e  => :forj_query_public_address,
+             :get_e    => :forj_get_public_address
             #      :update_e   => :forj_update_address
             #      :delete_e   => :forj_delete_address
             )

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

@@ -31,8 +31,21 @@ class CloudProcess
     register(security_group)
 
     PrcLib.info('Configuring Security Group \'%s\'', sg_name)
-    ports = config.get(:ports)
+    if hParams.exist?('server#ports')
+      ports = hParams['server#ports']
+    else # case kept for compatibility.
+      ports = config[:ports]
+    end
+
+    return security_group unless ports.is_a?(Array)
 
+    forj_sg_update_ports(ports)
+
+    security_group
+  end
+
+  # forj get or create port on SG
+  def forj_sg_update_ports(ports)
     ports.each do |port|
       port = port.to_s if port.class != String
       if !(/^\d+(-\d+)?$/ =~ port)
@@ -55,7 +68,6 @@ class CloudProcess
         process_create(:rule, params)
       end
     end
-    security_group
   end
 
   # Process Delete handler
@@ -80,8 +92,7 @@ class CloudProcess
     end
     case sgroups.length
     when 0
-      PrcLib.info("No security group '%s' found",
-                  hParams[:security_group])
+      PrcLib.info("No security group '%s' found", hParams[:security_group])
       nil
     when 1
       PrcLib.info("Found security group '%s'", sgroups[0, :name])
@@ -102,6 +113,7 @@ class Lorj::BaseDefinition
   obj_needs :CloudObject,  :network_connection
   obj_needs :data,         :security_group,      :for => [:create_e]
   obj_needs_optional
+  obj_needs :data,         'server#ports',       :for => [:create_e]
   obj_needs :data,         :sg_desc,             :for => [:create_e]
 end
 

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

@@ -48,7 +48,7 @@ class CloudProcess
   def forj_query_server(sCloudObj, sQuery, _hParams)
     ssl_error_obj = SSLErrorMgt.new
     begin
-      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
@@ -93,7 +93,12 @@ class Lorj::BaseDefinition
   predefine_data_value :boot,     :desc => 'Server is booting.'
   predefine_data_value :active,   :desc => 'Server is started.'
   predefine_data_value :error,    :desc => 'Server is in error.'
-  def_attribute :private_ip_address
+  predefine_data_value :shutdown, :desc => 'Server is down.'
+  # The private addresses attribute should be composed by
+  # network_name:
+  # - IP addresses
+  # The controller must return at least those structured data.
+  def_attribute :private_ip_addresses
   def_attribute :public_ip_address
 
   def_attribute :image_id

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

@@ -67,6 +67,11 @@ module HPCompute
     result
   end
 
+  def self.get_server_assigned_address(oComputeConnect, id)
+    addresses = oComputeConnect.addresses.all
+    addresses.each { |oElem| return oElem if oElem.attributes['id'] == id }
+  end
+
   def self.server_assign_address(oComputeConnect, server)
     while server.state != 'ACTIVE'
       sleep(5)

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

@@ -99,11 +99,13 @@ class Hpcloud
 
   # ************************************ SERVER Object
   define_obj :server
+  def_attr_mapping :private_ip_addresses, [:addresses, '{key}', [:addr]]
   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 :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
@@ -342,7 +344,7 @@ class HpcloudController # rubocop: disable Metrics/ClassLength
                               hParams[:server])
     end
   end
-
+  # rubocop: disable CyclomaticComplexity,
   def get(sObjectType, sUniqId, hParams)
     case sObjectType
     when :server_log
@@ -361,10 +363,16 @@ class HpcloudController # rubocop: disable Metrics/ClassLength
     when :keypairs
       required?(hParams, :compute_connection)
       HPKeyPairs.get_keypair(hParams[:compute_connection], sUniqId)
+    when :public_ip
+      required?(hParams, :compute_connection)
+      required?(hParams, :server)
+      HPCompute.get_server_assigned_address(hParams[:compute_connection],
+                                            sUniqId)
     else
       forjError "'%s' is not a valid object for 'get'", sObjectType
     end
   end
+  # rubocop: enable CyclomaticComplexity
 
   def query_each(oFogObject)
     case oFogObject.class.to_s

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

@@ -209,13 +209,18 @@ class Openstack
 
   define_obj :server
   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'
-
-  def_attr_mapping :private_ip_address, :accessIPv4
-  def_attr_mapping :public_ip_address, :accessIPv4
+  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'
+
+  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 :image_id, [:image, 'id']
 
   define_obj :router

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

@@ -32,6 +32,8 @@ class OpenstackController
 
   def_get :compute_connection, :keypairs, :key_pairs
 
+  def_get :compute_connection, :public_ip, :addresses
+
   def get_server_log(hParams, sUniqId)
     required?(hParams, :server)
     hParams[:server].console(sUniqId)

data/lorj_cloud.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   
-  spec.add_runtime_dependency "lorj", "~> 1.0.11"
+  spec.add_runtime_dependency "lorj", ">= 1.0.12"
+  spec.add_runtime_dependency 'subhash', '>= 0.1.3'
   spec.add_runtime_dependency "fog", "~> 1.30.0"
   spec.add_development_dependency "rspec", "~> 3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Christophe Larsonneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,30 @@ dependencies:
   name: lorj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.12
+- !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: 1.0.11
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement