sfpagent 0.1.4 → 0.1.5

data/README.md

@@ -1,7 +1,7 @@
 SFP Agent for Ruby
 ==================
 - Author: Herry (herry13@gmail.com)
-- Version: 0.1.4
+- [Version](https://github.com/herry13/sfpagent/blob/master/VERSION)
 - License: [BSD License](https://github.com/herry13/sfpagent/blob/master/LICENSE)
 
 A Ruby script and API of an SFP agent. The agent could be accessed through HTTP RESTful API.
@@ -23,6 +23,7 @@ Requirements
 To install
 ----------
 
+	$ apt-get install git make gcc ruby1.9.1 ruby1.9.1-dev libz-dev libaugeas-ruby1.9.1 libxml2-dev libxslt-dev
 	$ gem install sfpagent
 
 

data/VERSION

@@ -0,0 +1 @@
+0.1.5

data/bin/sfpagent

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-libdir = File.expand_path(File.dirname(__FILE__))
-require "#{libdir}/../lib/sfpagent"
+dir = File.expand_path(File.dirname(__FILE__))
+require "#{dir}/../lib/sfpagent"
 
 opts = Trollop::options do
-	version "sfpagent 0.1.4 (c) 2013 Herry"
+	version "sfpagent " + File.read("#{dir}/../VERSION").sub(/\n/, '') + " (c) 2013 Herry"
 	banner <<-EOS
 SFP Agent that provides a Ruby framework for managing system configurations. The configurations are modelled in SFP language.
 

data/lib/sfpagent/bsig.rb

@@ -0,0 +1,22 @@
+module Sfp::BSig
+end
+
+module Sfp::BSig::Main
+	def execute_model
+		# TODO -- implement
+	end
+
+	def achieve_local_goals(version, goals, operators, pi)
+		# TODO -- implement
+	end
+
+	def achieve_remote_goals(version, goals, pi)
+		# TODO -- implement
+	end
+end
+
+module Sfp::BSig::Satisfier
+	def receive_goals(agent, version, goals, pi)
+		# TODO -- implement
+	end
+end

data/lib/sfpagent/module.rb

@@ -2,7 +2,7 @@
 # predefined methods: update_state, apply, reset, resolve
 #
 module Sfp::Resource
-	attr_accessor :parent
+	attr_accessor :parent, :synchronized
 	attr_reader :state, :model
 
 	def init(model, default)
@@ -10,7 +10,7 @@ module Sfp::Resource
 		model.each { |k,v| @model[k] = v }
 		@state = {}
 		@default = {}
-		#default.each { |k,v| @state[k] = @default[k] = v }
+		@synchronized = []
 	end
 
 	def update_state

data/lib/sfpagent/runtime.rb

@@ -1,7 +1,10 @@
+require 'thread'
+
 class Sfp::Runtime
 	attr_reader :modules
 
 	def initialize(parser)
+		@mutex_procedure = Mutex.new
 		@parser = parser
 		@root = @parser.root
 		@modules = nil
@@ -22,7 +25,13 @@ class Sfp::Runtime
 		raise Exception, "Cannot execute #{action['name']}!" if not mod.respond_to?(method_name)
 
 		params = normalise_parameters(action['parameters'])
-		mod.send method_name.to_sym, params
+		if mod.synchronized.rindex(method_name)
+			@mutex_procedure.synchronize { mod.send method_name.to_sym, params }
+		else
+			mod.send method_name.to_sym, params
+		end
+
+		# TODO - check post-execution state for verification
 	end
 
 	def get_state(as_sfp=false)
@@ -54,6 +63,14 @@ class Sfp::Runtime
 			default = cleanup(root.at?(model['_isa']))
 			ruby_model = cleanup(model)
 			mod.init(ruby_model, default)
+
+			# update synchronized list of procedures
+			model.each { |k,v|
+				next if k[0,1] == '_' or not (v.is_a?(Hash) and v['_context'] == 'procedure')
+				mod.synchronized << k if v['_synchronized']
+			}
+
+			# return the object instant
 			mod
 		end
 
@@ -113,42 +130,11 @@ class Sfp::Runtime
 		state
 	end
 
-	def execute_plan(plan)
-		plan = JSON[plan]
-		if plan['type'] == 'sequential'
-			execute_sequential_plan(plan)
-		else
-			raise Exception, "Not implemented yet!"
-		end
-	end
-
 	protected
-	class SfpState
-		def visit(name, value, parent)
-			parent.delete(name) if name[0,1] == '_' or
-				(value.is_a?(Hash) and value['_context'] != 'object')
-			true
-		end
-	end
-
 	ParentGenerator = Object.new
 	def ParentGenerator.visit(name, value, parent)
 		value['_parent'] = parent if value.is_a?(Hash)
 		true
 	end
 
-	def execute_sequential_plan(plan)
-		puts 'Execute a sequential plan...'
-
-		plan['workflow'].each_index { |index|
-			action = plan['workflow'][index]
-			print "#{index+1}) #{action['name']} "
-			if not execute_action(action)
-				puts '[Failed]'
-				return false
-			end
-			puts '[OK]'
-		}
-		true
-	end
 end

data/lib/sfpagent.rb

@@ -6,11 +6,13 @@ require 'sfp'
 module Nuri
 end
 
+module Sfp
+end
+
 # internal dependencies
 libdir = File.expand_path(File.dirname(__FILE__))
 
 require libdir + '/sfpagent/net_helper.rb'
-require libdir + '/sfpagent/executor.rb'
 require libdir + '/sfpagent/runtime.rb'
 require libdir + '/sfpagent/module.rb'
 require libdir + '/sfpagent/agent.rb'

data/sfpagent.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name			= 'sfpagent'
-	s.version		= '0.1.4'
+	s.version		= File.read(File.join(File.dirname(__FILE__), 'VERSION')).sub(/\n/, '')
 	s.date			= '2013-08-13'
 	s.summary		= 'SFP Agent'
 	s.description	= 'A Ruby implementation of SFP agent.'
@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
 	s.homepage		= 'https://github.com/herry13/sfpagent'
 	s.rubyforge_project = 'sfpagent'
 
-	s.add_dependency 'sfp', '~> 0.3.6'
+	s.add_dependency 'sfp', '~> 0.3.9'
 end	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,15 +13,15 @@ date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &13245980 !ruby/object:Gem::Requirement
+  requirement: &20504460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *13245980
+  version_requirements: *20504460
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -32,11 +32,12 @@ files:
 - .gitignore
 - LICENSE
 - README.md
+- VERSION
 - bin/cert.rb
 - bin/sfpagent
 - lib/sfpagent.rb
 - lib/sfpagent/agent.rb
-- lib/sfpagent/executor.rb
+- lib/sfpagent/bsig.rb
 - lib/sfpagent/module.rb
 - lib/sfpagent/net_helper.rb
 - lib/sfpagent/runtime.rb

data/lib/sfpagent/executor.rb

@@ -1,207 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-require 'thread'
-
-module Sfp
-	module Executor
-		class ExecutionException < Exception; end
-		class ParallelExecutionException < Exception; end
-		class SequentialExecutionException < Exception; end
-
-		# @param :plan the plan to be executed
-		# @param :owner an object that implement the action
-		# @param :retry number of retries (default: 2) when execution is failed
-		#
-		def execute_plan(params={})
-			if params[:plan].nil? or not params[:plan].is_a?(Hash)
-				raise ExecutionException, 'Plan is not available.'
-			elsif params[:plan]['type'].to_s == 'parallel' or
-			      params[:plan][:type].to_s == 'parallel'
-				return self.execute_parallel_plan(params)
-			elsif params[:plan]['type'].to_s == 'sequential' or
-			      params[:plan][:type].to_s == 'sequential'
-				return self.execute_sequential_plan(params)
-			else
-				raise ExecutionException, 'Unknown type of plan!'
-			end
-			false
-		end
-
-		# @param :plan the plan to be executed
-		# @param :owner an object that implement the action
-		# @param :retry number of retries (default: 2) when execution is failed
-		#
-		def execute_parallel_plan(params={})
-			def assign_action_with_id(id)
-				thread_id = next_thread_id
-				action = @actions[id]
-				action[:executor] = thread_id
-				self.thread_execute_action(thread_id, action)
-			end
-
-			def next_thread_id
-				id = 0
-				@mutex.synchronize { @thread_id = id = @thread_id + 1 }
-				id
-			end
-
-			def action_to_string(action)
-				"#{action['id']}:#{action['name']}#{JSON.generate(action['parameters'])}"
-			end
-
-			def thread_execute_action(tid, action)
-				t = Thread.new {
-					@mutex.synchronize { @threads << tid }
-
-					while not @failed and not action[:executed]
-						# execute the action
-						op_str = action_to_string(action)
-						#Nuri::Util.puts "[ExecutorThread: #{tid}] #{op_str}"
-						success = false
-						num = @retry
-						begin
-							success = @owner.execute_action { action }
-							num -= 1
-						end while not success and num > 0
-
-						# check if execution failed
-						if success
-							next_actions = []
-							@mutex.synchronize {
-								# set executed
-								action[:executed] = true
-								# select next action to be executed from all predecessor actions
-								# if each action has not been assigned to any thread yet
-								if action['successors'].length > 0
-									action['successors'].each { |id|
-										if @actions[id][:executor].nil?
-											predecessors_ok = true
-											@actions[id]['predecessors'].each { |pid|
-												predecessors_ok = (predecessors_ok and @actions[pid][:executed])
-											}
-											next_actions << id if predecessors_ok
-										end
-									}
-								end
-								next_actions.each { |id| @actions[id][:executor] = tid }
-							}
-							if next_actions.length > 0
-								# execute next actions
-								action = @actions[next_actions[0]]
-								if next_actions.length > 1
-									for i in 1..(next_actions.length-1)
-										assign_action_with_id(next_actions[i])
-									end
-								end
-							end
-								
-						else
-							Nuri::Util.error "Failed executing #{op_str}!"
-							@mutex.synchronize {
-								@failed = true # set global flag
-								@actions_failed << action
-							}
-						end
-					end
-
-					@mutex.synchronize { @threads.delete(tid) }
-				}
-			end
-
-			if params[:plan].nil? or not params[:plan].is_a?(Hash)
-				raise ParallelExecutionException, 'Plan is not available.'
-			elsif params[:plan]['type'].to_s == 'parallel' or
-			      params[:plan][:type].to_s == 'parallel'
-			else
-				raise ParallelExecutionException, 'Not a parallel plan.'
-			end
-
-			@owner = params[:owner]
-			@retry = (params[:retry].nil? ? 2 : params[:retry].to_i)
-
-			@actions = params[:plan]['workflow']
-			@actions.sort! { |x,y| x['id'] <=> y['id'] }
-			@actions.each { |op| op[:executed] = false; op[:executor] = nil; }
-
-			@threads = []
-			@actions_failed = []
-			@mutex = Mutex.new
-			@failed = false
-			@thread_id = 0
-
-			params[:plan]['init'].each { |op_id| assign_action_with_id(op_id) }
-
-			begin
-				sleep 1
-			end while @threads.length > 0
-
-			Nuri::Util.log "Using #{@thread_id} threads in execution."
-
-			return (not @failed)
-		end
-
-		# @param :plan the plan to be executed
-		# @param :owner an object that implement the action
-		# @param :retry number of retries (default: 2) when execution is failed
-		#
-		def execute_sequential_plan(params={})
-			if params[:plan].nil? or not params[:plan].is_a?(Hash)
-				raise ParallelExecutionException, 'Plan is not available.'
-			elsif params[:plan]['type'].to_s == 'sequential' or
-			      params[:plan][:type].to_s == 'sequential'
-			else
-				raise ParallelExecutionException, 'Not a parallel plan.'
-			end
-
-			@owner = params[:owner]
-			@retry = (params[:retry].nil? ? 2 : params[:retry].to_i)
-			params[:plan]['workflow'].each { |action|
-				success = false
-				num = @retry
-				begin
-					success, data = @owner.execute_action { action }
-					puts data.to_s if params[:print_output]
-					num -= 1
-				end while not success and num > 0
-				return false if not success
-			}
-			true
-		end
-	end
-
-	class RubyExecutor
-		def execute_plan(params={})
-			exec = Object.new
-			exec.extend(Sfp::Executor)
-			params[:owner] = self
-			exec.execute_plan(params)
-		end
-
-		def execute_action
-			# TODO
-			action = yield
-			puts "Exec: #{action.inspect}"
-			[true, nil]
-		end
-	end
-
-	class BashExecutor < RubyExecutor
-		def execute_action
-			# TODO
-			action = yield
-			module_dir = (ENV.has_key?("SFP_HOME") ? ENV['SFP_HOME'] : ".")
-			script_path = "#{action['name'].sub!(/^\$\./, '')}"
-			script_path = "#{module_dir}/#{script_path.gsub!(/\./, '/')}"
-			cmd = "/bin/bash #{script_path}"
-			action['parameters'].each { |p| cmd += " '#{p}'" }
-			begin
-				data = `#{cmd}`
-			rescue Exception => exp
-				$stderr.puts "#{exp}\n#{exp.backtrace}"
-				[false, nil]
-			end
-			[true, data]
-		end
-	end
-end