lorj 1.0.3 → 1.0.4

data/lib/core_process/cloud/process/external_network.rb

@@ -16,6 +16,8 @@
 
 # It requires Core objects to be defined + default ForjProcess functions.
 
+# rubocop: disable Style/ClassAndModuleChildren
+
 # External network process attached to a network
 class CloudProcess
   def forj_get_or_create_ext_net(sCloudObj, hParams)
@@ -38,7 +40,7 @@ class CloudProcess
       external_network = forj_query_external_network(:network, {}, hParams)
       if !external_network.empty?
         router_obj[:gateway_network_id] = external_network[:id]
-        forj_update_router(:router, hParams)
+        controller_update(:router, router_obj)
         PrcLib.info("Router '%s' attached to the "\
                     "external network '%s'.",
                     router_name, external_network[:name])
@@ -58,37 +60,31 @@ class CloudProcess
     PrcLib.state('Identifying External gateway')
     begin
       # Searching for external network
-      networks = controller_query(:network, sQuery.merge(:external => true))
-
-      case networks.length
-      when 0
-        PrcLib.info('No external network')
-        nil
-      when 1
-        PrcLib.info("Found external network '%s'.", networks[0, :name])
-        networks[0]
-      else
-        PrcLib.warning('Found several external networks. '\
-                       "Selecting the first one '%s'", networks[0, :name])
-        networks[0]
-      end
-   rescue => e
-     PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
+      query = sQuery.merge(:external => true)
+      info = {
+        :notfound => 'No external network found',
+        :checkmatch => 'Found 1 %s. Checking if it is an %s.',
+        :nomatch => 'No %s identified as %s match',
+        :found => "Found external %s '%s'.",
+        :more => 'Found several %s. Searching for the first one to be an %s.'
+      }
+      networks = query_single(:network, query, 'external network', info)
+      return Lorj::Data.new if networks.length == 0
+      networks[0]
+    rescue => e
+      PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
     end
   end
 end
 
-# Define framework object on BaseDefinition
-module Lorj
-  # Identify an external network thanks to the network router.
-  class BaseDefinition
-    define_obj(:external_network,
+# Identify an external network thanks to the network router.
+class Lorj::BaseDefinition
+  define_obj(:external_network,
 
-               :create_e => :forj_get_or_create_ext_net,
-               :query_e => :forj_query_external_network
-               )
+             :create_e => :forj_get_or_create_ext_net,
+             :query_e => :forj_query_external_network
+             )
 
-    obj_needs :CloudObject,  :network_connection
-    obj_needs :CloudObject,  :router
-  end
+  obj_needs :CloudObject,  :network_connection
+  obj_needs :CloudObject,  :router
 end

data/lib/core_process/cloud/process/flavor.rb

@@ -61,40 +61,37 @@ class CloudProcess
   end
 end
 
-# Define framework object on BaseDefinition
-module Lorj
-  # ************************************ Flavor Object
-  # Identify flavor
-  class BaseDefinition # rubocop: disable ClassAndModuleChildren
-    define_obj(:flavor,
+# Flavor Object
+# Identify flavor
+class Lorj::BaseDefinition # rubocop: disable ClassAndModuleChildren
+  define_obj(:flavor,
 
-               :create_e => :forj_get_or_create_flavor,
-               :query_e => :forj_query_flavor
-               #         :get_e      => :forj_get_flavor,
-               #         :update_e   => :forj_update_flavor,
-               #         :delete_e   => :forj_delete_flavor
-               )
+             :create_e => :forj_get_or_create_flavor,
+             :query_e => :forj_query_flavor
+             #         :get_e      => :forj_get_flavor,
+             #         :update_e   => :forj_update_flavor,
+             #         :delete_e   => :forj_delete_flavor
+             )
 
-    obj_needs :CloudObject,  :compute_connection
-    obj_needs :data,         :flavor_name,         :for => [:create_e]
-    # Cloud provider will need to map to one of those predefined flavors.
-    # limitation values may match exactly or at least ensure those limitation
-    # are under provider limitation
-    # ie, at least the CloudProcess limitation can less than the
-    # Cloud provider defines.
-    # CloudProcess EHD = 160, then Provider EHD = 200 is ok
-    # but Provider EHD = 150 is not ok.
-    predefine_data_value('tiny',    :desc => 'VCU: 1,  RAM:512M, HD:1G,   '\
-                                             'EHD: 0G,   Swap: 0G')
-    predefine_data_value('xsmall',  :desc => 'VCU: 1,  RAM:1G,   HD:10G,  '\
-                                             'EHD: 10G,  Swap: 0G')
-    predefine_data_value('small',   :desc => 'VCU: 2,  RAM:2G,   HD:30G,  '\
-                                             'EHD: 10G,  Swap: 0G')
-    predefine_data_value('medium',  :desc => 'VCU: 2,  RAM:4G,   HD:30G,  '\
-                                             'EHD: 50G,  Swap: 0G')
-    predefine_data_value('large',   :desc => 'VCU: 4,  RAM:8G,   HD:30G,  '\
-                                             'EHD: 100G, Swap: 0G')
-    predefine_data_value('xlarge',  :desc => 'VCU: 8,  RAM:16G,  HD:30G,  '\
-                                             'EHD: 200G, Swap: 0G')
-  end
+  obj_needs :CloudObject,  :compute_connection
+  obj_needs :data,         :flavor_name,         :for => [:create_e]
+  # Cloud provider will need to map to one of those predefined flavors.
+  # limitation values may match exactly or at least ensure those limitation
+  # are under provider limitation
+  # ie, at least the CloudProcess limitation can less than the
+  # Cloud provider defines.
+  # CloudProcess EHD = 160, then Provider EHD = 200 is ok
+  # but Provider EHD = 150 is not ok.
+  predefine_data_value('tiny',    :desc => 'VCU: 1,  RAM:512M, HD:1G,   '\
+                                           'EHD: 0G,   Swap: 0G')
+  predefine_data_value('xsmall',  :desc => 'VCU: 1,  RAM:1G,   HD:10G,  '\
+                                           'EHD: 10G,  Swap: 0G')
+  predefine_data_value('small',   :desc => 'VCU: 2,  RAM:2G,   HD:30G,  '\
+                                           'EHD: 10G,  Swap: 0G')
+  predefine_data_value('medium',  :desc => 'VCU: 2,  RAM:4G,   HD:30G,  '\
+                                           'EHD: 50G,  Swap: 0G')
+  predefine_data_value('large',   :desc => 'VCU: 4,  RAM:8G,   HD:30G,  '\
+                                           'EHD: 100G, Swap: 0G')
+  predefine_data_value('xlarge',  :desc => 'VCU: 8,  RAM:16G,  HD:30G,  '\
+                                           'EHD: 200G, Swap: 0G')
 end

data/lib/core_process/cloud/process/images.rb

@@ -82,21 +82,18 @@ class CloudProcess
   end
 end
 
-# Define framework object on BaseDefinition
-module Lorj
-  # ************************************ Image Object
-  # Identify image
-  class BaseDefinition
-    define_obj(:image,
+# ************************************ Image Object
+# Identify image
+class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
+  define_obj(:image,
 
-               :create_e => :forj_get_or_create_image,
-               :query_e => :forj_query_image,
-               :get_e => :forj_get_image
-               #         :update_e   => :forj_update_image
-               #         :delete_e   => :forj_delete_image
-               )
+             :create_e => :forj_get_or_create_image,
+             :query_e => :forj_query_image,
+             :get_e => :forj_get_image
+             #         :update_e   => :forj_update_image
+             #         :delete_e   => :forj_delete_image
+             )
 
-    obj_needs :CloudObject,  :compute_connection
-    obj_needs :data,         :image_name,          :for => [:create_e]
-  end
+  obj_needs :CloudObject,  :compute_connection
+  obj_needs :data,         :image_name,          :for => [:create_e]
 end

data/lib/core_process/cloud/process/internet_network.rb

@@ -16,19 +16,18 @@
 
 # It requires Core objects to be defined + default ForjProcess functions.
 
-# Define framework object on BaseDefinition
-module Lorj
-  # ************************************ Internet network Object
-  # Define Internet network
-  #
-  # This object contains the logic to ensure the router's network has a gateway
-  # to the external network (internet)
-  # is capable to connect to internet
-  # And to create this connection if possible.
-  class BaseDefinition # rubocop: disable ClassAndModuleChildren
-    define_obj(:internet_network,    :nohandler => true)
+# rubocop: disable Style/ClassAndModuleChildren
 
-    obj_needs :CloudObject,  :external_network # External network to connect if
-    # needed.
-  end
+# Internet network Object
+# Define Internet network
+#
+# This object contains the logic to ensure the router's network has a gateway
+# to the external network (internet)
+# is capable to connect to internet
+# And to create this connection if possible.
+class Lorj::BaseDefinition # rubocop: disable ClassAndModuleChildren
+  define_obj(:internet_network,    :nohandler => true)
+
+  obj_needs :CloudObject,  :external_network # External network to connect if
+  # needed.
 end

data/lib/core_process/cloud/process/internet_server.rb

@@ -16,15 +16,14 @@
 
 # It requires Core objects to be defined + default ForjProcess functions.
 
-# Define framework object on BaseDefinition
-module Lorj
-  # ************************************ Internet SERVER Object
-  # internet server is a server connected to the internet network.
-  class BaseDefinition
-    define_obj(:internet_server,    :nohandler => true)
+# rubocop: disable Style/ClassAndModuleChildren
 
-    obj_needs :CloudObject,  :internet_network
-    obj_needs :CloudObject,  :server
-    obj_needs :CloudObject,  :public_ip
-  end
+# Internet SERVER Object
+# internet server is a server connected to the internet network.
+class Lorj::BaseDefinition
+  define_obj(:internet_server,    :nohandler => true)
+
+  obj_needs :CloudObject,  :internet_network
+  obj_needs :CloudObject,  :server
+  obj_needs :CloudObject,  :public_ip
 end

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

@@ -16,6 +16,8 @@
 
 # It requires Core objects to be defined + default ForjProcess functions.
 
+# rubocop: disable Style/ClassAndModuleChildren
+
 # Keypair management
 class CloudProcess
   # KeyPair Create Process Handler
@@ -59,15 +61,16 @@ class CloudProcess
                                   { :name => keypair_name }, hParams)
 
     if keypairs.length == 0
-      keypair = keypair_import(keypair_name, loc_kpair)
+      keypair = keypair_import(hParams, loc_kpair)
     else
       keypair = keypairs[0]
       keypair[:coherent] = coherent_keypair?(loc_kpair, keypair)
       # Adding information about key files.
     end
     if keypair[:coherent]
-      keypair[:private_key_file] = loc_kpair[:private_key_file]
-      keypair[:public_key_file] = loc_kpair[:public_key_file]
+      keypair[:private_key_name] = loc_kpair[:private_key_name]
+      keypair[:public_key_name] = loc_kpair[:public_key_name]
+      keypair[:keypair_path] = loc_kpair[:keypair_path]
     end
     keypair
   end
@@ -87,20 +90,27 @@ end
 
 # Keypair management: Internal process functions
 class CloudProcess
-  def keypair_import(keypair_name, loc_kpair)
+  def keypair_import(hParams, loc_kpair)
     PrcLib.fatal(1, "Unable to import keypair '%s'. "\
                     'Public key file is not found. '\
                     "Please run 'forj setup %s'",
-                 keypair_name,
+                 hParams[:keypair_name],
                  config[:account_name]) unless loc_kpair[:public_key_exist?]
+    public_key_file = File.join(loc_kpair[:keypair_path],
+                                loc_kpair[:public_key_name])
+
     begin
-      config[:public_key] = File.read(loc_kpair[:public_key_file])
+      config[:public_key] = File.read(public_key_file)
     rescue => e
       PrcLib.fatal(1, "Unable to import keypair '%s'. '%s' is "\
-                      "unreadable.\n%s", keypair_name,
-                   loc_kpair[:public_key_file], e.message)
+                      "unreadable.\n%s", hParams[:keypair_name],
+                   loc_kpair[:public_key_file],
+                   e.message)
     end
-    keypair = create_keypair(sCloudObj, hParams)
+    keypair = create_keypair(:keypairs, hParams)
+
+    return nil if keypair.nil?
+
     if !loc_kpair[:private_key_exist?]
       keypair[:coherent] = false
     else
@@ -252,26 +262,23 @@ class CloudProcess
   end
 end
 
-# Define framework object on BaseDefinition
-module Lorj
-  # ************************************ keypairs Object
-  # Identify keypairs
-  class BaseDefinition
-    define_obj(:keypairs,
+# ************************************ keypairs Object
+# Identify keypairs
+class Lorj::BaseDefinition
+  define_obj(:keypairs,
 
-               :create_e => :forj_get_or_create_keypair,
-               :query_e => :forj_query_keypair,
-               :get_e => :forj_get_keypair
-               #         :delete_e   => :forj_delete_keypair
-               )
+             :create_e => :forj_get_or_create_keypair,
+             :query_e => :forj_query_keypair,
+             :get_e => :forj_get_keypair
+             #         :delete_e   => :forj_delete_keypair
+             )
 
-    obj_needs :CloudObject,  :compute_connection
-    obj_needs :data,         :keypair_name,        :for => [:create_e]
-    obj_needs :data,         :keypair_path,        :for => [:create_e]
+  obj_needs :CloudObject,  :compute_connection
+  obj_needs :data,         :keypair_name,        :for => [:create_e]
+  obj_needs :data,         :keypair_path,        :for => [:create_e]
 
-    obj_needs_optional
-    obj_needs :data,         :public_key,          :for => [:create_e]
+  obj_needs_optional
+  obj_needs :data,         :public_key,          :for => [:create_e]
 
-    def_attribute :public_key
-  end
+  def_attribute :public_key
 end

data/lib/core_process/cloud/process/network.rb

@@ -16,6 +16,8 @@
 
 # It requires Core objects to be defined + default ForjProcess functions.
 
+# rubocop: disable Style/ClassAndModuleChildren
+
 # Network Management
 class CloudProcess
   # Process Create handler
@@ -31,13 +33,12 @@ class CloudProcess
 
     # Attaching if missing the subnet.
     # Creates an object subnet, attached to the network.
+    params = {}
     unless hParams[:subnetwork_name]
-      hParams[:subnetwork_name] = 'sub-' + hParams[:network_name]
-      config[:subnetwork_name] = hParams[:subnetwork_name]
+      params[:subnetwork_name] = 'sub-' + hParams[:network_name]
     end
 
-    # object.Create(:subnetwork)
-    process_create(:subnetwork)
+    process_create(:subnetwork, params)
 
     network
   end
@@ -56,25 +57,23 @@ class CloudProcess
   end
 end
 
-# Define framework object on BaseDefinition
-module Lorj
-  # ************************************ Network Object
-  # Identify the network
-  class BaseDefinition
-    define_obj(:network,
-               :create_e => :forj_get_or_create_network,
-               :query_e => :controller_query,
-               :get_e => :forj_get_network,
-               :delete_e => :forj_delete_network
-              )
-    obj_needs :CloudObject,  :network_connection
-    obj_needs :data,         :network_name,        :for => [:create_e]
+# Network Object
+# Identify the network
+class Lorj::BaseDefinition
+  define_obj(:network,
+             :create_e => :forj_get_or_create_network,
+             :query_e => :controller_query,
+             :get_e => :forj_get_network,
+             :delete_e => :forj_delete_network
+            )
+  obj_needs :CloudObject,  :network_connection
+  obj_needs :data,         :network_name,        :for => [:create_e]
 
-    obj_needs_optional
-    obj_needs :data,         :subnetwork_name,     :for => [:create_e]
+  obj_needs_optional
+  obj_needs :data,         :subnetwork_name,     :for => [:create_e]
 
-    def_query_attribute :external # true if network is external or not.
-  end
+  # Any attribute are queriable
+  def_attribute :external # true if network is external or not.
 end
 
 # Network Process internal functions #
@@ -100,8 +99,7 @@ class CloudProcess
   # nil or Provider Object
   def find_network(sCloudObj, hParams)
     query = { :name => hParams[:network_name] }
-    #  list = controller_query(sCloudObj, query)
-    #  query_single(sCloudObj, list, query, hParams[:network_name])
+
     query_single(sCloudObj, query, hParams[:network_name])
  rescue => e
    PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))

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

@@ -16,6 +16,8 @@
 
 # It requires Core objects to be defined + default ForjProcess functions.
 
+# rubocop: disable Style/ClassAndModuleChildren
+
 # Addresses management
 class CloudProcess
   # Process Handler functions
@@ -62,26 +64,23 @@ class CloudProcess
   end
 end
 
-# Define framework object on BaseDefinition
-module Lorj
-  # ************************************ SERVER Addresses Object
-  # Object representing the list of IP addresses attached to a server.
-  class BaseDefinition
-    define_obj(:public_ip,
-               :create_e => :forj_get_or_assign_public_address,
-               :query_e => :forj_query_public_address
-    #      :get_e      => :forj_get_address
-    #      :update_e   => :forj_update_address
-    #      :delete_e   => :forj_delete_address
-    )
+# SERVER Addresses Object
+# Object representing the list of IP addresses attached to a server.
+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
+  #      :update_e   => :forj_update_address
+  #      :delete_e   => :forj_delete_address
+  )
 
-    obj_needs :CloudObject,  :compute_connection
-    obj_needs :CloudObject,  :server
+  obj_needs :CloudObject,  :compute_connection
+  obj_needs :CloudObject,  :server
 
-    def_attribute :server_id
-    def_attribute :public_ip
-    undefine_attribute :name # No name to extract
-  end
+  def_attribute :server_id
+  def_attribute :public_ip
+  undefine_attribute :name # No name to extract
 end
 
 # Internal Process function