oneacct-export 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d05de90f6c075741a02dee7cc02b1ec10633935
-  data.tar.gz: 232870fe469a478ac67710257be3768da938806d
+  metadata.gz: 7c97727a09636b7edebe37a73fd01907ecf90dba
+  data.tar.gz: 6611ef8ab87262b8fc76117eacf42278bf422aef
 SHA512:
-  metadata.gz: 930ffdb5223cd34c6b0b26929d2be5d321602dad5555cafa73d633611caf7b5874f8f991b0298d129ec869404c14a75b3b7e7752923168755285cd9746f74986
-  data.tar.gz: 4e17fba48c83dbbf1bcb6c6ffe40b6eaaadf5da82d510767cd2724a62844c3ec6525816719ce525cc37aec78866b8db1273c925624a5d691e11c0ffdba95805d
+  metadata.gz: a2ba6173efd943e3bbd01850a089b5135f7ce94fccbb2f7ecc75b67cfda1b0d76d18a88ad29ab8c361c159943ab4cae9f16acaa064b6a4c881aaa87b3fc81e26
+  data.tar.gz: 3db730a269e531b8a48667275479e26d587cb12f98ae3a1055461304451458f753316dac4b8bd76cf881a4cdd5a3ea6d7d04a7a60c7dd1030fde38c01b18c7ae

data/lib/one_data_accessor.rb

@@ -17,7 +17,7 @@ class OneDataAccessor
 
   STATE_DONE = '6'
   BENCHMARK_TYPE_XPATH = 'TEMPLATE/BENCHMARK_TYPE'
-  BENCHMARK_VALUES_XPATH = 'TEMPLATE/BENCHMARK_VALUES'
+  BENCHMARK_VALUE_XPATH = 'TEMPLATE/BENCHMARK_VALUE'
 
   attr_reader :log, :batch_size, :client, :compatibility
   attr_accessor :start_vm_id
@@ -199,14 +199,14 @@ class OneDataAccessor
   #
   # @return [Hash] hosts' IDs and hash with benchmark name and value
   def benchmark_map
-    map = {}
+    map = Hash.new({})
     host_pool = OpenNebula::HostPool.new(@client)
     rc = host_pool.info
     check_retval(rc, Errors::ResourceRetrievalError)
 
     host_pool.each do |host|
       benchmark = benchmark_values(host)
-      if benchmark.empty?
+      unless benchmark[:benchmark_type]
         cluster = cluster_for_host(host)
         benchmark = benchmark_values(cluster) if cluster
       end
@@ -222,16 +222,7 @@ class OneDataAccessor
   # @param [OpenNebula::PoolElement] entity
   # @return [Hash] benchmark type and values in form of hash
   def benchmark_values(entity)
-    benchmark_type = entity[BENCHMARK_TYPE_XPATH]
-    return {} unless benchmark_type
-
-    mixins = {}
-    benchmark_values = entity[BENCHMARK_VALUES_XPATH]
-    if benchmark_values
-      mixins = JSON.parse(benchmark_values, :max_nesting => 1)
-    end
-
-    { :benchmark_type => benchmark_type, :mixins => mixins }
+    { benchmark_type: entity[BENCHMARK_TYPE_XPATH], benchmark_value: entity[BENCHMARK_VALUE_XPATH] }
   end
 
   # Returns object representing a cluster for specified host

data/lib/one_worker.rb

@@ -131,7 +131,7 @@ class OneWorker
     data['disks'] = disk_records(vm)
     data['number_of_public_ips'] = number_of_public_ips(vm)
 
-    benchmark = search_benchmark(vm, benchmark_map)
+    benchmark = benchmark_map[vm['HISTORY_RECORDS/HISTORY[last()]/HID']]
     data['benchmark_type'] = benchmark[:benchmark_type]
     data['benchmark_value'] = benchmark[:benchmark_value]
 
@@ -272,26 +272,6 @@ class OneWorker
     raise msg
   end
 
-  # Search benchmark type and value virtual machine.
-  #
-  # @param [OpenNebula::VirtualMachine] vm virtual machine
-  # @param [Hash] benchmark_map map of all hosts' benchmarks
-  #
-  # @return [Hash] benchmark type and value or both can be nil
-  def search_benchmark(vm, benchmark_map)
-    map = benchmark_map[vm['HISTORY_RECORDS/HISTORY[last()]/HID']]
-
-    return {} unless vm['USER_TEMPLATE/OCCI_COMPUTE_MIXINS']
-    return {} if map.nil? || map.empty?
-
-    occi_compute_mixins = vm['USER_TEMPLATE/OCCI_COMPUTE_MIXINS'].split(/\s+/)
-    occi_compute_mixins.each do |mixin|
-      return { :benchmark_type => map[:benchmark_type], :benchmark_value => map[:mixins][mixin] } if map[:mixins].has_key?(mixin)
-    end
-
-    {}
-  end
-
   private
 
   # Check if IP is public

data/lib/oneacct_exporter/version.rb

@@ -1,3 +1,3 @@
 class OneacctExporter
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/oneacct_opts.rb

@@ -69,6 +69,24 @@ class OneacctOpts
         options.compatibility = compatibility
       end
 
+      opts.on('--harden-ssl-security', 'Sets basic SSL options for better security.') do
+          OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2
+          OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv3
+          OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_COMPRESSION
+      end
+
+      opts.on('--ssl-cipher-suite CIPHER_SUITE', 'Sets SSL cipher suite.') do |suite|
+        OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers] = suite
+      end
+
+      opts.on('--ssl-version VERSION', 'Sets SSL version') do |version|
+        OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ssl_version] = version
+      end
+
+      opts.on("--skip-ca-check", "Skip server certificate verification [NOT recommended]") do
+          silence_warnings { OpenSSL::SSL.const_set(:VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE) }
+      end
+
       opts.on_tail('-h', '--help', 'Shows this message') do
         puts opts
         exit
@@ -173,4 +191,11 @@ class OneacctOpts
       end
     end
   end
+
+  def self.silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
 end

data/mock/one_data_accessor_cluster_01.xml

@@ -20,7 +20,7 @@
   </VNETS>
   <TEMPLATE>
     <BENCHMARK_TYPE>bench_type_cluster_1</BENCHMARK_TYPE>
-    <BENCHMARK_VALUES>{"mixin1": 21.7}</BENCHMARK_VALUES>
+    <BENCHMARK_VALUE>21.7</BENCHMARK_VALUE>
     <RESERVED_CPU><![CDATA[]]></RESERVED_CPU>
     <RESERVED_MEM><![CDATA[8388608]]></RESERVED_MEM>
   </TEMPLATE>

data/mock/one_data_accessor_host_01.xml

@@ -49,7 +49,7 @@
   <TEMPLATE>
     <ARCH><![CDATA[x86_64]]></ARCH>
     <BENCHMARK_TYPE>bench_type_1</BENCHMARK_TYPE>
-    <BENCHMARK_VALUES>{"mixin1": 36.9}</BENCHMARK_VALUES>
+    <BENCHMARK_VALUE>36.9</BENCHMARK_VALUE>
     <CPUSPEED><![CDATA[1200]]></CPUSPEED>
     <ERROR><![CDATA[Thu Nov 19 11:56:06 2015 : Error monitoring Host whatever.in.czech.republic.cz (21): -]]></ERROR>
     <HOSTNAME><![CDATA[whatever.in.czech.republic.cz]]></HOSTNAME>

data/spec/one_data_accessor_spec.rb

@@ -450,20 +450,10 @@ describe OneDataAccessor do
       OpenNebula::XMLElement.new(OpenNebula::XMLElement.build_xml(file, 'CLUSTER'))
     }
 
-    context 'with correct data on a host with one benchmark value' do
+    context 'with correct data on a host' do
       let(:host_filename) { 'one_data_accessor_host_01.xml' }
       let(:expected) { { '1' => { :benchmark_type => 'bench_type_1',
-                                  :mixins => { 'mixin1' => 36.9 } } } }
-
-      it 'creates correct benchmark_map' do
-        expect(subject.benchmark_map).to eq(expected)
-      end
-    end
-
-    context 'with correct data on a host with two benchmark values' do
-      let(:host_filename) { 'one_data_accessor_host_02.xml' }
-      let(:expected) { { '2' => { :benchmark_type => 'bench_type_2',
-                                  :mixins => { 'mixin1' => 788.6, 'mixin2' => 123.123 } } } }
+                                  :benchmark_value => '36.9' } } }
 
       it 'creates correct benchmark_map' do
         expect(subject.benchmark_map).to eq(expected)
@@ -478,7 +468,7 @@ describe OneDataAccessor do
       let(:host_filename) { 'one_data_accessor_host_03.xml' }
       let(:cluster_filename) { 'one_data_accessor_cluster_01.xml' }
       let(:expected) { { '3' => { :benchmark_type => 'bench_type_cluster_1',
-                                  :mixins => { 'mixin1' => 21.7 } } } }
+                                  :benchmark_value => '21.7' } } }
 
       it 'creates correct benchmark_map' do
         expect(subject.benchmark_map).to eq(expected)
@@ -492,7 +482,8 @@ describe OneDataAccessor do
 
       let(:host_filename) { 'one_data_accessor_host_04.xml' }
       let(:cluster_filename) { 'one_data_accessor_cluster_02.xml' }
-      let(:expected) { { '4' => {} } }
+      let(:expected) { { '4' => { :benchmark_type => nil,
+                                  :benchmark_value => nil } } }
 
       it 'creates correct benchmark_map' do
         expect(subject.benchmark_map).to eq(expected)
@@ -501,7 +492,8 @@ describe OneDataAccessor do
 
     context 'with no data on a host and without host\'s cluster' do
       let(:host_filename) { 'one_data_accessor_host_05.xml' }
-      let(:expected) { { '5' => {} } }
+      let(:expected) { { '5' => { :benchmark_type => nil,
+                                  :benchmark_value => nil } } }
       let(:searched_cluster) { nil }
 
       it 'creates correct benchmark_map' do

data/spec/one_worker_spec.rb

@@ -213,7 +213,7 @@ describe OneWorker do
     let(:user_map) { {'120' => '/Dn=FrOm/CN=DN/CN=MaP'} }
     let(:image_map) { {'31' => 'image_name_from_map'} }
     let(:cluster_map) { {'100' => 'site-name-from-cluster'}}
-    let(:benchmark_map) { {'123' => nil}  }
+    let(:benchmark_map) { {'11' => {}}  }
 
     context 'with apel specific data' do
       let(:filename) { 'one_worker_vm_dn01.xml' }
@@ -583,49 +583,4 @@ describe OneWorker do
       end
     end
   end
-
-  describe '.search_benchmark' do
-    let(:vm) do
-      xml = File.read("#{GEM_DIR}/mock/#{filename}")
-      OpenNebula::XMLElement.new(OpenNebula::XMLElement.build_xml(xml, 'VM'))
-    end
-
-    let(:benchmark_map) do
-      values1 = { :benchmark_type => 'bench_type_1', :mixins => { 'mixin1' => '34.12' } }
-      values2 = { :benchmark_type => 'bench_type_2', :mixins => { 'mixin2' => '123.2', 'mixin3' => '129.6' } }
-      values3 = { }
-
-      benchmark_map = { '19' => values1, '11' => values2, '23' => values3 }
-      benchmark_map
-    end
-
-    context 'with empty benchmark_map' do
-      let(:filename) { 'one_worker_vm_search_benchmark_01.xml' }
-      let(:benchmark_map) { {} }
-      let(:expected) { {} }
-
-      it 'returns array with two nil items' do
-        expect(subject.search_benchmark(vm, benchmark_map)).to eq(expected)
-      end
-    end
-
-    context 'with no data for the virtual machine in benchmark_map' do
-      let(:filename) { 'one_worker_vm_search_benchmark_02.xml' }
-      let(:expected) { {} }
-
-      it 'returns array with two nil items' do
-        expect(subject.search_benchmark(vm, benchmark_map)).to eq(expected)
-      end
-    end
-
-    context 'with correct data in vm and benchmark_map' do
-      let(:filename) { 'one_worker_vm_search_benchmark_01.xml' }
-      let(:expected) { { :benchmark_type => 'bench_type_2', :benchmark_value => '129.6' } }
-
-      it 'returns correct benchmark type and value' do
-        expect(subject.search_benchmark(vm, benchmark_map)).to eq(expected)
-      end
-    end
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneacct-export
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,6 @@ files:
 - mock/one_data_accessor_cluster_01.xml
 - mock/one_data_accessor_cluster_02.xml
 - mock/one_data_accessor_host_01.xml
-- mock/one_data_accessor_host_02.xml
 - mock/one_data_accessor_host_03.xml
 - mock/one_data_accessor_host_04.xml
 - mock/one_data_accessor_host_05.xml
@@ -274,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Exporting OpenNebula accounting data.

data/mock/one_data_accessor_host_02.xml

@@ -1,65 +0,0 @@
-<HOST>
-  <ID>2</ID>
-  <NAME>whatever.in.czech.republic.cz</NAME>
-  <STATE>5</STATE>
-  <IM_MAD><![CDATA[kvm]]></IM_MAD>
-  <VM_MAD><![CDATA[kvm]]></VM_MAD>
-  <VN_MAD><![CDATA[802.1Q]]></VN_MAD>
-  <LAST_MON_TIME>1447930638</LAST_MON_TIME>
-  <CLUSTER_ID>1</CLUSTER_ID>
-  <CLUSTER>fedcloud-warg</CLUSTER>
-  <HOST_SHARE>
-    <DISK_USAGE>0</DISK_USAGE>
-    <MEM_USAGE>50331648</MEM_USAGE>
-    <CPU_USAGE>2000</CPU_USAGE>
-    <MAX_DISK>19686</MAX_DISK>
-    <MAX_MEM>57674040</MAX_MEM>
-    <MAX_CPU>3200</MAX_CPU>
-    <FREE_DISK>13945</FREE_DISK>
-    <FREE_MEM>30670728</FREE_MEM>
-    <FREE_CPU>3196</FREE_CPU>
-    <USED_DISK>4742</USED_DISK>
-    <USED_MEM>35391920</USED_MEM>
-    <USED_CPU>3</USED_CPU>
-    <RUNNING_VMS>11</RUNNING_VMS>
-    <DATASTORES>
-      <DS>
-        <FREE_MB><![CDATA[3037509]]></FREE_MB>
-        <ID><![CDATA[101]]></ID>
-        <TOTAL_MB><![CDATA[3338205]]></TOTAL_MB>
-        <USED_MB><![CDATA[122933]]></USED_MB>
-        <VMS_ALLOCATED_MB><![CDATA[122733]]></VMS_ALLOCATED_MB>
-        <VMS_REQUIRED_MB><![CDATA[130925]]></VMS_REQUIRED_MB>
-      </DS>
-    </DATASTORES>
-  </HOST_SHARE>
-  <VMS>
-    <ID>51575</ID>
-    <ID>53988</ID>
-    <ID>54035</ID>
-    <ID>54553</ID>
-    <ID>55276</ID>
-    <ID>56251</ID>
-    <ID>56288</ID>
-    <ID>56291</ID>
-    <ID>59948</ID>
-    <ID>60163</ID>
-    <ID>60173</ID>
-  </VMS>
-  <TEMPLATE>
-    <ARCH><![CDATA[x86_64]]></ARCH>
-    <BENCHMARK_TYPE>bench_type_2</BENCHMARK_TYPE>
-    <BENCHMARK_VALUES>{"mixin1": 788.6, "mixin2": 123.123}</BENCHMARK_VALUES>
-    <CPUSPEED><![CDATA[1200]]></CPUSPEED>
-    <ERROR><![CDATA[Thu Nov 19 11:56:06 2015 : Error monitoring Host whatever.in.czech.republic.cz (21): -]]></ERROR>
-    <HOSTNAME><![CDATA[whatever.in.czech.republic.cz]]></HOSTNAME>
-    <HYPERVISOR><![CDATA[kvm]]></HYPERVISOR>
-    <MODELNAME><![CDATA[Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz]]></MODELNAME>
-    <NETRX><![CDATA[518778988428]]></NETRX>
-    <NETTX><![CDATA[761175714938]]></NETTX>
-    <PRIORITY><![CDATA[990]]></PRIORITY>
-    <RESERVED_CPU><![CDATA[]]></RESERVED_CPU>
-    <RESERVED_MEM><![CDATA[]]></RESERVED_MEM>
-    <VERSION><![CDATA[4.10.1]]></VERSION>
-  </TEMPLATE>
-</HOST>