oneacct-export 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 841473513aa37713ab102ac8b54d85d05fd52b75
-  data.tar.gz: c3195af5db1345b1471fb28e90909e01200525fb
+  metadata.gz: e33fa6806cd2ea1a65ac02313c0a3aa3cf549095
+  data.tar.gz: 3691a9b9a6eea6c22987c3f78934c199dc7e6596
 SHA512:
-  metadata.gz: d09c93b909f2c534a62c3c58d8cc5d70a4d82d9ceba4725b8a983d5d584bf15a3680fcdf63631c615c25e68145ae3c6da66eab46e890b3776857f291e883cda4
-  data.tar.gz: 92039510265e1bd5decbd534e79e67c324ce069faedad79e9d6fbd2e466f1107aa01d63df970f2bc9fa3954a146d14e72b8fabdedd9a001af693f4af6ccd1640
+  metadata.gz: 0b049a0279a7cbdb37b002faa9c554596201aee6965a13789f0b234657421f4e32ce03add5708458540cfc37d80307a922837acf10028ecb60e311bdb98da60a
+  data.tar.gz: bf8ad5f4cce2931091cfcd5851780b2cbf6c42eb0f5d7e949135147387bb657653fec11cc7b8e0bfcb76fe5af69773aef608b18ece6ab873d438d9ae2978d685

data/.gitignore

@@ -14,3 +14,5 @@ mkmf.log
 *.gem
 *.swp
 *.lock
+/.idea/
+/vendor/

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper --color --format Fuubar

data/.travis.yml

@@ -3,32 +3,12 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1
+  - 2.2
   - ruby-head
-  - jruby-19mode
-  - jruby-head
-
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - openjdk6
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-  exclude:
-    - rvm: 2.0.0
-      jdk: openjdk7
-    - rvm: 2.0.0
-      jdk: oraclejdk7
-    - rvm: 2.1
-      jdk: openjdk7
-    - rvm: 2.1
-      jdk: oraclejdk7
-    - rvm: ruby-head
-      jdk: openjdk7
-    - rvm: ruby-head
-      jdk: oraclejdk7
   fast_finish: true
 
 branches:

data/bin/oneacct-export

@@ -6,15 +6,16 @@ require 'oneacct_exporter'
 require 'oneacct_exporter/log'
 require 'settings'
 require 'fileutils'
+require 'json'
 require 'oneacct_opts'
 
-#parse options from command line
+# parse options from command line
 options = OneacctOpts.parse(ARGV)
 
-#initialize default logger
+# initialize default logger
 log = Logger.new(STDOUT)
 
-#initialize specific logger according to the configuration
+# initialize specific logger according to the configuration
 if Settings['logging'] && Settings['logging']['log_type'] == 'file'
   begin
     log_file = File.open(Settings['logging']['log_file'], File::WRONLY | File::CREAT | File::APPEND)
@@ -38,7 +39,7 @@ groups = {}
 groups[:include] = options.include_groups if options.include_groups
 groups[:exclude] = options.exclude_groups if options.exclude_groups
 
-#read groups restriction from file if chosen
+# read groups restriction from file if chosen
 if options.groups_file
   log.debug('Reading groups from file...')
   if File.exist?(options.groups_file) && File.readable?(options.groups_file)
@@ -54,7 +55,7 @@ if options.groups_file
   end
 end
 
-#create output directory
+# create output directory
 begin
   FileUtils.mkdir_p Settings.output['output_dir']
 rescue SystemCallError => e
@@ -73,6 +74,6 @@ opts[:compatibility] = options.compatibility
 
 log.debug(opts)
 
-#run the export
+# run the export
 oneacct_exporter = OneacctExporter.new(opts, log)
 oneacct_exporter.export

data/config/conf.yml

@@ -1,12 +1,21 @@
 ---
 defaults: &defaults
-  site_name: Undefined # Usually a short provider name, e.g. CESNET
-  cloud_type: OpenNebula # CMF type, only OpenNebula is supported
-  endpoint: https://occi.localhost.com:11443/ # URL of your OCCI endpoint, e.g. https://fqdn.example.com:11443/
   output:
     output_dir: /var/spool/apel/outgoing/00000000 # Directory for outgoing messages
-    output_type: apel-0.2 # Format of outgoing messages. apel-0.2 is currently the only option
+    output_type: apel-0.2 # Format of outgoing messages. Choices are: apel-0.2, pbs-0.1, logstash-0.1
     num_of_vms_per_file: 500 # Maximum number of virtual machine records per one output file
+    apel: # Options for apel output format
+      site_name: Undefined # Usually a short provider name, e.g. CESNET
+      cloud_type: OpenNebula # CMF type, only OpenNebula is supported
+      endpoint: https://occi.localhost.com:11443/ # URL of your OCCI endpoint, e.g. https://fqdn.example.com:11443/
+    pbs: # Options for pbs output format
+      realm: REALM # Owner's realm, e.g. META
+      queue: cloud # Queue name
+      scratch_type: local # Data store type
+      host_identifier: on_localhost # Identifier for host OpenNebula is running on
+    logstash: # Options for logstash output format
+      host: localhost # Host OpenNebula is running on
+      port: 11443 # Port OpenNebula's RPC is listening on
   logging:
     log_type: file # Two options: file, syslog. Defaults to stdout
     log_file: /var/log/oneacct-export/oneacct-export.log # Used when type file selected
@@ -33,13 +42,22 @@ development:
 
 
 test:
-  site_name: <placeholder>
-  cloud_type: <placeholder>
-  endpoint: <placeholder>
   output:
     output_dir: <placeholder>
     output_type: <placeholder>
     num_of_vms_per_file: <placeholder>
+    apel:
+      site_name: <placeholder>
+      cloud_type: <placeholder>
+      endpoint: <placeholder>
+    pbs:
+      realm: <placeholder>
+      queue: <placeholder>
+      scratch_type: <placeholder>
+      host_identifier: <placeholder>
+    logstash:
+      host: <placeholder>
+      port: <placeholder>
   logging:
     log_type: <placeholder>
     log_file: <placeholder>

data/lib/data_validators/apel_data_validator.rb

@@ -0,0 +1,99 @@
+require 'data_validators/data_validator'
+require 'data_validators/data_compute'
+require 'data_validators/data_validator_helper'
+require 'errors'
+
+module DataValidators
+  # Data validator class for apel output type
+  class ApelDataValidator < DataValidator
+    include InputValidator
+    include Errors
+    include DataCompute
+    include DataValidatorHelper
+
+    B_IN_GB = 1_073_741_824
+    STATES = %w(started started suspended started suspended suspended completed completed suspended)
+    DEFAULT_VALUE = 'NULL'
+
+    attr_reader :log
+
+    def initialize(log = Logger.new(STDOUT))
+      @log = log
+    end
+
+    # All possible output fields and their default values:
+    #
+    # valid_data['endpoint'] - required
+    # valid_data['site_name'] - required
+    # valid_data['cloud_type'] - required
+    # valid_data['vm_uuid'] - required
+    # valid_data['start_time'] - required
+    # valid_data['end_time'] - defaults to NULL, has to be bigger than valid_data['start_time'] if number
+    # valid_data['machine_name'] - defaults to "one-#{valid_data['vm_uuid']}"
+    # valid_data['user_id'] - defaults to NULL
+    # valid_data['group_id'] - defaults to NULL
+    # valid_data['user_dn'] - defaults to NULL
+    # valid_data['group_name'] - defaults to nil
+    # valid_data['status'] - defaults to NULL
+    # valid_data['duration'] - required
+    # valid_data['suspend'] - defaults to NULL
+    # valid_data['cpu_count'] - defaults to 1
+    # valid_data['network_inbound'] - defaults to 0
+    # valid_data['network_outbound'] - defaults to 0
+    # valid_data['memory'] - defaults to 0
+    # valid_data['image_name'] - defaults to NULL
+    # valid_data['disk_size']  -defaults to NULL
+    def validate_data(data = nil)
+      unless data
+        fail Errors::ValidationError, 'Skipping a malformed record. '\
+          'No data available to validate'
+      end
+
+      valid_data = data.clone
+
+      fail_validation 'Endpoint' unless string?(data['endpoint'])
+      fail_validation 'SiteName' unless string?(data['site_name'])
+      fail_validation 'CloudType' unless string?(data['cloud_type'])
+      fail_validation 'VMUUID' unless string?(data['vm_uuid'])
+
+      fail_validation 'StartTime' unless non_zero_number?(data['start_time'])
+      start_time = data['start_time'].to_i
+      valid_data['start_time'] = Time.at(start_time)
+      fail_validation 'EndTime' unless number?(data['end_time'])
+      end_time = data['end_time'].to_i
+      valid_data['end_time'] = end_time == 0 ? 'NULL' : Time.at(end_time)
+      fail_validation 'EndTime' if end_time != 0 && valid_data['start_time'] > valid_data['end_time']
+
+      valid_data['machine_name'] = default(data['machine_name'], :string, "one-#{valid_data['vm_uuid']}")
+      valid_data['user_id'] = default(data['user_id'], :string, DEFAULT_VALUE)
+      valid_data['group_id'] = default(data['group_id'], :string, DEFAULT_VALUE)
+      valid_data['user_dn'] = default(data['user_dn'], :string, DEFAULT_VALUE)
+      valid_data['user_name'] = default(data['user_name'], :string, DEFAULT_VALUE)
+      valid_data['group_name'] = default(data['group_name'], :string, nil)
+
+      status = default(data['status_code'], :number, nil)
+      if status
+        status = status.to_i
+        fail_validation 'Status' unless status.to_s == data['status_code'] && status < STATES.size && status >= 0
+      end
+      valid_data['status'] = status ? STATES[status] : 'NULL'
+
+      fail_validation 'HISTORY_RECORDS' if (!data['history']) || data['history'].empty?
+
+      duration = sum_rstime(data['history'], valid_data['status'] == 'completed', valid_data['vm_uuid'])
+      valid_data['duration'] = Time.at(duration)
+      valid_data['suspend'] = end_time == 0 ? 'NULL' : (end_time - start_time) - duration
+      valid_data['cpu_count'] = default(data['cpu_count'], :nzn, '1')
+
+      valid_data['network_inbound'] = (default(data['network_inbound'], :number, 0).to_i / B_IN_GB).round
+      valid_data['network_outbound'] = (default(data['network_outbound'], :number, 0).to_i / B_IN_GB).round
+
+      valid_data['memory'] = default(data['memory'], :number, '0')
+      valid_data['image_name'] = default(data['image_name'], :string, DEFAULT_VALUE)
+      disk_size_sum = sum_disk_size(data['disks'], valid_data['vm_uuid'])
+      valid_data['disk_size'] = disk_size_sum ? disk_size_sum : 'NULL'
+
+      valid_data
+    end
+  end
+end

data/lib/data_validators/data_compute.rb

@@ -0,0 +1,57 @@
+# This module expects module DataValidatorHelper to be included with him
+module DataValidators
+  module DataCompute
+    # Sums RSTIME (time when virtual machine was actually running)
+    #
+    # @param [Array] history records
+    # @param [Boolean] completed whether vm was completed or not
+    # @param [Fixnum] vm_id vm's id
+    #
+    # @return [Integer] sum of time when virtual machine was actually running
+    def sum_rstime(history_records, completed, vm_id)
+      return nil unless history_records
+
+      rstime = 0
+
+      history_records.each do |record|
+        next unless default(record['rstart_time'], :nzn, nil) && default(record['rend_time'], :number, nil)
+        rstart_time = record['rstart_time'].to_i
+        rend_time = record['rend_time'].to_i
+
+        if (rend_time > 0 && rstart_time > rend_time) || (rend_time == 0 && completed)
+          fail Errors::ValidationError, 'Skipping a malformed record. '\
+            "History records' times are invalid for vm with id #{vm_id}."
+        end
+
+        rend_time = rend_time == 0 ? Time.now.to_i : rend_time
+
+        rstime += rend_time - rstart_time
+      end
+
+      rstime
+    end
+
+    # Sums disk size of all disks within the virtual machine
+    #
+    # @param [Array] disk records
+    #
+    # @return [Integer] sum of disk sizes in GB rounded up
+    def sum_disk_size(disks, vm_id)
+      return nil unless disks
+
+      disk_size = 0
+
+      disks.each do |disk|
+        size = default(disk['size'], :number, nil)
+        unless size
+          log.warn("Disk size invalid for vm with id #{vm_id}")
+          return nil
+        end
+
+        disk_size += size.to_i
+      end
+
+      disk_size
+    end
+  end
+end

data/lib/data_validators/data_validator.rb

@@ -0,0 +1,12 @@
+module DataValidators
+  # Interface class for data validator implementations
+  class DataValidator
+    # Validates data for specific output formate and sets default values if necessary.
+    #
+    # @param data [Hash] data to be validated
+    # @return [Hash] data with default values set if necessary
+    def validate_data(data = nil)
+      fail Errors::NotImplementedError, "#{__method__} is just a stub!"
+    end
+  end
+end

data/lib/data_validators/data_validator_helper.rb

@@ -0,0 +1,15 @@
+# This module expects modules Errors and InputValidator to be included with him
+module DataValidators
+  module DataValidatorHelper
+    def fail_validation(field)
+      fail Errors::ValidationError, 'Skipping a malformed record. '\
+        "Field '#{field}' is invalid."
+    end
+
+    def default(value, condition_method, default_value)
+      return string?(value) ? value : default_value if condition_method == :string
+      return number?(value) ? value : default_value if condition_method == :number
+      return non_zero_number?(value) ? value : default_value if condition_method == :nzn
+    end
+  end
+end

data/lib/data_validators/logstash_data_validator.rb

@@ -0,0 +1,82 @@
+require 'data_validators/data_validator'
+require 'data_validators/data_compute'
+require 'errors'
+
+module DataValidators
+  class LogstashDataValidator
+    include InputValidator
+    include Errors
+    include DataCompute
+    include DataValidatorHelper
+
+    attr_reader :log
+
+    def initialize(log = Logger.new(STDOUT))
+      @log = log
+    end
+
+    def validate_data(data = nil)
+      unless data
+        fail Errors::ValidationError, 'Skipping a malformed record. '\
+          'No data available to validate'
+      end
+
+      valid_data = data.clone
+
+      fail_validation 'start_time' unless non_zero_number?(data['start_time'])
+      valid_data['start_time'] = data['start_time'].to_i
+      fail_validation 'end_time' unless number?(data['end_time'])
+      valid_data['end_time'] = data['end_time'].to_i
+      fail_validation 'end_time' if valid_data['end_time'] != 0 && valid_data['start_time'] > valid_data['end_time']
+
+      fail_validation 'user_id' unless number?(data['user_id'])
+      valid_data['user_id'] = data['user_id'].to_i
+      fail_validation 'group_id' unless number?(data['group_id'])
+      valid_data['group_id'] = data['group_id'].to_i
+
+      fail_validation 'status_code' unless number?(data['status_code'])
+      valid_data['status_code'] = data['status_code'].to_i
+
+      fail_validation 'cpu_count' unless number?(data['cpu_count'])
+      valid_data['cpu_count'] = data['cpu_count'].to_i
+      fail_validation 'network_inbound' unless number?(data['network_inbound'])
+      valid_data['network_inbound'] = data['network_inbound'].to_i
+      fail_validation 'network_outbound' unless number?(data['network_outbound'])
+      valid_data['network_outbound'] = data['network_outbound'].to_i
+      fail_validation 'memory' unless number?(data['memory'])
+      valid_data['memory'] = data['memory'].to_i
+
+      fail_validation 'history' unless data['history']
+      history = []
+      data['history'].each do |h|
+        history_record = h.clone
+        fail_validation 'history record start_time' unless non_zero_number?(h['start_time'])
+        history_record['start_time'] = h['start_time'].to_i
+        fail_validation 'history record end_time' unless number?(h['end_time'])
+        history_record['end_time'] = h['end_time'].to_i
+        fail_validation 'history record rstart_time' unless non_zero_number?(h['rstart_time'])
+        history_record['rstart_time'] = h['rstart_time'].to_i
+        fail_validation 'history record rend_time' unless number?(h['rend_time'])
+        history_record['rend_time'] = h['rend_time'].to_i
+        fail_validation 'history record seq' unless number?(h['seq'])
+        history_record['seq'] = h['seq'].to_i
+
+        history << history_record
+      end
+      valid_data['history'] = history
+
+      fail_validation 'disks' unless data['disks']
+      disks = []
+      data['disks'].each do |d|
+        disk = d.clone
+        disk['size'] = d['size']
+        disk['size'] = d['size'].to_i if number?(d['size'])
+
+        disks << disk
+      end
+      valid_data['disks'] = disks
+
+      valid_data
+    end
+  end
+end

data/lib/data_validators/pbs_data_validator.rb

@@ -0,0 +1,86 @@
+require 'data_validators/data_validator'
+require 'data_validators/data_compute'
+require 'errors'
+
+module DataValidators
+  # Data validator class for pbs output type
+  class PbsDataValidator < DataValidator
+    include InputValidator
+    include Errors
+    include DataCompute
+    include DataValidatorHelper
+
+    COMPLETED = '6'
+
+    attr_reader :log
+
+    def initialize(log = Logger.new(STDOUT))
+      @log = log
+    end
+
+    # All possible output fields and their default values:
+    #
+    # valid_data['host'] - required
+    # valid_data['pbs_queue'] - required
+    # valid_data['realm'] - required
+    # valid_data['scratch_type'] - optional, defaults to nil
+    # valid_data['vm_uuid'] - required
+    # valid_data['machine_name'] - required, defaults to "one-#{valid_data['vm_uuid']}"
+    # valid_data['user_name'] - required
+    # valid_data['group_name'] - required
+    # valid_data['duration'] - required, defaults to 00:00:00
+    # valid_data['cpu_count'] - required
+    # valid_data['memory'] - required
+    # valid_data['disk_size']  - optional, defaults to nil
+    # valid_data['history'] - set of history records
+    # history_record['start_time'] - required
+    # history_record['end_time'] - required
+    # history_record['state'] - required, either all history records 'U' or last history record with 'E' if vm finished
+    # history_record['seq'] - required
+    # history_record['hostname'] - required
+    def validate_data(data = nil)
+      unless data
+        fail Errors::ValidationError, 'Skipping a malformed record. '\
+          'No data available to validate'
+      end
+
+      valid_data = data.clone
+
+      fail_validation 'host' unless string?(data['host'])
+      fail_validation 'queue' unless string?(data['pbs_queue'])
+      fail_validation 'owner' unless string?(data['realm'])
+      fail_validation 'VMUUID' unless string?(data['vm_uuid'])
+      fail_validation 'owner' unless string?(data['user_name'])
+      fail_validation 'group' unless string?(data['group_name'])
+      fail_validation 'ppn' unless number?(data['cpu_count'])
+      fail_validation 'mem' unless number?(data['memory'])
+      fail_validation 'HISTORY_RECORDS' if (!data['history']) || data['history'].empty?
+
+      history = []
+      data['history'].each do |h|
+        history_record = h.clone
+        fail_validation 'start' unless non_zero_number?(h['start_time'])
+        history_record['start_time'] = Time.at(h['start_time'].to_i)
+        fail_validation 'end' unless number?(h['end_time'])
+        history_record['end_time'] = Time.at(h['end_time'].to_i)
+        fail_validation 'seq' unless number?(h['seq'])
+        fail_validation 'hostname' unless string?(h['hostname'])
+
+        history_record['state'] = 'U'
+        history << history_record
+      end
+
+      history.last['state'] = 'E' if data['status_code'] == COMPLETED
+      valid_data['history'] = history
+
+      valid_data['machine_name'] = default(data['machine_name'], :string, "one-#{valid_data['vm_uuid']}")
+
+      duration = sum_rstime(data['history'], data['status_code'] == COMPLETED, valid_data['vm_uuid'])
+      valid_data['duration'] = Time.at(duration)
+
+      valid_data['disk_size'] = sum_disk_size(data['disks'], valid_data['vm_uuid'])
+
+      valid_data
+    end
+  end
+end

data/lib/errors/not_implemented_error.rb

@@ -0,0 +1,3 @@
+module Errors
+  class NotImplementedError < ::NotImplementedError; end
+end

data/lib/errors/validation_error.rb

@@ -0,0 +1,3 @@
+module Errors
+  class ValidationError < ::StandardError; end
+end

data/lib/errors.rb

@@ -3,5 +3,7 @@ require 'errors/resource_not_found_error'
 require 'errors/resource_retrieval_error'
 require 'errors/resource_state_error'
 require 'errors/user_not_authorized_error'
+require 'errors/validation_error'
+require 'errors/not_implemented_error'
 
 module Errors; end

data/lib/input_validator.rb

@@ -4,16 +4,26 @@ require 'uri'
 module InputValidator
   URI_RE = /\A#{URI.regexp}\z/
   NUMBER_RE = /\A[[:digit:]]+\z/
+  STRING_RE = /\A[[:print:]]+\z/
+  NON_ZERO_NUMBER_RE = /\A[1-9][[:digit:]]*\z/
 
   def is?(object, regexp)
     object.to_s =~ regexp
   end
 
-  def is_number?(object)
+  def number?(object)
     is?(object, NUMBER_RE)
   end
 
-  def is_uri?(object)
+  def uri?(object)
     is?(object, URI_RE)
   end
+
+  def string?(object)
+    is?(object, STRING_RE)
+  end
+
+  def non_zero_number?(object)
+    is?(object, NON_ZERO_NUMBER_RE)
+  end
 end

data/lib/one_data_accessor.rb

@@ -9,7 +9,8 @@ require 'input_validator'
 # @attr_reader [any logger] logger
 # @attr_reader [Integer] batch_size number of vm records to request
 # @attr_reader [OpenNebula::Client] client client for communicaton with OpenNebula
-# @attr_reader [TrueClass, FalseClass] compatibility whether or not communicate in compatibility mode (omit some newer API functions)
+# @attr_reader [TrueClass, FalseClass] compatibility whether or not communicate in
+# compatibility mode (omit some newer API functions)
 class OneDataAccessor
   include Errors
   include InputValidator
@@ -23,7 +24,7 @@ class OneDataAccessor
     @compatibility = compatibility
 
     @batch_size = Settings.output['num_of_vms_per_file'] ? Settings.output['num_of_vms_per_file'] : 500
-    fail ArgumentError, 'Wrong number of vms per file.' unless is_number?(@batch_size)
+    fail ArgumentError, 'Wrong number of vms per file.' unless number?(@batch_size)
 
     @compatibility_vm_pool = nil
 
@@ -34,7 +35,7 @@ class OneDataAccessor
   def initialize_client
     secret = Settings['xml_rpc'] ? Settings.xml_rpc['secret'] : nil
     endpoint = Settings['xml_rpc'] ? Settings.xml_rpc['endpoint'] : nil
-    fail ArgumentError, "#{endpoint} is not a valid URL." if endpoint && !is_uri?(endpoint)
+    fail ArgumentError, "#{endpoint} is not a valid URL." if endpoint && !uri?(endpoint)
 
     @client = OpenNebula::Client.new(secret, endpoint)
   end
@@ -48,7 +49,7 @@ class OneDataAccessor
   def mapping(pool_class, xpath)
     @log.debug("Generating mapping for class: #{pool_class} and xpath: '#{xpath}'.")
     pool = pool_class.new(@client)
-    #call info_all method instead of info on pools that support it
+    # call info_all method instead of info on pools that support it
     if pool.respond_to? 'info_all'
       rc = pool.info_all
       check_retval(rc, Errors::ResourceRetrievalError)
@@ -57,7 +58,7 @@ class OneDataAccessor
       check_retval(rc, Errors::ResourceRetrievalError)
     end
 
-    #generate mapping
+    # generate mapping
     map = {}
     pool.each do |item|
       unless item['ID']
@@ -76,7 +77,7 @@ class OneDataAccessor
   #
   # @return [OpenNebula::VirtualMachine] virtual machine
   def vm(vm_id)
-    fail ArgumentError, "#{vm_id} is not a valid id." unless is_number?(vm_id)
+    fail ArgumentError, "#{vm_id} is not a valid id." unless number?(vm_id)
     @log.debug("Retrieving virtual machine with id: #{vm_id}.")
     vm = OpenNebula::VirtualMachine.new(OpenNebula::VirtualMachine.build_xml(vm_id), @client)
     rc = vm.info
@@ -93,7 +94,7 @@ class OneDataAccessor
   # @return [Array] array with virtual machines' IDs
   def vms(batch_number, range, groups)
     vms = []
-    #load specific batch
+    # load specific batch
     vm_pool = load_vm_pool(batch_number)
     return nil if vm_pool.count == 0
 
@@ -104,7 +105,7 @@ class OneDataAccessor
         next
       end
 
-      #skip unsuitable virtual machines
+      # skip unsuitable virtual machines
       next unless want?(vm, range, groups)
 
       vms << vm['ID'].to_i
@@ -145,12 +146,12 @@ class OneDataAccessor
   #
   # @param [Integer] batch_number
   def load_vm_pool(batch_number)
-    fail ArgumentError, "#{batch_number} is not a valid number" unless is_number?(batch_number)
+    fail ArgumentError, "#{batch_number} is not a valid number" unless number?(batch_number)
     @log.debug("Loading vm pool with batch number: #{batch_number}.")
     from = batch_number * @batch_size
     to = (batch_number + 1) * @batch_size - 1
 
-    #if in compatibility mode, whole virtual machine pool has to be loaded for the first time
+    # if in compatibility mode, whole virtual machine pool has to be loaded for the first time
     if @compatibility
       unless @compatibility_vm_pool
         vm_pool = OpenNebula::VirtualMachinePool.new(@client)