sisfc 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4db7cb93e8cfd8e52ef91b888359f61d513761a0
-  data.tar.gz: 3370237ff41037080a11ce54c4efb04510d24cab
+  metadata.gz: ee8e44bf402532fa027e91c284013a1044da5190
+  data.tar.gz: 779b1cfc0560936edb1c75efe381d321c9407476
 SHA512:
-  metadata.gz: 153d84d057e7011351998a401f44139827b72edb6051d274b8ab09bd9aaefc2a61083e26807073bd0e0a9ccfa5b53f5f4f66d654d0415cfa4743ebb2a84d0e90
-  data.tar.gz: f59a60e8c490cca293ef9836fbc990ce56663d55c681f9ecc32017ace690947a6d9ecc06728e5f1fd004762f9c87afeb050a02b790cec82079cc1ae1af244160
+  metadata.gz: bd44dc6c5480ce6e2f23418315148a186c7106ede73bcc0e3320b5794a97f64e934a74c356641dc02dfb710e7746e81377359b4c4481ca1e6447f5aad4524d1e
+  data.tar.gz: a927ec9bb0a5a8cc0f5e89259220358acb4d7f19712ba65f071813a07c5e6b77c8a4b3c680207a31809fb7facc2da6ceb3d47a7485b950b4471b8607f69dde0a

data/bin/sisfc

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 
-# should we actually decomment these lines?
-# require 'rubygems'
-# require 'bundler/setup'
-
-require 'awesome_print'
-
-require 'sisfc'
-require 'sisfc/evaluation'
+begin
+  require 'sisfc'
+  require 'sisfc/evaluation'
+  require 'awesome_print'
+rescue LoadError
+  require 'rubygems'
+  require 'sisfc'
+  require 'sisfc/evaluation'
+  require 'awesome_print'
+end
 
 
 if __FILE__ == $0

data/lib/sisfc/evaluation.rb

@@ -14,7 +14,7 @@ module SISFC
       cost = vm_allocation.inject(0.0) do |s,x|
         hc = @vm_hourly_cost.find{|i| i[:data_center] == x[:dc_id] and i[:vm_type] == x[:vm_size] }
         unless hc
-          raise Error, "Cannot find hourly cost for data center #{x[:dc_id]} and VM size #{x[:vm_size]}!"
+          raise "Cannot find hourly cost for data center #{x[:dc_id]} and VM size #{x[:vm_size]}!"
         end
         s += x[:vm_num] * hc[:cost]
       end
@@ -23,7 +23,7 @@ module SISFC
       # puts "vm allocation cost: #{cost}"
 
       # consider SLO violations
-      penalties = (@penalties_func.nil? ? 0.0 : @penalties_func.call(kpis, dc_kpis))
+      penalties = (@penalties_func.nil? ? 0.0 : (@penalties_func.call(kpis, dc_kpis) or 0.0))
       kpis[:penalties] = penalties
       # puts "slo penalties cost: #{penalties}"
       cost += penalties

data/lib/sisfc/simulation.rb

@@ -195,7 +195,7 @@ module SISFC
       fitness = @evaluator.evaluate_business_impact(kpis, dc_kpis, vm_allocation)
       puts "====== Evaluating new allocation ======\n" +
         vm_allocation.map{|x| x.except(:service_time_distribution) }.inspect + "\n" +
-        "kpis #{kpis.to_s}\n" +
+        "kpis: #{kpis.to_s}\n" +
         "dc_kpis: #{dc_kpis.to_s}\n" +
         "=======================================\n"
       fitness

data/lib/sisfc/version.rb

@@ -1,3 +1,3 @@
 module SISFC
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/sisfc.rb

@@ -2,3 +2,4 @@ require 'active_support/time'
 
 require 'sisfc/configuration'
 require 'sisfc/simulation'
+require 'sisfc/evaluation'

data/test/sisfc/evaluation_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+require 'sisfc/reference_configuration'
+
+
+describe SISFC::Evaluator do
+  describe '.penalties' do
+    EXAMPLE_ALLOCATION = [
+      { dc_id: 1, vm_size: :medium, vm_num: 20 },
+      { dc_id: 1, vm_size:  :large, vm_num: 30 },
+      { dc_id: 2, vm_size: :medium, vm_num: 50 },
+      { dc_id: 2, vm_size:  :large, vm_num: 60 },
+    ]
+
+    it 'should work if no penalty function is provided' do
+      evaluation_no_penalties = EVALUATION.reject {|x| x == :penalties }
+      with_reference_config(evaluation: evaluation_no_penalties) do |conf|
+        SISFC::Evaluator.new(conf)
+      end
+    end
+
+    it 'should work if penalty function returns something' do
+      evaluator = with_reference_config do |conf|
+        SISFC::Evaluator.new(conf)
+      end
+      evaluator.evaluate_business_impact({ mttr: 0.075 }, nil, EXAMPLE_ALLOCATION)
+    end
+
+    it 'should work if penalty function returns nil' do
+      evaluator = with_reference_config do |conf|
+        SISFC::Evaluator.new(conf)
+      end
+      evaluator.evaluate_business_impact({ mttr: 0.025 }, nil, EXAMPLE_ALLOCATION)
+    end
+  end
+end

data/test/sisfc/reference_configuration.rb

@@ -131,6 +131,17 @@ request_generation \
   command: "<pwd>/generator.R"
 END
 
+EVALUATION_CHARACTERIZATION = <<END
+evaluation \
+  :vm_hourly_cost => [
+    { :data_center => 1, :vm_type => :medium, :cost => 0.160 },
+    { :data_center => 1, :vm_type => :large,  :cost => 0.320 },
+    { :data_center => 2, :vm_type => :medium, :cost => 0.184 },
+    { :data_center => 2, :vm_type => :large,  :cost => 0.368 }
+  ],
+  # 500$ penalties if MTTR takes more than 50 msecs
+  :penalties => lambda {|kpis,dc_kpis| 500.0 if kpis[:mttr] > 0.050 }
+END
 
 # this is the whole reference configuration
 # (useful for spec'ing configuration.rb)
@@ -139,7 +150,8 @@ REFERENCE_CONFIGURATION =
   DATA_CENTERS_CHARACTERIZATION +
   SERVICE_COMPONENT_TYPES_CHARACTERIZATION +
   WORKFLOW_TYPES_CHARACTERIZATION +
-  REQUEST_GENERATION_CHARACTERIZATION
+  REQUEST_GENERATION_CHARACTERIZATION +
+  EVALUATION_CHARACTERIZATION
 
 
 evaluator = Object.new
@@ -151,6 +163,7 @@ evaluator.instance_eval(REFERENCE_CONFIGURATION)
 DATA_CENTERS            = evaluator.data_centers
 SERVICE_COMPONENT_TYPES = evaluator.service_component_types
 WORKFLOW_TYPES          = evaluator.workflow_types
+EVALUATION              = evaluator.evaluation
 
 
 def with_reference_config(opts={})

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: sisfc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Mauro Tortonesi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+  name: activesupport
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: awesome_print
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
+  name: awesome_print
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: erv
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
+  name: erv
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.3
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.1
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.1
 description: Simulator for IT Services in Federated Clouds
 email:
 - mauro.tortonesi@unife.it
@@ -112,6 +112,7 @@ files:
 - lib/sisfc/vm.rb
 - sisfc.gemspec
 - test/sisfc/configuration_test.rb
+- test/sisfc/evaluation_test.rb
 - test/sisfc/generator_test.rb
 - test/sisfc/reference_configuration.rb
 - test/sisfc/request_test.rb
@@ -136,12 +137,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.1
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: A simulator for business-driven IT management research capable of evaluating IT service component placement in federated Cloud environments
 test_files:
 - test/sisfc/configuration_test.rb
+- test/sisfc/evaluation_test.rb
 - test/sisfc/generator_test.rb
 - test/sisfc/reference_configuration.rb
 - test/sisfc/request_test.rb