nuri 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52435655f176b90c016bb5f1ae94348f03c480c7
-  data.tar.gz: 12e8e06d2689353bb6fd3dfe2b8047b709ba8d20
+  metadata.gz: 9d540fda2ce76121b09511e85b2c986141462e3f
+  data.tar.gz: 36872856f912ad6cbd3998fac2721ac4c7713e8b
 SHA512:
-  metadata.gz: fbe8ac30498b9f0c672dcf429d6c7a5e7178e00a24c50c725cd95d1472d06d570e0a35121913d266c112b797c4af141ad16b2bd0870c7899006484102093dadf
-  data.tar.gz: da39e1869ccf6eae68622497fe2f99c6143079dc57aa8675a6a6ebc2584f28c51d4477587e86359273c8c763537657bc4bf3c32c4dd0220e52ed6b0c9a5c9684
+  metadata.gz: d5bf64d0730f0f802a28d0464e79905f0c9a1ed60a7e083d6276b93f3eae99a1016eac02a57ccd7f0ff65b4b9c47f92f3828b4379c8fec942c562af643c0cb61
+  data.tar.gz: c593d7e1a00db7e9e8c2e5c95b79e0573b849dcd3f8a6aea7343f34cf762db3de27d6a45c6cee78bd00e63905e8c3f0bcc0f8a57360965c9a70f7180cd3e5b49

data/README.md

@@ -58,10 +58,14 @@ Assume that the model of your system is in file "model.sfp".
 
   press 'Y' and enter to execute the plan (if the plan exists).
 
-- to execute any generated plan
+- to execute any generated plan with orchestration
 
 		$ nuri plan -m model.sfp -a
 
+- to execute any generated plan with choreography
+
+		$ nuri bsig -a
+
 
 Console mode
 ------------

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/bin/nuri

@@ -6,8 +6,6 @@ require "#{dir}/lib/nuri"
 Version = File.read(File.dirname(__FILE__) + "/../VERSION").strip
 About = "Nuri #{Version} (c) 2013"
 
-Nuri.init
-
 class Nuri::Console
 	include Nuri::Helper
 
@@ -27,7 +25,7 @@ class Nuri::Console
 	def do_state(args=ARGV, cmd="nuri ")
 		parser = Trollop::Parser.new do
 			banner <<-EOS
-Usage: #{cmd}state [options]
+Usage: #{cmd}state [options] [path]
 where [options] are:
 EOS
 			opt :model_file, 'file contains a model of desired state', :default => Nuri.main, :short => '-m'
@@ -48,12 +46,17 @@ EOS
 			state = master.get_state opts
 			state.accept(Sfp::Helper::Sfp2Ruby)
 
+			if args.length > 0
+				state = state.at?("$.#{args[0]}")
+				puts (!opts[:color] ? "Path: #{args[0]}" : "Path: " + "#{args[0]}".yellow)
+			end
+
 			if opts[:json]
 				puts (!opts[:color] ? JSON.generate(state) : CodeRay.encode(JSON.pretty_generate(state), :json, :terminal))
 			else
 				puts (!opts[:color] ? YAML.dump(state) : CodeRay.encode(YAML.dump(state), :yaml, :terminal))
-
 			end
+
 		else
 			$stderr.puts "Model file '#{opts[:model_file]}' is not exist! Use \"-h\" option for more details.".red
 
@@ -73,7 +76,7 @@ EOS
 			opt :color, 'enable colorized output'
 			opt :no_interactive, 'disable interactive input'
 			opt :no_push_module, 'disable automatic push module'
-			opt :image, 'image graph of the generated plan', :default => Dir.home + '/.nuri/plan.png'
+			opt :image, 'image graph of the generated plan', :default => '' #Dir.home + '/.nuri/plan.png'
 		end
 		help, args = check_help(args)
 		opts = process_args args, parser
@@ -92,7 +95,7 @@ EOS
 					plan_file = Dir.home + '/.nuri/plan.json'
 					File.open(plan_file, 'w') { |f| f.write(JSON.generate(plan)) }
 
-					if opts[:image]
+					if opts[:image].strip.length > 0
 						system "#{File.dirname(__FILE__)}/nuri-sfwgraph #{plan_file} #{opts[:image]}"
 					end
 
@@ -147,25 +150,60 @@ Usage: #{cmd}bsig [options]
 where [options] are:
 EOS
 			opt :model_file, 'file contains a model of desired state', :default => Nuri.main, :short => '-m'
+			opt :apply, 'generate and then deploy a BSig model'
+			opt :status, 'get BSig status of all agents'
 			opt :purge, 'purge existing BSig model', :short => '-g'
-			opt :deploy, 'generate and then deploy a BSig model'
 			opt :color, 'enable colorized output'
 			opt :no_interactive, 'disable interactive input'
+			opt :no_push_module, 'disable automatic push module'
 		end
 		help, args = check_help(args)
 		opts = process_args args, parser
 
 		if help
 			parser.educate(STDOUT)
+
+		elsif opts[:status]
+			opts[:push_modules] = true if !opts[:no_push_module]
+			master = Nuri::Master.new
+			master.set_model opts
+			master.get_state(opts).each do |name,state|
+				print "- #{name}: "
+				if not state.is_a?(Hash) or not state.has_key?('sfpAddress')
+					puts (opts[:color] ? "unknown address".yellow : "unknown address")
+				else
+					address = state['sfpAddress']
+					port = (state['sfpPort'] ? state['sfpPort'] : 1314)
+					if address.is_a?(String) and port.is_a?(Fixnum)
+						status = Net::HTTP.get(URI("http://#{address}:#{port}/bsig/flaws"))
+						if status == '{}'
+							puts (opts[:color] ? "no-flaws".green : "no-flaws")
+						else
+							puts (opts[:color] ? status.yellow : status)
+						end
+					elsif address.is_a?(Sfp::Undefined)
+						puts (opts[:color] ? "not-exist".yellow : "not-exist")
+					elsif address.is_a?(Sfp::Unknown)
+						puts (opts[:color] ? "unknown".yellow : "unknown")
+					end
+				end
+			end
+
 		elsif File.exist?(opts[:model_file])
 			opts[:bsig_deploy] = true
 			opts[:parallel] = true
+			opts[:push_modules] = true if !opts[:no_push_module]
 			master = Nuri::Master.new
 			master.set_model(opts)
 	
 			if opts[:purge]
 				print "Purging Behavioural Signature model "
-				if master.purge_bsig(opts)
+				puts (opts[:color] ? "[Wait]".yellow : "[Wait]")
+
+				status = master.purge_bsig(opts)
+				print "Purging Behavioural Signature model "
+
+				if status
 					puts (opts[:color] ? "[OK]".green : "[OK]")
 				else
 					puts (opts[:color] ? "[Failed]".red : "[Failed]")
@@ -179,17 +217,21 @@ EOS
 						json = JSON.pretty_generate(bsig)
 						puts (opts[:color] ? CodeRay.encode(json, :json, :terminal) : json)
 		
-						if not opts[:no_interactive] and not opts[:deploy]
+						if not opts[:no_interactive] and not opts[:apply]
 							print "Deploy the BSig model [y/N]? "
-							opts[:deploy] = true if STDIN.gets.chomp.upcase == 'Y'
+							opts[:apply] = true if STDIN.gets.chomp.upcase == 'Y'
 						end
 	
-						if opts[:deploy]
+						if opts[:apply]
 							print 'Deploying the BSig model '
+							puts (opts[:color] ? "[Wait]".yellow : "[Wait]")
+							
 							opts[:bsig] = bsig
 							if master.deploy_bsig(opts)
+								print 'Deploying the BSig model '
 								puts (opts[:color] ? "[OK]".green : "[OK]")
 							else
+								print 'Deploying the BSig model '
 								puts (opts[:color] ? "[Failed]".red : "[Failed]")
 							end
 						end
@@ -400,8 +442,8 @@ EOS
 		agents = {}
 		state.each do |name,model|
 			agents[name] = {
-				'sfpAddress' => (model['sfpAddress'].is_a?(String) ? model['sfpAddress'] : ''),
-				'sfpPort' => (model['sfpPort'].is_a?(Fixnum) ? model['sfpPort'] : 0)
+				'sfpAddress' => (model.is_a?(Hash) and model['sfpAddress'].is_a?(String) ? model['sfpAddress'] : ''),
+				'sfpPort' => (model.is_a?(Hash) and model['sfpPort'].is_a?(Fixnum) ? model['sfpPort'] : 0)
 			}
 		end
 		agents
@@ -554,4 +596,8 @@ EOS
 	end
 end
 
-Nuri::Console.new.run if $0 == __FILE__
+if $0 == __FILE__
+	Nuri.init
+	Nuri::Console.new.run
+end
+

data/bin/nuri-install-module

@@ -9,21 +9,29 @@ module Nuri
 	module Util
 		TarGzip = Object.new.extend(Util::Tar)
 	
-		def self.install_modules(address, port, modules, protocol="http")
+		def self.install_modules(address, port, modules, protocol="http", open_timeout=2, read_timeout=10)
 			data = {}
 			modules.each do |module_name|
 				raise Exception, "Module #{module_name} is not exist!" if not ::File.directory?(module_name)
 				data[module_name] = TarGzip.targzip(module_name, module_name).read
 			end
 
-			url = "#{protocol}://#{address}:#{port}/modules"
-			uri = URI.parse(url)
-			http = Net::HTTP.new(uri.host, uri.port)
-			request = Net::HTTP::Put.new(uri.request_uri)
-			request.set_form_data(data)
-			response = http.request(request)
-
-			(response.code == '200')
+			begin
+				url = "#{protocol}://#{address}:#{port}/modules"
+				uri = URI.parse(url)
+				http = Net::HTTP.new(uri.host, uri.port)
+				http.open_timeout = open_timeout
+				http.read_timeout = read_timeout
+				request = Net::HTTP::Put.new(uri.request_uri)
+				request.set_form_data(data)
+				response = http.request(request)
+	
+				(response.code == '200')
+			rescue Exception => e
+				$stderr.puts "Cannot install module with URL: #{url}"
+				$stderr.puts e
+				false
+			end
 		end
 	end
 end

data/examples/mockcloud/apache2.sfp

@@ -0,0 +1,14 @@
+include "modules/node/node.sfp"
+include "modules/apache2/apache2.sfp"
+include "modules/vm/vm.sfp"
+include "modules/mockcloud/mockcloud.sfp"
+
+local isa Node {
+	sfpAddress is "localhost"
+	hpcloud isa MockCloud
+}
+vm1 isa VM {
+	apache isa Apache2 {
+		running is true
+	}
+}

data/examples/mockcloud/ping.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'net/http'
+require 'thread'
+
+len = 120
+
+def ping(address, port=1314)
+	print "print #{address} "
+	url = "http://#{address}:#{port}/sfpstate"
+	uri = URI.parse(url)
+	http = Net::HTTP.new(uri.host, uri.port)
+	http.open_timeout = 2
+	http.read_timeout = 5
+	begin
+		req = Net::HTTP::Get.new(uri.path)
+		http.start
+		http.request(req) { |res|
+			puts "[#{res.code}] [OK]"
+		}
+	rescue Exception => e
+		puts "[Failed] #{e}" #\n#{e.backtrace.join("\n")}"
+	end
+end
+
+ping('hadoopmaster')
+finished = []
+(1..len).each do |i|
+#	Thread.new {
+		host = "hadoopslave#{i}"
+		ping(host)
+		finished << host
+#	}
+end
+
+until finished.length >= len do
+	sleep 1
+end

data/examples/openstack/openstack-hadoop1-cluster.sfp

@@ -0,0 +1,37 @@
+include "modules/vm/vm.sfp"
+include "modules/openstack/openstack.sfp"
+
+proxy isa Node {
+	sfpAddress is "localhost"
+	herry isa OpenStack {
+		// replace the value of OpenStack Identity's URL plus "/tokens/"
+		auth_uri is "http://16.25.166.21:5000/v2.0/tokens/"
+
+		// replace the value with your SSH key name, and then put
+		// the private key (with name <key-name>.pem) in module's directory.
+		vm_ssh_key_name is "nurikey"
+
+		// an image that already has nuri agent
+		vm_image is "8fe14786-5388-4787-8aaf-96feebfa8aae"
+	}
+}
+
+include "modules/hadoop1/hadoop1.sfp"
+
+vm1 isa VM {
+	hadoop isa Hadoop1Master {
+		// replace this with the URL of hadoop1 tar package file
+		source is "http://master.nuri.ext9.sup.hpl.hp.com/hadoop"
+	}
+}
+vm2 isa VM {
+	hadoop isa Hadoop1Slave {
+		master is vm1.hadoop
+		// replace this with the URL of hadoop1 tar package file
+		source is "http://master.nuri.ext9.sup.hpl.hp.com/hadoop"
+	}
+}
+vm3 extends vm2
+vm4 extends vm2
+vm5 extends vm2
+vm6 extends vm2

data/examples/openstack/openstack-hadoop2-cluster.sfp

@@ -0,0 +1,39 @@
+include "modules/vm/vm.sfp"
+include "modules/openstack/openstack.sfp"
+
+proxy isa Node {
+	sfpAddress is "localhost"
+	herry isa OpenStack {
+		auth_uri is "http://16.25.166.21:5000/v2.0/tokens/"
+
+		// use m1.medium (id="2") flavor because Hadoop2 requires minimum 4GB of memory
+		vm_flavor is "3"
+
+		// - replace the value with your key name
+		// - put the key file <key-name>.pem in module's directory
+		vm_ssh_key_name is "nurikey"
+
+		// a VM image that already has Nuri agent
+		vm_image is "8fe14786-5388-4787-8aaf-96feebfa8aae"
+	}
+}
+
+include "modules/hadoop2/hadoop2.sfp"
+
+vm1 isa VM {
+	hadoop isa Hadoop2Master {
+		// replace this with the URL of hadoop2 tar package file
+		source is "http://master.nuri.ext9.sup.hpl.hp.com/hadoop"
+	}
+}
+vm2 isa VM {
+	hadoop isa Hadoop2Slave {
+		master is vm1.hadoop
+		// replace this with the URL of hadoop2 tar package file
+		source is "http://master.nuri.ext9.sup.hpl.hp.com/hadoop"
+	}
+}
+vm3 extends vm2
+vm4 extends vm2
+vm5 extends vm2
+vm6 extends vm2

data/examples/v2/apache.sfp

@@ -0,0 +1,30 @@
+include "service.sfp"
+
+schema Apache extends Service {
+	package_name = "apache2"
+	service_name = "apache2"
+	installed = true
+	running = true
+	configured = true
+
+	final port = 80
+	final document_root = "/var/www"
+	final modules isset String
+	final server_name = ""
+
+	// load balancer config
+	final load_balancer = false
+	final lb_members isset Node
+	final lb_method = "byrequests"  // byrequests, bytraffic, bybusyness
+
+	sub configure {
+		condition {
+			this.installed = true
+			this.running = false
+			this.configured = false
+		}
+		effect {
+			this.configured = true
+		}
+	}
+}

data/examples/v2/aptpackage.sfp

@@ -0,0 +1,6 @@
+include "package.sfp"
+
+schema AptPackage extends Package {
+	final version = "latest"
+	final source = "default"
+}

data/examples/v2/mock1.sfp

@@ -0,0 +1,12 @@
+include "../../modules/mockcloud/mockcloud.sfp"
+include "../../modules/vm/vm.sfp"
+include "apache.sfp"
+
+proxy isa Node {
+	sfpAddress is "localhost"
+	mockcloud isa MockCloud
+}
+vm1 isa VM {
+	//apache isa Apache
+	s isa Service
+}

data/examples/v2/package.sfp

@@ -0,0 +1,22 @@
+schema Package {
+	installed = true
+
+	final package_name = ""
+	final version = ""
+	final source = ""
+
+	synchronized sub install {
+		effect {
+			this.installed = true
+		}
+	}
+
+	synchronized sub uninstall {
+		condition {
+			this.installed = true
+		}
+		effect {
+			this.installed = false
+		}
+	}
+}

data/examples/v2/service.sfp

@@ -0,0 +1,94 @@
+include "aptpackage.sfp"
+
+schema Service {
+	running = true
+	configured = true
+
+	final service_name = ""
+
+	sub start {
+		condition {
+			this.running != true
+			this.configured = true
+		}
+		effect {
+			this.running = true
+		}
+	}
+
+	sub stop {
+		condition {
+			this.running = true
+		}
+		effect {
+			this.running = false
+		}
+	}
+
+	sub configure {
+		condition {
+			this.running = false
+		}
+		effect {
+			this.configured = true
+		}
+	}
+}
+
+schema SysVService extends Service {
+	final runlevel isset String
+}
+
+schema AptService extends AptPackage {
+	synchronized sub install {
+		condition {
+			this.installed != true
+		}
+		effect {
+			this.installed = true
+			this.running = false
+			this.configured = false
+		}
+	}
+	
+	synchronized sub uninstall {
+		condition {
+			this.running = false
+			this.installed = true
+		}
+		effect {
+			this.installed = false
+			this.configured = true
+		}
+	}
+
+	sub start {
+		condition {
+			this.running != true
+			this.installed = true
+			this.configured = true
+		}
+		effect {
+			this.running = true
+		}
+	}
+
+	sub stop {
+		condition {
+			this.running = true
+		}
+		effect {
+			this.running = false
+		}
+	}
+
+	sub configure {
+		condition {
+			this.installed = true
+			this.running = false
+		}
+		effect {
+			this.configured = true
+		}
+	}
+}