oneacct-export 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8ec2b00918ec5fec106d4cae21103fd5d373f1
-  data.tar.gz: bd243d18fb461e681d6e96c36cc0597f13e11c5b
+  metadata.gz: 841473513aa37713ab102ac8b54d85d05fd52b75
+  data.tar.gz: c3195af5db1345b1471fb28e90909e01200525fb
 SHA512:
-  metadata.gz: a075db4e55f76c87d951c7c3e8325f41213eb8d05e8fccbdb26d0f2ab6bc3b7eaf821f874cf0a2e3e3e851ad7e1a6df91de8ef1496ecff0851da749a4cc0d444
-  data.tar.gz: 37f5e20dfe9e431fa9d8ba6c08805ec805bd5f8dc3f8f1c462022e24058dedd135d2b29bb5ac23939e49b4077b12b109e4b0de9b9d7b3485fdcd24ced640dde2
+  metadata.gz: d09c93b909f2c534a62c3c58d8cc5d70a4d82d9ceba4725b8a983d5d584bf15a3680fcdf63631c615c25e68145ae3c6da66eab46e890b3776857f291e883cda4
+  data.tar.gz: 92039510265e1bd5decbd534e79e67c324ce069faedad79e9d6fbd2e466f1107aa01d63df970f2bc9fa3954a146d14e72b8fabdedd9a001af693f4af6ccd1640

data/lib/one_worker.rb

@@ -172,7 +172,7 @@ class OneWorker
     rstime = 0
     vm.each 'HISTORY_RECORDS/HISTORY' do |h|
       next unless h['RSTIME'] && h['RETIME'] && h['RSTIME'] != '0'
-      if h['RETIME'] == '0'
+      if h['RETIME'] == '0' && STATES[vm['STATE'].to_i] != 'completed'
         rstime += Time.now.to_i - h['RSTIME'].to_i
         next
       end
@@ -213,8 +213,8 @@ class OneWorker
   # Sidekiq specific method, specifies the purpose of the worker
   #
   # @param [String] vms IDs of virtual machines to process in form of numbers separated by '|' (easier for cooperation with redis)
-  # @param [String] output output directory
-  def perform(vms, output)
+  # @param [String] file_number number of the output file
+  def perform(vms, file_number)
     OneacctExporter::Log.setup_log_level(logger)
 
     vms = vms.split('|')
@@ -237,16 +237,16 @@ class OneWorker
       data << vm_data
     end
 
-    write_data(data, output)
+    write_data(data, file_number)
   end
 
   # Write processed data into output directory
-  def write_data(data, output)
+  def write_data(data, file_number)
     logger.debug('Creating writer...')
-    ow = OneWriter.new(data, output, logger)
+    ow = OneWriter.new(data, file_number, logger)
     ow.write
   rescue => e
-    msg = "Cannot write result to #{output}: #{e.message}"
+    msg = "Cannot write result: #{e.message}"
     logger.error(msg)
     raise msg
   end

data/lib/one_writer.rb

@@ -7,21 +7,26 @@ require 'logger'
 # Class responsible for writing data into files in specific format
 #
 # @attr_reader [Hash] data vm data
-# @attr_reader [String] output path to the output directory
+# @attr_reader [String] output path to the output file
 # @attr_reader [any logger] logger
 class OneWriter
+  APEL_FILENAME_FORMAT = '%014d'
 
   attr_reader :data, :output, :log
 
-  def initialize(data, output, log = Logger.new(STDOUT))
-    fail ArgumentError, 'Data and output cannot be nil' if data.nil? || output.nil?
+  def initialize(data, file_number, log = Logger.new(STDOUT))
+    fail ArgumentError, 'Data and file number cannot be nil' if data.nil? || file_number.nil?
 
-    @template = OneWriter.template_filename(Settings.output['output_type']) if Settings['output']
+    output_type = Settings.output['output_type']
+    @template = OneWriter.template_filename(output_type) if Settings['output']
     fail ArgumentError, "No such file: #{@template}." unless File.exist?(@template)
 
     @data = data
-    @output = output
     @log = log
+
+    filename = file_number.to_s
+    filename = APEL_FILENAME_FORMAT % file_number if output_type == 'apel-0.2'
+    @output = "#{Settings.output['output_dir']}/#{filename}"
   end
 
   # Write data to file in output directory

data/lib/oneacct_exporter.rb

@@ -13,7 +13,6 @@ require 'sidekiq/api'
 # @attr_reader [Integer] timeout timeout for blocking mode
 # @attr_reader [TrueClass, FalseClass] compatibility says whether to run export in compatibility mode or not 
 class OneacctExporter
-  CONVERT_FORMAT = '%014d'
 
   attr_reader :log, :range, :groups, :blocking, :timeout, :compatibility
 
@@ -39,11 +38,10 @@ class OneacctExporter
     vms = []
     #load records of virtual machines in batches
     while vms = oda.vms(batch_number, @range, @groups)
-      output_file = CONVERT_FORMAT % new_file_number
       @log.info("Starting worker with batch number: #{batch_number}.")
       unless vms.empty?
         #add a new job for every batch to the Sidekiq's queue
-        OneWorker.perform_async(vms.join('|'), "#{Settings.output['output_dir']}/#{output_file}")
+        OneWorker.perform_async(vms.join('|'), new_file_number)
         new_file_number += 1
       end
       batch_number += 1

data/lib/oneacct_exporter/version.rb

@@ -1,3 +1,3 @@
 class OneacctExporter
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

data/mock/one_worker_RETIME_0_RUNNING.xml

@@ -0,0 +1,115 @@
+<VM>
+  <ID>36551</ID>
+  <UID>120</UID>
+  <GID>0</GID>
+  <UNAME>uname</UNAME>
+  <GNAME>gname</GNAME>
+  <NAME>one-36551</NAME>
+  <PERMISSIONS>
+    <OWNER_U>1</OWNER_U>
+    <OWNER_M>1</OWNER_M>
+    <OWNER_A>0</OWNER_A>
+    <GROUP_U>0</GROUP_U>
+    <GROUP_M>0</GROUP_M>
+    <GROUP_A>0</GROUP_A>
+    <OTHER_U>0</OTHER_U>
+    <OTHER_M>0</OTHER_M>
+    <OTHER_A>0</OTHER_A>
+  </PERMISSIONS>
+  <LAST_POLL>1383741679</LAST_POLL>
+  <STATE>4</STATE>
+  <LCM_STATE>0</LCM_STATE>
+  <RESCHED>0</RESCHED>
+  <STIME>1383741160</STIME>
+  <ETIME>1383742270</ETIME>
+  <DEPLOY_ID>one-36551</DEPLOY_ID>
+  <MEMORY>1736960</MEMORY>
+  <CPU>0</CPU>
+  <NET_TX>0</NET_TX>
+  <NET_RX>0</NET_RX>
+  <TEMPLATE>
+    <CONTEXT>
+      <DISK_ID><![CDATA[1]]></DISK_ID>
+      <FILES><![CDATA[https://somewhere.com/init.sh]]></FILES>
+      <HOSTNAME><![CDATA[DebianVM]]></HOSTNAME>
+      <PUBLIC_IP><![CDATA[123.123.5.5]]></PUBLIC_IP>
+      <SSH_KEY><![CDATA[ssh-rsa AAAAB3NzaC1yc2EAAAADAQABasdgsdfhfgjhxhcHPNFthrHT5/+9lfrQCorJy5YjMJEGBC22dfgjghkDjSDFgjdhgKd54645dfJKd39LdlyzlEaCnjGUeD4C6tZdAISLSDfghSDFgSJ54sSFGJ5RTHARJIRJcX8QRVH46Zq02AeTgrty567ss34tqaa8Pt user@machine1.somewhere.com]]></SSH_KEY>
+      <TARGET><![CDATA[xvdb]]></TARGET>
+    </CONTEXT>
+    <CPU><![CDATA[0.5]]></CPU>
+    <DISK>
+      <BUS><![CDATA[ide]]></BUS>
+      <CLONE><![CDATA[YES]]></CLONE>
+      <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
+      <DATASTORE><![CDATA[default]]></DATASTORE>
+      <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
+      <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
+      <DISK_ID><![CDATA[0]]></DISK_ID>
+      <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
+      <IMAGE><![CDATA[debian6]]></IMAGE>
+      <IMAGE_ID><![CDATA[31]]></IMAGE_ID>
+      <READONLY><![CDATA[NO]]></READONLY>
+      <SAVE><![CDATA[NO]]></SAVE>
+      <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/bc8db254875412f417ac745b7d47820]]></SOURCE>
+      <TARGET><![CDATA[xvda]]></TARGET>
+      <TM_MAD><![CDATA[ssh]]></TM_MAD>
+      <TYPE><![CDATA[FILE]]></TYPE>
+    </DISK>
+    <ERROR>
+      <MESSAGE><![CDATA[Error executing image transfer script: Path https://somewhere.com/init.sh is not allowed!]]></MESSAGE>
+      <TIMESTAMP><![CDATA[Wed Nov  6 13:34:19 2013]]></TIMESTAMP>
+    </ERROR>
+    <FEATURES>
+      <ACPI><![CDATA[no]]></ACPI>
+    </FEATURES>
+    <MEMORY>1736960</MEMORY>
+    <NAME><![CDATA[one-36551]]></NAME>
+    <NIC>
+      <BRIDGE><![CDATA[xenbr0]]></BRIDGE>
+      <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
+      <IP><![CDATA[123.123.5.5]]></IP>
+      <MAC><![CDATA[01:23:45:67:89:ab]]></MAC>
+      <NETWORK><![CDATA[public]]></NETWORK>
+      <NETWORK_ID><![CDATA[4]]></NETWORK_ID>
+      <VLAN><![CDATA[NO]]></VLAN>
+      <WHITE_PORTS_TCP><![CDATA[22]]></WHITE_PORTS_TCP>
+      <WHITE_PORTS_UDP><![CDATA[67,68]]></WHITE_PORTS_UDP>
+    </NIC>
+    <OS>
+      <BOOTLOADER><![CDATA[pygrub]]></BOOTLOADER>
+    </OS>
+    <RAW>
+      <TYPE><![CDATA[xen]]></TYPE>
+    </RAW>
+    <TEMPLATE_ID><![CDATA[66]]></TEMPLATE_ID>
+    <VCPU><![CDATA[1]]></VCPU>
+    <VMID><![CDATA[36551]]></VMID>
+  </TEMPLATE>
+  <USER_TEMPLATE>
+    <SCHED_REQUIREMENTS><![CDATA[CLUSTER_ID = 100]]></SCHED_REQUIREMENTS>
+  </USER_TEMPLATE>
+  <HISTORY_RECORDS>
+    <HISTORY>
+      <OID>36551</OID>
+      <SEQ>1</SEQ>
+      <HOSTNAME>supermachine1.somewhere.com</HOSTNAME>
+      <HID>11</HID>
+      <CID>100</CID>
+      <STIME>1383741589</STIME>
+      <ETIME>1383742270</ETIME>
+      <VMMMAD>vmm_xen</VMMMAD>
+      <VNMMAD>fw</VNMMAD>
+      <TMMAD>ssh</TMMAD>
+      <DS_LOCATION>/opt/opennebula/var/datastores</DS_LOCATION>
+      <DS_ID>0</DS_ID>
+      <PSTIME>1383741589</PSTIME>
+      <PETIME>1383741674</PETIME>
+      <RSTIME>1383741674</RSTIME>
+      <RETIME>0</RETIME>
+      <ESTIME>1383742270</ESTIME>
+      <EETIME>1383742270</EETIME>
+      <REASON>0</REASON>
+      <ACTION>0</ACTION>
+    </HISTORY>
+  </HISTORY_RECORDS>
+</VM>

data/spec/one_worker_spec.rb

@@ -680,18 +680,26 @@ describe OneWorker do
       end
     end
 
-    context 'vm with RETIME that is 0' do
+    context 'vm with RETIME that is 0 and still running' do
       before :example do
-        allow(Time).to receive(:now) { 1383741716 }
+        allow(Time).to receive(:now) { Time.at(1383741716) }
       end
 
-      let(:filename) { 'one_worker_RETIME_0.xml' }
+      let(:filename) { 'one_worker_RETIME_0_RUNNING.xml' }
 
       it 'returns difference between current time and start of the virtual machine' do
         expect(subject.sum_rstime(vm)).to eq(42)
       end
     end
 
+    context 'vm with RETIME that is 0 and is stopped' do
+      let(:filename) { 'one_worker_RETIME_0_STOPPED.xml' }
+
+      it 'returns nil' do
+        expect(subject.sum_rstime(vm)).to be_nil
+      end
+    end
+
     context 'vm with RSTIME bigger than RETIME' do
       let(:filename) { 'one_worker_RSTIME_>_RETIME.xml' }
 

data/spec/one_writer_spec.rb

@@ -4,12 +4,13 @@ describe OneWriter do
   subject { one_writer }
   before :example do
     Settings.output['output_type'] = 'one_writer_test_output_type'
+    Settings.output['output_dir'] = 'one_writer_test_output_dir'
   end
 
   let(:data) { { 'aaa' => 111, 'bbb' => 222 } }
   let(:testfile) { "#{GEM_DIR}/mock/one_writer_testfile" }
   let(:dev_null) { '/dev/null' }
-  let(:output) { "#{GEM_DIR}/mock/one_writer_output" }
+  let(:file_number) { 42 }
 
   describe '#new' do
     context 'with correct arguments' do
@@ -18,7 +19,7 @@ describe OneWriter do
       end
 
       let(:one_writer) do
-        OneWriter.new(data, output, dev_null)
+        OneWriter.new(data, file_number, dev_null)
       end
 
       it 'takes three parameters and returns OneWriter object' do
@@ -27,11 +28,26 @@ describe OneWriter do
 
       it 'correctly assigns three parameters' do
         expect(subject.data).to eq(data)
-        expect(subject.output).to eq(output)
+        expect(subject.output).to eq("#{Settings.output['output_dir']}/#{file_number}")
         expect(subject.log).to eq(dev_null)
       end
     end
 
+    context 'with apel output format' do
+      before :example do
+        Settings.output['output_type'] = 'apel-0.2'
+        allow(OneWriter).to receive(:template_filename) { testfile }
+      end
+
+      let(:one_writer) do
+        OneWriter.new(data, file_number, dev_null)
+      end
+
+      it 'uses apel specific filename format' do
+        expect(subject.output).to eq("#{Settings.output['output_dir']}/000000000000#{file_number}")
+      end
+    end
+
     context 'with incorrect arguments' do
       before :example do
         allow(OneWriter).to receive(:template_filename) { testfile }
@@ -128,7 +144,7 @@ describe OneWriter do
     end
 
     let(:one_writer) do
-      OneWriter.new(data, output, Logger.new(dev_null))
+      OneWriter.new(data, file_number, Logger.new(dev_null))
     end
     let(:tmp) do
       tmp = double('tmp')
@@ -138,7 +154,7 @@ describe OneWriter do
 
     it 'writes result version of a template into output file' do
       expect(subject).to receive(:write_to_tmp).with(tmp, data)
-      expect(subject).to receive(:copy_to_output).with("#{GEM_DIR}/mock/one_writer_tmp", output)
+      expect(subject).to receive(:copy_to_output).with("#{GEM_DIR}/mock/one_writer_tmp", "#{Settings.output['output_dir']}/#{file_number}")
       expect(tmp).to receive(:close)
       subject.write
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneacct-export
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,7 +198,8 @@ files:
 - mock/one_worker_NET_TX_0.xml
 - mock/one_worker_NET_TX_missing.xml
 - mock/one_worker_NET_TX_nan.xml
-- mock/one_worker_RETIME_0.xml
+- mock/one_worker_RETIME_0_RUNNING.xml
+- mock/one_worker_RETIME_0_STOPPED.xml
 - mock/one_worker_RETIME_missing.xml
 - mock/one_worker_RSTIME_0.xml
 - mock/one_worker_RSTIME_>_RETIME.xml