forj 0.0.40 → 0.0.41

data/lib/forj-config.rb

@@ -37,19 +37,22 @@ class ForjDefault
          Logging.fatal(1, 'Internal $LIB_PATH was not set.')
       end
 
-      Logging.info ('Reading default configuration...')
+      Logging.info('Reading default configuration...')
 
       @sDefaultsName=File.join($LIB_PATH,'defaults.yaml')
 
       @yDefaults=YAML.load_file(@sDefaultsName)
    end
 
-   def exist?(key, section = 'default')
+   def exist?(key, section = :default)
+      key = key.to_sym if key.class == String
       (rhExist?(@yDefaults, section, key) == 2)
    end
 
-   def get(key, section = 'default')
-      rhGet(@yDefaults, section, key)
+   def get(key, section = :default)
+      key = key.to_sym if key.class == String
+      return(rhGet(@yDefaults, section, key)) if key
+      rhGet(@yDefaults, section) if not key
    end
 
    def dump()
@@ -73,13 +76,14 @@ class ForjConfig
 
    def default_dump(interms = nil)
       # Build a config hash.
+
       res = {}
-      @oDefaults.dump['default'].each_key { |key|
+      @oDefaults.dump[:default].each_key { |key|
          dump_key = exist?(key)
          rhSet(res, get(key), dump_key, key)
          }
-      if rhExist?(@yLocal, 'default') == 1
-         @yLocal['default'].each_key { |key|
+      if rhExist?(@yLocal, :default) == 1
+         @yLocal[:default].each_key { |key|
          dump_key = exist?(key)
          rhSet(res, get(key), dump_key, key) if rhExist?(res, dump_key, key) != 2
          }
@@ -90,8 +94,7 @@ class ForjConfig
                dump_key = exist?(key)
                rhSet(res, get(key), dump_key, key) if rhExist?(res, dump_key, key) != 2
                }
-         elsif interms.instance_of? Array # Array of hash
-            iCount=0
+         elsif interms.instance_of? Array # Array of hash of hash
             interms.each { | elem |
                elem.each_key { | key|
                dump_key = exist?(key)
@@ -104,7 +107,7 @@ class ForjConfig
          dump_key = exist?(key)
          rhSet(res, get(key), dump_key, key) if rhExist?(res, dump_key, key) != 2
          }
-      
+
       res
    end
 
@@ -135,8 +138,13 @@ class ForjConfig
 
       if File.exists?(@sConfigName)
          @yLocal = YAML.load_file(@sConfigName)
+         if rhKeyToSymbol?(@yLocal, 2)
+            @yLocal = rhKeyToSymbol(@yLocal, 2) 
+            self.SaveConfig()
+         end
+
       else
-         @yLocal = { 'default' => nil }
+         @yLocal = { :default => nil }
          # Write the empty file
          Logging.info('Creating your default configuration file ...')
          self.SaveConfig()
@@ -155,7 +163,7 @@ class ForjConfig
        Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
        return false
      end
-     Logging.info ('Configuration file "%s" updated.' % @sConfigName)
+     Logging.info('Configuration file "%s" updated.' % @sConfigName)
      return true
    end
 
@@ -170,7 +178,7 @@ class ForjConfig
             Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
             return false
          end
-         Logging.info ('Configuration file "%s" updated.' % sFile)
+         Logging.info('Configuration file "%s" updated.' % sFile)
          return true
       end
    end
@@ -186,6 +194,8 @@ class ForjConfig
    def ExtraExist?(section, name, key = nil)
       return nil if not section or not name
 
+      key = key.to_sym if key.class == String
+
       return(rhExist?(@yObjConfig, section, name) == 2) if not key
       return(rhExist?(@yObjConfig, section, name, key) == 3)
    end
@@ -193,13 +203,15 @@ class ForjConfig
    def ExtraGet(section, name, key = nil, default = nil)
       return nil if not section or not name
 
+      key = key.to_sym if key.class == String
       return default unless ExtraExist?(section, name, key)
       return rhGet(@yObjConfig, section, name, key) if key
       rhGet(@yObjConfig, section, name)
    end
 
-   def ExtraSet(section, name, key = nil, value)
-      if key
+   def ExtraSet(section, name, key, value)
+     key = key.to_sym if key.class == String
+     if key
          rhSet(@yObjConfig, value, section, name, key)
       else
          rhSet(@yObjConfig, value, section, name)
@@ -210,9 +222,10 @@ class ForjConfig
       # Function to set a runtime key/value, but remove it if value is nil.
       # To set in config.yaml, use LocalSet
       # To set on extra data, like account information, use ExtraSet
-      if not key
-         return false
-      end
+      
+      key = key.to_sym if key.class == String
+      return false if key.class != Symbol
+
       if value
          rhSet(@yRuntime, value, key)
       else
@@ -222,21 +235,28 @@ class ForjConfig
    end
 
    def get(key, interms = nil, default = nil)
+   
+      key = key.to_sym if key.class == String
+      return nil if key.class != Symbol
       # If key is in runtime
       return rhGet(@yRuntime, key) if rhExist?(@yRuntime, key) == 1
       # Check data in intermediate hashes or array of hash. (like account data - key have to be identical)
       if interms
          if interms.instance_of? Hash
             return rhGet(interms, key) if rhExist?(interms, key) == 1
-         elsif interms.instance_of? Array # Array of hash
+         elsif interms.instance_of? Array # Array of hashes
             iCount=0
+            oVal = nil
             interms.each { | elem |
                if elem.class == Hash
-                  oVal = nil
                   elem.each { | hashkey, value |
-                     if value.class == Hash and rhExist?(elem, hashkey, key) == 2
-                        oVal = rhGet?(elem, hashkey, key)
+                     if value.class == Hash and rhExist?(elem, hashkey, key) == 2 # hash of hash
+                        oVal = rhGet(elem, hashkey, key)
+                        break
+                     elsif value.class != Hash and rhExist?(elem, hashkey) == 1 # single hash: key = value.
+                        oVal = rhGet(elem, hashkey)
                         break
+
                      end
                      }
                   break if oVal
@@ -254,11 +274,16 @@ class ForjConfig
       default
    end
 
-   def getAppDefault(section, key)
+   def getAppDefault(section, key = nil)
+
+      key = key.to_sym if key.class == String
+
       @oDefaults.get(key, section)
    end
 
    def exist?(key, interms = nil)
+      key = key.to_sym if key.class == String
+
       # Check data in intermediate hashes or array of hash. (like account data - key have to be identical)
       return "runtime" if rhExist?(@yRuntime, key) == 1
       if interms
@@ -266,10 +291,11 @@ class ForjConfig
             return 'hash' if rhExist?(interms, key) == 1
          elsif interms.instance_of? Array # Array of hash
             iCount = 0
-            Array.each { | elem |
+            interms.each { | elem |
                if elem.class == Hash
                   elem.each { | hashkey, value |
                      return ("%s" % hashkey)  if value.class == Hash and rhExist?(elem, hashkey, key) == 2
+                     return ("hash[%s]" % iCount)  if value.class != Hash and rhExist?(elem, hashkey) == 1
                      }
                end
                iCount += 1
@@ -286,12 +312,15 @@ class ForjConfig
       LocalExist?(key)
    end
 
-   def LocalExist?(key, section = 'default')
+   def LocalExist?(key, section = :default)
+
+      key = key.to_sym if key.class == String
       return true if rhExist?(@yLocal, section, key) == 2
       false
    end
 
-   def LocalSet(key, value, section = 'default')
+   def LocalSet(key, value, section = :default)
+     key = key.to_sym if key.class == String
      if not key or not value
         return false
      end
@@ -306,12 +335,15 @@ class ForjConfig
      return true
    end
 
-   def LocalGet(key, section = 'default', default = nil)
+   def LocalGet(key, section = :default, default = nil)
+     key = key.to_sym if key.class == String
+
      return default if rhExist?(@yLocal, section, key) != 2
      rhGet(@yLocal, section, key)
    end
 
-   def LocalDel(key, section = 'default')
+   def LocalDel(key, section = :default)
+     key = key.to_sym if key.class == String
      if not key
         return false
      end
@@ -342,7 +374,6 @@ def rhExist?(yVal, *p)
    return 0 if not yVal or not yVal[p[0]]
    ret = rhExist?(yVal[p[0]], p.drop(1)) if yVal[p[0]]
    return 1 + ret
-   0
 end
 
 def rhGet(yVal, *p)
@@ -367,10 +398,18 @@ def rhSet(yVal, value, *p)
    p=p.flatten
    if p.length() == 1
       if yVal
-         yVal[p[0]] = value
+         if value
+            yVal[p[0]] = value
+         else
+            yVal.delete(p[0])
+         end
          return yVal
       end
-      ret = { p[0] => value }
+      if value
+         ret = { p[0] => value }
+      else
+         ret = {}
+      end
       return ret
    end
    if yVal
@@ -382,3 +421,38 @@ def rhSet(yVal, value, *p)
       return { p[0] => ret }
    end
 end
+
+def rhKeyToSymbol(yVal, levels = 1)
+   return nil if not yVal
+   yRes = {}
+   yVal.each { | key, value |
+   if key.class == String
+      if levels <= 1
+         yRes[key.to_sym] = value
+      else
+         yRes[key.to_sym] = rhKeyToSymbol(value, levels - 1)
+      end
+   else
+      if levels <= 1
+         yRes[key] = value
+      else
+         yRes[key] = rhKeyToSymbol(value, levels - 1)
+      end
+   end
+   }
+   yRes
+end
+
+def rhKeyToSymbol?(yVal, levels = 1)
+   return false if not yVal
+   yVal.each { | key, value |
+   if key.class == String
+      return true
+   end
+   if levels >1
+      res = rhKeyToSymbol?(value, levels - 1)
+      return true if res
+   end
+   }
+   false
+end

data/lib/network.rb

@@ -49,7 +49,7 @@ module Network
         else  
           Logging.warning("Several network was found with '%s'. Selecting the first one '%s'." % [name, networks[0].name])
           networks[0]
-        end
+      end
     rescue => e
       Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     end
@@ -75,36 +75,36 @@ module Network
 
 
   # Subnet management
-  def get_or_create_subnet(oFC, network_id, name)
-    Logging.state("Searching for sub-network attached '%s'." % [name])
-    begin
-      subnets = oFC.oNetwork.subnets.all(:network_id => network_id)
-    rescue => e
-      Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
-    end
-    if subnets 
-      case subnets.length()
-        when 0
-          Logging.debug("No subnet found from '%s' network" % [name])
-          subnet = nil
-        when 1
-          Logging.debug("Found '%s' subnet from '%s' network" % [subnets[0].name, name])
-          subnet = subnets[0]
-        else 
-          Logging.warning("Several subnet was found on '%s'. Choosing the first one = '%s'" % [name, subnets[0].name])
-          subnet = subnets[0]
-        end
-    end  
-    if not subnet
-      # Create the subnet with 'sub-' prefixing the network name.   
+   def get_or_create_subnet(oFC, network_id, name)
+      Logging.state("Searching for sub-network attached '%s'." % [name])
       begin
-        subnet = create_subnet(oFC, network_id, 'sub-%s' % [name])
+         subnets = oFC.oNetwork.subnets.all(:network_id => network_id)
       rescue => e
-        Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
+         Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
       end
-    end
-    return subnet
-  end
+      if subnets 
+         case subnets.length()
+            when 0
+               Logging.debug("No subnet found from '%s' network" % [name])
+               subnet = nil
+            when 1
+               Logging.debug("Found '%s' subnet from '%s' network" % [subnets[0].name, name])
+               subnet = subnets[0]
+            else 
+               Logging.warning("Several subnet was found on '%s'. Choosing the first one = '%s'" % [name, subnets[0].name])
+               subnet = subnets[0]
+         end
+      end  
+      if not subnet
+         # Create the subnet with 'sub-' prefixing the network name.   
+         begin
+            subnet = create_subnet(oFC, network_id, 'sub-%s' % [name])
+         rescue => e
+            Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
+         end
+      end
+      return subnet
+   end
 
   def create_subnet(oFC, network_id, name)
     Logging.debug("Creating subnet '%s'" % [name])

data/lib/repositories.rb

@@ -125,7 +125,7 @@ module Repositories
 
             # SET_DOMAIN="{SET_DOMAIN!}" => Setting for Maestro (required) and DNS if enabled. 
             # ==> :forj_accounts, sAccountName, :dns, :domain_name
-            sAccountName = oConfig.get('account_name')
+            sAccountName = oConfig.get(:account_name)
 
             yDns = {}
             yDns = oConfig.ExtraGet(:forj_accounts, sAccountName, :dns) if oConfig.ExtraExist?(:forj_accounts, sAccountName, :dns)

data/lib/security.rb

@@ -138,7 +138,7 @@ module SecurityGroup
     rule
   end
 
-  def keypair_detect(keypair_name, key_fullpath)
+   def keypair_detect(keypair_name, key_fullpath)
       # Build key data information structure.
       # Take care of priv with or without .pem and pubkey with pub.
 	
@@ -163,17 +163,17 @@ module SecurityGroup
       public_key_name = key_basename + '.pub'
     
     
-      result = {:keypair_name     => keypair_name,
-                :keypair_path     => key_path,         :key_basename       => key_basename,
-                :private_key_name => private_key_name, :private_key_exist? => private_key_exist,
-                :public_key_name  => public_key_name,  :public_key_exist?  => public_key_exist,
-               }
+      {:keypair_name     => keypair_name,
+       :keypair_path     => key_path,         :key_basename       => key_basename,
+       :private_key_name => private_key_name, :private_key_exist? => private_key_exist,
+       :public_key_name  => public_key_name,  :public_key_exist?  => public_key_exist,
+      }
    end
 
   def hpc_import_key(oForjAccount)
 
-    keys = keypair_detect(oForjAccount.get(:credentials, 'keypair_name'), oForjAccount.get(:credentials, 'keypair_path'))
-    account = oForjAccount.get(:account, :name)
+    keys = keypair_detect(oForjAccount.get('keypair_name'), oForjAccount.get('keypair_path'))
+    account = oForjAccount.get(:name)
 
     Logging.fatal(1, "'keypair_path' undefined. check your config.yaml file.") if not keys[:keypair_path]
     Logging.fatal(1, "'keypair_name' undefined. check your config.yaml file.") if not keys[:keypair_name]

data/lib/setup.rb

@@ -39,5 +39,5 @@ module Setup
       rescue  => e
          Logging.fatal(1,"Unable to run setup" , e)
       end
-  end
+   end
 end

data/lib/ssh.rb

@@ -16,28 +16,32 @@
 #    limitations under the License.
 
 require 'rubygems'
-require 'require_relative'
-
-#require_relative 'log.rb'
-#include Logging
 
+require 'security.rb'
+include SecurityGroup
 #
 # ssh module
 #
 module Ssh
-  def connect(name, server)
+  def connect(name, server, oConfig)
     msg = 'logging into %s : %s' % [name, server]
     Logging.info(msg)
-    current_dir = Dir.pwd
-    Dir.chdir(current_dir + '/lib')
 
-    update = './ssh.sh -u'
-    connection = './ssh.sh %s %s' % [name, server]
+	oForjAccount = ForjAccount.new(oConfig)
+
+	oForjAccount.ac_load()
+
+	oKey = SecurityGroup.keypair_detect(oForjAccount.get(:keypair_name), oForjAccount.get(:keypair_path))
+
+    update = '%s/ssh.sh -u %s' % [ $LIB_PATH, oConfig.get(:account_name)]
+    connection = '%s/ssh.sh %s %s %s' % [$LIB_PATH, name, server, File.join(oKey[:keypair_path],oKey[:private_key_name]) ]
 
     # update the list of servers
+    Logging.debug("Executing '%s'" % update)
     Kernel.system(update)
 
     # connect to the server
+    Logging.debug("Executing '%s'" % connection)
     Kernel.system(connection)
   end
 end