abiquo-etk 0.6.3 → 0.6.4

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = %Q{Tools to troubleshoot and manage your Abiquo installation}
     gem.email = "srubio@abiquo.com"
     gem.homepage = "http://github.com/abiquo/abiquo-etk"
-    gem.authors = ["Sergio Rubio","Abel Boldú"]
+    gem.authors = ["Sergio Rubio","Abel Boldu"]
     gem.version = File.read 'VERSION'
     gem.add_dependency(%q<nokogiri>, [">= 1.3"])
     gem.add_dependency(%q<rpm-utils>, [">= 0.1"])

data/VERSION

@@ -1,2 +1,2 @@
-0.6.3
+0.6.4
 

data/lib/abicli/commands/set.rb

@@ -16,6 +16,8 @@ if ARGV[0] == 'set'
     load File.dirname(__FILE__) + "/set20.ext"
   elsif rel_info =~ /Version: 2\.2(.*)/
     load File.dirname(__FILE__) + "/set22.ext"
+  elsif rel_info =~ /Version: 2\.3(.*)/
+    load File.dirname(__FILE__) + "/set23.ext"
   elsif rel_info =~ /Version: 2\.4(.*)/
     load File.dirname(__FILE__) + "/set24.ext"
   else

data/lib/abicli/commands/set23.ext

@@ -0,0 +1,215 @@
+#!/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 
+    nfs_url = val
+    if nfs_url !~ /^nfs:\/\//
+      nfs_url = "nfs://#{val}"
+    end
+    uri = URI.parse(nfs_url)
+    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.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def set_cifs_repository(val)
+  begin 
+    cifs_url = val
+    if cifs_url !~ /^cifs:/
+      cifs_url = "cifs:#{val}"
+    end
+    uri = URI.parse(cifs_url)
+    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')
+  cifs_uri = "//#{host}#{path}"
+  config['remote-services']['abiquo.virtualfactory.hyperv.repositoryLocation'] = cifs_uri
+  config.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def set_aim_redis_host(val)
+  if not File.exist? '/etc/abiquo-aim.ini'
+    raise Exception.new('Abiquo AIM config file not available')
+  end
+  config = IniParse.parse(File.read('/etc/abiquo-aim.ini'))
+  config.save('/etc/abiquo-aim.ini.bak')
+  if config['monitor'].nil?
+    raise Exception.new('Invalid Abiquo AIM config file')
+  end
+  config['monitor']['redisHost'] = val
+  config.save('/etc/abiquo-aim.ini')
+end
+
+def set_ontap_user(val)
+  config = IniParse.parse(File.read('/opt/abiquo/config/abiquo.properties'))
+  config['remote-services']['abiquo.storagemanager.netapp.user'] = val
+  config.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def set_ontap_password(val)
+  config = IniParse.parse(File.read('/opt/abiquo/config/abiquo.properties'))
+  config['remote-services']['abiquo.storagemanager.netapp.password'] = val
+  config.save('/opt/abiquo/config/abiquo.properties')
+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|
+      set_cifs_repository val
+  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) },
+  'aim-redis-host' => Proc.new { |val| set_aim_redis_host(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)
+    else
+      comp, path = $command_mappings[comp]
+    end
+  else
+    help
+  end
+rescue NoMethodError => e
+  $stderr.puts e.message
+  $stderr.puts e.backtrace
+  $stderr.puts "\nproperty not found in component #{comp.bold}\n\n"
+rescue Exception => e
+    $stderr.puts e.message
+end

data/lib/abicli/commands/set24.ext

@@ -0,0 +1,215 @@
+#!/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 
+    nfs_url = val
+    if nfs_url !~ /^nfs:\/\//
+      nfs_url = "nfs://#{val}"
+    end
+    uri = URI.parse(nfs_url)
+    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.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def set_cifs_repository(val)
+  begin 
+    cifs_url = val
+    if cifs_url !~ /^cifs:/
+      cifs_url = "cifs:#{val}"
+    end
+    uri = URI.parse(cifs_url)
+    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')
+  cifs_uri = "//#{host}#{path}"
+  config['remote-services']['abiquo.virtualfactory.hyperv.repositoryLocation'] = cifs_uri
+  config.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def set_aim_redis_host(val)
+  if not File.exist? '/etc/abiquo-aim.ini'
+    raise Exception.new('Abiquo AIM config file not available')
+  end
+  config = IniParse.parse(File.read('/etc/abiquo-aim.ini'))
+  config.save('/etc/abiquo-aim.ini.bak')
+  if config['monitor'].nil?
+    raise Exception.new('Invalid Abiquo AIM config file')
+  end
+  config['monitor']['redisHost'] = val
+  config.save('/etc/abiquo-aim.ini')
+end
+
+def set_ontap_user(val)
+  config = IniParse.parse(File.read('/opt/abiquo/config/abiquo.properties'))
+  config['remote-services']['abiquo.storagemanager.netapp.user'] = val
+  config.save('/opt/abiquo/config/abiquo.properties')
+end
+
+def set_ontap_password(val)
+  config = IniParse.parse(File.read('/opt/abiquo/config/abiquo.properties'))
+  config['remote-services']['abiquo.storagemanager.netapp.password'] = val
+  config.save('/opt/abiquo/config/abiquo.properties')
+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|
+      set_cifs_repository val
+  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) },
+  'aim-redis-host' => Proc.new { |val| set_aim_redis_host(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)
+    else
+      comp, path = $command_mappings[comp]
+    end
+  else
+    help
+  end
+rescue NoMethodError => e
+  $stderr.puts e.message
+  $stderr.puts e.backtrace
+  $stderr.puts "\nproperty not found in component #{comp.bold}\n\n"
+rescue Exception => e
+    $stderr.puts e.message
+end

data/lib/abicli/commands/upload-template.rb

@@ -263,13 +263,27 @@ if ARGV[0] == 'upload-template'
   fo = File.new(file)
   fsize = File.size(file)
   count = 0
-json = """{'ovfPackageInstanceDto':{
+# Old json format
+# json = """{'ovfPackageInstanceDto':{
+# 'idEnterprise':#{cli.config[:enterprise_id]},
+# 'ovfUrl':'http://upload/#{cli.config[:name]}/#{cli.config[:name]}.ovf',
+# 'diskFileFormat':'#{cli.config[:disk_format]}',
+# 'ramSizeUnit':'BYTE',
+# 'hdSizeUnit':'BYTE',
+# 'diskFilePath':'#{disk_name}',
+# 'name':'#{cli.config[:name]}',
+# 'description':'#{cli.config[:description]}',
+# 'categoryName':'#{cli.config[:category]}',
+# 'iconPath':'#{cli.config[:icon_url]}',
+# 'cpu':#{cli.config[:cpus]},
+# 'hd':#{cli.config[:disk_capacity]},
+# 'ram':#{cli.config[:memory]}
+# }}"""
+json = """{
 'idEnterprise':#{cli.config[:enterprise_id]},
 'ovfUrl':'http://upload/#{cli.config[:name]}/#{cli.config[:name]}.ovf',
-'diskFileFormat':'#{cli.config[:disk_format]}',
-'ramSizeUnit':'BYTE',
-'hdSizeUnit':'BYTE',
 'diskFilePath':'#{disk_name}',
+'diskFileFormat':'#{cli.config[:disk_format]}',
 'name':'#{cli.config[:name]}',
 'description':'#{cli.config[:description]}',
 'categoryName':'#{cli.config[:category]}',
@@ -277,7 +291,7 @@ json = """{'ovfPackageInstanceDto':{
 'cpu':#{cli.config[:cpus]},
 'hd':#{cli.config[:disk_capacity]},
 'ram':#{cli.config[:memory]}
-}}"""
+}"""
   json.gsub!("'",'"')
   $stdout.sync = true
   line_reset = "\r\e[0K" 
@@ -288,7 +302,7 @@ json = """{'ovfPackageInstanceDto':{
   end
   StreamingUploader.post(
     rsurl,
-    { :aovfpackageinstance => json, :diskFile => fo }
+    { :diskInfo => json, :diskFile => fo }
   ) do |size|
     count += size
     per = (100*count)/fsize 

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Sergio Rubio
-- "Abel Bold\xC3\xBA"
+- Abel Boldu
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-10-10 00:00:00 Z
+date: 2012-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -97,10 +97,10 @@ dependencies:
 description: Tools to troubleshoot and manage your Abiquo installation
 email: srubio@abiquo.com
 executables: 
-- abiquo-check-install
 - abicli
 - abiquo-check-16-install
 - ciab-setup
+- abiquo-check-install
 extensions: []
 
 extra_rdoc_files: 
@@ -134,6 +134,8 @@ files:
 - lib/abicli/commands/set18.ext
 - lib/abicli/commands/set20.ext
 - lib/abicli/commands/set22.ext
+- lib/abicli/commands/set23.ext
+- lib/abicli/commands/set24.ext
 - lib/abicli/commands/smoketest.rb
 - lib/abicli/commands/upload-template.rb
 - lib/abicli/commands/version.rb