sfpagent 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 379783979940f9c3e00cb6d7d87cfe70f2141394
-  data.tar.gz: 3de89027212aa57b1f7e19f06af789c108711470
+  metadata.gz: 94a46954e0baa7fad3685faae5e88b9a2f7d769f
+  data.tar.gz: edf671fc44ffb00b0067bd09e1a7f59f051a2719
 SHA512:
-  metadata.gz: 779c7727e036da6f400cc9a2237f03ee609d54b9fb7f8dacc781720be30ef89b76e53ab999b205f59b894d7991ba1057c71b346562942ea091b0d552492f4f1d
-  data.tar.gz: 17de98cf9906dfaba55362a4a2948606e150185a53a841552a00b4e5232ce53cfdb15a7e4c809ca1d9042c2238ee127fe3b21325e6a5f8f74e15f34337afe639
+  metadata.gz: 4d4c45a2879ea273dd9ca19151ab01cfaada5475eadd81df40306be9856a2d4b46b17bba81e7babafaa8afdc704d713f4ed383ae4e13ee894acaa74bfb4f7d05
+  data.tar.gz: 3ada473126c4d2a3bde62295d255977c173f2de73d7bd6e7df80255482cc32a27480699f003f6b031dbeec1d6a3a8152a461929baed3632a9a6c0f942565d8ec

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/sfpagent/agent.rb

@@ -676,13 +676,16 @@ module Sfp
 			# Process HTTP GET request
 			#
 			# uri:
-			#  /pid      => save daemon's PID to a file (only requested from localhost)
-			#  /state    => return the current state
-			#  /model    => return the current model
-			#  /sfp      => return the SFP description of a module
-			#  /modules  => return a list of available modules
-			#  /agents   => return a list of agents database
-			#  /log      => return last 100 lines of log file
+			#  /pid          => save daemon's PID to a file (only requested from localhost)
+			#  /state        => return the current state
+			#  /model        => return the current model
+			#  /model/cache  => return the cached model
+			#  /sfp          => return the SFP description of a module
+			#  /modules      => return a list of available modules
+			#  /agents       => return a list of agents database
+			#  /log          => return last 100 lines of log file
+			#  /bsig         => return BSig model
+			#  /bsig/flaws   => return flaws of BSig model
 			#
 			def do_GET(request, response)
 				status = 400
@@ -713,7 +716,12 @@ module Sfp
 						status, content_type, body = self.get_cache_model({:name => path[13, path.length-13]})
 
 					elsif path == '/bsig'
-						status, content_Type, body = get_bsig
+						status, content_type, body = get_bsig
+
+					elsif path == '/bsig/flaws'
+						status = 200
+						content_type = 'application/json'
+						body = JSON.generate(Sfp::Agent.bsig_engine.get_flaws)
 
 					elsif path =~ /^\/sfp\/.+/
 						status, content_type, body = get_sfp({:module => path[10, path.length-10]})
@@ -803,7 +811,7 @@ module Sfp
 						status, content_type, body = self.set_bsig({:query => request.query})
 
 					elsif path == '/bsig/satisfier'
-						status, content_type, body = self.satisfy_bsig_request({:query => request.query})
+						status, content_type, body = self.satisfy_bsig_request({:query => request.query, :client => request.remote_ip})
 
 					end
 				end
@@ -1025,7 +1033,7 @@ module Sfp
 				return [500, '', ''] if Sfp::Agent.bsig_engine.nil?
 
 				req = p[:query]
-				return [200, '', ''] if Sfp::Agent.bsig_engine.receive_goal_from_agent(req['id'].to_i, JSON[req['goal']], req['pi'].to_i)
+				return [200, '', ''] if Sfp::Agent.bsig_engine.receive_goal_from_agent(req['id'].to_i, JSON[req['goal']], req['pi'].to_i, p[:client])
 
 				[500, '', '']
 			end

data/lib/sfpagent/bsig.rb

@@ -91,6 +91,16 @@ class Sfp::BSig
 		end
 	end
 
+	def get_flaws
+		bsig = Sfp::Agent.get_bsig
+		if bsig.nil?
+			{}
+		else
+			current = get_current_state
+			compute_flaws(bsig['goal'], current)
+		end
+	end
+
 	def wait_for_satisfier?
 		total_satisfier = 1
 		loop do
@@ -271,7 +281,7 @@ class Sfp::BSig
 		true
 	end
 
-	def receive_goal_from_agent(id, goal, pi)
+	def receive_goal_from_agent(id, goal, pi, client='')
 		register_satisfier_thread
 
 		return false if not @enabled
@@ -283,7 +293,7 @@ class Sfp::BSig
 		status = nil
 		tries = MaxTries
 		begin
-			status = achieve_local_goal(bsig['id'], goal, bsig['operators'], pi, :satisfier)
+			status = achieve_local_goal(bsig['id'], goal, bsig['operators'], pi, "satisfier[#{client}]")
 			if status == :no_flaw or status == :failure or not @enabled
 				break
 			elsif status == :pending

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Herry