forj 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe45b075653728015aec4bace3b604d214c94e4
-  data.tar.gz: f00361d094599e50b214c8fecdb17e95b04c56a5
+  metadata.gz: 6cec6f0b29fd74ec7ce415b7a5a293015317d13f
+  data.tar.gz: 9fb49f4ba7707eec34a0a287a2ec5dcf80b8c4cf
 SHA512:
-  metadata.gz: 3429c0634f5dea3a1174c47277e0e188905e52cc61ef6a7b66a3d507463a7373166e750a79bb9d0999ea1e0751fe1c542138c224ab99cd680cc91fc7e47ec95f
-  data.tar.gz: 7ba23851e38c291693c8d24b1abc09022cad244eb56b4e03731145c576181e8f94d792872023eee0451f0f0e1eba78624c1897c7c4bad2e21723a0ef91515f3c
+  metadata.gz: 41be8862c0f5f95302a4469cf61632af0ca3805c580d6de11abb23e44bd2afbdef9d258e4318b112a3bb170770a58c8d567e3e4d4269783c4d2866345af30a3d
+  data.tar.gz: 66f2fe74fcbef1ee7ed7170d8bdf8391d93c150bf998cb5daaa1d0842c0ad26aa01a20af7bfae8e64f2e4b5450700976f63cfde522d5e46a3bd04e60ed01576b

data/bin/forj

@@ -218,6 +218,9 @@ Maestro/infra bootstrap debugging:"
          oConfig[:blueprint] = blueprint
          Logging.info("Starting boot process of '%s' with blueprint '%s'." % [oConfig[:instance_name], oConfig[:blueprint]])
       end
+
+      Logging.high_level_msg ("Preparing your forge '%s'. Please be patient\n" % oConfig[:instance_name])
+
       oCloud.Create(:forge)
       #Boot.boot(blueprint, name, options[:build], options[:boothook], options[:box_name], oForjAccount)
   end

data/lib/defaults.yaml

@@ -69,6 +69,12 @@
    :ask_step:
       -  :desc:    "Provider configuration:"
       -  :desc:    "Maestro Cloud compute configuration:"
+         :explanation:        |-
+            Maestro (gardener) is currently configured to access your cloud Compute service with fog openstack.
+            Fog openstack is compatible with hpcloud services
+
+            It requires the openstack project name, user and password.
+
       -  :desc:    "Maestro and blueprint configuration:"
          :add:
             - :keypair_files
@@ -148,18 +154,11 @@
       :account:            true
       :required:           true
     :tenant:
-      :explanation:        |-
-
-         Maestro is currently configured to access your cloud Compute service with fog openstack.
-         Fog openstack is compatible with hpcloud services
-
-         It requires the openstack project name to use, user and password.
-
-      :desc:               "Openstack Tenant name"
+      :desc:               "Openstack Tenant ID"
       :account_exclusive:  true
       :account:            true
       :required:           true
-      :ask_step:           1
+      :ask_step:           0
     :os_user:
       :desc:               "Openstack compute cloud User name"
       :account_exclusive:  true
@@ -199,6 +198,10 @@
   :maestro:
     :tenant_name:
       :desc:            "Tenant name required by fog/openstack on gardener"
+      :account:         true
+      :validate:        !ruby/regexp /^\w?[\w_-]*$/
+      :ask_step:        1
+      :ask_sort:        0
     :network_name:
       :desc:            "Network name to attach to each forge boxes. By default we use 'forj'. If it doesn't exist, it will be created."
       :default:         network

data/lib/forj/process/ForjProcess.rb

@@ -116,7 +116,12 @@ class ForjCoreProcess
 
    def build_forge(sObjectType, hParams)
 
-      oServer = object.Create(:server)
+
+      object.Create(:internet_server)
+
+      Logging.high_level_msg ("\nBuilding your forge...\n")
+
+      oServer = DataObjects(:server, :ObjectData)
 
       # Define the log lines to get and test.
       config.set(:log_lines, 5)
@@ -126,29 +131,26 @@ class ForjCoreProcess
 
       sStatus = :checking
       maestro_create_status(sStatus)
+      oAddress = DataObjects(:public_ip, :ObjectData)
+
       if oServer[:attrs][:status] == :active
-         oAddresses = object.Query(:public_ip, :server_id => oServer[:id])
-         if oAddresses.length == 0
-            sStatus = :assign_ip
-         else
-            oAddress = oAddresses[0]
-            sMsg = <<-END
+         sMsg = <<-END
 Your server is up and running and is publically accessible through IP '#{oAddress[:public_ip]}'.
 
 You can connect to '#{oServer[:name]}' with:
 ssh ubuntu@#{oAddress[:public_ip]} -o StrictHostKeyChecking=no -i #{get_data(:keypairs, :private_key_file)}
-            END
-            if not object.get_data(:keypairs)[:coherent]
-               sMsg += ANSI.bold("\nUnfortunatelly") + " your current keypair is not usable to connect to your server.\nYou need to fix this issue to gain access to your server."
-            end
-            Logging.info(sMsg)
+         END
+         if not object.get_data(:keypairs)[:coherent]
+            sMsg += ANSI.bold("\nUnfortunatelly") + " your current keypair is not usable to connect to your server.\nYou need to fix this issue to gain access to your server."
+         end
+         Logging.info(sMsg)
+         Logging.high_level_msg ("\n%s\nThe forge is still building...\n" % sMsg)
 
-            oLog = object.Get(:server_log, 5)[:attrs][:output]
-            if /cloud-init boot finished/ =~ oLog
-               sStatus = :active
-            else
-               sStatus = :cloud_init
-            end
+         oLog = object.Get(:server_log, 5)[:attrs][:output]
+         if /cloud-init boot finished/ =~ oLog
+            sStatus = :active
+         else
+            sStatus = :cloud_init
          end
       else
          sleep 5
@@ -167,8 +169,16 @@ ssh ubuntu@#{oAddress[:public_ip]} -o StrictHostKeyChecking=no -i #{get_data(:ke
                sStatus = :assign_ip
             end
          elsif sStatus == :assign_ip
-            # Assigning Public IP.
-            oAddress = object.Create(:public_ip)
+            if oAddress.empty?
+               query_cache_cleanup(:public_ip) # To be able to ask for server IP assigned
+               oAddresses = object.Query(:public_ip, :server_id => oServer[:id])
+               if oAddresses.length == 0
+                  # Assigning Public IP.
+                  oAddress = object.Create(:public_ip)
+               else
+                  oAddress = oAddresses[0]
+               end
+            end
             sMsg = <<-END
 Public IP for server '#{oServer[:name]}' is assigned'
 Now, as soon as the server respond to the ssh port, you will be able to get a tail of the build with:
@@ -182,6 +192,7 @@ done
                sMsg += ANSI.bold("\nUnfortunatelly") + " your current keypair is not usable to connect to your server.\nYou need to fix this issue to gain access to your server."
             end
             Logging.info(sMsg)
+            Logging.high_level_msg ("\n%s\nThe forge is still building...\n" % sMsg)
             sStatus = :cloud_init
          elsif sStatus == :cloud_init
             oLog = object.Get(:server_log, 5)[:attrs][:output]
@@ -191,7 +202,10 @@ done
          end
          sleep(5) if sStatus != :active
       end
-      Logging.info("Server '%s' is now ACTIVE. Bootstrap done." % oServer[:name])
+      sMsg = "Server '%s' is now ACTIVE. Bootstrap done." % oServer[:name]
+      Logging.info(sMsg)
+      # TODO: read the blueprint/layout to identify which services are implemented and can be accessible.
+      Logging.high_level_msg ("Your Forge '%s' is over and accessible from IP #{oAddress[:public_ip]}. Enjoy!\n" % config[:instance_name])
       oServer
    end
 
@@ -438,6 +452,13 @@ done
          mime_cmd, # $6: mime script file to execute.
          mime # $7: mime file generated.
       ]
+
+      # TODO: Replace shell script call to ruby functions
+      if $LIB_FORJ_DEBUG >=1
+         cmd += " >> #{$FORJ_DATA_PATH}/forj.log"
+      else
+         cmd += " | tee -a #{$FORJ_DATA_PATH}/forj.log"
+      end
       raise ForjError.new, "#{bootstrap} script file is not found." if not File.exists?(bootstrap)
       Logging.debug("Running '%s'" % cmd)
       Kernel.system(cmd)

data/lib/lib-forj/lib/core/core.rb

@@ -59,11 +59,11 @@ module ForjLib
             oType = oObj.type?
             case oType
                when :data, :object
-                  @data[:object_type] = oObj.object_type?
+                  @data[:object_type] = ((sObjType.nil?)? (oObj.object_type?) : sObjType)
                   @data[:object] = oObj.get(:object)
                   @data[:attrs] = oObj.get(:attrs)
                when :list
-                  @data[:object_type] = oObj.object_type?
+                  @data[:object_type] = ((sObjType.nil?)? (oObj.object_type?) : sObjType)
                   @data[:object] = oObj.get(:object)
                   @data[:list] = oObj.get(:list)
                   @data[:query] = oObj.get(:query)
@@ -104,6 +104,12 @@ module ForjLib
          self
       end
 
+      def type=(sObjType)
+         return self if self.empty?
+         @data[:object_type] = sObjType
+         self
+      end
+
       def [](*key)
          get(*key)
       end
@@ -140,7 +146,12 @@ module ForjLib
          end
       end
 
+      def empty?()
+         @data[:object].nil?
+      end
+
       def nil?()
+         # Obsolete Use empty? instead.
          @data[:object].nil?
       end
 
@@ -573,6 +584,16 @@ class BaseProcess
    end
    private
 
+   def query_cache_cleanup(sObjectType)
+      raise ForjError.new(), "No Base object loaded." if not @oDefinition
+      @oDefinition.query_cleanup(sObjectType)
+   end
+
+   def object_cache_cleanup(sObjectType)
+      raise ForjError.new(), "No Base object loaded." if not @oDefinition
+      @oDefinition.object_cleanup(sObjectType)
+   end
+
    def controler
       raise ForjError.new(), "No Controler object loaded." if not @oDefinition
       @oDefinition
@@ -595,6 +616,11 @@ class BaseProcess
       @oDefinition.format_list(sObjectType, oMiscObj, hQuery)
    end
 
+   def DataObjects(sObjectType, *key)
+      raise ForjError.new(), "No Base object loaded." if not @oDefinition
+      @oDefinition.DataObjects(sObjectType, *key)
+   end
+
    def get_data(oObj, *key)
 
       raise ForjError.new(), "No Base object loaded." if not @oDefinition
@@ -697,30 +723,30 @@ end
 
 
 class BaseController
-   # Default handlers which needs to be defined by the cloud provider,
+   # Default handlers which needs to be defined by the cloud controller,
    # called by BaseDefinition Create, Delete, Get, Query and Update functions.
    def connect(sObjectType, hParams)
-      raise ForjError.new(), "connect has not been redefined by the provider '%s'" % self.class
+      raise ForjError.new(), "connect has not been redefined by the controller '%s'" % self.class
    end
 
    def create(sObjectType, hParams)
-      raise ForjError.new(), "create_object has not been redefined by the provider '%s'" % self.class
+      raise ForjError.new(), "create_object has not been redefined by the controller '%s'" % self.class
    end
 
    def delete(sObjectType, hParams)
-      raise ForjError.new(), "delete_object has not been redefined by the provider '%s'" % self.class
+      raise ForjError.new(), "delete_object has not been redefined by the controller '%s'" % self.class
    end
 
    def get(sObjectType, sUniqId, hParams)
-      raise ForjError.new(), "get_object has not been redefined by the provider '%s'" % self.class
+      raise ForjError.new(), "get_object has not been redefined by the controller '%s'" % self.class
    end
 
    def query(sObjectType, sQuery, hParams)
-      raise ForjError.new(), "query_object has not been redefined by the provider '%s'" % self.class
+      raise ForjError.new(), "query_object has not been redefined by the controller '%s'" % self.class
    end
 
-   def update(sObjectType, hParams)
-      raise ForjError.new(), "update_object has not been redefined by the provider '%s'" % self.class
+   def update(sObjectType, oObject, hParams)
+      raise ForjError.new(), "update_object has not been redefined by the controller '%s'" % self.class
    end
 
    def forjError(msg)
@@ -800,13 +826,13 @@ class ObjectData
    end
 
    def delete(oObj)
-      if oObject.is_a?(Symbol)
+      if oObj.is_a?(Symbol)
          sObjectType = oObj
          @hParams[sObjectType] = nil
       else
-         raise ForjError.new(), "ObjectData: delete error. oObj is not a symbol or a recognized formatted Object." unless oObj.key?(:object)
+         raise ForjError.new(), "ObjectData: delete error. oObj is not a framework data Object." unless oObj.is_a?(ForjLib::Data)
          if oObj[:object_type] == :object_list
-            rhSet(@hParams, nil, :list, sObjectType)
+            rhSet(@hParams, nil, :query, sObjectType)
          else
             sObjectType = oObj[:object_type]
             @hParams[sObjectType] = nil
@@ -875,8 +901,6 @@ class BaseDefinition
 
       pProc = rhGet(@@meta_obj, sCloudObj, :lambdas, :create_e)
 
-      return nil if pProc.nil?
-
       # Check required parameters
       oObjMissing = _check_required(sCloudObj, :create_e, pProc).reverse
 
@@ -890,18 +914,26 @@ class BaseDefinition
       end
       @RuntimeContext[:oCurrentObj] = sCloudObj # Context: Default object used.
 
-      # build Function params to pass to the event handler.
-      aParams = _get_object_params(sCloudObj, :create_e, pProc,)
-      ForjLib.debug(2, "Create Object '%s' - Running '%s'" % [sCloudObj, pProc])
+      if pProc.nil?
+         # This object is a meta object, without any data.
+         # Used to build other kind of objects.
+         oObject = ForjLib::Data.new
+         oObject.set({}, sCloudObj) {}
+      else
+         # build Function params to pass to the event handler.
+         aParams = _get_object_params(sCloudObj, :create_e, pProc,)
+         ForjLib.debug(2, "Create Object '%s' - Running '%s'" % [sCloudObj, pProc])
+
+         # Call the process function.
+         # At some point, the process will call the controller, via the framework.
+         # This controller call via the framework has the role to
+         # create an ObjectData well formatted, with _return_map function
+         # See Definition.connect/create/update/query/get functions (lowercase)
+         oObject = @oForjProcess.method(pProc).call(sCloudObj, aParams)
+         # return usually is the main object that the process called should provide.
+         # Save Object if the object has been created by the process, without controller
+      end
 
-      # Call the process function.
-      # At some point, the process will call the controller, via the framework.
-      # This controller call via the framework has the role to
-      # create an ObjectData well formatted, with _return_map function
-      # See Definition.connect/create/update/query/get functions (lowercase)
-      oObject = @oForjProcess.method(pProc).call(sCloudObj, aParams)
-      # return usually is the main object that the process called should provide.
-      # Save Object if the object has been created by the process, without controller
       unless oObject.nil?
          @ObjectData.add(oObject)
       end
@@ -938,6 +970,21 @@ class BaseDefinition
 
    end
 
+   def query_cleanup(sCloudObj)
+      oList = @ObjectData[:query, sCloudObj]
+      unless oList.nil?
+         @ObjectData.delete(oList)
+      end
+   end
+
+   def object_cleanup(sCloudObj)
+      oObject = @ObjectData[sCloudObj, :ObjectData]
+      unless oObject.nil?
+         @ObjectData.delete(oObject)
+      end
+   end
+
+
    # This function returns a list of objects
    def Query(sCloudObj, hQuery)
 
@@ -1063,6 +1110,7 @@ class BaseDefinition
       hAskStep.each{ | value |
          aSetup << {
             :desc => value[:desc],
+            :explanation => value[:explanation],
             :pre_step_handler => value[:pre_step_function],
             :order => [[]],
             :post_step_handler => value[:post_step_function]
@@ -1202,6 +1250,7 @@ class BaseDefinition
       aSetup.each_index { | iStep |
          ForjLib.debug(2, "Ask step %s:" % iStep)
          puts "%s%s%s" % [ANSI.bold, aSetup[iStep][:desc], ANSI.clear] unless aSetup[iStep][:desc].nil?
+         puts "%s\n\n" % ANSI.yellow(aSetup[iStep][:explanation]) unless aSetup[iStep][:explanation].nil?
          aOrder = aSetup[iStep][:order]
          aOrder.each_index { | iIndex |
          ForjLib.debug(2, "Ask order %s:" % iIndex)
@@ -1473,6 +1522,10 @@ class BaseDefinition
       @ObjectData.add oDataObject
    end
 
+   def DataObjects(sObjectType, *key)
+      @ObjectData[sObjectType, key]
+   end
+
    # get an attribute/object/... from an object.
    def get_data(oObj, *key)
       if oObj.is_a?(Hash) and oObj.key?(:object_type)
@@ -1593,34 +1646,34 @@ class BaseDefinition
 
       hParams = _get_object_params(sObjectType, :update_e, :update, true)
 
-      oObject = hParams.get(sObjectType)
-      oControlerObject = hParams[sObjectType]
+      oObject = @ObjectData[sObjectType, :ObjectData]
+      oControlerObject = oObject[:object]
 
       bUpdated = false
-      oObject[attrs].each { |key, value |
-         #      hValueMapping = rhGet(@@meta_obj, sCloudObj, :value_mapping, key)
+      oObject[:attrs].each { |key, value |
          oKeyPath = KeyPath.new(key)
-         oMapPath = KeyPath.new(rhGet(@@meta_obj, sCloudObj, :returns, oKeyPath.sFullPath))
+         oMapPath = KeyPath.new(rhGet(@@meta_obj, sObjectType, :returns, oKeyPath.sFullPath))
          old_value = @oProvider.get_attr(oControlerObject, oMapPath.aTree)
          if value != old_value
             bUpdated = true
-            @oProvider.set_attr(oControlerObject, hMap, value)
+            @oProvider.set_attr(oControlerObject, oMapPath.aTree, value)
             ForjLib.debug(2, "%s.%s - Updating: %s = %s (old : %s)" % [@oForjProcess.class, sObjectType, key, value, old_value])
          end
       }
-      oControlerObject = @oProvider.update(sObjectType, hParams) if bUpdated
-      ForjLib.debug(1, "%s.%s - Saved." % [@oForjProcess.class, sObjectType])
-      oDataObject = ForjLib::Data.new
-      oDataObject.set(oControlerObject, sObjectType) { | sObjType, oObject |
+
+      bDone = @oProvider.update(sObjectType, oObject, hParams) if bUpdated
+
+      raise ForjError.new, "Controller function 'update' must return True or False. Class returned: '%s'" % bDone.class if not [TrueClass, FalseClass].include?(bDone.class)
+
+      ForjLib.debug(1, "%s.%s - updated." % [@oForjProcess.class, sObjectType]) if bDone
+      oObject.set(oControlerObject, sObjectType) { | sObjType, oObject |
          begin
             _return_map(sObjType, oObject)
          rescue => e
             raise ForjError.new(), "update %s.%s : %s" % [@oForjProcess.class, sObjectType, e.message]
          end
       }
-      @ObjectData.add oDataObject
-
-      oDataObject
+      bDone
    end
 
 

data/lib/lib-forj/lib/core/definition_internal.rb

@@ -208,7 +208,7 @@ class BaseDefinition
             # [:section1][subsect][key] = value
             # oParam => [:hdata][mykey] = value
             # not oParam => [:hdata][:section1][subsect][mykey] = value
-            oParam[:hdata][rhGet(hParams, :mapping)] = value
+            rhSet(oParam[:hdata], value, rhGet(hParams, :mapping))
          end
       end
       oParam[oKeyPath.aTree] = value

data/lib/lib-forj/lib/core_process/CloudProcess.rb

@@ -91,22 +91,27 @@ class BaseDefinition
 
    # ************************************ SubNetwork Object
    # Identify subnetwork as part of network.
-   define_obj(:subnetwork,    :nohandler => true)
+   define_obj(:subnetwork,
+              :create_e    => :forj_get_or_create_subnetwork
+             )
 
    obj_needs   :CloudObject,  :network_connection
    obj_needs   :CloudObject,  :network
+   obj_needs   :data,         :subnetwork_name
 
    def_query_attribute :network_id
 
    # ************************************ Port Object
    # Identify port attached to network
-   define_obj   :port,    :nohandler => true
+   define_obj  :port,   :nohandler => true
 
+   obj_needs   :CloudObject,  :network_connection
    def_attribute :device_id
 
    def_query_attribute :network_id
    def_query_attribute :device_owner
 
+
    # ************************************ Router Object
    # Identify the router of a network.
    define_obj(:router,
@@ -125,6 +130,21 @@ class BaseDefinition
 
    def_attribute :gateway_network_id
 
+   # ************************************ Router interface Object
+   # Identify interface attached to a router
+   # This object will probably be moved to controller task
+   # To keep the network model more generic.
+
+   # No process handler defined. Just Controller object
+   define_obj  :router_interface,   :nohandler => true
+
+   obj_needs   :CloudObject,  :network_connection
+   obj_needs   :CloudObject,  :router,             { :for => [:create_e] }
+   obj_needs   :CloudObject,  :subnetwork,         { :for => [:create_e] }
+
+   undefine_attribute   :name
+   undefine_attribute   :id
+
    # Identify an external network thanks to the network router.
    define_obj(:external_network,
       {
@@ -185,6 +205,9 @@ class BaseDefinition
    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] }
+
    def_attribute :public_key
 
    # ************************************ Image Object

data/lib/lib-forj/lib/core_process/global_process.rb

@@ -112,7 +112,8 @@ class CloudProcess
             Logging.warning("Unable to verify keypair coherence between your cloud and your local SSH keys. The cloud controller did not provided ':public_key'")
          end
       else
-         keypair = create_keypair(sCloudObj,hParams)
+         config[:public_key] = File.read(hParams[:public_key_file])
+         keypair = create_keypair(sCloudObj, hParams)
          if not hKeys[:private_key_exist? ]
             keypair[:coherent] = false
          else
@@ -139,18 +140,20 @@ class CloudProcess
 
    end
 
-   def keypair_create(sCloudObj,hParams)
+   def create_keypair(sCloudObj, hParams)
       key_name = hParams[:keypair_name]
-      Logging.debug("Importing keypair '%s'" % [key_name])
+      Logging.state("Importing keypair '%s'" % [key_name])
       oSSLError=SSLErrorMgt.new
       begin
-         controler.create(sCloudObj)
+         keypair = controler.create(sCloudObj)
+         Logging.info("Keypair '%s' imported." % [keypair[:name]])
       rescue StandardError => e
          if not oSSLError.ErrorDetected(e.message,e.backtrace, e)
             retry
          end
          Logging.error "error importing keypair '%s'" % [key_name]
       end
+      keypair
    end
 
    def keypair_detect(keypair_name, key_fullpath)

data/lib/lib-forj/lib/core_process/network_process.rb

@@ -62,10 +62,10 @@ class CloudProcess < BaseProcess
       # Creates an object subnet, attached to the network.
       if not hParams[:subnetwork_name]
          hParams[:subnetwork_name] = 'sub-' + hParams[:network_name]
-         config.set(:subnetwork_name, hParams[:subnetwork_name])
+         config[:subnetwork_name] = hParams[:subnetwork_name]
       end
 
-      get_or_create_subnet(hParams)
+      object.Create(:subnetwork)
 
       network
 
@@ -95,12 +95,15 @@ class CloudProcess < BaseProcess
    # It returns:
    # nil or Provider Object
    def create_network(sCloudObj, hParams)
+      name = hParams[:network_name]
       begin
-         Logging.debug('creating network %s' % [name])
-         controler.create(sCloudObj)
+         Logging.state("Creating network '%s'" % [name])
+         network = controler.create(sCloudObj)
+         Logging.info("Network '%s' created" % [network[:name]])
       rescue => e
-         Logging.fatal(1, "Unable to create network '%s'" % name, e)
+         Logging.fatal(1, "Unable to create network '%s'" % [name, e])
       end
+      network
    end
 
    # Search for a network from his name.
@@ -118,12 +121,12 @@ class CloudProcess < BaseProcess
       end
    end
 
-   def get_or_create_subnet(hParams)
+   def forj_get_or_create_subnetwork(sCloudObj, hParams)
 
-      Logging.state("Searching for sub-network attached '%s'" % [hParams[:network_name]])
+      Logging.state("Searching for sub-network attached to network '%s'" % [hParams[:network, :name]])
       #######################
       begin
-         sQuery = { :network_id => get_data(:network, :id) }
+         sQuery = { :network_id => hParams[:network, :id] }
          subnets = controler.query(:subnetwork, sQuery)
       rescue => e
          Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
@@ -131,21 +134,20 @@ class CloudProcess < BaseProcess
       if subnets
          case subnets.length()
             when 0
-               Logging.info("No subnet found from '%s' network" % [hParams[:network_name]])
+               Logging.info("No subnet found from '%s' network" % [hParams[:network, :name]])
                subnet = ForjLib::Data.new
             when 1
-               Logging.info("Found '%s' subnet from '%s' network" % [subnets[0, :name], hParams[:network_name]])
+               Logging.info("Found '%s' subnet from '%s' network" % [subnets[0, :name], hParams[:network, :name]])
                subnet = subnets[0]
             else
-               Logging.warning("Several subnet was found on '%s'. Choosing the first one = '%s'" % [hParams[:network_name], subnets[0, :name]])
+               Logging.warning("Several subnet was found on '%s'. Choosing the first one = '%s'" % [hParams[:network, :name], subnets[0, :name]])
                subnet = subnets[0]
          end
       end
-      if not subnet
+      if not subnet or subnets.length == 0
          # Create the subnet
-         subname = hParams[:subnetwork_name]
          begin
-            subnet = create_subnet(hParams[:network_connection], hParams[:network], subname)
+            subnet = create_subnet(sCloudObj, hParams)
          rescue => e
             Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
          end
@@ -154,16 +156,17 @@ class CloudProcess < BaseProcess
       subnet
    end
 
-  def create_subnet(oNetworkConnect, oNetwork, network_name)
-    Logging.state("Creating subnet '%s'" % [network_name])
-    begin
-      subnet = provider_create_subnetwork(oNetworkConnect, oNetwork, network_name)
-      Logging.info("Subnet '%s' created." % [network_name])
-    rescue => e
-      Logging.fatal(1, "Unable to create '%s' subnet." % network_name, e)
-    end
-    subnet
-  end
+   def create_subnet(sCloudObj, hParams)
+      name = hParams[:subnetwork_name]
+      Logging.state("Creating subnet '%s'" % [name])
+      begin
+         subnet = controler.create(sCloudObj)
+         Logging.info("Subnet '%s' created." % [subnet[:name]])
+      rescue => e
+         Logging.fatal(1, "Unable to create '%s' subnet." % name, e)
+      end
+      subnet
+   end
 
    def delete_subnet()
 
@@ -186,21 +189,21 @@ end
 class CloudProcess
    # Process Create handler
    def forj_get_or_create_router(sCloudObj, hParams)
-      oNetwork = hParams.get(:network)
       oSubNetwork = hParams[:subnetwork]
 
-      router_name = rhGet(hParams, :router_name)
-      if not router_name
-         router_name = 'router-%s' % router_name
+      if not hParams[:router_name]
+         config[:router_name] = 'router-%s' % hParams[:network, :name]
+         hParams[:router_name] = config[:router_name]
       end
 
+      router_name = hParams[:router_name]
       router_port = get_router_interface_attached(:port, hParams)
 
-      if not router_port
+      if not router_port or router_port.empty?
          # Trying to get router
          router = get_router(router_name)
-         router = create_router(router_name) if not router
-         create_router_interface(oSubNetwork, router) if router
+         router = create_router(router_name) if not router or router.empty?
+         create_router_interface(oSubNetwork, router) if router and not router.empty?
       else
          sQuery = {:id => get_data(router_port, :device_id)}
          routers = controler.query(:router, sQuery)
@@ -210,7 +213,7 @@ class CloudProcess
                   routers[0, :name],
                   get_data(:network, :name)
                ])
-               router = routers[:list][0]
+               router = routers[0]
             else
                Logging.warning("Unable to find the router id '%s'" % [ get_data(router_port, :device_id) ])
                router = ForjLib::Data.new
@@ -221,7 +224,7 @@ class CloudProcess
    end
 
    def forj_update_router(sCloudObj, hParams)
-      controler.update(sObjectType)
+      controler.update(sCloudObj)
             ################################
             #routers[0].external_gateway_info = { 'network_id' => external_network.id }
             #routers[0].save
@@ -239,7 +242,7 @@ class CloudProcess
             when 1
                routers[0]
             else
-               Logging.warning("Router '%s' not found." % [ name ] )
+               Logging.info("Router '%s' not found." % [ name ] )
                ForjLib::Data.new
          end
       rescue => e
@@ -248,26 +251,25 @@ class CloudProcess
    end
 
    def create_router(router_name, oExternalNetwork = nil)
-
-      sExtNet = nil
-      sExtNet = get_data(oExternalNetwork, :name) if oExternalNetwork
-
       begin
-         hRouter = {
-            :router_name => router_name,
-            :external_gateway_id => get_data(oExternalNetwork, :id)
-         }
          if oExternalNetwork
+            sExtNet = get_data(oExternalNetwork, :name)
             Logging.state("Creating router '%s' attached to the external Network '%s'" % [router_name, sExtNet])
-
-            hRouter[:external_gateway_id] = get_data(oExternalNetwork, :id)
+            config[:external_gateway_id] = get_data(oExternalNetwork, :id)
          else
             Logging.state("Creating router '%s' without external Network" % [router_name])
          end
-         controler.create(:router)
+
+         router = controler.create(:router)
+         if oExternalNetwork
+            Logging.info("Router '%s' created and attached to the external Network '%s'." % [router_name, sExtNet])
+         else
+            Logging.info("Router '%s' created without external Network." % [router_name])
+         end
       rescue => e
          raise ForjError.new(), "Unable to create '%s' router\n%s" % [router_name, e.message]
       end
+      router
    end
 
    def delete_router(oNetworkConnect, oRouter)
@@ -281,19 +283,21 @@ class CloudProcess
       end
    end
 
-  # Router interface to connect to the network
-  def create_router_interface(oSubnet, oRouter)
-    Logging.fatal(1, "Internal Error: subnet/router object not passed.") if not oSubnet or not oRouter
+   # TODO: Move router interface management to hpcloud controller.
+   # Router interface to connect to the network
+   def create_router_interface(oSubnet, oRouter)
 
-    Logging.state("Attaching subnet '%s' to router '%s'" % [oSubnet.name, oRouter.name])
-    begin
-      #################
-      provider_add_interface()
-      # oRouter.add_interface(oSubnet.id, nil)
-    rescue => e
-      Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
-    end
-  end
+      Logging.state("Attaching subnet '%s' to router '%s'" % [oSubnet[:name], oRouter[:name]])
+      begin
+         controler.create(:router_interface)
+
+         #################
+         #provider_add_interface()
+         # oRouter.add_interface(oSubnet.id, nil)
+      rescue => e
+         Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
+      end
+   end
 
   def delete_router_interface(oSubnet, oRouter)
     Logging.state("Removing subnet '%s' from router '%s'" % [oSubnet.name, oRouter.name])
@@ -306,22 +310,6 @@ class CloudProcess
     end
   end
 
-  #~ def get_router_interface(oNetworkConnect, network_id, device_id)
-    #~ begin
-      #~ # Searching for router port attached
-      #~ #################
-      #~ ports=oNetworkConnect.ports.all({:network_id => network_id, :device_id => device_id})
-      #~ case ports.length()
-        #~ when 0
-          #~ nil
-        #~ else
-          #~ port[0]
-      #~ end
-    #~ rescue => e
-      #~ Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
-    #~ end
-  #~ end
-
   def get_router_interface_attached(sCloudObj, hParams)
 
       oNetwork = hParams[:network]
@@ -329,7 +317,8 @@ class CloudProcess
       begin
          # Searching for router port attached
          #################
-         sQuery = {:network_id => get_data(:network, :id), :device_owner => 'network:router_interface'}
+         sQuery = {:network_id => hParams[:network, :id], :device_owner => 'network:router_interface'}
+
          ports = controler.query(sCloudObj, sQuery)
          case ports.length()
             when 0
@@ -452,7 +441,7 @@ class CloudProcess
       end
       case sgroups.length()
          when 0
-            Logging.info("No security group '%s' found" % [ hParams[:name] ] )
+            Logging.info("No security group '%s' found" % [ hParams[:security_group] ] )
             nil
          when 1
             Logging.info("Found security group '%s'" % [sgroups[0, :name]])
@@ -463,12 +452,14 @@ class CloudProcess
    # SecurityGroups Process internal functions #
    #-------------------------------------------#
   def create_security_group(sCloudObj, hParams)
-    Logging.state("creating security group '%s'" % hParams[:name])
+    Logging.state("Creating security group '%s'" % hParams[:security_group])
     begin
-      controler.create(sCloudObj)
+      sg = controler.create(sCloudObj)
+      Logging.info("Security group '%s' created." % sg[:name])
     rescue => e
       Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     end
+    sg
   end
 
    # Rules handler #
@@ -531,16 +522,18 @@ class CloudProcess
    def create_rule(sCloudObj, hParams)
 
       sRule = '%s %s:%s - %s to %s' % [ hParams[:dir], hParams[:rule_proto], hParams[:port_min], hParams[:port_max], hParams[:addr_map] ]
-      Logging.debug("Creating rule '%s'" % [sRule])
+      Logging.state("Creating rule '%s'" % [sRule])
       oSSLError=SSLErrorMgt.new
       begin
-         controler.create(sCloudObj)
+         rule = controler.create(sCloudObj)
+         Logging.info("Rule '%s' created." % [sRule])
       rescue StandardError => e
          if not oSSLError.ErrorDetected(e.message,e.backtrace, e)
             retry
          end
          Logging.error 'error creating the rule for port %s' % [sRule]
       end
+      rule
    end
 
 end
@@ -551,26 +544,30 @@ end
 class CloudProcess
    def forj_get_or_create_ext_net(sCloudObj, hParams)
 
-      Logging.state("Checking router's gateway'")
+      Logging.state("Checking router '%s' gateway" % hParams[:router, :name])
 
-      oRouter = hParams.get(:router)
-      sRouterName = get_data(:router, :name)
-      sNetworkId = get_data(:router, :gateway_network_id)
+      oRouter = hParams[:router]
+      sRouterName = hParams[:router, :name]
+      sNetworkId = hParams[:router, :gateway_network_id]
       if sNetworkId
-         Logging.info("Found router '%s' attached to an external gateway." % [ sRouterName ] )
-         forj_query_external_network(sCloudObj, {:id => sNetworkId}, hParams)
+         external_network = forj_query_external_network(sCloudObj, {:id => sNetworkId}, hParams)
+         Logging.info("Router '%s' is attached to the external gateway '%s'." % [ sRouterName, external_network[:name] ] )
       else
-         #byebug
-         Logging.info("Found router '%s' but need to be attached to an external gateway. Attaching" % [ sRouterName ] )
+         Logging.info("Router '%s' needs to be attached to an external gateway." % [ sRouterName ] )
+         Logging.state("Attaching")
          external_network = forj_query_external_network(:network, {}, hParams)
-         if external_network
-            oRouter[:attrs][:gateway_network_id] = get_data(external_network, :id)
+         if not external_network.empty?
+            oRouter[:gateway_network_id] = external_network[:id]
             forj_update_router(:router, hParams)
-            Logging.info("Router '%s' attached to the external network '%s'." % [routers[:list][0][:attrs][:name], get_data(external_network, :name) ])
+            Logging.info("Router '%s' attached to the external network '%s'." % [ sRouterName, external_network[:name] ])
          else
             Logging.fatal(1, "Unable to attach router '%s' to an external gateway. Required for boxes to get internet access. " % [ get_data(:router, :name) ] )
          end
       end
+
+      # Need to keep the :network object as :external_network object type.
+      external_network.type = sCloudObj
+      external_network
    end
 
    def forj_query_external_network(sCloudObj, sQuery, hParams)
@@ -579,16 +576,16 @@ class CloudProcess
          # Searching for external network
          networks = controler.query(:network, sQuery.merge({ :external => true }))
 
-         case networks[:list].length()
+         case networks.length()
          when 0
             Logging.info("No external network")
             nil
          when 1
-            Logging.info("Found external network '%s'." % [networks[:list][0][:attrs][:name] ])
-            networks[:list][0]
+            Logging.info("Found external network '%s'." % [networks[0, :name] ])
+            networks[0]
          else
-            Logging.warning("Found several external networks. Selecting the first one '%s'" % [networks[:list][0][:attrs][:name]])
-            networks[:list][0]
+            Logging.warning("Found several external networks. Selecting the first one '%s'" % [networks[0, :name]])
+            networks[0]
          end
       rescue => e
          Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])

data/lib/lib-forj/lib/providers/hpcloud/Hpcloud.rb

@@ -87,8 +87,14 @@ class Hpcloud < BaseDefinition
 
    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' ]
+
    get_attr_mapping :gateway_network_id, [:external_gateway_info, 'network_id']
 
    # ************************************ SERVER Object
@@ -219,20 +225,21 @@ class HpcloudController < BaseController
             required?(hParams, :network)
             required?(hParams, :subnetwork_name)
             HPNetwork.create_subnetwork(hParams[:network_connection], hParams[:network], hParams[:subnetwork_name])
-         when :security_group
+         when :security_groups
             required?(hParams, :network_connection)
             required?(hParams, :security_group)
             HPSecurityGroups.create_sg(hParams[:network_connection], hParams[:security_group], hParams[:sg_desc])
          when :keypairs
             required?(hParams, :compute_connection)
             required?(hParams, :keypair_name)
-            required?(hParams, :public_key_file)
-            HPKeyPairs.create_keypair(hParams[:compute_connection], hParams[:keypair_name], hParams[:public_key_file])
+            required?(hParams, :public_key)
+            HPKeyPairs.create_keypair(hParams[:compute_connection], hParams[:keypair_name], hParams[:public_key])
          when :router
             required?(hParams, :network_connection)
-            if hParams.key?(:external_gateway_id)
-               hParams[:hdata][:external_gateway_info] = { 'network_id' => hParams[:external_gateway_id] }
-            end
+            required?(hParams, :router_name)
+            #~ if hParams[:external_gateway_id]
+               #~ hParams[:hdata][:external_gateway_info] = { 'network_id' => hParams[:external_gateway_id] }
+            #~ end
             hParams[:hdata] = hParams[:hdata].merge(:admin_state_up => true) # Forcelly used admin_status_up to true.
 
             HPNetwork.create_router(hParams[:network_connection], hParams[:hdata])
@@ -240,6 +247,10 @@ class HpcloudController < BaseController
             required?(hParams, :network_connection)
             required?(hParams, :security_groups)
             HPSecurityGroups.create_rule(hParams[:network_connection], hParams[:hdata])
+         when :router_interface
+            required?(hParams, :router)
+            required?(hParams, :subnetwork)
+            HPNetwork.add_interface(hParams[:router], hParams[:subnetwork])
          else
             forjError "'%s' is not a valid object for 'create'" % sObjectType
       end
@@ -358,10 +369,12 @@ class HpcloudController < BaseController
    end
 
 
-   def update(sObjectType, hParams)
+   def update(sObjectType, oObject, hParams)
       case sObjectType
          when :router
-            HPNetwork.update_router(hParams[:router])
+            forjError "Object to update is nil" if oObject.nil?
+
+            HPNetwork.update_router(oObject[:object])
          else
             forjError "'%s' is not a valid list for 'update'" % oFogObject.class
       end

data/lib/lib-forj/lib/providers/hpcloud/network.rb

@@ -96,10 +96,20 @@ module HPNetwork
       oNetworkConnect.routers.all(sQuery)
    end
 
-   def HPNetwork.update_router(oRouter)
+   def HPNetwork.update_router(oRouters)
       oRouters.save
    end
 
+   def HPNetwork.create_router(oNetwork, hOptions)
+      oNetwork.routers.create(hOptions)
+   end
+
+   # router interface
+
+   def HPNetwork.add_interface(oRouter, oSubNetwork)
+      oRouter.add_interface(oSubNetwork.id, nil)
+   end
+
    # Port driver
    def HPNetwork.query_port(oNetworkConnect, sQuery)
       oNetworkConnect.ports.all(sQuery)

data/lib/lib-forj/lib/providers/hpcloud/security_groups.rb

@@ -22,7 +22,7 @@ module HPSecurityGroups
    def HPSecurityGroups.create_sg(oNetwork, name, description)
       params = {:name => name}
       params[:description] = description if description
-      oFC.oNetwork.security_groups.create( params )
+      oNetwork.security_groups.create( params )
    end
 
    def HPSecurityGroups.create_rule(oNetwork, hData)

data/lib/log.rb

@@ -156,7 +156,7 @@ module Logging
 
   def high_level_msg(message)
      # Not DEBUG and not INFO. Just printed to the output.
-     puts ("%s" % [message]) if $FORJ_LOGGER.level > 1
+     print ("%s" % [message]) if $FORJ_LOGGER.level > 1
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor