sfpagent 0.1.14 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.2.3

data/lib/sfpagent/agent.rb

@@ -11,7 +11,7 @@ require 'digest/md5'
 
 module Sfp
 	module Agent
-		NetHelper = Object.new.extend(Sfp::Net::Helper)
+		NetHelper = Object.new.extend(Sfp::Helper::Net)
 
 		CacheDir = (Process.euid == 0 ? '/var/sfpagent' : File.expand_path('~/.sfpagent'))
 		Dir.mkdir(CacheDir, 0700) if not File.exist?(CacheDir)
@@ -42,7 +42,7 @@ module Sfp
 
 		@@runtime_lock = Mutex.new
 
-		@@agents_database = nil
+		@@agents_database = {}
 		@@agents_database_modified_time = nil
 
 		def self.logger
@@ -53,6 +53,10 @@ module Sfp
 			@@config
 		end
 
+		def self.runtime
+			@@runtime
+		end
+
 		# Start the agent.
 		#
 		# options:
@@ -511,6 +515,16 @@ module Sfp
 			end
 		end
 
+		def self.delete_agents
+			File.open(AgentsDataFile, File::RDWR|File::CREAT, 0644) { |f|
+				f.flock(File::LOCK_EX)
+				f.rewind
+				f.write('{}')
+				f.flush
+				f.truncate(f.pos)
+			}
+		end
+
 		# parameter:
 		#   :data => To delete an agent: { "agent_name" => nil }
 		#            To add/modify an agent: { "agent_name" => { "sfpAddress" => "10.0.0.1", "sfpPort" => 1314 } }
@@ -528,6 +542,7 @@ module Sfp
 				json = f.read
 				agents = (json == '' ? {} : JSON[json])
 				current_hash = agents.hash
+
 				data.each { |k,v|
 					if !agents.has_key?(k) or v.nil? or agents[k].hash != v.hash
 						agents[k] = v
@@ -544,16 +559,18 @@ module Sfp
 				end
 			}
 
-			if updated # if updated then broadcast to other agents
-				http_data = {'agents' => JSON.generate(data)}
-
-				agents.each { |name,agent|
-					begin
-						code, _ = NetHelper.put_data(agent['sfpAddress'], agent['sfpPort'], '/agents', http_data, 5, 20)
-						raise Exception if code != '200'
-					rescue Exception => e
-						Sfp::Agent.logger.warn "Push agents list to #{agent['sfpAddress']}:#{agent['sfpPort']} [Failed]"
-					end
+			if updated
+				Thread.new {
+					# if updated then broadcast to other agents
+					http_data = {'agents' => JSON.generate(data)}
+					agents.each { |name,agent|
+						begin
+							code, _ = NetHelper.put_data(agent['sfpAddress'], agent['sfpPort'], '/agents', http_data, 5, 20)
+							raise Exception if code != '200'
+						rescue Exception => e
+							Sfp::Agent.logger.warn "Push agents list to #{agent['sfpAddress']}:#{agent['sfpPort']} [Failed]"
+						end
+					}
 				}
 			end
 
@@ -563,6 +580,7 @@ module Sfp
 		def self.get_agents
 			return {} if not File.exist?(AgentsDataFile)
 			return @@agents_database if File.mtime(AgentsDataFile) == @@agents_database_modified_time
+			@@agents_database_modified_time = File.mtime(AgentsDataFile)
 			@@agents_database = JSON[File.read(AgentsDataFile)]
 		end
 
@@ -677,21 +695,25 @@ module Sfp
 					path = (request.path[-1,1] == '/' ? ryyequest.path.chop : request.path)
 
 					if path == '/model' and request.query.has_key?('model')
-						status, content_type, body = self.set_model({:query => request.query})
+						status, content_type, body = self.set_model({:model => request.query['model']})
 
 					elsif path =~ /\/model\/cache\/.+/ and request.query.length > 0
-						status, content_type, body = self.set_cache_model({:name => path[13, path.length-13],
-						                                                   :query => request.query})
+						status, content_type, body = self.manage_cache_model({:set => true,
+						                                                      :name => path[13, path.length-13],
+						                                                      :model => request.query['model']})
 
 					elsif path =~ /\/modules\/.+/ and request.query.length > 0
-						status, content_type, body = self.manage_modules({:name => path[9, path.length-9],
-						                                                  :query => request.query})
+						status, content_type, body = self.manage_modules({:install => true,
+						                                                  :name => path[9, path.length-9],
+						                                                  :module => request.query['module']})
 
 					elsif path == '/modules' and request.query.length > 0
-						status, content_type, body = self.manage_modules({:query => request.query})
+						status, content_type, body = self.manage_modules({:install => true,
+						                                                  :modules => request.query})
 
 					elsif path == '/agents' and request.query.has_key?('agents')
-						status, content_type, body = self.set_agents({:query => request.query})
+						status, content_type, body = self.manage_agents({:set => true,
+						                                                 :agents => request.query['agents']})
 
 					elsif path == '/bsig' and request.query.has_key?('bsig')
 						status, content_type, body = self.set_bsig({:query => request.query})
@@ -707,14 +729,17 @@ module Sfp
 				response.body = body
 			end
 
-			# Handle HTTP Put request
+			# Handle HTTP Delete request
 			#
 			# uri:
-			#	/model          => delete existing model
-			#	/modules        => delete a module with name specified in parameter "module", or
-			#	                   delete all modules if parameter "module" is not provided
-			#	/agents         => delete agents database
-			#  /bsig           => delete existing BSig model
+			#	/model            => delete existing model
+			#  /model/cache      => delete all cache models
+			#  /model/cache/name => delete cache model of agent "name"
+			#	/modules          => delete all modules from module database
+			#	/modules/name     => delete module "name" from module database
+			#	/agents           => delete all agents from agent database
+			#  /agents/name      => delete "name" from agent database
+			#  /bsig             => delete existing BSig model
 			#
 			def do_DELETE(request, response)
 				status = 400
@@ -728,19 +753,19 @@ module Sfp
 						status, content_type, body = self.set_model
 
 					elsif path == '/model/cache'
-						status, content_type, body = self.set_cache_model
+						status, content_type, body = self.manage_cache_model({:delete => true, :name => :all})
 
 					elsif path =~ /\/model\/cache\/.+/
-						status, content_type, body = self.set_cache_model({:name => path[13, path.length-13]})
+						status, content_type, body = self.manage_cache_model({:delete => true, :name => path[13, path.length-13]})
 
 					elsif path == '/modules'
-						status, content_type, body = self.manage_modules({:deleteall => true})
+						status, content_type, body = self.manage_modules({:uninstall => true, :name => :all})
 
 					elsif path =~ /\/modules\/.+/
-						status, content_type, body = self.manage_modules({:name => path[9, path.length-9]})
+						status, content_type, body = self.manage_modules({:uninstall => true, :name => path[9, path.length-9]})
 
 					elsif path == '/agents'
-						status, content_type, body = self.set_agents
+						status, content_type, body = self.manage_agents({:delete => true, :name => :all})
 
 					elsif path == '/bsig'
 						status, content_type, body = self.set_bsig
@@ -750,12 +775,18 @@ module Sfp
 				end
 			end
 
-			def set_agents(p={})
+			def manage_agents(p={})
 				begin
-					if p[:query] and p[:query].has_key?('agents')
-						return [200, '', ''] if Sfp::Agent.set_agents(JSON[p[:query]['agents']])
-					else
-						return [200, '', ''] if Sfp::Agent.set_agents({})
+					if p[:delete]
+						if p[:name] == :all
+							return [200, '', ''] if Sfp::Agent.delete_agents
+						elsif p[:name] != ''
+							return [200, '', ''] if Sfp::Agent.set_agents({p[:name] => nil})
+						else
+							return [400, '', '']
+						end
+					elsif p[:set]
+						return [200, '', ''] if Sfp::Agent.set_agents(JSON[p[:agents]])
 					end
 				rescue Exception => e
 					@logger.error "Saving agents list [Failed]\n#{e}\n#{e.backtrace.join("\n")}"
@@ -764,18 +795,23 @@ module Sfp
 			end
 
 			def manage_modules(p={})
-				if p[:name]
-					if p[:query]
-						return [200, '', ''] if Sfp::Agent.install_module(p[:name], p[:query]['module'])
+				if p[:install]
+					if p[:name] and p[:module]
+						return [200, '', ''] if Sfp::Agent.install_module(p[:name], p[:module])
+					elsif p[:modules]
+						return [200, '', ''] if Sfp::Agent.install_modules(p[:modules])
 					else
+						return [400, '', '']
+					end
+				elsif p[:uninstall]
+					if p[:name] == :all
+						return [200, '', ''] if Sfp::Agent.uninstall_all_modules
+					elsif p[:name] != ''
 						return [200, '', ''] if Sfp::Agent.uninstall_module(p[:name])
+					else
+						return [400, '', '']
 					end
-				elsif p[:query].length > 0
-					return [200, '', ''] if Sfp::Agent.install_modules(p[:query])
-				else
-					return [200, '', ''] if Sfp::Agent.uninstall_all_modules
 				end
-
 				[500, '', '']
 			end
 
@@ -788,19 +824,22 @@ module Sfp
 				end
 			end
 
-			def set_cache_model(p={})
-				p[:model] = JSON[p[:query]['model']] if p[:query].is_a?(Hash) and p[:query]['model']
-
-				if p[:name]
+			def manage_cache_model(p={})
+				if p[:set] and p[:name] and p[:model]
+					p[:model] = JSON[p[:model]]
 					return [200, '', ''] if Sfp::Agent.set_cache_model(p)
+				elsif p[:delete] and p[:name]
+					if p[:name] == :all
+						return [200, '', ''] if Sfp::Agent.set_cache_model
+					else
+						return [200, '', ''] if Sfp::Agent.set_cache_model({:name => p[:name]})
+					end
 				else
-					return [200, '', ''] if Sfp::Agent.set_cache_model
+					return [400, '', '']
 				end
-
 				[500, '', '']
 			end
 
-
 			def get_sfp(p={})
 				begin
 					module_name, _ = p[:module].split('/', 2)
@@ -827,9 +866,9 @@ module Sfp
 			end
 
 			def set_model(p={})
-				if p[:query] and p[:query].has_key?('model')
+				if p[:model]
 					# If setting the model was success, then return '200' status.
-					return [200, '', ''] if Sfp::Agent.set_model(JSON[p[:query]['model']])
+					return [200, '', ''] if Sfp::Agent.set_model(JSON[p[:model]])
 				else
 					# Removing the existing model by setting an empty model, if it's success then return '200' status.
 					return [200, '', ''] if Sfp::Agent.set_model({})

data/lib/sfpagent/bsig.rb

@@ -1,7 +1,7 @@
 require 'thread'
 
 class Sfp::BSig
-	include Sfp::Net::Helper
+	include Sfp::Helper::Net
 
 	SleepTime = 5
 	MaxTries = 5
@@ -108,8 +108,8 @@ class Sfp::BSig
 		operator = select_operator(flaws, operators, pi)
 		return :failure if operator.nil?
 
-# debugging
-#Sfp::Agent.logger.info "[#{mode}] Flaws: #{JSON.generate(flaws)}"
+		# debugging
+		#Sfp::Agent.logger.info "[#{mode}] Flaws: #{JSON.generate(flaws)}"
 
 		return :ongoing if not lock_operator(operator)
 
@@ -118,8 +118,8 @@ class Sfp::BSig
 		next_pi = operator['pi'] + 1
 		pre_local, pre_remote = split_preconditions(operator)
 
-# debugging
-#Sfp::Agent.logger.info "[#{mode}] local-flaws: #{JSON.generate(pre_local)}, remote-flaws: #{JSON.generate(pre_remote)}"
+		# debugging
+		#Sfp::Agent.logger.info "[#{mode}] local-flaws: #{JSON.generate(pre_local)}, remote-flaws: #{JSON.generate(pre_remote)}"
 
 		status = nil
 		tries = MaxTries
@@ -149,7 +149,6 @@ class Sfp::BSig
 	end
 
 	def achieve_remote_goal(id, goal, pi, mode)
-
 		if goal.length > 0
 			agents = Sfp::Agent.get_agents
 			split_goal_by_agent(goal).each do |agent_name,agent_goal|
@@ -161,6 +160,7 @@ class Sfp::BSig
 				end
 			end
 		end
+
 		true
 	end
 
@@ -178,7 +178,6 @@ class Sfp::BSig
 		return false if not @enabled
 
 		bsig = Sfp::Agent.get_bsig
-
 		return false if bsig.nil? or id < bsig['id']
 
 		status = nil
@@ -242,38 +241,67 @@ class Sfp::BSig
 	end
 
 	def split_goal_by_agent(goal)
-		#agents = Sfp::Agent.get_agents
 		agent_goal = {}
 		goal.each { |var,val|
 			_, agent_name, _ = var.split('.', 3)
-			#fail "Agent #{agent_name} is not in database!" if not agents.has_key?(agent_name)
 			agent_goal[agent_name] = {} if not agent_goal.has_key?(agent_name)
 			agent_goal[agent_name][var] = val
 		}
 		agent_goal
 	end
 
-	def send_goal_to_agent(agent, id, g, pi, agent_name='', mode)
+	def send_goal_to_agent(agent, id, goal, pi, agent_name='', mode)
 		begin
 			data = {'id' => id,
-			        'goal' => JSON.generate(g),
+			        'goal' => JSON.generate(goal),
 			        'pi' => pi}
-	
 			Sfp::Agent.logger.info "[#{mode}] Request goal to: #{agent_name} [WAIT]"
-	
 			code, _ = put_data(agent['sfpAddress'], agent['sfpPort'], SatisfierPath, data)
-	
 			Sfp::Agent.logger.info "[#{mode}] Request goal to: #{agent_name} - status: #{code}"
-	
 			(code == '200')
 		rescue
+			return true if check_not_created_agent(agent_name, goal)
 			false
 		end
 	end
 
+	def check_not_created_agent(agent_name, goal)
+		state = Sfp::Agent.get_state
+		vms = {}
+		Sfp::Agent.runtime.cloudfinder.clouds.each { |cloud|
+			cloud.sub!(/^\$\./, '')
+			cloud_ref = "$.#{Sfp::Agent.whoami?}.#{cloud}"
+			ref = "#{cloud_ref}.vms"
+			vms = state.at?(ref)
+			vms.each { |name,status| vms[name] = {'created' => true} } if vms.is_a?(Hash)
+		}
+		if not vms.has_key?(agent_name)
+			state = {agent_name => {'created' => false, 'in_cloud' => nil}}
+			goal.each { |var,val| return false if state.at?(var) != val }
+			return true
+		end
+		false
+	end
+
 	def get_current_state
 		state = Sfp::Agent.get_state
 		fail "BSig engine cannot get current state" if state == false
+
+		Sfp::Agent.runtime.cloudfinder.clouds.each { |cloud|
+			cloud.sub!(/^\$\./, '')
+			cloud_ref = "$.#{Sfp::Agent.whoami?}.#{cloud}"
+			ref = "#{cloud_ref}.vms"
+			vms = state.at?(ref)
+			if vms.is_a?(Hash)
+				vms.each { |name,status|
+					state[name] = { 'created' => true,
+					                'in_cloud' => cloud_ref,
+					                'sfpAddress' => status['ip'],
+					                'sfpPort' => Sfp::Agent::DefaultPort }
+				}
+			end
+		}
+
 		state
 	end
 
@@ -281,13 +309,14 @@ class Sfp::BSig
 		return goal.clone if current.nil?
 		flaws = {}
 		goal.each { |var,val|
-			_, agent_name, _ = var.split('.', 3)
-			if agent_name != Sfp::Agent.whoami?
-				current_value = Sfp::Resource.resolve(var)
-			else
-				current_value = current.at?(var)
+			current_value = current.at?(var)
+			if current_value.is_a?(Sfp::Unknown)
+				_, agent_name, _ = var.split('.', 3)
+				if agent_name != Sfp::Agent.whoami?
+					s = {agent_name => {'created' => false, 'in_cloud' => nil}}
+					current_value = s.at?(var)
+				end
 			end
-
 			if current_value.is_a?(Sfp::Undefined)
 				flaws[var] = val if not val.is_a?(Sfp::Undefined)
 			else
@@ -359,7 +388,7 @@ class Sfp::BSig
 		@lock_postprocess.synchronize {
 			_, agent_name, _ = operator['name'].split('.', 3)
 
-Sfp::Agent.logger.info "Postprocess delete VM #{agent_name}"
+			Sfp::Agent.logger.info "Postprocess delete VM #{agent_name}"
 
 			# update agents database (automatically broadcast to other agents)
 			Sfp::Agent.set_agents({agent_name => nil})
@@ -373,7 +402,7 @@ Sfp::Agent.logger.info "Postprocess delete VM #{agent_name}"
 
 			_, agent_name, _ = operator['parameters']['$.vm'].split('.', 3)
 
-Sfp::Agent.logger.info "Postprocess create VM #{agent_name}"
+			Sfp::Agent.logger.info "Postprocess create VM #{agent_name}"
 
 			# update proxy component's state
 			state = Sfp::Agent.get_state
@@ -390,6 +419,8 @@ Sfp::Agent.logger.info "Postprocess create VM #{agent_name}"
 			# get new agent's model and BSig model from cache database
 			model = Sfp::Agent.get_cache_model(agent_name)
 			model['model']['in_cloud'] = refs[0..-2].join('.')
+			model['model']['sfpAddress'] = vms[agent_name]['ip']
+			model['model']['sfpPort'] = Sfp::Agent::DefaultPort
 			
 			if not model.nil?
 				address = data[agent_name]['sfpAddress']
@@ -467,20 +498,4 @@ Sfp::Agent.logger.info "Postprocess create VM #{agent_name}"
 
 end
 
-module Sfp::Helper
-end
-
-class Sfp::Helper::SchemaCollector
-	attr_reader :schemata
-	def initialize
-		@schemata = []
-	end
-		
-	def visit(name, value, parent)
-		if value.is_a?(Hash) and value.has_key?('_classes')
-			value['_classes'].each { |s| @schemata << s }
-		end
-		true
-	end
-end
 

data/lib/sfpagent/helper.rb

@@ -0,0 +1,96 @@
+module Sfp::Helper
+end
+
+module Sfp::Helper::Net
+	def post_data(address, port, path, data, open_timeout=5, read_timeout=1800)
+		uri = create_uri(address, port, path)
+		req = Net::HTTP::Post.new(uri.path)
+		req.set_form_data(data)
+		http_request(uri, req, open_timeout, read_timeout)
+	end
+
+	def put_data(address, port, path, data, open_timeout=5, read_timeout=1800)
+		uri = create_uri(address, port, path)
+		req = Net::HTTP::Put.new(uri.path)
+		req.set_form_data(data)
+		http_request(uri, req, open_timeout, read_timeout)
+	end
+
+	def get_data(address, port, path, open_timeout=5, read_timeout=1800)
+		uri = create_uri(address, port, path)
+		req = Net::HTTP::Get.new(uri.path)
+		http_request(uri, req, open_timeout, read_timeout)
+	end
+
+	def delete_data(address, port, path, open_timeout=5, read_timeout=1800)
+		uri = create_uri(address, port, path)
+		req = Net::HTTP::Delete.new(uri.path)
+		http_request(uri, req, open_timeout, read_timeout)
+	end
+
+	private
+	def create_uri(address, port, path)
+		address = address.to_s.strip
+		port = port.to_s.strip
+		path = path.to_s.strip
+		raise Exception, "Invalid parameters [address:#{address},port:#{port},path:#{path}]" if
+			address.length <= 0 or port.length <= 0 or path.length <= 0
+		path.sub!(/^\/+/, '')
+		URI.parse("http://#{address}:#{port}/#{path}")
+	end
+
+	def use_http_proxy?(uri)
+		ENV['no_proxy'].to_s.split(',').each { |pattern|
+			pattern.chop! if pattern[-1] == '*'
+			return false if uri.host[0,pattern.length] == pattern
+		}
+		true
+	end
+
+	def http_request(uri, request, open_timeout=5, read_timeout=1800)
+		if ENV['http_proxy'].to_s.strip != '' and use_http_proxy?(uri)
+			proxy = URI.parse(ENV['http_proxy'])
+			http = Net::HTTP::Proxy(proxy.host, proxy.port).new(uri.host, uri.port)
+		else
+			http = Net::HTTP.new(uri.host, uri.port)
+		end
+		http.open_timeout = open_timeout
+		http.read_timeout = read_timeout
+		http.start
+		http.request(request) { |res| return [res.code, res.body] }
+	end	
+end
+
+class Sfp::Helper::SchemaCollector
+	attr_reader :schemata
+	def initialize
+		@schemata = []
+	end
+		
+	def visit(name, value, parent)
+		if value.is_a?(Hash) and value.has_key?('_classes')
+			value['_classes'].each { |s| @schemata << s }
+		end
+		true
+	end
+end
+
+class Sfp::Helper::CloudFinder
+	CloudSchema = '$.Cloud'
+	attr_accessor :clouds
+
+	def reset
+		@clouds = []
+		self
+	end
+
+	def visit(name, value, parent)
+		if value.is_a?(Hash)
+			if value['_context'] == 'object'
+				@clouds << parent.ref.push(name) if value.has_key?('_classes') and value['_classes'].index(CloudSchema)
+				return true
+			end
+		end
+		false
+	end
+end

data/lib/sfpagent/runtime.rb

@@ -1,12 +1,13 @@
 require 'thread'
 
 class Sfp::Runtime
-	attr_reader :root
+	attr_reader :root, :cloudfinder
 
 	def initialize(model)
 		@mutex_procedure = Mutex.new
 		@mutex_get_state = Mutex.new
 		@root = nil
+		@cloudfinder = Sfp::Helper::CloudFinder.new
 		set_model(model)
 	end
 
@@ -48,6 +49,9 @@ class Sfp::Runtime
 				root_model.accept(ParentEliminator)
 				@root = update_model(root_model, root_model, '$')
 				@root.accept(ParentGenerator)
+
+				@cloudfinder.clouds = []
+				@model.accept(@cloudfinder.reset)
 			end
 		}
 	end

data/lib/sfpagent/sfplanner.rb

@@ -57,6 +57,34 @@ class Planner
 	end
 
 	def to_image(p={})
+		def self.dot2image(dot, image_file)
+			dot_file = "/tmp/#{Time.now.getutc.to_i}.dot"
+			File.open(dot_file, 'w') { |f|
+				f.write(dot)
+				f.flush
+			}
+			!!system("dot -Tpng -o #{image_file} #{dot_file}")
+		ensure
+			File.delete(dot_file) if File.exist?(dot_file)
+		end
+
+		dot = "digraph {\n"
+		@variables.each do |sym,var|
+			name = var.name.gsub(/[\s\.\$]/, '_')
+			dot += "#{name} [label=\"#{var.name}\", shape=rect];\n"
+		end
+		@variables.each do |sym,var|
+			name = var.name.gsub(/[\s\.\$]/, '_')
+			var.dependencies.each { |sym,operators|
+				var2 = @variables[sym]
+				name2 = var2.name.gsub(/[\s\.\$]/, '_')
+				dot += "#{name} -> #{name2} ;\n"
+			}
+		end
+		dot += "}"
+puts dot
+
+		dot2image(dot, p[:file])
 	end
 
 	class Variable < Array
@@ -214,4 +242,7 @@ class Planner
 	end
 end
 
-Planner.new(:sas => File.read(ARGV[0]))
+if $0 == __FILE__ and ARGV.length > 0
+	planner = Planner.new(:sas => File.read(ARGV[0]))
+	planner.to_image(:file => 'domain.png')
+end

data/lib/sfpagent.rb

@@ -12,7 +12,7 @@ end
 # internal dependencies
 libdir = File.expand_path(File.dirname(__FILE__))
 
-require libdir + '/sfpagent/net_helper.rb'
+require libdir + '/sfpagent/helper.rb'
 require libdir + '/sfpagent/runtime.rb'
 require libdir + '/sfpagent/module.rb'
 require libdir + '/sfpagent/bsig.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &13903480 !ruby/object:Gem::Requirement
+  requirement: &14891600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *13903480
+  version_requirements: *14891600
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables:
@@ -39,8 +39,8 @@ files:
 - lib/sfpagent.rb
 - lib/sfpagent/agent.rb
 - lib/sfpagent/bsig.rb
+- lib/sfpagent/helper.rb
 - lib/sfpagent/module.rb
-- lib/sfpagent/net_helper.rb
 - lib/sfpagent/runtime.rb
 - lib/sfpagent/sfplanner.rb
 - sfpagent.gemspec

data/lib/sfpagent/net_helper.rb

@@ -1,56 +0,0 @@
-require 'uri'
-require 'net/http'
-
-module Sfp::Net
-end
-
-module Sfp::Net::Helper
-	def http_request(uri, request, open_timeout=5, read_timeout=1800)
-		http = Net::HTTP.new(uri.host, uri.port)
-		http.open_timeout = open_timeout
-		http.read_timeout = read_timeout
-		http.start
-		http.request(request) { |res| return [res.code, res.body] }
-	end	
-
-	def post_data(address, port, path, data, open_timeout=5, read_timeout=1800)
-		address = address.to_s.strip
-		port = port.to_s.strip
-		path = path.to_s.strip
-		raise Exception, "Invalid parameters [address:#{address},port:#{port},path:#{path}]" if
-			address.length <= 0 or port.length <= 0 or path.length <= 0
-
-		path.sub!(/^\/+/, '')
-		url = URI.parse("http://#{address}:#{port}/#{path}")
-		req = Net::HTTP::Post.new(url.path)
-		req.set_form_data(data)
-		http_request(url, req, open_timeout, read_timeout)
-	end
-
-	def put_data(address, port, path, data, open_timeout=5, read_timeout=1800)
-		address = address.to_s.strip
-		port = port.to_s.strip
-		path = path.to_s.strip
-		raise Exception, "Invalid parameters [address:#{address},port:#{port},path:#{path}]" if
-			address.length <= 0 or port.length <= 0 or path.length <= 0
-
-		path.sub!(/^\/+/, '')
-		url = URI.parse("http://#{address}:#{port}/#{path}")
-		req = Net::HTTP::Put.new(url.path)
-		req.set_form_data(data)
-		http_request(url, req, open_timeout, read_timeout)
-	end
-
-	def get_data(address, port, path, open_timeout=5, read_timeout=1800)
-		address = address.to_s.strip
-		port = port.to_s.strip
-		path = path.to_s.strip
-		raise Exception, "Invalid parameters [address:#{address},port:#{port},path:#{path}]" if
-			address.length <= 0 or port.length <= 0 or path.length <= 0
-
-		path.sub!(/^\/+/, '')
-		url = URI.parse("http://#{address}:#{port}/#{path}")
-		req = Net::HTTP::Get.new(url.path)
-		http_request(url, req, open_timeout, read_timeout)
-	end
-end