abiquo-etk 0.4.42 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.4.42
+0.5.3

data/bin/abicli

@@ -11,6 +11,7 @@ end
 
 include AETK::OutputFormatters
 
+
 TOMCAT_SERVER_CONFIG='/opt/abiquo/tomcat/conf/Catalina/localhost/server.xml'
 TOMCAT_SERVER_BUILTIN_CONFIG='/opt/abiquo/tomcat/webapps/server/META-INF/context.xml'
 TOMCAT_API_CONFIG='/opt/abiquo/tomcat/conf/Catalina/localhost/api.xml'

data/bin/abiquo-check-16-install

@@ -1,129 +1,3 @@
 #!/usr/bin/env ruby
 
-if `whoami`.strip.chomp != 'root'
-  puts 'You need to run this as root.'
-  exit
-end
-
-begin
-  require 'lib/abiquo-etk'
-rescue LoadError
-  require 'abiquo-etk'
-end
-
-class String
-  include Term::ANSIColor
-end
-
-
-def print_server_config
-  puts "SERVER CONFIG".bold
-  puts "-------------"
-  sc = abiquo_server_config
-  puts "  Version: #{config_property(sc, 'abicloud/version')}"
-  puts "  Event Sink Address: #{config_property(sc, 'eventSinkAddress')}"
-  puts "  API Location: #{config_property sc, 'apiLocation'}"
-  puts "  Repository Space: #{config_property(sc,'repositorySpace')}"
-  puts "  Session Timeout: #{config_property(sc, 'sessionTimeout')}"
-end
-
-def print_virtualfactory_config
-  puts "VIRTUAL FACTORY".bold
-  puts "---------------"
-  sc = abiquo_virtualfactory_config
-  two_cols("  Hyper-V LocalRepo:", "#{config_property(sc, 'hypervisors/hyperv/localRepositoryPath')}")
-  two_cols("  Hyper-V DestRepo:", "#{config_property(sc, 'hypervisors/hyperv/destinationRepositoryPath')}")
-end
-
-def print_vsm_config
-  puts "VIRTUAL SYSTEM MONITOR".bold
-  puts "----------------------"
-  sc = abiquo_vsm_config
-  two_cols("  VMWARE User:", "#{config_property(sc, 'hypervisors/vmware/user')}")
-  two_cols("  VMWARE Password:", "#{config_property(sc, 'hypervisors/vmware/password')}")
-  two_cols("  Hyper-V User:", "#{config_property(sc, 'hypervisors/hyperv/user')}")
-  two_cols("  Hyper-V Password:", "#{config_property(sc, 'hypervisors/hyperv/password')}")
-  two_cols("  LibVirt User:", "#{config_property(sc, 'hypervisors/libvirtAgent/user')}")
-  two_cols("  LibVirt Password:", "#{config_property(sc, 'hypervisors/libvirtAgent/password')}")
-  two_cols("  LibVirt Port:", "#{config_property(sc, 'hypervisors/libvirtAgent/port')}")
-  two_cols("  XenServer User:", "#{config_property(sc, 'hypervisors/xenserver/user')}")
-  two_cols("  XenServer Password:", "#{config_property(sc, 'hypervisors/xenserver/password')}")
-end
-
-def print_nodecollector_config
-  puts "NODE COLLECTOR".bold
-  puts "--------------"
-  sc = abiquo_nodecollector_config
-  two_cols("  VMWARE User:", "#{config_property(sc, 'hypervisors/esxi/user')}")
-  two_cols("  VMWARE Password:", "#{config_property(sc, 'hypervisors/esxi/password')}")
-  two_cols("  Hyper-V User:", "#{config_property(sc, 'hypervisors/hyperv/user')}")
-  two_cols("  Hyper-V Password:", "#{config_property(sc, 'hypervisors/hyperv/password')}")
-  two_cols("  LibVirt User:", "#{config_property(sc, 'wsman/user')}")
-  two_cols("  LibVirt Password:", "#{config_property(sc, 'wsman/password')}")
-  two_cols("  LibVirt Port:", "#{config_property(sc, 'wsman/port')}")
-  two_cols("  XenServer User:", "#{config_property(sc, 'hypervisors/xenserver/user')}")
-  two_cols("  XenServer Password:", "#{config_property(sc, 'hypervisors/xenserver/password')}")
-end
-
-class MyCLI
-  include Mixlib::CLI
-
-  option :debug,
-    :long  => "--debug",
-    :description => "Set the log level to debug",
-    #:required => true,
-    :proc => Proc.new { |l| AETK::Log.instance.level = Logger::DEBUG }
-  
-  option :print_configs,
-    :long  => "--print-configs",
-    :description => "Print Abiquo Configs"
-
-
-  option :extra_plugins,
-    :long => '--extra-plugins DIR',
-    :description => 'Extra plugins directory',
-    :default => nil
-
-  option :version,
-    :long => '--version',
-    :short => '-v',
-    :proc => Proc.new { puts "Abiquo Elite Toolkit Version " + File.read(File.dirname(__FILE__) + '/../VERSION') },
-    :exit => 0
-    
-
-  option :help,
-    :short => "-h",
-    :long => "--help",
-    :description => "Show this message",
-    :on => :tail,
-    :boolean => true,
-    :show_options => true,
-    :exit => 0
-
-end
-
-# ARGV = [ '-c', 'foo.rb', '-l', 'debug' ]
-cli = MyCLI.new
-cli.parse_options
-
-AETK.load_plugins(cli.config[:extra_plugins])
-include AETK::OutputFormatters
-
-
-if cli.config[:print_configs] 
-  # print config info
-  #
-  puts "\n"
-  if abiquo_components_installed.include? 'server'
-    print_server_config
-  end
-  puts "\n"
-  if abiquo_components_installed.include? 'virtualfactory'
-    print_virtualfactory_config
-  end
-  puts "\n"
-  if abiquo_components_installed.include? 'nodecollector'
-    print_nodecollector_config
-  end
-end
-
+load "#{File.dirname(__FILE__)}/abiquo-check-install"

data/bin/abiquo-check-install

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'abiquo-etk'
+
+begin
+  v = AETK::System.abiquo_version
+  if v !~ /1\.7\.5/
+    raise Exception.new
+  end
+rescue Exception => e
+  $stderr.puts 'This version of abicli only supports Abiquo 1.7.5. Use abiquo-etk <= 0.4.42'
+  $stderr.puts "DEBUG: #{e.message}"
+  exit 1
+end
+
+if `whoami`.strip.chomp != 'root'
+  puts 'You need to run this as root.'
+  exit
+end
+
+begin
+  require 'lib/abiquo-etk'
+rescue LoadError
+  require 'rubygems'
+  require 'abiquo-etk'
+end
+
+class String
+  include Term::ANSIColor
+end
+
+class MyCLI
+  include Mixlib::CLI
+
+  option :debug,
+    :long  => "--debug",
+    :description => "Set the log level to debug",
+    #:required => true,
+    :proc => Proc.new { |l| AETK::Log.instance.level = Logger::DEBUG }
+  
+  option :extra_plugins,
+    :long => '--extra-plugins DIR',
+    :description => 'Extra plugins directory',
+    :default => nil
+
+  option :version,
+    :long => '--version',
+    :short => '-v',
+    :proc => Proc.new { puts "Abiquo Elite Toolkit Version " + File.read(File.dirname(__FILE__) + '/../VERSION') },
+    :exit => 0
+    
+  option :help,
+    :short => "-h",
+    :long => "--help",
+    :description => "Show this message",
+    :on => :tail,
+    :boolean => true,
+    :show_options => true,
+    :exit => 0
+
+end
+
+# ARGV = [ '-c', 'foo.rb', '-l', 'debug' ]
+cli = MyCLI.new
+cli.parse_options
+
+AETK.load_plugins(cli.config[:extra_plugins])
+include AETK::OutputFormatters

data/lib/abicli/commands/set.rb

@@ -1,8 +1,20 @@
+
 if ARGV[0] == 'set'
   if not File.exist?('/etc/abiquo-release')
     $stderr.puts "Abiquo release version not found. Unsupported installation."
     exit
   end
+
+  begin
+    v = AETK::System.abiquo_version
+    if v !~ /1\.7\.5/
+      raise Exception.new
+    end
+  rescue Exception
+    $stderr.puts 'This version of abicli only supports Abiquo 1.7.5. Use abiquo-etk <= 0.4.42'
+    exit 1
+  end
+
   rel_info = File.read('/etc/abiquo-release')
   if rel_info =~ /Version: 1\.7/
     load File.dirname(__FILE__) + "/set17.ext"

data/lib/abicli/commands/set17.ext

@@ -75,31 +75,16 @@ def set_nfs_repository(val)
   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
+  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)
-  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
+  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)
@@ -160,8 +145,7 @@ $command_mappings = {
   '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) }
+  'ontap-password' => Proc.new { |val| set_ontap_password(val) }
 }
 
 def mapping_exist?(key)

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

@@ -39,7 +39,7 @@ if ARGV[0] == 'upload-template'
               parts << StringPart.new("\r\n")
             else
               parts << StringPart.new( "--" + boundary + "\r\n" +
-                                       "Content-Disposition: form-data; name=\"" + key.to_s + "\"\r\n\r\n")
+                                       "Content-Disposition: form-data; Content-Type:application/json; name=\"" + key.to_s + "\"\r\n\r\n")
               parts << StringPart.new(value.to_s + "\r\n")
             end
           end
@@ -149,37 +149,36 @@ if ARGV[0] == 'upload-template'
   class MyCLI
     include Mixlib::CLI
 
-    option :enterprise_id,
-      :long => '--enterprise-id USER',
-      :description => 'Enterprise ID',
-      :default => 1
-
+    # Mandatory values
     option :name,
       :long => '--name NAME',
       :description => 'Template Name'
 
+    option :enterprise_id,
+      :long => '--enterprise-id USER',
+      :description => 'Enterprise ID'
+
     option :disk_file,
       :long => '--disk-file FILE',
       :description => 'Virtual disk file to upload'
-    
-    option :category,
-      :long => '--category CAT',
-      :description => 'Template Category Name',
-      :default => 'Operating Systems'
 
-    option :description,
-      :long => '--description DESC',
-      :description => 'Template description',
-      :default => 'Operating Systems'
+    option :disk_name,
+      :long => '--disk-name NAME',
+      :description => 'The name that will have the disk in the target repository (use the extension is encouraged)'
 
-    option :icon_url,
-      :long => '--icon-url URL',
-      :description => 'Template Icon URL',
-      :default => 'http://icons.abiquo.com/abiquo.png'
+    option :rs_url,
+      :long => '--rs-url URL',
+      :description => 'Remote Services URL (i.e. http://remote-services-ip)'
 
+    # Mandatory values with default values
+    option :disk_format,
+      :long => '--disk-format FORMAT',
+      :description => 'Disk Format type. Default: QCOW2_SPARSE',
+      :default => 'QCOW2_SPARSE'  
+    
     option :cpus,
       :long => '--cpus NUMBER',
-      :description => 'Number of CPUs for the template',
+      :description => 'Number of CPUs for the template. Default 1',
       :default => 1
 
     option :disk_capacity,
@@ -192,16 +191,28 @@ if ARGV[0] == 'upload-template'
       :description => 'Template memory (in bytes). Default 512M',
       :default => 524288
 
-    option :rs_url,
-      :long => '--rs-url URL',
-      :description => 'Remote Services URL (i.e. http://remote-services-ip)'
+    # Optional values
+    option :category,
+      :long => '--category CAT',
+      :description => 'Template Category Name',
+      :default => 'Operating Systems'
+
+    option :description,
+      :long => '--description DESC',
+      :description => 'Template description',
+      :default => 'Operating Systems'
 
+    option :icon_url,
+      :long => '--icon-url URL',
+      :description => 'Template Icon URL',
+      :default => 'http://icons.abiquo.com/abiquo.png'
+
+    # Help actions
     option :debug,
       :long => '--debug',
       :description => 'Print debugging output',
       :default => false
 
-    
     option :help,
       :short => "-h",
       :long => "--help",
@@ -227,21 +238,38 @@ if ARGV[0] == 'upload-template'
   rs_url = cli.config[:rs_url]
   if rs_url.nil?
     $stderr.puts "\n --rs-url is required.\n\n"
+    puts cli.opt_parser.help
     exit 1
   end
   tname = cli.config[:name]
   if tname.nil?
     $stderr.puts "\n --name is required.\n\n"
+    puts cli.opt_parser.help
+    exit 1
+  end
+  ent = cli.config[:enterprise_id]
+  if ent.nil?
+    $stderr.puts "\n --enterprise-id is required.\n\n"
+    puts cli.opt_parser.help
     exit 1
   end
+  disk_name = cli.config[:disk_name]
+  if disk_name.nil?
+      splitted_disk = file.split("/")
+      disk_name = splitted_disk[splitted_disk.size-1]
+      puts disk_name
+  end
 
   fo = File.new(file)
   fsize = File.size(file)
   count = 0
-json = """{
+json = """{'ovfPackageInstanceDto':{
 'idEnterprise':#{cli.config[:enterprise_id]},
 'ovfUrl':'http://upload/#{cli.config[:name]}/#{cli.config[:name]}.ovf',
-'diskFileFormat':'VMDK_STREAM_OPTIMIZED',
+'diskFileFormat':'#{cli.config[:disk_format]}',
+'ramSizeUnit':'BYTE',
+'hdSizeUnit':'BYTE',
+'diskFilePath':'#{disk_name}',
 'name':'#{cli.config[:name]}',
 'description':'#{cli.config[:description]}',
 'categoryName':'#{cli.config[:category]}',
@@ -249,11 +277,11 @@ json = """{
 'cpu':#{cli.config[:cpus]},
 'hd':#{cli.config[:disk_capacity]},
 'ram':#{cli.config[:memory]}
-}"""
+}}"""
   json.gsub!("'",'"')
   $stdout.sync = true
   line_reset = "\r\e[0K" 
-  rsurl = "#{cli.config[:rs_url]}/am/er/#{cli.config[:enterprise_id]}/ovf/upload"
+  rsurl = "#{cli.config[:rs_url]}/am/erepos/#{cli.config[:enterprise_id]}/ovfs"
   if cli.config[:debug]
     puts "Upload URL: #{rsurl}"
     puts "JSON sent:\n#{json}"

data/lib/abiquo-etk.rb

@@ -168,6 +168,11 @@ module AETK
   end
 
   class System
+
+    def self.abiquo_version
+      File.read('/etc/abiquo-release').match(/Version:(.*)/)[1].to_s.strip.chomp
+    end
+
     def self.detect_install_type
       found = ['bpm-async', 'am', 'server'].each do |dir|
         break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
@@ -197,12 +202,53 @@ module AETK
       return :unknown
 
     end
+
+    def self.detect_install_type2
+      itype = []
+      found = ['bpm-async', 'am', 'server'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      itype << :monolithic if found
+      
+      found = ['am', 'virtualfactory', 'bpm-async'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      itype << :rs_plus_v2v if found
+      
+      found = ['am', 'virtualfactory'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      itype << :remote_services if found
+      
+      found = ['server', 'api'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      itype << :server if found
+      
+      found = ['bpm-async'].each do |dir|
+        break if not File.directory?(ABIQUO_BASE_DIR + "/tomcat/webapps/#{dir}")
+      end
+      itype << :v2v if found
+
+      itype << :cloudnode_vbox if RPMUtils.rpm_installed?('abiquo-virtualbox')
+      itype << :cloudnode_kvm if RPMUtils.rpm_installed?('abiquo-cloud-node') and \
+        RPMUtils.rpm_installed?('kvm') and not RPMUtils.rpm_installed?('xen')
+      itype << :cloudnode_xen if RPMUtils.rpm_installed?('abiquo-cloud-node') and \
+        RPMUtils.rpm_installed?('xen')
+      
+      if itype.size > 0
+        itype
+      else
+        return [:unknown]
+      end
+    end
   end
 
 
   def self.load_plugins(extra_plugins_dir = nil)
     puts "Loading plugins...".yellow.bold
-    plugins = Dir[File.dirname(__FILE__) + '/checks/*.rb'].sort
+    version = System.abiquo_version.gsub(/-(rc\d|ga|final|beta|preview|alpha)/i,'')
+    plugins = Dir[File.dirname(__FILE__) + "/checks/#{version}/*.rb"].sort
     if extra_plugins_dir and File.directory? extra_plugins_dir
       puts "Loading extra plugins...".yellow.bold
       plugins.concat( Dir[extra_plugins_dir + '/*.rb'].sort )

data/lib/checks/1.7.5/01detect_abiquo.rb

@@ -0,0 +1,4 @@
+if not abiquo_installed? 
+  puts "WARNING: Abiquo Platform Not Found."
+end
+

data/lib/checks/1.7.5/abiquo_version.rb

@@ -0,0 +1,3 @@
+include AETK::OutputFormatters
+
+two_cols('Abiquo Version:'.bold, AETK::System.abiquo_version)

data/lib/checks/{firewall.rb → 1.7.5/firewall.rb}

@@ -4,7 +4,7 @@ def fw_rules_defined?
   not `iptables -nL | grep -iv ^chain | grep -iv ^target | grep -v ^$`.empty?
 end
 
-puts "Firewall Service:".bold.ljust(40) + (system_service_on?('iptables') ? 'Active'.red.bold : 'Disabled'.green.bold)
+puts "Firewall Service:".bold.ljust(40) + (system_service_on?('iptables') ? 'Active'.yellow.bold : 'Disabled'.green.bold)
 
-puts "Firewall Rules:".bold.ljust(40) + (fw_rules_defined? ? 'Found'.red.bold : "Not Found".green.bold)
+puts "Firewall Rules:".bold.ljust(40) + (fw_rules_defined? ? 'Found'.yellow.bold : "Not Found".green.bold)
 

data/lib/checks/1.7.5/install_type.rb

@@ -0,0 +1,4 @@
+#
+# Helpers  
+#
+puts "Abiquo Install:".bold.ljust(40) + AETK::System.detect_install_type2.join(',').upcase.bold.blue

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abiquo-etk
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 42
-  version: 0.4.42
+  - 5
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +01:00
+date: 2011-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,8 +97,8 @@ dependencies:
 description: Tools to troubleshoot and manage your Abiquo installation
 email: srubio@abiquo.com
 executables: 
+- abiquo-check-install
 - abicli
-- abiquo-initenv
 - abiquo-check-16-install
 extensions: []
 
@@ -113,11 +113,10 @@ files:
 - Rakefile
 - TODO
 - VERSION
-- abiquo-etk.gemspec
 - abiquo-etk.spec
 - bin/abicli
 - bin/abiquo-check-16-install
-- bin/abiquo-initenv
+- bin/abiquo-check-install
 - lib/abicli/commands/instant-deploy.rb
 - lib/abicli/commands/remote-services-settings.rb
 - lib/abicli/commands/remote-services-settings16.ext
@@ -132,18 +131,17 @@ files:
 - lib/abicli/commands/upload-template.rb
 - lib/abicli/commands/version.rb
 - lib/abiquo-etk.rb
-- lib/checks/01detect_abiquo.rb
-- lib/checks/abiquo_service.rb
-- lib/checks/abiquo_version.rb
-- lib/checks/components_installed.rb
-- lib/checks/firewall.rb
-- lib/checks/hv_passwords.rb
-- lib/checks/install_type.rb
-- lib/checks/java.rb
-- lib/checks/mysql.rb
-- lib/checks/nfs.rb
-- lib/checks/os_version.rb
-- lib/checks/virtualbox.rb
+- lib/checks/1.7.5/01detect_abiquo.rb
+- lib/checks/1.7.5/abiquo_service.rb
+- lib/checks/1.7.5/abiquo_version.rb
+- lib/checks/1.7.5/components_installed.rb
+- lib/checks/1.7.5/firewall.rb
+- lib/checks/1.7.5/install_type.rb
+- lib/checks/1.7.5/java.rb
+- lib/checks/1.7.5/mysql.rb
+- lib/checks/1.7.5/nfs.rb
+- lib/checks/1.7.5/os_version.rb
+- lib/checks/1.7.5/virtualbox.rb
 - lib/upgrades/17-nuclear-launch
 - scripts/setup_rs
 - scripts/setup_v2v