abiquo-etk 0.4.33 → 0.4.42

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_dependency(%q<rpm-utils>, [">= 0.1"])
     gem.add_dependency(%q<term-ansicolor>, [">= 1.0"])
     gem.add_dependency(%q<mixlib-cli>, [">= 1.2"])
+    gem.add_dependency(%q<iniparse>, [">= 1.1.4"])
     gem.files.include %w(
       scripts/*
       lib/**/*
@@ -71,10 +72,10 @@ end
 
 task :updatepkg => [:build, :tarball] do
   version = File.read('VERSION').strip.chomp
-  `rm ~/Work/abiquo/git/abiquo-ce-rpms/abiquo-platform/abiquo-etk/abiquo-etk*.tar.gz`
-  `cp ../abiquo-etk-#{version}.tar.gz ~/Work/abiquo/git/abiquo-ce-rpms/abiquo-platform/abiquo-etk/`
-  `cp abiquo-etk.spec ~/Work/abiquo/git/abiquo-ce-rpms/abiquo-platform/abiquo-etk/`
-  `cp pkg/abiquo-etk-#{version}.gem ~/Work/abiquo/git/abiquo-ce-rpms/abiquo-platform/abiquo-etk/`
+  `rm ~/Work/abiquo/git/abiquo-common-rpms/abiquo-etk/abiquo-etk*.tar.gz`
+  `cp ../abiquo-etk-#{version}.tar.gz ~/Work/abiquo/git/abiquo-common-rpms/abiquo-etk/`
+  `cp abiquo-etk.spec ~/Work/abiquo/git/abiquo-common-rpms/abiquo-etk/`
+  `cp pkg/abiquo-etk-#{version}.gem ~/Work/abiquo/git/abiquo-common-rpms/abiquo-etk/`
 end
 
 

data/VERSION

@@ -1 +1 @@
-0.4.33
+0.4.42

data/abiquo-etk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{abiquo-etk}
-  s.version = "0.4.33"
+  s.version = "0.4.35"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Rubio"]
-  s.date = %q{2010-11-04}
+  s.date = %q{2010-11-12}
   s.description = %q{Tools to troubleshoot and manage your Abiquo installation}
   s.email = %q{srubio@abiquo.com}
   s.executables = ["abiquo-check-16-install", "abicli", "abiquo-initenv"]

data/abiquo-etk.spec

@@ -5,7 +5,7 @@
 
 Summary: Abiquo Elite Toolkit
 Name: rubygem-%{gemname}
-Version: 0.4.33
+Version: 0.4.35
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -55,6 +55,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Nov 09 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.34-1
+- Updated to upstream 0.4.35-1
+
+* Tue Nov 09 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.34-1
+- Updated to upstream 0.4.34-1
+
 * Thu Nov 04 2010 : Sergio Rubio <srubio@abiquo.com> - 0.4.33-1
 - Updated to upstream 0.4.33-1
 

data/bin/abiquo-initenv

@@ -6,11 +6,23 @@ require 'abiquo-etk'
 def create_schemas(user = 'root', password = '')
   log = AETK::Log.instance
   cmd = ''
+
+  # if abiquo-server RPM not installed, return
+  `/bin/rpm -q abiquo-server`
+  if $? != 0
+    log.warn 'abiquo-server package not found. Skipping schema creation.'
+    return
+  end
   if password.strip.chomp.empty? 
     cmd = "mysql -u #{user} "
   else
     cmd = "mysql -u #{user} -p#{password} "
   end
+  
+  if `#{cmd} -e 'show databases'` != 0
+    log.error "Can't access MySQL with username #{user}, password #{password}"
+    return
+  end
 
   if `#{cmd} -e 'show databases'|grep kinton`.strip.chomp.empty?
     out = `mysql -u root < /usr/share/doc/abiquo-server/database/kinton-schema.sql`
@@ -32,55 +44,46 @@ def create_schemas(user = 'root', password = '')
 end
 
 def init_server_install
-  config_file ='/etc/sysconfig/abiquo-server'
+  config_file ='/opt/abiquo/config/abiquo.properties'
   log = AETK::Log.instance
 
   begin
     if File.exist? config_file 
-      @settings = abiquo_server_settings
+      settings = abiquo_server_settings
     else
       log.error "Config file #{config_file} does not exist. Exit."
       exit
     end
 
-    log.info "Setting EventSink URL"
-    `abicli set event-sink-url http://#{@settings['abiquo_server_ip']}/server/EventSink`
-    
     log.info "Setting DB Properties"
-    `abicli set database-host #{@settings['abiquo_db_host']}`
+    `abicli set database-host #{settings['abiquo.database.host']}`
     `abicli set database-user root`
-    `abicli set database-password #{@settings['abiquo_db_password']}`
+    `abicli set database-password #{settings['abiquo.database.password']}`
     `abicli set mail-server 127.0.0.1`
       
     log.info "Creating database schemas..."
     create_schemas
   rescue Exception => e
     log.error "Unhandled exception: #{e.message}"
-    log.error "Unhandled exception: #{e.backtrace}"
+    log.error "BACKTRACE: #{e.backtrace}"
+    raise e
   end
 end
 
 def init_remote_services_install
-  config_file ='/etc/sysconfig/abiquo-rs'
+  config_file ='/opt/abiquo/config/abiquo.properties'
 
   log = AETK::Log.instance
 
   begin
-    @settings = {}
+    settings = {}
     if File.exist? config_file
-      @settings = abiquo_rs_settings
+      settings = abiquo_rs_settings
     else
       log.error "Config file #{config_file} does not exist. Exit."
       exit
     end
-    repo = @settings['abiquo_nfs_repository']
-    if repo =~ /localhost|127.0.0.1/
-      if File.exist? '/etc/sysconfig/abiquo-server'
-        log.info "NFS Repository points to localhost, fixing..."
-        s = abiquo_server_settings
-        repo = s['abiquo_server_ip'] + ':/opt/vm_repository'
-      end
-    end
+    repo = settings['abiquo.appliancemanager.repositoryLocation']
     log.info "Setting nfs-repository to #{repo}"
     `abicli set nfs-repository #{repo}`
     log.info "Setting cifs-repository to #{repo}"
@@ -88,13 +91,12 @@ def init_remote_services_install
 
   rescue Exception => e
     log.error "Unhandled exception: #{e.message}"
-    log.error "Unhandled exception: #{e.backtrace}"
+    log.error "BACKTRACE: #{e.backtrace}"
+    raise e
   end
 end
 
 def init_v2v_install
-  config_file ='/etc/sysconfig/abiquo-server'
-  log = AETK::Log.instance
 end
 
 def init_rs_plus_v2v_install
@@ -104,6 +106,34 @@ end
 
 log = AETK::Log.instance
 log.info "Running abiquo-initenv..."
+
+# Check if we need to run
+if File.exist?(ABIQUO_BASE_DIR + '/config/.configured') and \
+  (not File.exists?(ABIQUO_BASE_DIR + '/config/.needsupgrade'))
+    log.info "Ok Sargent. No need to change anything. Exit."
+    exit 0
+end
+
+begin
+  if File.exist?('/opt/abiquo/config/.needsupgrade')
+    log.info "Upgrade needed, upgrading..."
+    upgrade_script = File.readlines('/opt/abiquo/config/.needsupgrade').first
+    if not upgrade_script.nil?
+      script_file = File.dirname(__FILE__) + "/../lib/upgrades/#{upgrade_script.strip.chomp}"
+      log.info "Using upgrade script #{script_file}"
+      load script_file
+      log.info "Upgrade completed succesfully."
+    else
+      log.error "Invalid upgrade script found in .needsupgrade file. Aborting the upgrade"
+    end
+  end
+rescue Exception => e
+  log.error "Unknown error upgrading: #{e.message}"
+  log.error "BACKTRACE: #{e.backtrace}"
+  log.error "Aborting."
+  exit 1
+end
+  
 case AETK::System.detect_install_type 
 when :monolithic
   log.info "Monolithic install detected. Setting up the environment."
@@ -127,36 +157,32 @@ else
 end
 
 #
-# Try to apply netapp ontap connector settings
+# Set nofile limits in /etc/security/limits.conf
 #
-if File.exist?('/opt/abiquo/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml')
-  AETK::Log.info "Abiquo ONTAP connector found."
-  if File.exist?('/etc/sysconfig/abiquo-rs')
-    buf = File.read '/etc/sysconfig/abiquo-rs'
-    buf.each_line do |l|
-      if l =~ /ontap_user/
-        user = l.split('=').last.strip.chomp rescue ''
-        AETK::Log.info "ONTAP: Configure ontap-user"
-        `abicli set ontap-user #{user}`
-      end
-    end
-    buf.each_line do |l|
-      if l =~ /ontap_password/
-        password = l.split('=').last.strip.chomp rescue ''
-        AETK::Log.info "ONTAP: Configure ontap-password"
-        `abicli set ontap-password #{password}`
-      end
+begin
+  slimits_found = false
+  hlimits_found = false
+  File.readlines('/etc/security/limits.conf').each do |l|
+    slimits_found = true if l =~ /^\s*root\s+soft\s+nofile\s+4096/
+    hlimits_found = true if l =~ /^\s*root\s+hard\s+nofile\s+10240/
+  end
+  if not slimits_found
+    AETK::Log.info "Setting soft nofile limits to 4096"
+    File.open('/etc/security/limits.conf', 'a') do |f|
+      f.puts "root soft nofile 4096"
     end
-    buf.each_line do |l|
-      if l =~ /ontap_server_ip/
-        server = l.split('=').last.strip.chomp rescue ''
-        AETK::Log.info "ONTAP: Configure ontap-server-ip"
-        `abicli set ontap-server-ip #{server}`
-      end
+  end
+  if not hlimits_found
+    AETK::Log.info "Setting hard nofile limits to 10240"
+    File.open('/etc/security/limits.conf', 'a') do |f|
+      f.puts "root hard nofile 10240"
     end
-  else
-    AETK::Log.warn "/etc/sysconfig/abiquo-rs config file not found. Skipping ONTAP configuration."
   end
-else
-  AETK::Log.info "Abiquo ONTAP connector NOT found."
+  if slimits_found and hlimits_found
+    AETK::Log.info "System hard/soft nofile limits Ok. Not updating."
+  end
+rescue Exception => e
+  AETK::Log.error "Error setting nofile limits: #{e.message}"
 end
+
+FileUtils.touch(ABIQUO_BASE_DIR + '/config/.configured')

data/lib/abicli/commands/instant-deploy.rb

@@ -154,7 +154,7 @@ if ARGV[0] == 'instant-deploy'
   end
 
   def pfcheck_redhat
-    if File.read('/etc/redhat-release') !~ /^(FrameOS|CentOS)/
+    if File.read('/etc/redhat-release') !~ /^(FrameOS|CentOS|Red Hat Enterprise|Fedora)/
       $stderr.puts "\nRHEL not found. Your distribution is not supported.\n\n"
       exit
     end

data/lib/abicli/commands/remote-services-settings.rb

@@ -1,24 +1,16 @@
 if ARGV[0] == 'remote-services-settings'
-  
   ARGV.shift
-
-  if not File.directory? ABIQUO_BASE_DIR
-    $stderr.puts "\n'abicli set' command is used to configure the Abiquo Platform.\nUnfortunately, I can't find the Abiquo Platform installed in this server.\n\nTry other commands.\n\n"
-    help
-    exit 1
+  if not File.exist?('/etc/abiquo-release')
+    $stderr.puts "Abiquo release version not found. Unsupported installation."
+    exit
   end
-
-  def print_remote_services_settings
-    f = ABIQUO_BASE_DIR + '/config/virtualfactory.xml'
-    doc = Nokogiri::XML(File.new(f))
-    puts
-    two_cols("NFS Repository:".bold, config_get_node(doc, 'hypervisors/xenserver/abiquoRepository'))
-    two_cols("CIFS Repository:".bold, config_get_node(doc, 'hypervisors/hyperv/destinationRepositoryPath'))
-    two_cols("Storage Link URL:".bold, config_get_node(doc, 'storagelink/address'))
-    two_cols("Storage Link User:".bold, config_get_node(doc, 'storagelink/user'))
-    two_cols("Storage Link Password:".bold, config_get_node(doc, 'storagelink/password'))
-    puts
+  rel_info = File.read('/etc/abiquo-release')
+  if rel_info =~ /Version: 1\.7/
+    load File.dirname(__FILE__) + "/remote-services-settings17.ext"
+  elsif rel_info =~ /Version: 1\.6/
+    load File.dirname(__FILE__) + "/remote-services-settings16.ext"
+  else
+    $stderr.puts "Abiquo release version not found. Unsupported installation."
+    exit
   end
-
-  print_remote_services_settings
 end

data/lib/abicli/commands/remote-services-settings16.ext

@@ -0,0 +1,19 @@
+if not File.directory? ABIQUO_BASE_DIR
+  $stderr.puts "\n'abicli set' command is used to configure the Abiquo Platform.\nUnfortunately, I can't find the Abiquo Platform installed in this server.\n\nTry other commands.\n\n"
+  help
+  exit 1
+end
+
+def print_remote_services_settings
+  f = ABIQUO_BASE_DIR + '/config/virtualfactory.xml'
+  doc = Nokogiri::XML(File.new(f))
+  puts
+  two_cols("NFS Repository:".bold, config_get_node(doc, 'hypervisors/xenserver/abiquoRepository'))
+  two_cols("CIFS Repository:".bold, config_get_node(doc, 'hypervisors/hyperv/destinationRepositoryPath'))
+  two_cols("Storage Link URL:".bold, config_get_node(doc, 'storagelink/address'))
+  two_cols("Storage Link User:".bold, config_get_node(doc, 'storagelink/user'))
+  two_cols("Storage Link Password:".bold, config_get_node(doc, 'storagelink/password'))
+  puts
+end
+
+print_remote_services_settings

data/lib/abicli/commands/remote-services-settings17.ext

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'iniparse'
+
+settings_file = "#{ABIQUO_BASE_DIR}/config/abiquo.properties"
+
+if File.exist? settings_file
+  
+  begin
+    ini = IniParse.parse File.read(settings_file)
+    raise Exception.new('Missing [remote-services] section') if ini['remote-services'].nil?
+    
+    puts "\nAbiquo Remote Services Configuration"
+    puts "-------------------------------------\n\n"
+
+    File.read(settings_file).each_line do |l|
+      next if l =~ /\[.*?\]/
+      puts l
+    end
+  rescue Exception => e
+    puts "Invalid properties file. Missing [remote-services] section?"
+    puts "DEBUG: #{e.message}"
+  end
+else
+  $stderr.puts "abiquo.properties file not found. Cannot retrieve properties."
+end

data/lib/abicli/commands/server-settings.rb

@@ -1,22 +1,16 @@
 if ARGV[0] == 'server-settings'
-  
   ARGV.shift
-  
-  if not File.directory? ABIQUO_BASE_DIR
-    $stderr.puts "\n'abicli set' command is used to configure the Abiquo Platform.\nUnfortunately, I can't find the Abiquo Platform installed in this server.\n\nTry other commands.\n\n"
-    help
-    exit 1
+  if not File.exist?('/etc/abiquo-release')
+    $stderr.puts "Abiquo release version not found. Unsupported installation."
+    exit
   end
-
-  def print_server_settings
-    f = ABIQUO_BASE_DIR + '/config/server.xml'
-    doc = Nokogiri::XML(File.new(f))
-    puts
-    two_cols("Event Sink URL:".bold, config_get_node(doc, 'eventSinkAddress'))
-    two_cols("Session Timeout:".bold, config_get_node(doc, 'sessionTimeout'))
-    puts
+  rel_info = File.read('/etc/abiquo-release')
+  if rel_info =~ /Version: 1\.7/
+    load File.dirname(__FILE__) + "/server-settings17.ext"
+  elsif rel_info =~ /Version: 1\.6/
+    load File.dirname(__FILE__) + "/server-settings168.ext"
+  else
+    $stderr.puts "Abiquo release version not found. Unsupported installation."
+    exit
   end
-
-  print_server_settings
-
 end

data/lib/abicli/commands/server-settings168.ext

@@ -0,0 +1,17 @@
+if not File.directory? ABIQUO_BASE_DIR
+  $stderr.puts "\n'abicli set' command is used to configure the Abiquo Platform.\nUnfortunately, I can't find the Abiquo Platform installed in this server.\n\nTry other commands.\n\n"
+  help
+  exit 1
+end
+
+def print_server_settings
+  f = ABIQUO_BASE_DIR + '/config/server.xml'
+  doc = Nokogiri::XML(File.new(f))
+  puts
+  two_cols("Event Sink URL:".bold, config_get_node(doc, 'eventSinkAddress'))
+  two_cols("Session Timeout:".bold, config_get_node(doc, 'sessionTimeout'))
+  puts
+end
+
+print_server_settings
+

data/lib/abicli/commands/server-settings17.ext

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'iniparse'
+
+settings_file = "#{ABIQUO_BASE_DIR}/config/abiquo.properties"
+
+if File.exist? settings_file
+
+  begin
+    ini = IniParse.parse File.read(settings_file)
+    raise Exception.new('Missing [server] section') if ini['server'].nil?
+
+    puts "\nAbiquo Server Configuration"
+    puts "----------------------------\n\n"
+
+    File.read(settings_file).each_line do |l|
+      next if l =~ /\[.*?\]/
+      puts l
+    end
+  rescue Exception => e
+    puts "Invalid properties file. Missing [server] section?"
+    puts "DEBUG: #{e.message}"
+  end
+else
+  $stderr.puts "abiquo.properties file not found. Cannot retrieve properties."
+end

data/lib/abicli/commands/set.rb

@@ -1,171 +1,15 @@
 if ARGV[0] == 'set'
-  
-  if not File.directory? ABIQUO_BASE_DIR
-    $stderr.puts "\n'abicli set' command is used to configure the Abiquo Platform.\nUnfortunately, I can't find the Abiquo Platform installed in this server.\n\nTry other commands.\n\n"
-    help
-    exit 1
+  if not File.exist?('/etc/abiquo-release')
+    $stderr.puts "Abiquo release version not found. Unsupported installation."
+    exit
+  end
+  rel_info = File.read('/etc/abiquo-release')
+  if rel_info =~ /Version: 1\.7/
+    load File.dirname(__FILE__) + "/set17.ext"
+  elsif rel_info =~ /Version: 1\.6/
+    load File.dirname(__FILE__) + "/set168.ext"
+  else
+    $stderr.puts "Abiquo release version not found. Unsupported installation."
+    exit
   end
-
-  def set_database_host(val)
-    url = "jdbc:mysql://#{val}:3306/kinton?autoReconnect=true"
-    [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'url', url, true)
-      end
-    end
-    
-    [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'url', url,true)
-        config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'url', url, true)
-      end
-    end
-    [TOMCAT_BPMASYNC_CONFIG, TOMCAT_BPMASYNC_BUILTIN_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoBpmDB"]', 'url', url, true)
-      end
-    end
-  end
-
-  def set_database_user(val)
-    [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'username', val, true)
-      end
-    end
-    [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'username', val, true)
-        config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'username', val, true)
-      end
-    end
-    [TOMCAT_BPMASYNC_CONFIG, TOMCAT_BPMASYNC_BUILTIN_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoBpmDB"]', 'username', val, true)
-      end
-    end
-  end
-
-  def set_database_password(val)
-    [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'password', val, true)
-      end
-    end
-    [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'password', val, true)
-        config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'password', val, true)
-      end
-    end
-    [TOMCAT_BPMASYNC_CONFIG, TOMCAT_BPMASYNC_BUILTIN_CONFIG].each do |f|
-      if File.exist?(f)
-        config_set_attribute(f, 'Resource[@name="jdbc/abiquoBpmDB"]', 'password', val, true)
-      end
-    end
-  end
-
-  def set_nfs_repository(val)
-    f = ABIQUO_BASE_DIR + '/config/am.xml' 
-    if File.exist? f
-      config_set_node(f, 'repository/location', val, true)
-    end
-    f = ABIQUO_BASE_DIR + '/config/virtualfactory.xml' 
-    if File.exist? f
-      config_set_node(f, 'hypervisors/xenserver/abiquoRepository', val, true)
-    end
-  end
-  
-  def set_ontap_server_ip(val)
-    f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
-    if File.exist? f
-      config_set_node(f, 'filer/host', val, true)
-    else
-      $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
-    end
-  end
-  
-  def set_ontap_user(val)
-    f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
-    if File.exist? f
-      config_set_node(f, 'filer/user', val, true)
-    else
-      $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
-    end
-  end
-
-  def set_ontap_password(val)
-    f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
-    if File.exist? f
-      config_set_node(f, 'filer/password', val, true)
-    else
-      $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
-    end
-  end
-
-  $command_mappings = {
-    'event-sink-url' => ['server', 'eventSinkAddress'],
-    'session-timeout' => ['server', 'sessionTimeout'],
-    'mail-server' => ['server', 'mail/server'],
-    'mail-server-user' => ['server', 'mail/user'],
-    'mail-server-password' => ['server', 'mail/password'],
-    'nfs-repository' => Proc.new { |val| set_nfs_repository(val) },
-    'cifs-repository' => ['virtualfactory', 'hypervisors/hyperv/destinationRepositoryPath'],
-    'storagelink-address' => ['virtualfactory', 'storagelink/address'],
-    'storagelink-user' => ['virtualfactory', 'storagelink/user'],
-    'storagelink-password' => ['virtualfactory', 'storagelink/password'],
-    'database-host' => Proc.new { |val| set_database_host(val) },
-    'database-user' => Proc.new { |val| set_database_user(val) },
-    'database-password' => Proc.new { |val| set_database_password(val) },
-    'ontap-user' => Proc.new { |val| set_ontap_user(val) },
-    'ontap-password' => Proc.new { |val| set_ontap_password(val) },
-    'ontap-server-ip' => Proc.new { |val| set_ontap_server_ip(val) }
-  }
-
-  def mapping_exist?(key)
-    $command_mappings.has_key? key
-  end
-
-  def mapping_has_proc?(comp)
-    $command_mappings[comp].is_a? Proc
-  end
-  
-  def help
-    puts "\nSet Abiquo Platform properties\n\n"
-    puts "Available subcommands:"
-    $command_mappings.keys.sort.each do |cmd,proc|
-      puts "  #{cmd}"
-    end
-  end
-
-
-  comp = ARGV[1]
-  path = ARGV[2]
-  val = ARGV[3]
-  file = nil
-  begin
-    if mapping_exist? comp
-      val = path
-      if mapping_has_proc? comp
-        $command_mappings[comp].call(val)
-        exit
-      end
-      comp, path = $command_mappings[comp]
-    else
-      help
-      exit 0
-    end
-    file = File.join(ABIQUO_BASE_DIR, "config/#{comp}.xml")
-    if not File.exist?(file)
-      AETK::Log.instance.error "File #{file} does not exist. Skip setting the property: #{path}"
-    else
-      config_set_node(file, path, val, true)
-    end
-  rescue NoMethodError => e
-    $stderr.puts e.message
-    $stderr.puts e.backtrace
-    $stderr.puts "\nproperty not found in component #{comp.bold}\n\n"
-    exit 1
-  end
-
 end

data/lib/abicli/commands/set168.ext

@@ -0,0 +1,167 @@
+if not File.directory? ABIQUO_BASE_DIR
+  $stderr.puts "\n'abicli set' command is used to configure the Abiquo Platform.\nUnfortunately, I can't find the Abiquo Platform installed in this server.\n\nTry other commands.\n\n"
+  help
+  exit 1
+end
+
+def set_database_host(val)
+  url = "jdbc:mysql://#{val}:3306/kinton?autoReconnect=true"
+  [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'url', url, true)
+    end
+  end
+  
+  [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'url', url,true)
+      config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'url', url, true)
+    end
+  end
+  [TOMCAT_BPMASYNC_CONFIG, TOMCAT_BPMASYNC_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoBpmDB"]', 'url', url, true)
+    end
+  end
+end
+
+def set_database_user(val)
+  [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'username', val, true)
+    end
+  end
+  [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'username', val, true)
+      config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'username', val, true)
+    end
+  end
+  [TOMCAT_BPMASYNC_CONFIG, TOMCAT_BPMASYNC_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoBpmDB"]', 'username', val, true)
+    end
+  end
+end
+
+def set_database_password(val)
+  [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'password', val, true)
+    end
+  end
+  [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'password', val, true)
+      config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'password', val, true)
+    end
+  end
+  [TOMCAT_BPMASYNC_CONFIG, TOMCAT_BPMASYNC_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoBpmDB"]', 'password', val, true)
+    end
+  end
+end
+
+def set_nfs_repository(val)
+  f = ABIQUO_BASE_DIR + '/config/am.xml' 
+  if File.exist? f
+    config_set_node(f, 'repository/location', val, true)
+  end
+  f = ABIQUO_BASE_DIR + '/config/virtualfactory.xml' 
+  if File.exist? f
+    config_set_node(f, 'hypervisors/xenserver/abiquoRepository', val, true)
+  end
+end
+
+def set_ontap_server_ip(val)
+  f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
+  if File.exist? f
+    config_set_node(f, 'filer/host', val, true)
+  else
+    $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
+  end
+end
+
+def set_ontap_user(val)
+  f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
+  if File.exist? f
+    config_set_node(f, 'filer/user', val, true)
+  else
+    $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
+  end
+end
+
+def set_ontap_password(val)
+  f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
+  if File.exist? f
+    config_set_node(f, 'filer/password', val, true)
+  else
+    $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
+  end
+end
+
+$command_mappings = {
+  'event-sink-url' => ['server', 'eventSinkAddress'],
+  'session-timeout' => ['server', 'sessionTimeout'],
+  'mail-server' => ['server', 'mail/server'],
+  'mail-server-user' => ['server', 'mail/user'],
+  'mail-server-password' => ['server', 'mail/password'],
+  'nfs-repository' => Proc.new { |val| set_nfs_repository(val) },
+  'cifs-repository' => ['virtualfactory', 'hypervisors/hyperv/destinationRepositoryPath'],
+  'storagelink-address' => ['virtualfactory', 'storagelink/address'],
+  'storagelink-user' => ['virtualfactory', 'storagelink/user'],
+  'storagelink-password' => ['virtualfactory', 'storagelink/password'],
+  'database-host' => Proc.new { |val| set_database_host(val) },
+  'database-user' => Proc.new { |val| set_database_user(val) },
+  'database-password' => Proc.new { |val| set_database_password(val) },
+  'ontap-user' => Proc.new { |val| set_ontap_user(val) },
+  'ontap-password' => Proc.new { |val| set_ontap_password(val) },
+  'ontap-server-ip' => Proc.new { |val| set_ontap_server_ip(val) }
+}
+
+def mapping_exist?(key)
+  $command_mappings.has_key? key
+end
+
+def mapping_has_proc?(comp)
+  $command_mappings[comp].is_a? Proc
+end
+
+def help
+  puts "\nSet Abiquo Platform properties\n\n"
+  puts "Available subcommands:"
+  $command_mappings.keys.sort.each do |cmd,proc|
+    puts "  #{cmd}"
+  end
+end
+
+
+comp = ARGV[1]
+path = ARGV[2]
+val = ARGV[3]
+file = nil
+begin
+  if mapping_exist? comp
+    val = path
+    if mapping_has_proc? comp
+      $command_mappings[comp].call(val)
+      exit
+    end
+    comp, path = $command_mappings[comp]
+  else
+    help
+    exit 0
+  end
+  file = File.join(ABIQUO_BASE_DIR, "config/#{comp}.xml")
+  if not File.exist?(file)
+    AETK::Log.instance.error "File #{file} does not exist. Skip setting the property: #{path}"
+  else
+    config_set_node(file, path, val, true)
+  end
+rescue NoMethodError => e
+  $stderr.puts e.message
+  $stderr.puts e.backtrace
+  $stderr.puts "\nproperty not found in component #{comp.bold}\n\n"
+  exit 1
+end

data/lib/abicli/commands/set17.ext

@@ -0,0 +1,205 @@
+#!/usr/bin/env ruby
+require 'iniparse'
+require 'uri'
+
+if not File.directory? ABIQUO_BASE_DIR
+  $stderr.puts "\n'abicli set' command is used to configure the Abiquo Platform.\nUnfortunately, I can't find the Abiquo Platform installed in this server.\n\nTry other commands.\n\n"
+  help
+  exit 1
+end
+
+def set_database_host(val)
+  url = "jdbc:mysql://#{val}:3306/kinton?autoReconnect=true&useUnicode=true&characterEncoding=UTF8"
+  [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'url', url, true)
+    end
+  end
+  
+  [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'url', url,true)
+      config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'url', url, true)
+    end
+  end
+  set_property('server', 'abiquo.database.host', val)
+end
+
+def set_database_user(val)
+  [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'username', val, true)
+    end
+  end
+  [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'username', val, true)
+      config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'username', val, true)
+    end
+  end
+  set_property('server', 'abiquo.database.user', val)
+end
+
+def set_database_password(val)
+  [TOMCAT_API_BUILTIN_CONFIG, TOMCAT_API_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'password', val, true)
+    end
+  end
+  [TOMCAT_SERVER_CONFIG, TOMCAT_SERVER_BUILTIN_CONFIG].each do |f|
+    if File.exist?(f)
+      config_set_attribute(f, 'Resource[@name="jdbc/abiquoDB"]', 'password', val, true)
+      config_set_attribute(f, 'Resource[@name="jdbc/heartbeatDB"]', 'password', val, true)
+    end
+  end
+  set_property('server', 'abiquo.database.password', val)
+end
+
+def set_nfs_repository(val)
+  begin 
+    uri = URI.parse(val)
+    host = uri.host
+    path = uri.path
+    raise Exception.new if (path.nil? or host.nil?)
+  rescue
+    $stderr.puts 'ERROR: Invalid NFS/CIFS URI'
+    return
+  end
+  config = IniParse.parse(File.read('/opt/abiquo/config/abiquo.properties'))
+  config.save('/opt/abiquo/config/abiquo.properties.bak')
+  config['remote-services']['abiquo.appliancemanager.repositoryLocation'] = val
+  config['remote-services']['abiquo.virtualfactory.xenserver.repositoryLocation'] = val
+  config['remote-services']['abiquo.virtualfactory.vmware.repositoryLocation'] = val
+  cifs_uri = "//#{host}/#{path}"
+  config['remote-services']['abiquo.virtualfactory.hyperv.repositoryLocation'] = cifs_uri
+  config.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def set_ontap_server_ip(val)
+  f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
+  if File.exist? f
+    config_set_node(f, 'filer/host', val, true)
+  else
+    $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
+  end
+end
+
+def set_ontap_user(val)
+  f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
+  if File.exist? f
+    config_set_node(f, 'filer/user', val, true)
+  else
+    $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
+  end
+end
+
+def set_ontap_password(val)
+  f = ABIQUO_BASE_DIR + '/ontap/tomcat/webapps/ROOT/WEB-INF/classes/config.xml'
+  if File.exist? f
+    config_set_node(f, 'filer/password', val, true)
+  else
+    $stderr.puts "NetApp Ontap Connector not installed. Ignoring the order."
+  end
+end
+
+def set_property(section, key, val)
+  config = IniParse.parse(File.read('/opt/abiquo/config/abiquo.properties'))
+  config.save('/opt/abiquo/config/abiquo.properties.bak')
+  config[section][key] = val
+  config.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def get_property(section, key)
+  config = IniParse.parse(File.read('/opt/abiquo/config/abiquo.properties'))
+  config[section][key] rescue nil
+end
+
+$command_mappings = {
+  'rabbitmq-host' => Proc.new do |val| 
+    if get_property('remote-services', 'abiquo.rabbitmq.host')
+      set_property('remote-services', 'abiquo.rabbitmq.host', val)
+    end
+    if get_property('server', 'abiquo.rabbitmq.host')
+      set_property('server', 'abiquo.rabbitmq.host', val)
+    end
+  end,
+  'session-timeout' => ['server', 'sessionTimeout'],
+  'mail-server' => ['server', 'mail/server'],
+  'mail-server-user' => ['server', 'mail/user'],
+  'mail-server-password' => ['server', 'mail/password'],
+  'nfs-repository' => Proc.new { |val| set_nfs_repository(val) },
+  'cifs-repository' => Proc.new do |val|
+      begin 
+        uri = URI.parse(val)
+        host = uri.host
+        path = uri.path
+        raise Exception.new if (path.nil? or host.nil?)
+        cifs_uri = "//#{host}/#{path}"
+        set_property 'remote-services', 'abiquo.virtualfactory.hyperv.repositoryLocation', cifs_uri
+      rescue Exception => e
+        $stderr.puts 'ERROR: Invalid NFS/CIFS URI'
+        $stderr.puts "DEBUG: #{e.message}"
+      end
+  end,
+  'storagelink-address' => Proc.new do |val| 
+    if get_property 'remote-services', 'abiquo.virtualfactory.storagelink.address'
+      set_property('remote-services', 'abiquo.virtualfactory.storagelink.address', val)
+    end
+  end,
+  'storagelink-user' => Proc.new do |val| 
+    if get_property 'remote-services', 'abiquo.virtualfactory.storagelink.user'
+      set_property('remote-services', 'abiquo.virtualfactory.storagelink.user', val)
+    end
+  end,
+  'storagelink-password' => Proc.new do |val| 
+    if get_property 'remote-services', 'abiquo.virtualfactory.storagelink.password'
+      set_property('remote-services', 'abiquo.virtualfactory.storagelink.password', val)
+    end
+  end,
+  'database-host' => Proc.new { |val| set_database_host(val) },
+  'database-user' => Proc.new { |val| set_database_user(val) },
+  'database-password' => Proc.new { |val| set_database_password(val) },
+  'ontap-user' => Proc.new { |val| set_ontap_user(val) },
+  'ontap-password' => Proc.new { |val| set_ontap_password(val) },
+  'ontap-server-ip' => Proc.new { |val| set_ontap_server_ip(val) }
+}
+
+def mapping_exist?(key)
+  $command_mappings.has_key? key
+end
+
+def mapping_has_proc?(comp)
+  $command_mappings[comp].is_a? Proc
+end
+
+def help
+  puts "\nSet Abiquo Platform properties\n\n"
+  puts "Available subcommands:"
+  $command_mappings.keys.sort.each do |cmd,proc|
+    puts "  #{cmd}"
+  end
+end
+
+
+comp = ARGV[1]
+path = ARGV[2]
+val = ARGV[3]
+file = nil
+begin
+  if mapping_exist? comp
+    val = path
+    if mapping_has_proc? comp
+      $command_mappings[comp].call(val)
+      exit
+    end
+    comp, path = $command_mappings[comp]
+  else
+    help
+    exit 0
+  end
+rescue NoMethodError => e
+  $stderr.puts e.message
+  $stderr.puts e.backtrace
+  $stderr.puts "\nproperty not found in component #{comp.bold}\n\n"
+  exit 1
+end

data/lib/abiquo-etk.rb

@@ -32,7 +32,7 @@ ABIQUO_BPMASYNC_CONFIG = '/opt/abiquo/config/bpm-async.xml'
 def abiquo_edition
 end
 
-def abiquo_server_settings(file = '/etc/sysconfig/abiquo-server')
+def abiquo_server_settings(file = '/opt/abiquo/config/abiquo.properties')
 	settings = {}
   File.read(file).each_line do |l|
     next if l.strip.chomp.empty?
@@ -42,14 +42,8 @@ def abiquo_server_settings(file = '/etc/sysconfig/abiquo-server')
   settings
 end
 
-def abiquo_rs_settings(file = '/etc/sysconfig/abiquo-rs')
-	settings = {}
-  File.read(file).each_line do |l|
-    next if l.strip.chomp.empty?
-    key,val = l.strip.chomp.split('=')
-    settings[key.strip.chomp] = val.strip.chomp rescue ''
-  end
-  settings
+def abiquo_rs_settings(file = '/opt/abiquo/config/abiquo.properties')
+  abiquo_server_settings
 end
 
 def abiquo_base_dir
@@ -151,7 +145,11 @@ module AETK
     end
 
     def self.instance(file = '/var/log/abiquo-etk.log')
-      @@logger ||= Logger.new file
+      begin
+        @@logger ||= Logger.new file
+      rescue Exception
+        @@logger ||= Logger.new $stderr
+      end
     end
 
   end

data/lib/upgrades/17-nuclear-launch

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'fileutils'
+require 'logger'
+
+log = Logger.new '/var/log/17-nuclear-launch.log'
+
+if not File.directory?('/opt/abiquo/backup/1.6.8')
+  log.error '/opt/abiquo/backup/1.6.8 directory not found.Aborting upgrade.'
+  exit 1
+end
+
+`mkdir -p /opt/abiquo/backup/1.6.8/database/`
+log.info "Dumping current database schema..."
+output = `/usr/bin/mysqldump -R -u root kinton > /opt/abiquo/backup/1.6.8/database/kinton-#{Time.now.strftime('%F_%H%M')}.sql 2>&1`
+if $? != 0
+  log.error "MySQL backup failed: #{output}"
+end
+
+log.info "Applying upgrade deltas (kinton-delta-1_6_8-to-1_7_0)..."
+output = `/usr/bin/mysql -u root kinton 2>&1 < /usr/share/doc/abiquo-server/database/kinton-delta-1_6_8-to-1_7_0.sql`
+if $? != 0
+  log.error "Upgrading database schema failed: #{output}"
+  log.error "Aborting the upgrade."
+  exit 1
+end
+
+log.info "Applying upgrade deltas (kinton-premium-delta-1_6_8-to-1_7_0)..."
+output = `/usr/bin/mysql -u root kinton 2>&1 < /usr/share/doc/abiquo-server/database/kinton-premium-delta-1.6.8-to-1.7.0.sql`
+if $? != 0
+  log.error "Upgrading database schema failed: #{output}"
+  log.error "Aborting the upgrade."
+  exit 1
+end
+log.info "Done!"
+
+FileUtils.rm '/opt/abiquo/config/.needsupgrade'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 91
   prerelease: false
   segments: 
   - 0
   - 4
-  - 33
-  version: 0.4.33
+  - 42
+  version: 0.4.42
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +01:00
+date: 2011-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,12 +78,28 @@ dependencies:
         version: "1.2"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: iniparse
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
+        version: 1.1.4
+  type: :runtime
+  version_requirements: *id005
 description: Tools to troubleshoot and manage your Abiquo installation
 email: srubio@abiquo.com
 executables: 
-- abiquo-check-16-install
 - abicli
 - abiquo-initenv
+- abiquo-check-16-install
 extensions: []
 
 extra_rdoc_files: 
@@ -92,7 +108,6 @@ extra_rdoc_files:
 - TODO
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -105,8 +120,14 @@ files:
 - bin/abiquo-initenv
 - lib/abicli/commands/instant-deploy.rb
 - lib/abicli/commands/remote-services-settings.rb
+- lib/abicli/commands/remote-services-settings16.ext
+- lib/abicli/commands/remote-services-settings17.ext
 - lib/abicli/commands/server-settings.rb
+- lib/abicli/commands/server-settings168.ext
+- lib/abicli/commands/server-settings17.ext
 - lib/abicli/commands/set.rb
+- lib/abicli/commands/set168.ext
+- lib/abicli/commands/set17.ext
 - lib/abicli/commands/smoketest.rb
 - lib/abicli/commands/upload-template.rb
 - lib/abicli/commands/version.rb
@@ -123,6 +144,7 @@ files:
 - lib/checks/nfs.rb
 - lib/checks/os_version.rb
 - lib/checks/virtualbox.rb
+- lib/upgrades/17-nuclear-launch
 - scripts/setup_rs
 - scripts/setup_v2v
 - vendor/activesupport-2.3.8/CHANGELOG
@@ -624,8 +646,8 @@ homepage: http://github.com/abiquo/abiquo-etk
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC