forj 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d116642b62ded0c9f2aa26a8f3d67acf73a45d3
-  data.tar.gz: 81d3018544a5e3a211dbaf72110815cddbd0c503
+  metadata.gz: b1995afd2ab24967e07aef8b4451acbff58dd367
+  data.tar.gz: 662ce3b7da524bf101ba45a3526ca1c04d1a336f
 SHA512:
-  metadata.gz: e80b51b75742c2288a3351aca10d79438f94e8ce02713f14d956cadd135bfc29e9b4d8e9e90a5104ea90bb6f438c3afc4f5684989726a7cafa4cb0d47bd3d129
-  data.tar.gz: b2e2fddb8b5dbe3410f22606eb248f43f0152b83b89c0a7a7f9643f0f385e0bdcd544e7aa8cd1f02b4fcf79617322914eb75ef1716d583ae59c799ac66c7c6e5
+  metadata.gz: bb8659a39b98f5aed5a0e26337428e8a96667d8f2c35482855e24b0db706492020a6d03564ded3d635d9f096a52b01e25f2d1a685bb4e824c5a93111ab464350
+  data.tar.gz: 60918b32d461c2ad7b5e43dda24172a036d6c22c6fef392d0ec4ce5092652d6e16bb250abc98ea038f9e8b581a0361b2112905487d43bd3c2d9784b0c455fe11

data/README.md

@@ -8,17 +8,17 @@ Installation
 
 **Fedora/CentOS/Redhat rpm like package system**
 
-    $ sudo yum install ruby-devel libxml2-devel libxslt-devel python-yaml -y
+    $ sudo yum install ruby-devel libxml2-devel libxslt-devel python-yaml gcc git -y
     $ sudo gem install forj
 
 **Ubuntu/Debian deb like package system (not tested)**
 
-    $ sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev -y
+    $ sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev git -y
     $ sudo gem install forj
 
 ### For ruby 1.9
 
-    $ sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev -y
+    $ sudo apt-get install ruby-dev build-essential libopenssl-ruby1.9.1 libssl-dev zlib1g-dev git -y
     $ sudo gem install forj
 
 ### For ruby 1.8

data/bin/forj

@@ -18,6 +18,13 @@
 require 'rubygems'
 require 'require_relative'
 require 'thor'
+require 'ansi'
+
+$APP_PATH = File.dirname(__FILE__)
+$LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
+
+$FORJ_DATA_PATH= File.expand_path('~/.forj')
+$LOAD_PATH << './lib'
 
 require_relative '../lib/boot.rb'
 include Boot
@@ -28,16 +35,25 @@ include Setup
 require_relative '../lib/ssh.rb'
 include Ssh
 
-$APP_PATH = File.dirname(__FILE__)
-$LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
+require 'forj-config.rb' # Load class ForjConfig
+require 'log.rb' # Load default loggers
+require 'connection.rb' # Load class ForjConnection
 
-$FORJ_DATA_PATH= File.expand_path('~/.forj')
-$LOAD_PATH << './lib'
+#require 'debugger' # Use to debug with Ruby < 2.0
+#require 'byebug'   # Use to debug with Ruby >= 2.0
+
+include Logging
+
+# Initialize global Log object 
+$FORJ_LOGGER=ForjLog.new()
 
-require 'forj-config.rb' # Load class ForjConfig
 
 class Forj < Thor
 
+  class_option :debug,   :aliases => '-d', :desc => 'Set debug mode'
+  class_option :verbose, :aliases => '-v', :desc => 'Set verbose mode'
+  class_option :config,  :aliases => '-c', :desc => 'Path to a different forj config file. By default, use ~/.forj/config.yaml'
+
 
   desc "help [action]", "Describe available FORJ actions or one specific action"
   def help(task = nil, subcommand = false)
@@ -84,7 +100,7 @@ The list of predefined values can be retrieved with forj show defaults
 
   LONGDESC
 
-  method_option :config,           :aliases => '-c',   :desc => 'Path to a different forj config file. By default, use ~/.forj/config.yaml'
+  method_option :account_name,     :aliases => '-a',   :desc => 'Set the forj account name to use. By default, it takes the provider name.'
   method_option :infra,            :aliases => '-i',   :desc => 'Defines your Infra directory to use while booting. You can also set FORJ_INFRA_DIR.'
   method_option :key_name,         :aliases => '-k',   :desc => 'Import a key pair.'
   method_option :key_path,         :aliases => '-p',   :desc => 'Public key data'
@@ -92,19 +108,31 @@ The list of predefined values can be retrieved with forj show defaults
   method_option :boothook,         :aliases => '-H',   :desc => 'By default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
   method_option :build,            :aliases => '-B',   :desc => 'Replace the default build.sh'
   method_option :build_config,     :aliases => '-C',   :desc => 'The build config file to load <confdir>/<BoxName>.<Config>.env. By default, uses "master" as Config.'
-  method_option :git_repo,         :aliases => '-R',   :desc => 'The box built will use a different git repository sent out to <user_data>. This repository needs to be read only. No keys are sent.'
+  method_option :maestro_repo,     :aliases => '-M',   :desc => 'To use a different Maestro repository already cloned. By default, Maestro is cloned to ~/.forj/maestro from github.'
   method_option :branch,           :aliases => '-B',   :desc => 'The build will extract from git branch name. It sets the configuration build <config> to the branch name <branch>.'
   method_option :box_name,         :aliases => '-N',   :desc => 'Defines the name of the box or box image to build.'
   method_option :test_box,         :aliases => '-T',   :desc => 'Create test.rb-box meta from the repository path provided.'
  
   def boot(blueprint, on, cloud_provider, as, name, test = false)
-      Boot.boot(blueprint, cloud_provider, name,
+      Logging.set_level(Logger::INFO) if options[:verbose]
+      Logging.set_level(Logger::DEBUG) if options[:debug]
+      oConfig=ForjConfig.new(options[:config])
+      
+      Logging.fatal(1, "instance name '%s' not supported. Support only lower case, numeric and dash caracters." % [name]) if not /^[\d[[:lower:]]-]+$/ =~ name
+      
+      # Options are added if they are set. Otherwise, get will retrieve the default value.
+      oConfig.set('account_name', options[:account_name])
+      oConfig.set('infra_repo',   options[:infra])
+      oConfig.set('keypair_name', options[:key_name])
+      oConfig.set('keypair_path', options[:key_path])
+
+      # TODO: Be able to support the default provider from config.yaml
+      oConfig.set('provider', cloud_provider)
+      Boot.boot(blueprint, name,
                 options[:build], options[:build_config_dir],
                 options[:build_config], options[:branch],
-                options[:git_repo], options[:boothook],
-                options[:box_name], options[:key_name],
-                options[:key_path],options[:region],
-                options[:config], test)
+                options[:maestro_repo], options[:boothook],
+                options[:box_name], oConfig, test)
   end
 
   desc 'show defaults', 'Show list of predefined value you can update in your ~/.forj/config.yaml'
@@ -125,6 +153,8 @@ The list of predefined values can be retrieved with forj show defaults
   LONGDESC
   
   def down(name)
+      Logging.set_level(Logger::INFO) if options[:verbose]
+    Logging.set_level(Logger::DEBUG) if options[:debug]
     Down.down(name)
   end
 
@@ -137,11 +167,15 @@ Connect through ssh to an existing instance
   LONGDESC
   
   def ssh(name, server)
+    Logging.set_level(Logger::INFO) if options[:verbose]
+    Logging.set_level(Logger::DEBUG) if options[:debug]
     Ssh.connect(name, server)
   end
 
-  # SETUP
-  desc 'setup', 'set the credentials for forj cli'
+  # SETUP 
+  method_option :account_name,     :aliases => '-a',   :desc => 'Set the forj account name to use. By default, it takes the provider name.'
+
+  desc 'setup [Provider] [options]', 'set the hpcloud credentials for forj cli'
   long_desc <<-LONGDESC
 Set the cloud credentials and services for forj. Currently supports only hpcloud provider.
 
@@ -152,9 +186,13 @@ Several data will be requested like:
 \x5- tenant_id: id for the tenant you want to use
 \x5- availability_zone: which availability zone will be deployed
   LONGDESC
-  def setup
-    Setup.setup
+  def setup(sProvider = 'hpcloud')
+    Logging.set_level(Logger::INFO)  if options[:verbose]
+    Logging.set_level(Logger::DEBUG) if options[:debug]
+    oConfig=ForjConfig.new(options[:config])
+    Setup.setup(sProvider, oConfig, options)
   end
+
 end
 
 

data/lib/boot.rb

@@ -24,8 +24,8 @@ require_relative 'security.rb'
 include SecurityGroup
 require_relative 'repositories.rb'
 include Repositories
-require_relative 'log.rb'
-include Logging
+#require_relative 'log.rb'
+#include Logging
 require_relative 'helpers.rb'
 include Helpers
 
@@ -34,27 +34,29 @@ include Helpers
 # Boot module
 #
 module Boot
-  def boot(blueprint, cloud_provider, name,
+  def boot(blueprint, name,
       build, infra_dir, build_config,
-      branch, git_repo, boothook, box_name,
-      key_name, key_path, region, config,
-      test = false)
+      branch, maestro_repo, boothook, box_name,
+      oConfig, test = false)
     begin
-      initial_msg = 'booting %s on %s (~/.forj/forj.log)' % [blueprint , cloud_provider]
 
-      Logging.info(initial_msg)
+      # Check options and set data
+      cloud_provider=oConfig.get('provider')
+      raise 'No provider specified.' if not cloud_provider
+
+      if cloud_provider != 'hpcloud'
+         raise "forj setup support only hpcloud. '%s' is currently not supported." % cloud_provider
+      end
 
-      forj_dir = File.expand_path(File.dirname(__FILE__))
-      Dir.chdir(forj_dir)
+      oConfig.setDefault('account_name', cloud_provider)
 
-      puts ('INFO: Reading default configuration...')
-      oConfig=ForjConfig.new(config)
-      hConfig=oConfig.yConfig['default']
+      initial_msg = 'booting %s on %s (~/.forj/forj.log)' % [blueprint , cloud_provider]
+      Logging.message(initial_msg)
 
       # Initialize defaults
-      maestro_url =  hConfig['maestro_url']
+      maestro_url =  oConfig.get('maestro_url')
 
-      infra_dir = hConfig['infra_repo'] unless infra_dir
+      infra_dir = oConfig.get('infra_repo') unless infra_dir
 
       # Ask information if needed.
       bBuildInfra=false
@@ -62,95 +64,108 @@ module Boot
          sAsk = 'Your \'%s\' infra directory doesn\'t exist. Do you want to create a new one from Maestro(repo github)/templates/infra (yes/no)?' % [infra_dir]
          bBuildInfra=agree(sAsk)
       else
-         puts('INFO: Re-using your infra... in \'%s\'' % [infra_dir])
+         Logging.info('Re-using your infra... in \'%s\'' % [infra_dir])
       end
       if not Dir.exist?(File.expand_path(infra_dir)) and not bBuildInfra
-         puts ('Exiting.')
+         Logging.info ('Exiting.')
          return
       end
 
       # Step Maestro Clone
-      puts('INFO: cloning maestro repo from \'%s\'...' % maestro_url)
-      Repositories.clone_repo(maestro_url)
+      if not 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(maestro_repo)
+         if not File.exists?('%s/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/%s-maestro.box.GITBRANCH.env.tmpl" % [maestro_repo, cloud_provider])
+         end
+         Logging.info('Using your maestro cloned repo \'%s\'...' % maestro_repo)
+      end
 
       if bBuildInfra
-         puts('INFO: Building your infra... in \'%s\'' % [infra_dir])
-         Repositories.create_infra
+         Logging.info('Building your infra... in \'%s\'' % [infra_dir])
+         Repositories.create_infra(maestro_repo)
       end
 
-      puts('INFO: Configuring network \'%s\'' % [hConfig['network']])
-      network = Network.get_or_create_network(hConfig['network'])
+      # Connect to services
+      oFC=ForjConnection.new(oConfig)
+
+      Logging.info('Configuring network \'%s\'' % [oConfig.get('network')])
       begin
-        subnet = Network.get_or_create_subnet(network.id, name)
-        router = Network.get_router(hConfig['router'])
-        Network.create_router_interface(subnet.id, router)
+        network = Network.get_or_create_network(oFC, oConfig.get('network'))
+        subnet = Network.get_or_create_subnet(oFC, network.id, network.name)
+        router = Network.get_or_create_router(oFC, network, subnet)
       rescue => e
-        puts e.message
+        Logging.fatal(1, "Network properly configured is required.\n%s\n%s" % [e.message, e.backtrace.join("\n")])
       end
 
 
-      puts('INFO: Configuring keypair \'%s\'' % [hConfig['keypair_name']])
-      key_name = hConfig['keypair_name'] unless key_name
-      key_path = hConfig['keypair_path'] unless key_path
+      Logging.info('Configuring keypair \'%s\'' % [oConfig.get('keypair_name')])
+      key_name = oConfig.get('keypair_name')
+      key_path = oConfig.get('keypair_path')
       SecurityGroup.upload_existing_key(key_name, key_path)
 
-      puts('INFO: Configuring Security Group \'%s\'' % [hConfig['security_group']])
-      security_group = SecurityGroup.get_or_create_security_group(hConfig['security_group'])
-      ports = hConfig['ports']
-
-      ports.each do|port|
-        Network.get_or_create_rule(security_group.id, 'tcp', port, port)
+      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|
+        port = port.to_s if port.class != String
+        if not /^\d+(-\d+)?$/ =~ port 
+           Logging.error("Port '%s' is not valid. Must be <Port> or <PortMin>-<PortMax>" % [port])
+        else 
+           mPortFound = /^(\d+)(-(\d+))?$/.match(port)
+           portmin = mPortFound[1]
+           portmax = (mPortFound[3]) ? (mPortFound[3]) : (portmin)
+           Network.get_or_create_rule(oFC, security_group.id, 'tcp', portmin, portmax)
+        end   
       end
 
-      ENV['FORJ_HPC_NETID'] = network.id
-      ENV['FORJ_SECURITY_GROUP'] = security_group.name
+      ENV['FORJ_HPC_NET'] = network.name
+      ENV['FORJ_SECURITY_GROUP'] = oConfig.get('security_group')
       ENV['FORJ_KEYPAIR'] = key_name
-      ENV['FORJ_HPC_KEYPUB'] = key_path
-      if region
-        ENV['FORJ_REGION'] = region
-      end
+      ENV['FORJ_HPC_NOVA_KEYPUB'] = key_path
+      ENV['FORJ_BASE_IMG'] = oConfig.get('image')
 
       # run build.sh to boot maestro
       puts
-      current_dir = Dir.pwd
-      home = Helpers.get_home_path
-      build_path = home + '/.forj/maestro/build'
-      Dir.chdir(build_path)
 
       build = 'bin/build.sh' unless build
 
-      build_config = hConfig['build_config'] unless build_config
+      build_config = oConfig.get('build_config') unless build_config
 
-      branch = hConfig['branch'] unless branch
+      branch = oConfig.get('branch') unless branch
 
-      box_name = hConfig['box_name'] unless box_name
+      box_name = oConfig.get('box_name') unless box_name
 
       meta = '--meta blueprint=%s ' % [blueprint]
 
       command = '%s --build_ID %s --box-name %s --build-conf-dir %s --build-config %s --gitBranch %s --debug-box %s' % [build, name, box_name, infra_dir, build_config, branch, meta]
 
-      Logging.info('Calling build.sh')
-      Logging.info(command)
+      maestro_build_path = File.expand_path('~/.forj/maestro/build')
 
-      Kernel.system(command)
+      current_dir = Dir.pwd
+
+      Dir.chdir(File.expand_path('~/.forj/maestro/build'))
+
+      Logging.info("Calling '%s' from '%s'" %  [build, Dir.pwd])
+      Logging.debug(command)
+      Kernel.system(ENV, command)
       Dir.chdir(current_dir)
 
       if test
-        puts 'test flag is on, deleting objects'
+        Logging.debug 'test flag is on, deleting objects'
         Network.delete_router_interface(subnet.id, router)
         Network.delete_subnet(subnet.id)
         Network.delete_network(network.name)
       end
 
-    rescue SystemExit, Interrupt
-      msg = '%s interrupted by user' % [name]
-      puts msg
-      Logging.info(msg)
-    rescue StandardError => e
-      Logging.error(e.message)
-      puts e.backtrace.join("\n")
-
-      puts e.message
+    rescue Interrupt
+      Logging.message("\n'%s' boot from '%s' interrupted by user" % [name, blueprint])
+    rescue => e
+      Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     end
   end
 end

data/lib/compute.rb

@@ -18,21 +18,16 @@
 require 'rubygems'
 require 'require_relative'
 
-require_relative 'connection.rb'
-include Connection
-require_relative 'log.rb'
-include Logging
-
 #
 # compute module
 #
 module Compute
-  def delete_forge(name)
-    instances = Connection.compute.servers.all(:name => name)
+  def delete_forge(oFC, name)
+    instances = oFC.oCompute.servers.all(:name => name)
     instances.each do|instance|
       # make sure we don't delete another forge because fog filters
       # the name in a "like syntax" way
-      Connection.compute.servers.get(instance.id).destroy
+      oFC.oCompute.servers.get(instance.id).destroy
     end
   end
-end
+end

data/lib/connection.rb

@@ -25,43 +25,72 @@ include YamlParse
 #
 # Connection module
 #
-module Connection
-  def compute
-    begin
-      credentials = get_credentials
-      Fog::Compute.new({
-          :provider        => 'HP',
-          :hp_access_key   => credentials['access_key'],
-          :hp_secret_key   => credentials['secret_key'],
-          :hp_auth_uri     => credentials['auth_uri'],
-          :hp_tenant_id    => credentials['tenant_id'],
-          :hp_avl_zone     => credentials['availability_zone'],
+
+class ForjConnection
+
+   attr_accessor :oCompute
+   attr_accessor :oNetwork
+
+   def initialize(oConfig)
+
+     sAccountName = oConfig.get('account_name')
+     @provider='HP' # TODO: Support multiple provider. (Generic Provider object required)
+     sAccountName = oConfig.get('provider') if not sAccountName
+     sAccountName = 'hpcloud' if not sAccountName
+
+     @credentials = get_credentials(sAccountName)
+     oSSLError=SSLErrorMgt.new
+
+     # Trying to get Compute object
+
+     Logging.debug("compute: Connecting to '%s' - Project '%s'" % [@provider, @credentials['tenant_id']])
+     begin
+        @oCompute=Fog::Compute.new({
+          :provider        => @provider,
+          :hp_access_key   => @credentials['access_key'],
+          :hp_secret_key   => @credentials['secret_key'],
+          :hp_auth_uri     => @credentials['auth_uri'],
+          :hp_tenant_id    => @credentials['tenant_id'],
+          :hp_avl_zone     => @credentials['availability_zone'],
           :version         => 'v2'
-      })
-    rescue => e
-      Logging.error(e.message)
-    end
-  end
+        })
+     rescue => e
+       if not oSSLError.ErrorDetected(e.message,e.backtrace)
+          retry
+       end
+       Logging.fatal(1, 'Unable to connect.')
+     end
+
+     # Trying to get Network object
+     Logging.debug("HP network: Connecting to '%s' - Project '%s'" % [@provider, @credentials['tenant_id']])
+     begin
+       @oNetwork=Fog::HP::Network.new({
+          :hp_access_key   => @credentials['access_key'],
+          :hp_secret_key   => @credentials['secret_key'],
+          :hp_auth_uri     => @credentials['auth_uri'],
+          :hp_tenant_id    => @credentials['tenant_id'],
+          :hp_avl_zone     => @credentials['availability_zone']
+       })
+     rescue => e
+       if not oSSLError.ErrorDetected(e.message,e.backtrace)
+          retry
+       end
+       Logging.fatal(1, 'Unable to connect.')
+     end
+
+   end
 
-  def network
-    begin
-      credentials = get_credentials
-      Fog::HP::Network.new({
-          :hp_access_key   => credentials['access_key'],
-          :hp_secret_key   => credentials['secret_key'],
-          :hp_auth_uri     => credentials['auth_uri'],
-          :hp_tenant_id    => credentials['tenant_id'],
-          :hp_avl_zone     => credentials['availability_zone']
-      })
-    rescue => e
-      Logging.error(e.message)
-    end
-  end
 end
 
-def get_credentials
-  home = File.expand_path('~')
-  creds = '%s/.hpcloud/accounts/hp' % [home]
+def get_credentials(sAccountName)
+  # TODO: Should support forj credentials. not hpcloud credentials.
+
+  raise 'Internal Error: Missing sAccountName' if not sAccountName
+
+  creds = File.expand_path('~/.hpcloud/accounts/%s' % [sAccountName])
+  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
   template = YAML.load_file(creds)
   credentials = Hash.new
 
@@ -72,8 +101,8 @@ def get_credentials
     credentials['tenant_id'] = template[:credentials][:tenant_id]
     credentials['availability_zone'] = template[:regions][:compute]
   rescue => e
+    Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     puts 'your credentials are not configured, delete the file %s and run forj setup again' % [creds]
-    Logging.error(e.message)
   end
   credentials
 end

data/lib/defaults.yaml

@@ -15,14 +15,15 @@
 default:
   maestro_url: https://github.com/forj-oss/maestro.git
   infra_repo: ~/.forj/infra
-  image: proto2b
+  # You can set proto2b in your ~/.forj/config.yaml if you built it from maestro/build. Read the maestro/README.md to create it.
+  image: Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)
   flavor: standard.xsmall
-  ports: [22, 80, 443, 3131, 3000, 3132, 3133, 3134, 3135, 4505, 4506, 5000, 5666, 8000, 8080, 8081, 8083, 8125, 8139, 8140, 8773, 8774, 8776, 9292, 29418, 35357]
+  ports: [22, 80, 443, 3000, 3131, 3132, 3233, 3134, 3135, 4505-4506, 5000, 5666, 8000, 8080-8081, 8083, 8125, 8139-8140, 8773-8776, 9292, 29418, 35357]
   keypair_path: ~/.hpcloud/keypairs/nova
   keypair_name: nova
-  router: private-ext
-  security_group: default
-  network: private
+  # Network: If network doesn't exist, forj cli will try to create it, and attach it a router.
+  network: forj
+  security_group: forj
   # at this point you have to clone the infra project manually
   build_config: box
   branch: master

data/lib/down.rb

@@ -24,8 +24,8 @@ require_relative 'yaml_parse.rb'
 include YamlParse
 require_relative 'security.rb'
 include SecurityGroup
-require_relative 'log.rb'
-include Logging
+#require_relative 'log.rb'
+#include Logging
 require_relative 'ssh.rb'
 include Ssh
 require_relative 'compute.rb'
@@ -35,28 +35,26 @@ include Compute
 # Down module
 #
 module Down
-  def down(name)
+  def down(oFC, name)
     begin
 
       initial_msg = 'deleting forge "%s"' % [name]
       Logging.info(initial_msg)
-      puts (initial_msg)
 
       Compute.delete_forge(name)
 
-      router = Network.get_router('private-ext')
-      subnet = Network.get_subnet(name)
+      router = Network.get_router(oFC, 'private-ext')
+      subnet = Network.get_subnet(oFC, name)
       Network.delete_router_interface(subnet.id, router)
 
-      Network.delete_subnet(subnet.id)
-      network = Network.get_network(name)
-      Network.delete_network(network.name)
+      Network.delete_subnet(oFC, subnet.id)
+      network = Network.get_network(oFC, name)
+      Network.delete_network(oFC, network.name)
 
     rescue SystemExit, Interrupt
-      puts 'process interrupted by user'
       Logging.error('process interrupted by user')
     rescue Exception => e
-      Logging.error(e.message)
+      Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
     end
   end
 end