forj 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc168384e8283de3099794ba3fb85759286de890
-  data.tar.gz: 216c1d4e25503388473f88a2cce2db26674dc0d2
+  metadata.gz: 2a1aeb1a399ecfab67138cf2cb50b12deff71212
+  data.tar.gz: 9c46f0ccaeaaca2775b4d897065b10f1d4aea93e
 SHA512:
-  metadata.gz: 5c5edfe564a87533f683f25137a4cca65ad6fe642c160d729d73efcf66656614ba26e53d76fda270811c5b64a59715eadd795699bfbe1854b1f6b4ac651e7fa5
-  data.tar.gz: e0c005a6db73411311b85cece7979536cd56709d25644d182128a63eca8355f724fea32c39a3052f41fa2559f62b39419d3e10666ccd2cfe42928bc400d15a1b
+  metadata.gz: dd00c4f1f397736bf1f3b6cb0fce7c65a1545c927544afafb42cad52271632dcbded52531d643e5a674d3fe39f106e5e1139eae43cd082124555e5da0c9b7ccd
+  data.tar.gz: b840b30588d58ed512bb1890688aeb50596675d3376cbcaf9bbeb51ab2677723d1c0cef819b2cd5a18ce97755a7cb29d19dced034a8c38e66e8b8a702454583c

data/Rakefile

@@ -21,7 +21,7 @@ require 'rspec/core/rake_task'
 
 $stdout.sync = true
 $stderr.sync = true
-Bundler::GemHelper.install_task
+Bundler::GemHelper.install_tasks
 
 task :default => [:spec]
 

data/bin/forj

@@ -25,6 +25,18 @@ $LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
 
 $LOAD_PATH << $LIB_PATH
 
+require 'appinit.rb' # Load generic Application level function
+
+# Initialize forj paths
+AppInit::forj_initialize()
+
+# Initialize global Log object
+$FORJ_LOGGER=ForjLog.new()
+
+require 'forj-config.rb' # Load class ForjConfig and Meta data class variables. Requires Logging to be fully set.
+require 'forj-account.rb' # Load class ForjAccount
+require 'connection.rb' # Load class ForjConnection
+
 require 'boot.rb'
 require 'down.rb'
 require 'setup.rb'
@@ -34,25 +46,14 @@ include Boot
 include Down
 include Setup
 include Ssh
-
-require 'forj-config.rb' # Load class ForjConfig
-require 'forj-account.rb' # Load class ForjAccount
-require 'log.rb' # Load default loggers
-require 'connection.rb' # Load class ForjConnection
+require 'forj-settings.rb' # Settings features
 
 #require 'debugger' # Use to debug with Ruby < 2.0
 #require 'byebug'   # Use to debug with Ruby >= 2.0
 
-include Logging
 
-# Initialize forj paths
-ensure_forj_dirs_exists()
-
-# Initialize global Log object
-$FORJ_LOGGER=ForjLog.new()
 
-
-class Forj < Thor
+class ForjThor < Thor
 
   class_option :debug,   :aliases => '-d', :desc => 'Set debug mode'
   class_option :verbose, :aliases => '-v', :desc => 'Set verbose mode'
@@ -163,6 +164,9 @@ Maestro/infra bootstrap debugging:"
 
       # Options are added if they are set. Otherwise, get will retrieve the default value.
       oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
+      oForjAccount = ForjAccount.new(oConfig)
+      oForjAccount.ac_load()
+      
       oConfig.set(:infra_repo,     options[:infra])
       oConfig.set(:keypair_name,   options[:key_name])
       oConfig.set(:keypair_path,   options[:key_path])
@@ -171,6 +175,7 @@ Maestro/infra bootstrap debugging:"
       oConfig.set(:flavor,         options[:maestro_flavor])
       oConfig.set(:bp_flavor,      options[:bp_flavor])
       oConfig.set(:maestro_repo ,  options[:maestro_repo])
+      oConfig.set(:branch ,        options[:branch])
       oConfig.set(:test_box, File.expand_path(options[:test_box])) if options[:test_box] and File.directory?(File.expand_path(options[:test_box]))
 
 
@@ -187,8 +192,7 @@ Maestro/infra bootstrap debugging:"
          end
       end
 
-      Boot.boot(blueprint, name, options[:build],options[:branch],
-                options[:boothook], options[:box_name], oConfig)
+      Boot.boot(blueprint, name, options[:build], options[:boothook], options[:box_name], oForjAccount)
   end
 
 ################################# Show defaults
@@ -244,16 +248,19 @@ Warning! This action don't removed any network/security groups cloud object.
    def down(name)
       Logging.set_level(Logger::INFO) if options[:verbose]
       Logging.set_level(Logger::DEBUG) if options[:debug]
+
       oConfig = ForjConfig.new(options[:config])
       oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
+      oForjAccount = ForjAccount.new(oConfig)
+      oForjAccount.ac_load() 
 
-      Down.down(oConfig, name)
+      Down.down(oForjAccount, name)
    end
 
 ################################# SET
-  desc 'set [key=value] [options]', 'Set some variables in defaults or account.'
+  desc 'set [key=value] [...] [options]', 'Set one or more variables in defaults or a forj account.'
   long_desc <<-LONGDESC
-You can set some variables to change 'forj' defaults or specifically for a FORJ account.
+You can set some variables to change 'forj' defaults or specifically some account data.
 
 Ex: By default, forj use ~/.ssh/forj-id_rsa as keypair for all forge instance. During setup, if this keypair doesn't exist, it proposes to create it for you, with ssh-keygen.
     If you want to use a keypair that already exists, you can set it as your default, with:
@@ -280,65 +287,23 @@ Ex: By default, forj use ~/.ssh/forj-id_rsa as keypair for all forge instance. D
 
   method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
 
-   def set(key_val = nil)
+   def set(*p)
       Logging.set_level(Logger::INFO) if options[:verbose]
       Logging.set_level(Logger::DEBUG) if options[:debug]
 
       oConfig=ForjConfig.new()
-      if not key_val
-         puts "List of FORJ settings: Use 'forj set KeyName=Value [-a YourAccount]' to set one. Use `forj show defaults` / `account` to check values."
-         hMaps = oConfig.getAppDefault(:account_section_mapping)
-         hMaps.each_key { | key |
-            sDesc = rhGet(hMaps, key, :desc)
-            puts "%-15s : %s" % [key, sDesc]
-            }
+
+      if    p.length == 0 and not options[:account_name]
+         Forj::Settings::config_show_all(oConfig)
+
+      elsif p.length == 0 and options[:account_name]
+         Forj::Settings::account_show_all(oConfig, options[:account_name]) 
+
+      elsif p.length != 0 and options[:account_name]
+         Forj::Settings::account_set(oConfig, options[:account_name], p)
+
       else
-         mkey_val = key_val.match(/^(.*) *= *(.*)$/)
-         if mkey_val
-            if not options[:account_name]
-               if oConfig.exist?(mkey_val[1])
-                  sBef = "%s: '%s'" % [oConfig.exist?(mkey_val[1]), oConfig.get(mkey_val[1])]
-               else
-                  sBef = "unset"
-               end
-               if mkey_val[2] != ""
-                  oConfig.LocalSet(mkey_val[1], mkey_val[2])
-               else
-                  oConfig.LocalDel(mkey_val[1])
-               end
-               oConfig.SaveConfig()
-               if oConfig.exist?(mkey_val[1])
-                  sAft = "%s: '%s'" % [oConfig.exist?(mkey_val[1]), oConfig.get(mkey_val[1])]
-               else
-                  sAft = "unset"
-               end
-               puts "Updated:\n%s: %s => %s" % [mkey_val[1], sBef, sAft]
-            else
-               account_name = options[:account_name]
-               oConfig.set(:account_name, account_name)
-               oForjAccount = ForjAccount.new(oConfig)
-               oForjAccount.ac_load()
-               if oForjAccount.exist?(mkey_val[1])
-                  sBef = "%s: '%s'" % [oForjAccount.exist?(mkey_val[1]).sub("hash", account_name), oForjAccount.get(mkey_val[1])]
-               else
-                  sBef = "unset"
-               end
-               if mkey_val[2] == ""
-                  oForjAccount.del(mkey_val[1])
-               else
-                  oForjAccount.set(mkey_val[1], mkey_val[2])
-               end
-               oForjAccount.ac_save()
-               if oForjAccount.exist?(mkey_val[1])
-                  sAft = "%s: '%s'" % [oForjAccount.exist?(mkey_val[1]).sub("hash", account_name), oForjAccount.get(mkey_val[1])]
-               else
-                  sAft = "unset"
-               end
-               puts "Updated:\n%s: %s => %s" % [mkey_val[1], sBef, sAft]
-            end
-         else
-            Logging.fatal(1 ,"Syntax error. Please set your value like: 'key=value' and retry.")
-         end
+         Forj::Settings::config_set(oConfig, p)
       end
    end
 
@@ -369,54 +334,18 @@ Ex: To get the keypair_name defined from the account, or from your ~/.forj/confi
       Logging.set_level(Logger::INFO) if options[:verbose]
       Logging.set_level(Logger::DEBUG) if options[:debug]
 
-      oConfig=ForjConfig.new()
-      if not options[:account_name]
-         if key
-            if oConfig.exist?(key)
-               puts "%s:'%s'" % [oConfig.exist?(key), oConfig.get(key)]
-            else
-               Logging.message("key '%s' not found" % [key])
-            end
-         else
-            puts "legend: default = Application defaults, local = Local default config\n\n" % [options[:account_name], options[:account_name]]
-            puts "%-15s(%-7s) %-12s:\n--------------------------------------" % ['key', 'origin', 'section name']
-            hMaps = oConfig.getAppDefault(:account_section_mapping)
-            hMaps.each { |map_key, value|
-               if oConfig.exist?(map_key)
-                  puts "%-15s(%-7s) %-12s: '%s'" % [map_key, oConfig.exist?(map_key), value[:section], oConfig.get(map_key)]
-               else
-                  puts "%-15s(       ) %-12s: unset" % [map_key, value[:section]]
-               end
-
-               }
-         end
-         puts "\nUse 'forj set <key>=<value>' to update defaults"
+      oConfig = ForjConfig.new()
+      if    not options[:account_name] and not key
+         Forj::Settings::config_get_all(oConfig)
+         
+      elsif     options[:account_name] and     key
+         Forj::Settings::account_get(oConfig, options[:account_name], key)
+         
+      elsif not options[:account_name] and     key
+         Forj::Settings::config_get(oConfig, key)
+         
       else
-         oConfig.set(:account_name, options[:account_name])
-         oForjAccount = ForjAccount.new(oConfig)
-         Logging.fatal(1, "Unable to load account '%s'. Not found." % options[:account_name]) if not oForjAccount.ac_load
-         if key
-            if oForjAccount.exist?(key)
-               puts "%s: '%s'" % [oForjAccount.exist?(key).sub("hash", options[:account_name]), oForjAccount.get(key)]
-            elsif oForjAccount.exist?(key.parameterize.underscore.to_sym)
-               key_symb = key.parameterize.underscore.to_sym
-               puts "%s: '%s'" % [oForjAccount.exist?(key_symb).sub("hash", options[:account_name]), oForjAccount.get(key_symb)]
-            else
-               Logging.message("key '%s' not found"% [key])
-            end
-         else
-            puts "legend: default = Application defaults, local = Local default config, %s = '%s' account config\n\n" % [options[:account_name], options[:account_name]]
-            puts "%-15s(%-7s) %-12s:\n--------------------------------------" % ['key', 'origin', 'section name']
-            hMaps = oConfig.getAppDefault(:account_section_mapping)
-            hMaps.each { |map_key, value|
-               if oForjAccount.exist?(map_key)
-                  puts "%-15s(%-7s) %-12s: '%s'" % [map_key, oForjAccount.exist?(map_key).sub("hash", options[:account_name]), value[:section], oForjAccount.get(map_key)]
-               else
-                  puts "%-15s(       ) %12s: unset" % [map_key, value[:section]]
-               end
-               }
-         end
-         puts "\nUse 'forj set <key>=<value> -a %s' to update account data.\nOr  'forj set <key>= -a %s' to restore key default value." % [options[:account_name], options[:account_name]]
+         Forj::Settings::account_get_all(oConfig, options[:account_name])
       end
    end
 
@@ -472,4 +401,4 @@ Several data will be requested like:
 end
 
 
-Forj.start
+ForjThor.start

data/lib/appinit.rb

@@ -0,0 +1,50 @@
+# 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.
+
+
+
+# Base Logging system started and loaded.
+require 'log.rb' # Load default loggers
+include Logging
+
+module AppInit
+
+   def AppInit.forj_initialize()
+      # Function to create FORJ paths if missing.
+
+      # Defining Global variables
+      $FORJ_DATA_PATH = File.expand_path(File.join('~', '.forj'))
+      $FORJ_ACCOUNTS_PATH = File.join($FORJ_DATA_PATH, 'accounts')
+      $FORJ_KEYPAIRS_PATH = File.join($FORJ_DATA_PATH, 'keypairs')
+      $FORJ_CREDS_PATH = File.expand_path(File.join('~', '.cache', 'forj'))
+
+      # TODO: To move to an hpcloud object.
+      $HPC_KEYPAIRS = File.expand_path(File.join('~', '.hpcloud', 'keypairs'))
+      $HPC_ACCOUNTS = File.expand_path(File.join('~', '.hpcloud', 'accounts'))
+
+      AppInit.ensure_dir_exists($FORJ_DATA_PATH)
+      AppInit.ensure_dir_exists($FORJ_ACCOUNTS_PATH)
+      AppInit.ensure_dir_exists($FORJ_KEYPAIRS_PATH)
+      FileUtils.chmod(0700, $FORJ_KEYPAIRS_PATH)
+      AppInit.ensure_dir_exists($FORJ_CREDS_PATH)
+   end
+
+   def AppInit.ensure_dir_exists(path)
+      if not dir_exists?(path)
+       FileUtils.mkpath(path) if not File.directory?(path)
+      end
+   end
+end

data/lib/boot.rb

@@ -34,22 +34,13 @@ include Helpers
 # Boot module
 #
 module Boot
-  def boot(blueprint, name, build, branch, boothook, box_name, oConfig)
+  def boot(blueprint, name, build, boothook, box_name, oConfig)
     begin
 
       Logging.fatal(1, 'FORJ account not specified. Did you used `forj setup`, before?') if not oConfig.get(:account_name)
 
-      oForjAccount = ForjAccount.new(oConfig)
-
-      oForjAccount.ac_load()
-
-
-      # Load Forj account data
-      forjAccountFile = File.join($FORJ_ACCOUNTS_PATH, oConfig.get(:account_name))
-      oConfig.ExtraLoad(forjAccountFile, :forj_accounts, oConfig.get(:account_name))
-
       # Check options and set data
-      cloud_provider = oForjAccount.getAccountData(:account, :provider, 'hpcloud')
+      cloud_provider = oConfig.get(:provider_name, 'hpcloud')
 
       if cloud_provider != 'hpcloud'
          Logging.fatal(1, "forj setup support only hpcloud. '%s' is currently not supported." % cloud_provider)
@@ -61,7 +52,7 @@ module Boot
       # Initialize defaults
       maestro_url =  oConfig.get(:maestro_url)
 
-      infra_dir = File.expand_path(oForjAccount.get(:infra_repo))
+      infra_dir = File.expand_path(oConfig.get(:infra_repo))
 
 
       # Check about infra repo compatibility with forj cli
@@ -80,47 +71,47 @@ module Boot
       end
 
       # Get FORJ DNS setting
-      yDNS = rhGet(oForjAccount.hAccountData, :dns)
-      Logging.fatal(1, "DNS or domain name are missing. Please execute forj setup %s" % oForjAccount.getAccountData(:account, 'name')) if not yDNS
+      yDNS = rhGet(oConfig.hAccountData, :dns)
+      Logging.fatal(1, "DNS or domain name are missing. Please execute forj setup %s" % oConfig.getAccountData(:account, 'name')) if not yDNS
 
-      branch = oConfig.get(:branch) unless branch
+      branch = oConfig.get(:branch, 'master')
 
       # Step Maestro Clone
-      if not oForjAccount.get(:maestro_repo)
+      if not oConfig.get(:maestro_repo)
          Logging.info('cloning maestro repo from \'%s\'...' % maestro_url)
          Repositories.clone_repo(maestro_url)
          maestro_repo=File.expand_path('~/.forj/maestro')
       else
-         maestro_repo=File.expand_path(oForjAccount.get(:maestro_repo))
+         maestro_repo=File.expand_path(oConfig.get(:maestro_repo))
          if not File.exists?('%s/templates/infra/maestro.box.%s.env' % [maestro_repo, branch])
-            Logging.fatal(1, "'%s' is not a recognized Maestro repository. forj cli searched for templates/infra/%s-maestro.box.GITBRANCH.env.tmpl" % [maestro_repo, cloud_provider])
+            Logging.fatal(1, "'%s' is not a recognized Maestro repository. forj cli searched for templates/infra/maestro.box.%s.env" % [maestro_repo, branch])
          end
          Logging.info('Using your maestro cloned repo \'%s\'...' % maestro_repo)
       end
 
       if bBuildInfra
          Logging.info('Building your infra... in \'%s\'' % [infra_dir])
-         Repositories.create_infra(maestro_repo)
+         Repositories.create_infra(maestro_repo, branch)
       end
 
       # Connect to services
       oFC=ForjConnection.new(oConfig)
 
-      Logging.info('Configuring network \'%s\'' % [oForjAccount.get('network')])
+      Logging.info('Configuring network \'%s\'' % [oConfig.get('network_name')])
       begin
-        network = Network.get_or_create_network(oFC, oForjAccount.get('network'))
+        network = Network.get_or_create_network(oFC, oConfig.get('network_name'))
         subnet = Network.get_or_create_subnet(oFC, network.id, network.name)
         Network.get_or_create_router(oFC, network, subnet)
       rescue => e
         Logging.fatal(1, "Network properly configured is required.", e)
       end
 
-      Logging.info('Configuring keypair \'%s\'' % [oForjAccount.get('keypair_name')])
-      SecurityGroup.hpc_import_key(oForjAccount)
+      Logging.info('Configuring keypair \'%s\'' % [oConfig.get('keypair_name')])
+      SecurityGroup.hpc_import_key(oConfig)
 
 
-      Logging.info('Configuring Security Group \'%s\'' % [oForjAccount.get('security_group')])
-      security_group = SecurityGroup.get_or_create_security_group(oFC, oForjAccount.get('security_group'))
+      Logging.info('Configuring Security Group \'%s\'' % [oConfig.get('security_group')])
+      security_group = SecurityGroup.get_or_create_security_group(oFC, oConfig.get('security_group'))
       ports = oConfig.get(:ports)
 
       ports.each do |port|
@@ -135,24 +126,20 @@ module Boot
         end
       end
 
-      # oForjAccount data get are retrieved from the account file under section described in defaults.yaml, as soon as this mapping exist.
-      # If not found, get the data from the local configuration file. Usually ~/.forj/config.yaml
-      # If not found, get the data from defaults.yaml
-      # otherwise, use the get default parameter as value. Default is nil.
 
 
       oBuildEnv = BuildEnv.new(oConfig)
       ENV['FORJ_CLI_ENV'] = oBuildEnv.sBuildEnvFile
       oBuildEnv.set('FORJ_HPC',             oFC.sAccountName)
       oBuildEnv.set('FORJ_HPC_NET',         network.name)
-      oBuildEnv.set('FORJ_SECURITY_GROUP',  oForjAccount.get('security_group'))
-      oBuildEnv.set('FORJ_KEYPAIR',         oForjAccount.get('keypair_name'))
-      oBuildEnv.set('FORJ_HPC_NOVA_KEYPUB', oForjAccount.get('keypair_path') + '.pub')
-      oBuildEnv.set('FORJ_BASE_IMG',        oForjAccount.get('image'))
-      oBuildEnv.set('FORJ_FLAVOR',          oForjAccount.get('flavor'))
-      oBuildEnv.set('FORJ_BP_FLAVOR',       oForjAccount.get('bp_flavor'))
-      oBuildEnv.set('FORJ_TENANT_NAME',     oForjAccount.get(:tenant_name))
-      oBuildEnv.set('FORJ_HPC_COMPUTE',     rhGet(oConfig.ExtraGet(:hpc_accounts,  oFC.sAccountName, :regions), :compute))
+      oBuildEnv.set('FORJ_SECURITY_GROUP',  oConfig.get('security_group'))
+      oBuildEnv.set('FORJ_KEYPAIR',         oConfig.get('keypair_name'))
+      oBuildEnv.set('FORJ_HPC_NOVA_KEYPUB', oConfig.get('keypair_path') + '.pub')
+      oBuildEnv.set('FORJ_BASE_IMG',        oConfig.get('image'))
+      oBuildEnv.set('FORJ_FLAVOR',          oConfig.get('flavor'))
+      oBuildEnv.set('FORJ_BP_FLAVOR',       oConfig.get('bp_flavor'))
+      oBuildEnv.set('FORJ_TENANT_NAME',     oConfig.get(:tenant_name))
+      oBuildEnv.set('FORJ_HPC_COMPUTE',     rhGet(oConfig.oConfig.ExtraGet(:hpc_accounts,  oFC.sAccountName, :regions), :compute))
 
 
       oBuildEnv.set('FORJ_DOMAIN', yDNS[:domain_name])
@@ -168,8 +155,8 @@ module Boot
 
       build = 'bin/build.sh' unless build
 
-      build_config = oForjAccount.get('build_config')
-      box_name =     oForjAccount.get('box_name')
+      build_config = oConfig.get('build_config')
+      box_name =     oConfig.get('box_name')
 
       arg = '--meta blueprint=%s ' % [blueprint]
       arg += "--test-box '%s' " % oConfig.get(:test_box) if oConfig.exist?(:test_box)
@@ -209,12 +196,12 @@ class BuildEnv
 
    def initialize(oConfig)
 
-      oConfig.fatal_if_inexistent(:infra_repo)
-      oConfig.fatal_if_inexistent(:account_name)
+      oConfig.oConfig.fatal_if_inexistent(:infra_repo)
+      oConfig.oConfig.fatal_if_inexistent(:account_name)
 
       sBuildDir = File.expand_path(File.join(oConfig.get(:infra_repo),'build'))
       @sBuildEnvFile = File.join(sBuildDir, oConfig.get(:account_name)+'.build.env')
-      Helpers.ensure_dir_exists(sBuildDir)
+      AppInit.ensure_dir_exists(sBuildDir)
       @yBuildEnvVar = {}
       @oConfig = oConfig
    end
@@ -234,7 +221,7 @@ class BuildEnv
       begin
          File.open(@sBuildEnvFile, 'w') do |out|
             @yBuildEnvVar.each do | key, value |
-               desc = @oConfig.getAppDefault(:description, key)
+               desc = @oConfig.oConfig.getAppDefault(:description, key)
                out.write("# %s - %s\n" % [key, desc]) if desc
                value = "" if not value
                out.write("%s='%s'\n\n" % [key, value])

data/lib/connection.rb

@@ -17,15 +17,38 @@
 
 require 'rubygems'
 require 'fog'
-require 'require_relative'
-
-require_relative 'yaml_parse.rb'
+require 'yaml_parse.rb'
 include YamlParse
 
 #
 # Connection module
 #
 
+class SSLErrorMgt
+
+   def initialize()
+      @iRetry=0
+   end
+ 
+   def ErrorDetected(message,backtrace)
+      if message.match('SSLv2/v3 read server hello A: unknown protocol') 
+         if @iRetry <5
+            sleep(2)
+            @iRetry+=1
+            print "%s/5 try...\r" % @iRetry if $FORJ_LOGGER.level == 0
+            return false
+         else   
+            Logging.error('Too many retry. %s' % message)
+            return true
+         end
+      else   
+         Logging.error("%s\n%s" % [message,backtrace.join("\n")])
+         return true
+      end
+   end
+
+end
+
 class ForjConnection
 
    attr_accessor :oCompute
@@ -103,9 +126,9 @@ class ForjConnection
      if not File.exists?(creds)
         Logging.fatal(1, "'%s' was not configured. Did you executed 'forj setup %s'? Please do it and retry." % [@sAccountName, @sAccountName])
      end
-     @oConfig.ExtraLoad(creds, :hpc_accounts, @sAccountName)
+     @oConfig.oConfig.ExtraLoad(creds, :hpc_accounts, @sAccountName)
 
-     template = @oConfig.ExtraGet(:hpc_accounts, @sAccountName)
+     template = @oConfig.oConfig.ExtraGet(:hpc_accounts, @sAccountName)
      credentials = {}
      begin
        credentials['access_key'] = template[:credentials][:account_id]