vagrant-nodemaster 1.1.1 → 1.1.3

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+vagrant-nodemaster
+==================
+
+* Insertado la descarga de la configuración de los nodos
+* Insertada la adición y eliminación de máquinas virtuales a la configuración de los
+  nodos remotos
+* Añadida la funcionalidad de hacer upload de una configuración a un nodo y machacar
+  el contenido existente
+
+

data/README.md

@@ -2,11 +2,12 @@ vagrant-nodemaster
 ==================
 This plugin allows you to control centralizely remote virtual environments configured with the plugin [Vagrant-Node](https://github.com/fjsanpedro/vagrant-nodemaster/tree/master/lib/vagrant-node).
 
+You can also work with Vagrant-Node through a web application called [VagrantWeb](https://github.com/catedrasaes-umu/vagrantweb/). Watch the video [VagrantWeb Overview](https://www.youtube.com/watch?v=PslrNMAl_vU) to figure out all the functionality available.
 
 This plugin has been developed in the context of the [Catedra SAES](http://www.catedrasaes.org) of the University of Murcia(Spain).
 
 ##Installation
-Requires Vagrant 1.2 and libsqlite3-dev
+Requires Vagrant (minimum version 1.2.2) and libsqlite3-dev. The miminum version required of the plugin Vagrant-Node in each node is 1.1.3.
 
 ```bash
 $ vagrant plugin install vagrant-nodemaster

data/lib/vagrant-nodemaster/node/nodeadd.rb

@@ -22,9 +22,20 @@ module Vagrant
 		  		
 		  		#dbmanager=DB::NodeDBManager.new
 		  		
-		  		DB::NodeDBManager.add_node(argv[0],argv[1],argv[2].to_i,argv[3],options[:dns])
-					
-					0
+		  		
+				begin
+
+					DB::NodeDBManager.add_node(argv[0],argv[1],argv[2].to_i,argv[3],options[:dns])
+								
+				rescue Exception => e
+					if e.class == SQLite3::ConstraintException
+						@env.ui.error("Error adding node '#{argv[0]}': There is a node with the same name")
+					else 
+						@env.ui.error("Error adding node '#{argv[0]}': "+e.message)
+					end
+				end	
+				
+				0
 			end
   
   	end

data/lib/vagrant-nodemaster/node/nodedbmanager.rb

@@ -1,192 +1,212 @@
 require 'sqlite3'
 
 module Vagrant
-	module NodeMaster
-		module DB
-			class NodeDBManager
-				
-				def initialize(data_dir=nil)			  				  	
-				   
-					 @@db=check_database(data_dir) if data_dir
-					 
-				end
+module NodeMaster
+module DB
+	class NodeDBManager
+		
+		def initialize(data_dir=nil)			  				  	
+		   
+			 @@db=check_database(data_dir) if data_dir
+			 
+		end
+		
+		def self.get_reference
+		  @@db
+		end
+		
+
+		def self.import_node(node_name,node_address,node_port,node_password,raw)
+			if (!portvalid?(node_port))		
+				raise "Node port must be above 1023"
+			end
+			
+			
+			if (!namevalid?(node_name))
+				raise "Node name Invalid (Special characters allowed: '_' and '-')." 
+			end
+
+			sql="INSERT INTO #{TABLE_NAME} VALUES ( ? , ? , ?,?)"
+
+			password = node_password
+			password = Digest::MD5.hexdigest(password) if !raw
+
+			@@db.execute(sql,node_name,node_address,node_port,password)
+
+		end
+
+		def self.add_node(node_name,node_address,node_port,node_password,dnsformat)
+			
+			if (!portvalid?(node_port))		
+				raise "Node port must be above 1023"
+			end
+			
+			
+			if (!namevalid?(node_name))
+				raise "Node name Invalid (Special characters allowed: '_' and '-')." 
+			end
+			
+			if (dnsformat && !dnsvalid?(node_address)) || 
+				(!dnsformat && !ipvalid?(node_address))						
+			
+				raise "Invalid ip or dns address."
+				 
+			end				
+												
+			
+			sql="INSERT INTO #{TABLE_NAME} VALUES ( ? , ? , ?,?)"
+			@@db.execute(sql,node_name,node_address,node_port,Digest::MD5.hexdigest(node_password))
+			
+		end
+		
+		def self.update_node(node_name,node_address,node_port,dnsformat)
+			
+			if (!portvalid?(node_port))						
+			
+				raise "Node port must be above 1023"
+				 
+			end
+			
+			if (dnsformat && !dnsvalid?(node_address)) || 
+				(!dnsformat && !ipvalid?(node_address))						
+			
+				raise "Invalid ip or dns address."
+				 
+			end			
+			
+			sql="UPDATE #{TABLE_NAME} SET #{NODE_ADDRESS_COLUMN} = ?,#{NODE_PORT_COLUMN} = ?  WHERE #{NODE_NAME_COLUMN}= ?"
+			@@db.execute(sql,node_address,node_port,node_name)
+			
+		end
+		
+
+		def self.update_node_password(node_name,password)
+		  sql="UPDATE #{TABLE_NAME} SET #{NODE_PASSWORD_COLUMN} = ?  WHERE #{NODE_NAME_COLUMN}= ?"
+		  @@db.execute(sql,Digest::MD5.hexdigest(password),node_name)
+		end
+		
+		
+		def self.remove_node(node_name)
+			sql="DELETE FROM #{TABLE_NAME} WHERE #{NODE_NAME_COLUMN}=?"
+			@@db.execute(sql,node_name)
+		end
+		
+		def self.remove_nodes
+			sql="DELETE FROM #{TABLE_NAME}"
+			@@db.execute(sql)
+		end
+
+		
+		def self.get_node_names
+			sql="SELECT #{NODE_NAME_COLUMN} FROM #{TABLE_NAME}"
+			@@db.execute(sql);
+		end				
+		
+		def self.get_nodes				
+			sql="SELECT * FROM #{TABLE_NAME}"
+			rows=@@db.execute(sql);
+			nodes = []
+			rows.each do |row|
+				node = {}
+				node[:name]=row[0]
+				node[:address]=row[1]
+				node[:port]=row[2]
+				node[:password]=row[3]
+				nodes << node
+			end
+
+			nodes
+
+		end
+		
+		def self.get_node(node_name)
+			sql="SELECT * FROM #{TABLE_NAME} WHERE #{NODE_NAME_COLUMN}=?"
+			raise "Node not found" if (nodear=@@db.execute(sql,node_name)).empty?
+			node = {}
+			node[:name]=nodear[0][0]
+			node[:address]=nodear[0][1]
+			node[:port]=nodear[0][2]
+			node[:password]=nodear[0][3]
+			node
+
+		end
+		
+		private
+	
+		TABLE_NAME='node_table'
+		NODE_NAME_COLUMN = 'node_name'
+		NODE_ADDRESS_COLUMN = 'node_address'
+		NODE_PORT_COLUMN = 'node_port'
+		NODE_PASSWORD_COLUMN = 'node_password'
+		
+		def check_database(data_dir)
+			#Creates and/or open the database
+			db = SQLite3::Database.new( data_dir.to_s + "/nodemaster.db" )
+							
+			if db.execute("SELECT name FROM sqlite_master 
+									 WHERE type='table' AND name='#{TABLE_NAME}';").length==0						
+#						db.execute( "create table '#{TABLE_NAME}' (id INTEGER PRIMARY KEY AUTOINCREMENT, 
+#												{NODE_NAME_COLUMN} TEXT, #{NODE_ADDRESS_COLUMN} TEXT);" )				
+				db.execute( "create table '#{TABLE_NAME}' (#{NODE_NAME_COLUMN} TEXT PRIMARY KEY,#{NODE_ADDRESS_COLUMN} TEXT NOT NULL,#{NODE_PORT_COLUMN} INTEGER NOT NULL,#{NODE_PASSWORD_COLUMN} VARCHAR(64) NOT NULL);" )
+			end
+			
+			db
+
+		end
+
+		def self.ipvalid?(node_address)
 				
-				def self.get_reference
-				  @@db
-				end
+				ipreg= '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$'
 				
-				def self.add_node(node_name,node_address,node_port,node_password,dnsformat)
-					
-					if (!portvalid?(node_port))		
-						raise "Node port must be above 1023"
-					end
-					
-					
-					if (!namevalid?(node_name))
-						raise "Node name Invalid (Spectial characters allowed: '_' and '-')." 
-					end
-					
-					if (dnsformat && !dnsvalid?(node_address)) || 
-						(!dnsformat && !ipvalid?(node_address))						
-					
-						raise "Invalid ip or dns address."
-						 
-					end				
-														
-					
-					sql="INSERT INTO #{TABLE_NAME} VALUES ( ? , ? , ?,?)"
-					@@db.execute(sql,node_name,node_address,node_port,Digest::MD5.hexdigest(node_password))
-					
-				end
 				
-				def self.update_node(node_name,node_address,node_port,dnsformat)
-					
-					if (!portvalid?(node_port))						
-					
-						raise "Node port must be above 1023"
-						 
-					end
-					
-					if (dnsformat && !dnsvalid?(node_address)) || 
-						(!dnsformat && !ipvalid?(node_address))						
-					
-						raise "Invalid ip or dns address."
-						 
-					end			
-					
-					sql="UPDATE #{TABLE_NAME} SET #{NODE_ADDRESS_COLUMN} = ?,#{NODE_PORT_COLUMN} = ?  WHERE #{NODE_NAME_COLUMN}= ?"
-					@@db.execute(sql,node_address,node_port,node_name)
-					
-				end
+				ipregex = Regexp.new(ipreg)
 				
 
-        def self.update_node_password(node_name,password)
-          sql="UPDATE #{TABLE_NAME} SET #{NODE_PASSWORD_COLUMN} = ?  WHERE #{NODE_NAME_COLUMN}= ?"
-          @@db.execute(sql,Digest::MD5.hexdigest(password),node_name)
-        end
+				if (node_address =~ ipregex) 
+					return true
+				end
 				
+				false 
 				
-				def self.remove_node(node_name)
-					sql="DELETE FROM #{TABLE_NAME} WHERE #{NODE_NAME_COLUMN}=?"
-					@@db.execute(sql,node_name)
-				end
+		end
+		
+		def self.dnsvalid?(node_address)
 				
-				def self.remove_nodes
-					sql="DELETE FROM #{TABLE_NAME}"
-					@@db.execute(sql)
-				end
-
 				
-				def self.get_node_names
-					sql="SELECT #{NODE_NAME_COLUMN} FROM #{TABLE_NAME}"
-					@@db.execute(sql);
-				end				
+				hostreg='^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$'
 				
-				def self.get_nodes				
-					sql="SELECT * FROM #{TABLE_NAME}"
-					rows=@@db.execute(sql);
-					nodes = []
-					rows.each do |row|
-						node = {}
-						node[:name]=row[0]
-						node[:address]=row[1]
-						node[:port]=row[2]
-						node[:password]=row[3]
-						nodes << node
-					end
-
-					nodes
-
-				end
 				
-				def self.get_node(node_name)
-					sql="SELECT * FROM #{TABLE_NAME} WHERE #{NODE_NAME_COLUMN}=?"
-					raise "Node not found" if (nodear=@@db.execute(sql,node_name)).empty?
-					node = {}
-					node[:name]=nodear[0][0]
-					node[:address]=nodear[0][1]
-					node[:port]=nodear[0][2]
-					node[:password]=nodear[0][3]
-					node
+				hregex = Regexp.new(hostreg)
 
+				if (node_address =~ hregex)
+					return true
 				end
 				
-				private
-			
-				TABLE_NAME='node_table'
-				NODE_NAME_COLUMN = 'node_name'
-				NODE_ADDRESS_COLUMN = 'node_address'
-				NODE_PORT_COLUMN = 'node_port'
-				NODE_PASSWORD_COLUMN = 'node_password'
+				false 
 				
-				def check_database(data_dir)
-					#Creates and/or open the database
-					db = SQLite3::Database.new( data_dir.to_s + "/nodemaster.db" )
-									
-					if db.execute("SELECT name FROM sqlite_master 
-											 WHERE type='table' AND name='#{TABLE_NAME}';").length==0						
-#						db.execute( "create table '#{TABLE_NAME}' (id INTEGER PRIMARY KEY AUTOINCREMENT, 
-#												{NODE_NAME_COLUMN} TEXT, #{NODE_ADDRESS_COLUMN} TEXT);" )				
-						db.execute( "create table '#{TABLE_NAME}' (#{NODE_NAME_COLUMN} TEXT PRIMARY KEY,#{NODE_ADDRESS_COLUMN} TEXT NOT NULL,#{NODE_PORT_COLUMN} INTEGER NOT NULL,#{NODE_PASSWORD_COLUMN} VARCHAR(64) NOT NULL);" )
-					end
-					
-					db
-
-				end
+		end
 		
-				def self.ipvalid?(node_address)
-						
-						ipreg= '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$'
-						
-						
-						ipregex = Regexp.new(ipreg)
-						
-
-						if (node_address =~ ipregex) 
-							return true
-						end
-						
-						false 
-						
-				end
 				
-				def self.dnsvalid?(node_address)
-						
-						
-						hostreg='^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$'
-						
-						
-						hregex = Regexp.new(hostreg)
-
-						if (node_address =~ hregex)
-							return true
-						end
-						
-						false 
-						
-				end
-				
-						
-				def self.namevalid?(node_name)
-					#only allowing '_' and '-'
-					namereg = '^[a-z0-9_-]*$'
-					nameregex = Regexp.new(namereg)
-					if (node_name =~nameregex)
-						return true
-					end
-
-					false
-						
-				end
+		def self.namevalid?(node_name)
+			#only allowing '_' and '-'
+			namereg = '^[a-zA-Z0-9_-]*$'
+			nameregex = Regexp.new(namereg)
+			if (node_name =~nameregex)
+				return true
+			end
+
+			false
 				
-				def self.portvalid?(node_port)
-					if (node_port>=1024)
-						return true
-					end
-					false
-				end
-						
+		end
+		
+		def self.portvalid?(node_port)
+			if (node_port>=1024)
+				return true
 			end
+			false
 		end
+				
 	end
 end
+end
+end

data/lib/vagrant-nodemaster/node/nodeimport.rb

@@ -0,0 +1,92 @@
+require 'vagrant-nodemaster/node/nodedbmanager'
+require 'pp'
+
+module Vagrant
+  module NodeMaster
+  
+		class NodeImport < Vagrant.plugin(2, :command)
+
+			def execute
+					
+				options = {}
+
+				options[:raw] = false
+				options[:sample] = false
+				
+				opts = OptionParser.new do |opts|
+					opts.banner = "Usage: vagrant node import <file>"						
+					opts.separator ""
+					opts.on("-r", "--raw", "Import file exactly. Used when file has encoded md5 passwords ") do |f|
+		              options[:raw] = true
+		           	end
+		           	opts.on("-s", "--sample", "Writes a sample export file") do |f|
+		              options[:sample] = true
+		           	end
+				end
+				
+				argv = parse_options(opts)				
+				return if !argv
+		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 1
+		  		
+		  		if (!options[:sample])		  			
+		  			if !File.exist?(argv[0])
+		  				@env.ui.error("The file does not exist")
+		  			else
+		  				#FILE IMPORT
+		  				#CHECK IF RAW IMPORT OR NOT
+		  				File.foreach(argv[0]).with_index { |line, line_num|
+							if (line_num>0)
+								
+								line = line.gsub("\n",'')								
+								parts=line.split(",") 
+								#0 => node name
+								#1 => node address
+								#2 => node port
+								#3 => node password								
+								
+								begin
+
+									DB::NodeDBManager.import_node(parts[0],parts[1],parts[2].to_i,parts[3],options[:raw])
+								
+								rescue Exception => e
+									if e.class == SQLite3::ConstraintException
+										@env.ui.error("Error importing node '#{parts[0]}': There is a node with the same name")
+									else 
+										@env.ui.error("Error importing node '#{parts[0]}': "+e.message)
+									end
+								end
+							end
+						}
+		  			end
+		  		else
+		  			#USER WANTS TO WRITE A SAMPLE FILE
+		  			
+		  			#CHECK IF THE FILE EXISTS, SHOWING OVERWRITE QUESTION
+		  			if File.exist?(argv[0])
+		  				choice = @env.ui.ask("The file already exists, Do you really want to overwrite [N/Y]? ")
+
+		  				if (!choice || choice.upcase != "Y" )									
+							return 0				
+						end
+		  			end		  			
+
+
+
+					$samplecontent = "\"Node Name\",\"Node Address\",\"Node Port\",\"Node Password\"\n"
+					$samplecontent << "examplenode,127.0.0.1,3333,examplepassword\n";
+					
+					
+					File.write(argv[0], $samplecontent)
+
+		  		end
+		  		
+		  		
+		  		
+					
+				0
+			end
+  
+  	end
+  
+  end
+end

data/lib/vagrant-nodemaster/node/nodeinfo.rb

@@ -37,8 +37,14 @@ module Vagrant
 						end						
 
 						@env.ui.info("#{"CPU Average:".ljust(25)} #{result[:cpuaverage][0]}% (1 Minute)  #{result[:cpuaverage][1]}% (5 Minutes)  #{result[:cpuaverage][2]}% (15 Minutes)")
-						@env.ui.info("#{"Memory Size:".ljust(25)} #{result[:memorysize]} (#{result[:memoryfree]} Free)")
-						@env.ui.info("#{"Disk Used:".ljust(25)}#{result[:diskusage]} GB")
+						@env.ui.info("#{"Memory Size:".ljust(25)} #{result[:memorysize]} GB (#{result[:memoryfree]} GB Free)")
+						#@env.ui.info("#{"Disk Used:".ljust(25)}#{result[:diskusage]} GB")
+						@env.ui.info("Disk usage:")
+
+						result[:diskusage].each do |partition|
+							@env.ui.info("\tPartition #{partition[:partition]} => Free: #{partition[:free]} Total: #{partition[:total]} (Used: #{partition[:freepercent]})")
+						end
+
 
 						interfaces = result[:interfaces].split(",")
 						
@@ -47,6 +53,8 @@ module Vagrant
 							puts "Interface #{i} => "+result[interface] if result[interface]
 						end
 						
+						@env.ui.info("#{"Vagrant Version:".ljust(25)} #{result[:vagrant_version]}")
+
 					end
 					
 					0

data/lib/vagrant-nodemaster/node/nodeoperation.rb

@@ -0,0 +1,39 @@
+require 'vagrant-nodemaster/node/nodedbmanager'
+require 'vagrant-nodemaster/requestcontroller'
+
+module Vagrant
+  module NodeMaster
+  
+		class NodeOperation < Vagrant.plugin(2, :command)
+
+			def execute
+					
+					options = {}
+					
+					opts = OptionParser.new do |opts|
+						opts.banner = "Usage: vagrant node operation <node-name> <operation-id>"						
+					end
+					
+					argv = parse_options(opts)
+					return if !argv
+		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 2
+		  		
+		  		result = RequestController.node_operation_queued(argv[0],argv[1])
+		  		
+		  		
+		  		case result[0]
+		  		when "IN PROGRESS"
+		  		  @env.ui.info("The operation #{argv[1]} is \"IN PROGRESS\"")
+		  		when "SUCCESS"
+		  		  @env.ui.success("The operation #{argv[1]} succeeded.")
+		  		else
+		  		  @env.ui.error("The operation #{argv[1]} failed. The result is:\n#{result[1]}")
+		  		end
+					
+					0
+			end
+  
+  	end
+  
+  end
+end

data/lib/vagrant-nodemaster/node/nodeoperationlast.rb

@@ -18,7 +18,13 @@ module Vagrant
 				return if !argv
 		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 1
 		  		
+		  		
+
 		  		result = RequestController.node_operation_queued_last(argv[0])
+
+
+		  		
+		  		
 		  		
 		  		
 		  		if (result.empty?)
@@ -26,11 +32,15 @@ module Vagrant
 		  		  
 		  		else
   		      		@env.ui.info("-------------------------------------------------------------------------------------")
-            		@env.ui.info("| RESULT CODE |          RESUL  T INFO                              |")       
+            		@env.ui.info("| RESULT CODE |   VIRTUAL MACHINE    |               RESULT INFO               |")       
             		@env.ui.info("-------------------------------------------------------------------------------------")
             
 		            result.each do |operation|            
-		              @env.ui.info("|     #{operation[0]}     |#{operation[1].ljust(5)}")
+		              code= operation[0]		              
+		              rparams=JSON.parse(operation[1],{:quirks_mode => true,:symbolize_names => true})			              
+		              vm = rparams[0].has_key?(:vmname) ? rparams[0][:vmname]: "--"		              		              
+		              result = rparams[0][:status]		              
+		              @env.ui.info("|     #{code}     |         #{vm.ljust(5)}        |   #{result.ljust(5)}  ")
 		              @env.ui.info("-------------------------------------------------------------------------------------")    
 		            end
 		  		end	  		

data/lib/vagrant-nodemaster/node/nodeoperationshow.rb

@@ -8,27 +8,41 @@ module Vagrant
 
 			def execute
 					
-					options = {}
-					
-					opts = OptionParser.new do |opts|
-						opts.banner = "Usage: vagrant node operation show <node-name> <operation-id>"						
-					end
-					
-					argv = parse_options(opts)
-					return if !argv
+				options = {}
+				
+				opts = OptionParser.new do |opts|
+					opts.banner = "Usage: vagrant node operation show <node-name> <operation-id>"						
+				end
+				
+				argv = parse_options(opts)
+				return if !argv
 		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 2
 		  		
-		  		result = RequestController.node_operation_queued(argv[0],argv[1])
-		  		
-		  		
-		  		case result[0]
-		  		when 100
-		  		  @env.ui.info("The operation #{argv[1]} is \"IN PROGRESS\"")
-		  		when 200
-		  		  @env.ui.success("The operation #{argv[1]} succeeded.")
+		  		if (argv[1].to_i==0)
+		  			@env.ui.error("Invalid operation ID")
 		  		else
-		  		  @env.ui.error("The operation #{argv[1]} failed. The result is:\n#{result[1]}")
-		  		end
+
+
+		  			
+			  		result = RequestController.node_operation_queued(argv[0],argv[1])
+
+			  			  		
+		  			
+			  		
+			  		case result[0]
+			  		when 100
+			  		  @env.ui.info("The operation #{argv[1]} is \"IN PROGRESS\"")
+			  		when 200
+			  		  @env.ui.success("The operation #{argv[1]} succeeded.")
+			  		else		  			
+			  			rparams=JSON.parse(result[1],{:quirks_mode => true,:symbolize_names => true})	
+			  			rparams=rparams[0]
+			  			
+
+			  		  @env.ui.error("The operation #{argv[1]} in Virtual Machine '#{rparams[:vmname]}' failed. The result is:\n#{rparams[:status]}")
+			  		end
+				  	
+			  	end
 					
 					0
 			end

data/lib/vagrant-nodemaster/node/nodestatus.rb

@@ -22,7 +22,7 @@ module Vagrant
 		  		#dbmanager=DB::NodeDBManager.new
 
 					status = {}
-							  		
+
 
 
 					DB::NodeDBManager.get_nodes.each do |entry|							

data/lib/vagrant-nodemaster/nodecommand.rb

@@ -13,11 +13,8 @@ module Vagrant
 				@main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 				
 				#Initializing db structure
-        DB::NodeDBManager.new(@env.data_dir)
+        		DB::NodeDBManager.new(@env.data_dir)
 				
-#				puts "MAIN ARGS #{@main_args}"
-#				puts "SUB COMMAND #{@sub_command}"
-#				puts "SUB ARGS #{@sub_args}"
 				
 				@subcommands = Vagrant::Registry.new
 				
@@ -47,9 +44,9 @@ module Vagrant
 				end
 				
 				@subcommands.register(:updatepw) do
-          require File.expand_path("../node/nodeupdatepw", __FILE__)
-          NodeUpdatePw
-        end
+		          require File.expand_path("../node/nodeupdatepw", __FILE__)
+		          NodeUpdatePw
+		        end
 
 				@subcommands.register(:status) do
 					require File.expand_path("../node/nodestatus", __FILE__)
@@ -57,9 +54,15 @@ module Vagrant
 				end
 				
 				@subcommands.register(:operation) do
-          require File.expand_path("../node/nodeoperationcommand", __FILE__)
-          NodeOperationCommand
-        end
+		          require File.expand_path("../node/nodeoperationcommand", __FILE__)
+		          NodeOperationCommand
+		        end
+
+
+				@subcommands.register(:import) do
+		          require File.expand_path("../node/nodeimport", __FILE__)
+		          NodeImport
+		        end
 				
 			end
 
@@ -75,18 +78,31 @@ module Vagrant
 				
 				
 				
-			  # If we reached this far then we must have a subcommand. If not,
+			  	# If we reached this far then we must have a subcommand. If not,
 				# then we also just print the help and exit.
 				command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
 				return help if !command_class || !@sub_command
 				@logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")	  
 			  
-			  begin
+			  	begin
 					# Initialize and execute the command class
 					command_class.new(@sub_args, @env).execute
 				rescue Exception => e
 					@env.ui.error(e.message)
 				end
+
+				# begin				
+				# # Initialize and execute the command class
+				# command_class.new(@sub_args, @env).execute
+				# rescue RestClient::ExceptionWithResponse=> e          
+	   #    			@env.ui.error(e.response)
+				# rescue RestClient::RequestFailed => e
+				# 	@env.ui.error("Remote Client \"#{@sub_args[0]}\": Request Failed")
+				# rescue RestClient::ResourceNotFound => e          
+				# 	@env.ui.error("Remote Client \"#{@sub_args[0]}\": Virtual Machine \"#{@sub_args[1]}\" could not be found")			
+				# rescue Exception => e
+				# 	@env.ui.error(e.message)
+				# end
 			  
     
 				0

data/lib/vagrant-nodemaster/remote/remotebackuptake.rb

@@ -15,12 +15,12 @@ module Vagrant
 				opts = OptionParser.new do |opts|
 					opts.banner = "Usage: vagrant remote backup take [node-name] [vmname] [--download target_directory][--background] [-h]"
 					opts.separator ""
-          opts.on("-b", "--background", "Take backup in background") do |b|
-                  options[:background] = b
-          end
-          opts.on("--download target_directory", String,"Download backup to target directory") do |d|          				          				
-                  options[:download] = d
-          end
+				opts.on("-b", "--background", "Take backup in background") do |b|
+				  options[:background] = b
+				end
+				opts.on("--download target_directory", String,"Download backup to target directory") do |d|          				          				
+				  options[:download] = d
+				end
 
 				end
 				

data/lib/vagrant-nodemaster/remote/remoteconfigcommand.rb

@@ -11,9 +11,6 @@ module Vagrant
 
 			@main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 
-#			puts "MAIN ARGS #{@main_args}"
-#			puts "SUB COMMAND #{@sub_command}"
-#			puts "SUB ARGS #{@sub_args}"
 
 			@subcommands = Vagrant::Registry.new
 

data/lib/vagrant-nodemaster/remote/remotehalt.rb

@@ -29,10 +29,12 @@ module Vagrant
 
 					machines=RequestController.vm_halt(argv[0],argv[1],options[:force],options[:async])
 
-          if options[:async] == false   
-  					machines.each do |machine|
-  					 @env.ui.success("Remote Client \"#{argv[0]}\": Virtual Machine \"#{machine["vmname"]}\" halted")
-  					end          				
+					
+
+          			if options[:async] == false   
+	  					machines.each do |machine|
+	  					 @env.ui.success("Remote Client \"#{argv[0]}\": Virtual Machine \"#{machine["vmname"]}\" halted")
+	  					end          				
 					else
 					  @env.ui.info("Remote Client \"#{argv[0]}\": The operation ID is \"#{machines.gsub!(/\D/, "")}\"")
 					end

data/lib/vagrant-nodemaster/remote/remotesnapshotcommand.rb

@@ -11,9 +11,6 @@ module Vagrant
 
           @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 
-#			puts "MAIN ARGS #{@main_args}"
-#			puts "SUB COMMAND #{@sub_command}"
-#			puts "SUB ARGS #{@sub_args}"
 
           @subcommands = Vagrant::Registry.new
 

data/lib/vagrant-nodemaster/remote/remotesnapshotrestore.rb

@@ -12,8 +12,8 @@ module Vagrant
 					opts.banner = "Usage: vagrant remote snapshot restore <node-name> <vmname> <snapshot-uuid|snapshot-name] [--synchronous]>"
 					opts.separator ""
 					opts.on("-s", "--synchronous", "Wait until the operation finishes") do |f|
-              options[:async] = false
-           end
+		              options[:async] = false
+		           	end
 				end
 				
 				
@@ -27,9 +27,9 @@ module Vagrant
 				
 				if options[:async] == false
 					@env.ui.info("Remote Client \"#{argv[0]}\": Virtual Machine \"#{argv[1]}\" => Restoring snapshot \"#{argv[2]}\"", :prefix => false)					
-        else
-          @env.ui.info("Remote Client \"#{argv[0]}\": The operation ID is \"#{snapshot.gsub!(/\D/, "")}\"")
-        end 
+		        else
+		          @env.ui.info("Remote Client \"#{argv[0]}\": The operation ID is \"#{snapshot.gsub!(/\D/, "")}\"")
+		        end 
 				
 				
 				

data/lib/vagrant-nodemaster/remote/remotesnapshottake.rb

@@ -10,9 +10,9 @@ module Vagrant
 				opts = OptionParser.new do |opts|
 					opts.banner = "Usage: vagrant remote snapshot take <node-name> <vmname> <name> [description] [--synchronous]"
 					opts.separator ""
-          opts.on("-s", "--synchronous", "Wait until the operation finishes") do |f|
-              options[:async] = false
-          end
+		          opts.on("-s", "--synchronous", "Wait until the operation finishes") do |f|
+		              options[:async] = false
+		          end
 				end
 				
 				
@@ -25,11 +25,11 @@ module Vagrant
 				snapshot = RequestController.vm_snapshot_take(argv[0],argv[1],argv[2],argv[3],options[:async])
 				
 				if options[:async] == false
-          @env.ui.info("Remote Client: #{argv[0]}", :prefix => false)
-          @env.ui.info("Snapshot \"#{snapshot[:name]}\" with UUID #{snapshot[:id]} succesfully created.")           
-        else
-          @env.ui.info("Remote Client \"#{argv[0]}\": The operation ID is \"#{snapshot.gsub!(/\D/, "")}\"")
-        end
+		          @env.ui.info("Remote Client: #{argv[0]}", :prefix => false)
+		          @env.ui.info("Snapshot \"#{snapshot[:name]}\" with UUID #{snapshot[:id]} succesfully created.")           
+		        else
+		          @env.ui.info("Remote Client \"#{argv[0]}\": The operation ID is \"#{snapshot.gsub!(/\D/, "")}\"")
+		        end
 				
 						
 				0

data/lib/vagrant-nodemaster/remote/remotesuspend.rb

@@ -11,9 +11,9 @@ module Vagrant
 				opts = OptionParser.new do |opts|
 					opts.banner = "Usage: vagrant remote suspend <node-name> [vm_name] [--synchronous]"
 					opts.separator ""
-          opts.on("-s", "--synchronous", "Wait until the operation finishes") do |f|
-            options[:async] = false
-          end
+			          opts.on("-s", "--synchronous", "Wait until the operation finishes") do |f|
+			            options[:async] = false
+			          end
 				end
 				
 				argv = parse_options(opts)

data/lib/vagrant-nodemaster/remote/remoteup.rb

@@ -21,6 +21,7 @@ module Vagrant
           
           		
 					machines=RequestController.vm_up(argv[0],argv[1],options[:async])
+
           			  	
           if options[:async] == false		
   					machines.each do |machine|

data/lib/vagrant-nodemaster/remote/remotevminfo.rb

@@ -19,7 +19,7 @@ module Vagrant
 
 				@env.ui.info("Remote Client: #{argv[0]}", :prefix => false)
 
-				#pp vmstatus
+				
 
 				         				
 

data/lib/vagrant-nodemaster/remotecommand.rb

@@ -11,23 +11,11 @@ module Vagrant
 
 			@main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
      
-      #Initializing db structure
-      DB::NodeDBManager.new(@env.data_dir)
+		      #Initializing db structure
+		      DB::NodeDBManager.new(@env.data_dir)
       
-#			puts "MAIN ARGS #{@main_args}"
-#			puts "SUB COMMAND #{@sub_command}"
-#			puts "SUB ARGS #{@sub_args}"
 
-				@subcommands = Vagrant::Registry.new
-#          @subcommands.register(:add) do
-#            require File.expand_path("../add", __FILE__)
-#            Add
-#          end
-#
-#          @subcommands.register(:boxlist) do
-#            require File.expand_path("../remoteboxlist", __FILE__)
-#            BoxList
-#          end
+		@subcommands = Vagrant::Registry.new
 				
 			@subcommands.register(:box) do
 				require File.expand_path("../remote/remoteboxcommand", __FILE__)            
@@ -118,7 +106,7 @@ module Vagrant
 				# Initialize and execute the command class
 				command_class.new(@sub_args, @env).execute
 			rescue RestClient::ExceptionWithResponse=> e          
-      @env.ui.error(e.response)
+      			@env.ui.error(e.response)
 			rescue RestClient::RequestFailed => e
 				@env.ui.error("Remote Client \"#{@sub_args[0]}\": Request Failed")
 			rescue RestClient::ResourceNotFound => e          

data/lib/vagrant-nodemaster/requestcontroller.rb

@@ -19,6 +19,7 @@ module NodeMaster
 		DELETE_VERB = :delete
 		PUT_VERB = :put
 		SYNC_TIME = 10
+		OPERATION_IN_PROGRESS = 100
 		
 		def self.box_downloads(host)
 			client=get_host_parameters(host)
@@ -61,7 +62,7 @@ module NodeMaster
 			
 			resource = RestClient::Resource.new(
 				RouteManager.box_add_url(client[:address],client[:port]),					
-				:timeout => -1						
+				:timeout => nil						
 			)
 			
 			
@@ -80,12 +81,12 @@ module NodeMaster
 			#setting the request not to expire
 			resource = RestClient::Resource.new(
 				RouteManager.vm_up_url(client[:address],client[:port]),					
-				:timeout => -1						
+				:timeout => nil						
 			)
 			
 								
-		  	response = execute(client,POST_VERB,resource,{:vmname => vmname},async);
-		  
+		  	response = execute(client,POST_VERB,resource,{:vmname => vmname},async);		  
+		  	
 			return JSON.parse(response.to_str) if async ==false
 			response
 			
@@ -97,10 +98,11 @@ module NodeMaster
 			#setting the request not to expire
 			resource = RestClient::Resource.new(
 				RouteManager.vm_halt_url(client[:address],client[:port]),
-				:timeout => -1
+				:timeout => nil
 			)
 			
 		  	response = execute(client,POST_VERB,resource,{:vmname => vmname,:force=>force},async);
+		  	
 			return JSON.parse(response.to_str) if async ==false
     		response
 			
@@ -111,7 +113,7 @@ module NodeMaster
 			
 			resource = RestClient::Resource.new(
 				RouteManager.vm_destroy_url(client[:address],client[:port]),
-				:timeout => -1  				
+				:timeout => nil  				
 			)
 			
 			
@@ -141,7 +143,7 @@ module NodeMaster
 		    
 		    resource = RestClient::Resource.new(
 		      RouteManager.vm_add_url(client[:address],client[:port]),
-		      :timeout => -1 ,
+		      :timeout => nil ,
 		      # :payload => {
 		        # :content_type => 'text/plain',
 		        # :file => File.new(config, 'rb')
@@ -202,7 +204,7 @@ module NodeMaster
 			#setting the request not to expire
 			resource = RestClient::Resource.new(
 				RouteManager.vm_suspend_url(client[:address],client[:port]),					
-				:timeout => -1						
+				:timeout => nil						
 			)
 			
 								
@@ -219,7 +221,7 @@ module NodeMaster
 			#setting the request not to expire
 			resource = RestClient::Resource.new(
 				RouteManager.vm_resume_url(client[:address],client[:port]),					
-				:timeout => -1						
+				:timeout => nil						
 			)				
 			
 		  	response = execute(client,POST_VERB,resource,{:vmname => vmname},async);
@@ -236,7 +238,7 @@ module NodeMaster
 			#setting the request not to expire
 			resource = RestClient::Resource.new(
 				RouteManager.vm_provision_url(client[:address],client[:port]),					
-				:timeout => -1						
+				:timeout => nil						
 			)				
 			
 								
@@ -272,7 +274,7 @@ module NodeMaster
 				
 			resource = RestClient::Resource.new(
 				RouteManager.vm_snapshot_take_url(client[:address],client[:port],vmname),					 					
-				:timeout => -1,											
+				:timeout => nil,											
 			)				
 
     
@@ -291,7 +293,7 @@ module NodeMaster
 		    #setting the request not to expire                  
 		    resource = RestClient::Resource.new(
 		      RouteManager.vm_snapshot_delete_url(client[:address],client[:port],vmname,snapid),                   
-		      :timeout => -1,                     
+		      :timeout => nil,                     
 		    )       
 
 		            
@@ -308,7 +310,7 @@ module NodeMaster
 						
 			resource = RestClient::Resource.new(
 				RouteManager.vm_snapshot_restore_url(client[:address],client[:port],vmname),					
-				:timeout => -1						
+				:timeout => nil						
 			)
 			
 			response = execute(client,POST_VERB,resource,{:vmname => vmname,:snapid => snapid},async);
@@ -326,8 +328,8 @@ module NodeMaster
         		RouteManager.node_queue_url(client[:address],client[:port],id)
    		 	)
     
-    		response = execute(client,GET_VERB,resource);
-    
+    		response = execute(client,GET_VERB,resource);   
+
     		JSON.parse(response.to_str,{:symbolize_names => true})
 		end
 		
@@ -338,6 +340,8 @@ module NodeMaster
     		)
     
     		response = execute(client,GET_VERB,resource);
+
+    		
     
     		JSON.parse(response.to_str,{:symbolize_names => true})
 		end
@@ -383,7 +387,7 @@ module NodeMaster
 						resource = RestClient::Resource.new(
 								RouteManager.vm_snapshot_take_url(client[:address],client[:port],vm["name"]),
 								:download => download_backup,					
-								:timeout => -1						
+								:timeout => nil						
 						)
 					
 					#OLD. FIXME REMOVE
@@ -440,7 +444,7 @@ module NodeMaster
 			
 			resource = RestClient::Resource.new(
 					RouteManager.backup_log_url(client[:address],client[:port],vmname),					
-					:timeout => -1
+					:timeout => nil
 			)
 	
 	    
@@ -456,7 +460,7 @@ module NodeMaster
 			client=get_host_parameters(node)
 
 			resource = RestClient::Resource.new(
-        		RouteManager.node_info_url(client[:address],client[:port]),:timeout => -1                        
+        		RouteManager.node_info_url(client[:address],client[:port]),:timeout => nil                        
     		) 
 
 			response=execute(client,GET_VERB,resource);
@@ -474,7 +478,7 @@ module NodeMaster
 		  
 		  
 		  	resource = RestClient::Resource.new(
-        		RouteManager.config_show_url(client[:address],client[:port]),:timeout => -1                        
+        		RouteManager.config_show_url(client[:address],client[:port]),:timeout => nil                        
     		)   
 
     			  
@@ -490,7 +494,7 @@ module NodeMaster
 		    
 		    resource = RestClient::Resource.new(
 		        RouteManager.config_upload_url(client[:address],client[:port]),         
-		        :timeout => -1                        
+		        :timeout => nil                        
 		    )    
 		    
 		    execute(client,POST_VERB,resource,{:file => File.read(config_path), :content_type => 'text/plain'})
@@ -503,7 +507,7 @@ module NodeMaster
     
     
     		resource = RestClient::Resource.new(
-        		RouteManager.node_password_change_url(client[:address],client[:port]),:timeout => -1                        
+        		RouteManager.node_password_change_url(client[:address],client[:port]),:timeout => nil                        
     		)
     
     		execute(client,POST_VERB,resource,{:password => Digest::MD5.hexdigest(password)});
@@ -552,11 +556,9 @@ module NodeMaster
 
 		      responseop = resourceop.send GET_VERB
       
-      		   res = JSON.parse(responseop.to_str)
-      
-      
-                                                    
-  			end while (res[0].eql? "IN PROGRESS") #While operation code is IN PROGRESS iterate
+      		  res = JSON.parse(responseop.to_str)
+            
+  			end while (res[0] == OPERATION_IN_PROGRESS) #While operation code is IN PROGRESS iterate
                                  
       		res[1]       
 		     

data/lib/vagrant-nodemaster/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module NodeMaster
-    VERSION = "1.1.1"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nodemaster
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -84,6 +84,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -92,8 +93,10 @@ files:
 - lib/vagrant-nodemaster/apidesc.rb
 - lib/vagrant-nodemaster/node/nodeadd.rb
 - lib/vagrant-nodemaster/node/nodedbmanager.rb
+- lib/vagrant-nodemaster/node/nodeimport.rb
 - lib/vagrant-nodemaster/node/nodeinfo.rb
 - lib/vagrant-nodemaster/node/nodelist.rb
+- lib/vagrant-nodemaster/node/nodeoperation.rb
 - lib/vagrant-nodemaster/node/nodeoperationcommand.rb
 - lib/vagrant-nodemaster/node/nodeoperationlast.rb
 - lib/vagrant-nodemaster/node/nodeoperationshow.rb