nuri 0.5.2 → 0.5.3

data/bin/{install_module → nuri-install-module}

@@ -30,19 +30,22 @@ end
 
 if $0 == __FILE__
 	if ARGV.length < 2
-		puts "Usage: install_module <address> [port] <module-name> ..."
+		puts "Usage: #{$0.split('/').last} <address>:[port] <module-name>+
+
+"
 		exit(1)
 	end
 
 	DefaultPort = 1314
 
-	address = ARGV.shift
-	port = (ARGV.length >= 2 ? ARGV.shift : DefaultPort)
+	address, port = ARGV.shift.split(':', 2)
+	port = port.to_s.to_i
+	port = DefaultPort unless port > 0
 	modules = ARGV
 	missing = modules.select { |mod| not ::File.directory?(mod) }
 	modules = modules - missing
 	
-	success = Nuri::Util.install_modules(address, port, modules),
+	success = Nuri::Util.install_modules(address, port, modules)
 	output = {
 		:status => success,
 		:installed_modules => modules,

data/bin/{sfw2graph → nuri-sfwgraph}

@@ -3,10 +3,10 @@
 require 'rubygems'
 require 'json'
 
-module Sfp
+module Nuri
 end
 
-module Sfp::Graph
+module Nuri::Graph
 	ActionColor = 'white'
 	ActionLabelWithParameters = false
 
@@ -140,7 +140,8 @@ end
 
 def main
 	if ARGV.length < 1
-		puts "Convert SFP plan to an image graph with Graphviz (dot).\n\nUsage: sfw2dot.rb <input-file> [output-file]\n\n"
+		puts "Convert SFP plan to a PNG image graph using Graphviz library.
+Usage: #{$0.split('/').last} <input-file> [output-file]\n\n"
 		exit
 	end
 	
@@ -151,11 +152,11 @@ def main
 	dot = ""
 	case json["type"]
 	when 'partial-order', 'parallel'
-		dot = Sfp::Graph::partial2dot(json)
+		dot = Nuri::Graph::partial2dot(json)
 	when 'sequential'
-		dot = Sfp::Graph::sequential2dot(json)
+		dot = Nuri::Graph::sequential2dot(json)
 	when 'stage'
-		dot = Sfp::Graph::stage2dot(json)
+		dot = Nuri::Graph::stage2dot(json)
 	else
 		throw Exception, "Unrecognised type of workflow: #{json['type']}"
 	end

data/bin/nuri-uninstall-module

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require 'uri'
+require 'net/http'
+
+module Nuri
+	module Util
+		def self.delete_module(address, port, modules, protocol="http")
+			def self.send_request(url)
+				uri = URI.parse(url)
+				http = Net::HTTP.new(uri.host, uri.port)
+				request = Net::HTTP::Delete.new(uri.request_uri)
+				response = http.request(request)
+				(response.code == '200')
+			end
+			if modules.length <= 0
+				send_request("#{protocol}://#{address}:#{port}/modules")
+			else
+				modules.each do |mod|
+					return false if not send_request("#{protocol}://#{address}:#{port}/modules/#{mod}")
+				end
+				true
+			end
+		end
+	end
+end
+
+if $0 == __FILE__
+	DefaultPort = 1314
+
+	if ARGV.length < 1
+		puts "Usage: delete_modules <address>:[port] [module-name]*"
+		exit(1)
+	end
+
+	address, port = ARGV.shift.split(':', 2)
+	port = port.to_s.to_i
+	port = DefaultPort unless port > 0
+
+	if Nuri::Util.delete_module(address, port, ARGV)
+		puts '{"status":"ok"}'
+	else
+		puts '{"status":"failed"}'
+	end
+end

data/examples/.gitignore

@@ -1,3 +1,4 @@
 *cell*
 *.log
 *.log.*
+*idol*

data/examples/mockcloud/generator.rb

@@ -1,66 +1,22 @@
 #!/usr/bin/env ruby
 
-def generate(number_apps)
-	header = 'include "../modules/node/node.sfp"
-include "../modules/mockcloud/mockcloud.sfp"
-include "../modules/vm/vm.sfp"
-include "../modules/apache/apache.sfp"
-include "../modules/mysql/mysql.sfp"
-include "../modules/wordpresscluster/wordpresscluster.sfp"
+require 'erb'
+require 'ostruct'
 
-proxy isa Node {
-	sfpAddress is "localhost"
-	cloud isa MockCloud
-}
-'
-	vmlb = 'vmlb isa VM {
-	apache isa Apache {
-		running is true
-		is_load_balancer is true
-		lb_members is (%members%)
-	}
-}'
-	vmapp = '%vmapp% isa VM {
-	apache isa Apache {
-		running is true
-	}
-	wp_web isa WordpressWeb {
-		installed is true
-		http is %vmapp%.apache
-		database is vmdb.wp_db
-	}
-}'
-	vmdb = 'vmdb isa VM {
-	mysql isa Mysql {
-		running is true
-	}
-	wp_db isa WordpressDB {
-		installed is true
-		mysql is vmdb.mysql
-	}
-}'
-	output = ''
-	members = ''
-	global = "global {\n"
-	1.upto(number_apps) do |i|
-		name = "vmapp#{i}"
-		output += vmapp.gsub(/%vmapp%/, name) + "\n"
-		members += "#{name},"
-		global += "\tif vmlb.apache.running is true then #{name}.apache.running is true\n"
-		global += "\tif #{name}.apache.running is true then vmdb.mysql.running is true\n"
+class ErbBinding < OpenStruct
+	def render(template)
+		ERB.new(template).result(binding)
 	end
-	global += "}\n"
-	output = header +
-	         vmlb.sub(/%members%/, members.chop) + "\n" +
-	         output + vmdb + "\n" + global
-	output
 end
 
-if $0 == __FILE__
-	if ARGV[0] == 'help'
-		puts "Usage: generator.rb [total-app-layer]"
-	else
-		number_apps = (ARGV.length > 0 ? ARGV[0].to_i : 3)
-		puts generate(number_apps)
+if ARGV.length <= 0
+	puts "Usage: generator.rb <template-file> [key=value]*"
+else
+	template = File.read(ARGV.shift)
+	data = {}
+	ARGV.each do |arg|
+		key, value = arg.split('=')
+		data[key] = value
 	end
+	puts ErbBinding.new(data).render(template)
 end

data/examples/mockcloud/generator.rb.bak

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+def generate(number_apps)
+	header = 'include "../modules/node/node.sfp"
+include "../modules/mockcloud/mockcloud.sfp"
+include "../modules/vm/vm.sfp"
+include "../modules/apache/apache.sfp"
+include "../modules/mysql/mysql.sfp"
+include "../modules/wordpresscluster/wordpresscluster.sfp"
+
+proxy isa Node {
+	sfpAddress is "localhost"
+	cloud isa MockCloud
+}
+'
+	vmlb = 'vmlb isa VM {
+	apache isa Apache {
+		running is true
+		is_load_balancer is true
+		lb_members is (%members%)
+	}
+}'
+	vmapp = '%vmapp% isa VM {
+	apache isa Apache {
+		running is true
+	}
+	wp_web isa WordpressWeb {
+		installed is true
+		http is %vmapp%.apache
+		database is vmdb.wp_db
+	}
+}'
+	vmdb = 'vmdb isa VM {
+	mysql isa Mysql {
+		running is true
+	}
+	wp_db isa WordpressDB {
+		installed is true
+		mysql is vmdb.mysql
+	}
+}'
+	output = ''
+	members = ''
+	global = "global {\n"
+	1.upto(number_apps) do |i|
+		name = "vmapp#{i}"
+		output += vmapp.gsub(/%vmapp%/, name) + "\n"
+		members += "#{name},"
+		global += "\tif vmlb.apache.running is true then #{name}.apache.running is true\n"
+		global += "\tif #{name}.apache.running is true then vmdb.mysql.running is true\n"
+	end
+	global += "}\n"
+	output = header +
+	         vmlb.sub(/%members%/, members.chop) + "\n" +
+	         output + vmdb + "\n" + global
+	output
+end
+
+if $0 == __FILE__
+	if ARGV[0] == 'help'
+		puts "Usage: generator.rb [total-app-layer]"
+	else
+		number_apps = (ARGV.length > 0 ? ARGV[0].to_i : 3)
+		puts generate(number_apps)
+	end
+end

data/examples/mockcloud/hadoop2.sfp.template

@@ -0,0 +1,25 @@
+/***
+ *
+ * Required parameters:
+ * - total : number of slaves
+ *
+ */
+
+include "modules/vm/vm.sfp"
+include "modules/mockcloud/mockcloud.sfp"
+include "modules/hadoop2/hadoop2.sfp"
+proxy isa Node {
+	sfpAddress is "localhost"
+	cloud isa MockCloud
+}
+master isa VM {
+	hadoop isa Hadoop2Master
+}
+slave1 isa VM {
+	hadoop isa Hadoop2Slave {
+		master is master.hadoop
+	}
+}
+<% (2..total.to_i).each do |i| %>
+slave<%= i %> extends slave1
+<% end %>

data/lib/nuri.rb

@@ -53,10 +53,8 @@ module Nuri
 end
 
 # internal dependencies
-libdir = File.expand_path(File.dirname(__FILE__))
-require libdir + '/nuri/constraint_helper.rb'
-require libdir + '/nuri/helper.rb'
-require libdir + '/nuri/orchestrator.rb'
-require libdir + '/nuri/choreographer.rb'
-#require libdir + '/nuri/server.rb'
-require libdir + '/nuri/master.rb'
+libdir = File.dirname(__FILE__) << '/nuri'
+['constraint_helper.rb', 'helper.rb', 'orchestrator.rb',
+ 'choreographer.rb', 'master.rb'].each do |file|
+	require "#{libdir}/#{file}"
+end

data/lib/nuri/choreographer.rb

@@ -42,7 +42,7 @@ module Nuri::Choreographer
 				local_bsigs[name] = local
 			end
 		end
-		puts "Choreographing: #{choreographing_time}"
+		puts "Choreographing " + format_benchmark(choreographing_time)
 
 		# bsig
 		local_bsigs
@@ -62,7 +62,7 @@ module Nuri::Choreographer
 			address = @model.at?("$.#{name}.sfpAddress")
 			port = @model.at?("$.#{name}.sfpPort")
 			if !address.is_a?(String) or address.length <= 0 or !port.is_a?(Fixnum) or port <= 0
-				puts "Agent #{name} is not exist!".yellow
+				puts (p[:color] ? "[Warn]".yellow : "[Warn]") + " Agent #{name} is not exist!"
 				next
 			end
 
@@ -73,9 +73,9 @@ module Nuri::Choreographer
 			rescue
 			end
 			if code == '200'
-				puts "Deploying BSig model to #{name}@#{address}:#{port} [OK]".green
+				puts "Deploying BSig model to #{name}@#{address}:#{port} " + (p[:color] ? "[OK]".green : "[OK]")
 			else
-				$stderr.puts "Deploying BSig model to #{name}@#{address}:#{port} [Failed]".red
+				$stderr.puts "Deploying BSig model to #{name}@#{address}:#{port} " + (p[:color] ? "[Failed]".red : "[Failed]")
 				success = false
 			end
 		end
@@ -106,9 +106,9 @@ module Nuri::Choreographer
 					rescue
 					end
 					if code == '200'
-						puts "Sending model of #{name} to #{address}:#{port} [OK]".green
+						puts "Sending model of #{name} to #{address}:#{port} " + (p[:color] ? "[OK]".green : "[OK]")
 					else
-						$stderr.puts "Sending model of #{name} to #{address}:#{port} [Failed]".red
+						$stderr.puts "Sending model of #{name} to #{address}:#{port} " + (p[:color] ? "[Failed]".red : "[Failed]")
 						return false
 					end
 				end
@@ -139,9 +139,9 @@ module Nuri::Choreographer
 			rescue
 			end
 			if code1 == '200' and code2 == '200'
-				puts "Purging BSig model: #{name}@#{address}:#{port} [OK]".green
+				puts "Purging BSig model: #{name}@#{address}:#{port} " + (p[:color] ? "[OK]".green : "[OK]")
 			else
-				$stderr.puts "Purging BSig model: #{name}@#{address}:#{port} [Failed]".red
+				$stderr.puts "Purging BSig model: #{name}@#{address}:#{port} " + (p[:color] ? "[Failed]".red : "[Failed]")
 				success = false
 			end
 		end

data/lib/nuri/helper.rb

@@ -18,16 +18,23 @@ module Sfp::Helper
 			when 'null'
 				nil 
 			when 'any_value'
-				'$.Any:' + value['_isa']
+				isa = value['_isa']
+				if isa.is_a?(String) and isa.isref
+					'$.Any' + '.' + isa[2, isa.length-2]
+				else
+					'$.Any'
+				end
 			when 'set'
 				value['_values']
 			else
 				value
 			end
 		elsif value.is_a?(Sfp::Unknown)
-			'$.Unknown:' + value.type.to_s
+			t = value.type.to_s
+			"$.Unknown" + (t.length > 2 ? ".#{t[2, t.length-2]}" : "")
 		elsif value.is_a?(Sfp::Undefined)
-			'$.Undefined:' + value.type.to_s
+			t = value.type.to_s
+			"$.Undefined" + (t.length > 2 ? ".#{t[2, t.length-2]}" : "")
 		else
 			value
 		end 

data/lib/nuri/master.rb

@@ -12,6 +12,8 @@ class Nuri::Master
 	CloudSchema = '$.Cloud'
 	VMSchema = '$.VM'
 
+	InstallModule = File.dirname(__FILE__) + '/../../bin/nuri-install-module'
+
 	attr_reader :model
 
 	def initialize(p={})
@@ -62,12 +64,16 @@ class Nuri::Master
 		p[:sfp] = create_plan_task(p)
 		p[:sas_post_processor] = SASPostProcessor
 
+		print "Planning "
+
 		plan = nil
 		planning_time = Benchmark.measure do
 			planner = Sfp::Planner.new
 			plan = planner.solve(p)
 		end
-		puts "Planning time (s): #{planning_time}"
+
+		print (p[:color] ? "[Finish] ".green : "[Finish] ")
+		puts format_benchmark(planning_time)
 
 		plan
 	end
@@ -122,12 +128,23 @@ class Nuri::Master
 	end
 
 	protected
+	def format_benchmark(benchmark)
+		"cpu-time: user=#{benchmark.cutime.round(2)} sys=#{benchmark.cstime.round(2)} total=#{benchmark.total.round(2)}"
+	end
+
 	def create_plan_task(p={})
 		task = get_schemata
 
-		puts "Getting current state [WAIT]".yellow
-		b = Benchmark.measure { task['initial'] = to_state('initial', get_state(p)) }
-		puts "Getting current state [OK] : #{b}".green
+		print "Getting current state "
+		puts (p[:color] ? "[Wait]".yellow : "[Wait]")
+
+		b = Benchmark.measure do
+			task['initial'] = to_state('initial', get_state(p))
+		end
+
+		print "Getting current state "
+		print (p[:color] ? "[OK]".green : "[OK]")
+		puts " " + format_benchmark(b)
 
 		task['initial'].accept(Sfp::Visitor::SfpGenerator.new(task))
 		f1 = Sfp::Helper::SfpFlatten.new
@@ -149,17 +166,24 @@ class Nuri::Master
 		dead_nodes.each_key { |name|
 			task['initial'].delete(name)
 			task['goal'].keep_if { |k,v| !(k =~ /(\$\.#{name}\.|\$\.#{name}$)/) }
-			puts "[WARN] Removing node #{name} from the task.".red
+			print (p[:color] ? "[Warn]".red : "[Warn]")
+			puts " Removing node #{name} from the task."
 		}
 
 		# print the status of goal state
-		puts "Goal state:".yellow
+		puts "Goal state:"
 		goalgen.results.each { |k,v|
 			next if k[0,1] == '_'
-			print "  #{k}: " + Sfp::Helper::Sfp2Ruby.val(v['_value']).to_s.green
+
+			print "  #{k}: "
+			value = Sfp::Helper::Sfp2Ruby.val(v['_value']).to_s
+			print (p[:color] ? value.green : value) + " "
+
 			if f1.results.has_key?(k) and f1.results[k] != v['_value']
-				print " " + Sfp::Helper::Sfp2Ruby.val(f1.results[k]).to_s.red
+				value = Sfp::Helper::Sfp2Ruby.val(f1.results[k]).to_s
+				print (p[:color] ? value.red : value)
 			end
+
 			puts ""
 		}
 
@@ -310,6 +334,15 @@ class Nuri::Master
 		false
 	end
 
+	###############
+	#
+	# Push required modules to agent based on schemata available in agent's model
+	#
+	# @param agent_model    agent's model
+	# @param address        agent's address (IP or DNS address)
+	# @param port           agent's port
+	#
+	###############
 	def push_modules(agent_model, address=nil, port=nil)
 		if address.nil? or port.nil?
 			return false if !agent_model.is_a?(Hash) or !agent_model['sfpAddress'].is_a?(String)
@@ -330,15 +363,20 @@ class Nuri::Master
 			raise Exception, "Unable to get modules list from #{name}" if code.to_i != 200
 
 			modules = JSON[body]
-			list = ''
-			schemata.each { |m|
-				list += "#{m} " if File.exist?("#{@modules_dir}/#{m}") and
-				                   (not modules.has_key?(m) or modules[m] != get_local_module_hash(m).to_s)
-			}
+			tobe_installed_modules = []
+			schemata.each do |name|
+				module_dir = "#{@modules_dir}/#{name}"
+				if File.exist?(module_dir) and
+				   ( not modules.has_key?(name) or modules[name] != get_local_module_hash(name).to_s )
+					tobe_installed_modules << name
+				end
+			end
 
-			return true if list == ''
+			return true if tobe_installed_modules.length <= 0
 
-			output = JSON.parse(`cd #{@modules_dir}; ./install_module #{address} #{port} #{list}`)
+			### install new modules and replace old ones
+			list = tobe_installed_modules.join(" ")
+			output = JSON.parse(`cd #{@modules_dir}; #{InstallModule} #{address}:#{port} #{list}`)
 			if output['installed_modules'].length > 0
 				puts ("Push modules: " + output['installed_modules'].join(" ") + " to agent #{name} [OK]").green
 			end