oneacct-export 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3c538f8440a61bb9d37b9e046b8c0d0350de5e
-  data.tar.gz: 6032e05b202d5fd0623911d4bd49389e4dc489e2
+  metadata.gz: a2a9aff4b9c721de7af9275953ae9b5954c38cca
+  data.tar.gz: 071f245ec9f4475a9c8d1be9ba4c3dad15787b86
 SHA512:
-  metadata.gz: b451ef989eaadb314cf04d9e2ad49f984d12eb3c852b6981ff9561ba2fa367e98507b5a480f642dcb60b6d1551b48d47eadcda26305fe3ee8526a652974980f6
-  data.tar.gz: 158799a83a2114d5cfb27468119cbf73540d947ac715c3cd1b650507410f03a8631297e3496032eb600edc5126361475d34d8193d5386d707a3116c469d57eef
+  metadata.gz: f2b407955c1258694a8c3dec4b8dc544869aa8fde701ce893c95de5f6df76b25fa0d55debb9313958d6d757ef47e66756a55bed5cdd7a5cf0aedaa1284e465b7
+  data.tar.gz: 80e68e3c321cfec4288709a639a28c22b1b60f939e919a716872f4b869142f255fd8fff7160596e9c771fd0340419fc05df57c118fd533fcf66f045174dbb89f

data/lib/one_worker.rb

@@ -25,7 +25,7 @@ class OneWorker
   # Prepare data that are common for every virtual machine
   def common_data
     common_data = {}
-    common_data['endpoint'] = Settings['endpoint']
+    common_data['endpoint'] = Settings['endpoint'].chomp('/')
     common_data['site_name'] = Settings['site_name']
     common_data['cloud_type'] = Settings['cloud_type']
 
@@ -125,15 +125,14 @@ class OneWorker
     suspend = (end_time - start_time) - data['duration'].to_i unless end_time == 0
     data['suspend'] = parse(suspend.to_s, NUMBER)
 
-    vcpu = vm['TEMPLATE/VCPU']
-    data['cpu_count'] = parse(vcpu, NON_ZERO, '1')
+    data['cpu_count'] = parse(vm['TEMPLATE/VCPU'], NON_ZERO, '1')
 
     net_tx = parse(vm['NET_TX'], NUMBER, 0)
     data['network_inbound'] = (net_tx.to_i / B_IN_GB).round
     net_rx = parse(vm['NET_RX'], NUMBER, 0)
     data['network_outbound'] = (net_rx.to_i / B_IN_GB).round
 
-    data['memory'] = parse(vm['MEMORY'], NUMBER, '0')
+    data['memory'] = parse(vm['TEMPLATE/MEMORY'], NUMBER, '0')
 
     data['image_name'] = parse(image_map[vm['TEMPLATE/DISK[1]/IMAGE_ID']], STRING, nil)
     data['image_name'] = parse(mixin(vm), STRING) unless data['image_name']
@@ -168,7 +167,11 @@ class OneWorker
   def sum_rstime(vm)
     rstime = 0
     vm.each 'HISTORY_RECORDS/HISTORY' do |h|
-      next unless h['RSTIME'] && h['RETIME'] && h['RETIME'] != '0' && h['RSTIME'] != '0'
+      next unless h['RSTIME'] && h['RETIME'] && h['RSTIME'] != '0'
+      if h['RETIME'] == '0'
+        rstime += Time.now.to_i - h['RSTIME'].to_i
+        next
+      end
       if h['RSTIME'].to_i > h['RETIME'].to_i
         logger.warn('Skipping malformed record. '\
                     "VM with id #{vm['ID']} has wrong CpuDuration.")

data/lib/oneacct_exporter/version.rb

@@ -1,3 +1,3 @@
 class OneacctExporter
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/oneacct_opts.rb

@@ -127,7 +127,6 @@ class OneacctOpts
         Settings['output'] && Settings.output['output_dir'] && Settings.output['output_type']
       fail ArgumentError, 'Missing some mandatory parameters. Check your configuration file.'
     end
-    Settings['endpoint'].chop! if Settings['endpoint'].end_with?('/')
 
     #make sure log file is specified while loggin to file
     if Settings['logging'] && Settings.logging['log_type'] == 'file' &&

data/lib/templates/apel-0.2.erb

@@ -13,7 +13,7 @@ FQAN: NULL
 <% end -%>
 Status: <%= vm['status']%>
 StartTime: <%= vm['start_time'].to_i%>
-EndTime: <%= vm['end_time'].to_i%>
+EndTime: <%= vm['end_time'].to_s == vm['end_time'] ? vm['end_time'] : vm['end_time'].to_i%>
 SuspendDuration: <%= vm['suspend']%>
 WallDuration: <%= vm['duration']%>
 CpuDuration: <%= vm['duration']%>

data/mock/one_worker_MEMORY_0.xml

@@ -62,7 +62,7 @@
     <FEATURES>
       <ACPI><![CDATA[no]]></ACPI>
     </FEATURES>
-    <MEMORY><![CDATA[1024]]></MEMORY>
+    <MEMORY><![CDATA[0]]></MEMORY>
     <NAME><![CDATA[one-36551]]></NAME>
     <NIC>
       <BRIDGE><![CDATA[xenbr0]]></BRIDGE>

data/mock/one_worker_MEMORY_missing.xml

@@ -61,7 +61,6 @@
     <FEATURES>
       <ACPI><![CDATA[no]]></ACPI>
     </FEATURES>
-    <MEMORY><![CDATA[1024]]></MEMORY>
     <NAME><![CDATA[one-36551]]></NAME>
     <NIC>
       <BRIDGE><![CDATA[xenbr0]]></BRIDGE>

data/mock/one_worker_MEMORY_nan.xml

@@ -62,7 +62,7 @@
     <FEATURES>
       <ACPI><![CDATA[no]]></ACPI>
     </FEATURES>
-    <MEMORY><![CDATA[1024]]></MEMORY>
+    <MEMORY><![CDATA[not_a_number]]></MEMORY>
     <NAME><![CDATA[one-36551]]></NAME>
     <NIC>
       <BRIDGE><![CDATA[xenbr0]]></BRIDGE>

data/spec/one_worker_spec.rb

@@ -358,6 +358,7 @@ describe OneWorker do
       before :example do
         data['cpu_count'] = '1'
         data['image_name'] = 'NULL'
+        data['memory'] = '0'
       end
 
       let(:filename) { 'one_worker_TEMPLATE_missing.xml' }
@@ -606,10 +607,14 @@ describe OneWorker do
     end
 
     context 'vm with RETIME that is 0' do
+      before :example do
+        allow(Time).to receive(:now) { 1383741716 }
+      end
+
       let(:filename) { 'one_worker_RETIME_0.xml' }
 
-      it 'returns 0' do
-        expect(subject.sum_rstime(vm)).to eq(0)
+      it 'returns difference between current time and start of the virtual machine' do
+        expect(subject.sum_rstime(vm)).to eq(42)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneacct-export
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler