vagrant-nodemaster 0.0.2 → 1.0.0

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

@@ -16,10 +16,10 @@ module Vagrant
 					return if !argv
 		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 0
 		  		
-		  		dbmanager=DB::NodeDBManager.new
+		  		#
 		  		
 		  		@env.ui.info("#{"NODE".ljust(25)} ADDRESS (PORT) ",:prefix => false)
-					dbmanager.get_nodes.each do |entry|
+					DB::NodeDBManager.get_nodes.each do |entry|
 						@env.ui.info("#{entry[:name].ljust(25)} #{entry[:address]}(#{entry[:port]})", :prefix => false) 
 					end
 					@env.ui.info(" ", :prefix => false)

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

@@ -0,0 +1,85 @@
+require 'vagrant/plugin'
+require 'sqlite3'
+
+
+module Vagrant
+  module NodeMaster
+   
+		class NodeOperationCommand < Vagrant.plugin(2, :command)
+			
+			def initialize(argv, env)
+				super
+				
+				@main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)				
+				
+				
+				@subcommands = Vagrant::Registry.new
+				
+				@subcommands.register(:show) do
+					require File.expand_path("../nodeoperationshow", __FILE__)
+					NodeOperationShow
+				end       
+				
+				@subcommands.register(:last) do
+					require File.expand_path("../nodeoperationlast", __FILE__)
+					NodeOperationLast
+				end				
+								
+			end
+
+			
+			
+			
+			
+			def execute
+				if @main_args.include?("-h") || @main_args.include?("--help")
+					# Print the help for all the box commands.
+					return help
+				end
+				
+				
+				
+			  # 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
+					# Initialize and execute the command class
+					command_class.new(@sub_args, @env).execute
+				rescue Exception => e
+					@env.ui.error(e.message)
+				end
+			  
+    
+				0
+			end
+			
+			def help
+				opts = OptionParser.new do |opts|
+					opts.banner = "Usage: vagrant node <command> [<args>]"
+					opts.separator ""
+					opts.separator "Available subcommands:"
+			
+					# Add the available subcommands as separators in order to print them
+					# out as well.
+					keys = []
+					@subcommands.each { |key, value| keys << key.to_s }
+			
+					keys.sort.each do |key|
+						opts.separator "     #{key}"
+					end
+			
+					opts.separator ""
+					opts.separator "For help on any individual command run `vagrant node COMMAND -h`"
+				end
+			
+				@env.ui.info(opts.help, :prefix => false)
+			end
+			
+			
+		end
+		
+	end
+end

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

@@ -0,0 +1,47 @@
+require 'vagrant-nodemaster/node/nodedbmanager'
+require 'vagrant-nodemaster/requestcontroller'
+
+module Vagrant
+  module NodeMaster
+  
+		class NodeOperationLast < Vagrant.plugin(2, :command)
+
+			def execute
+					
+					options = {}
+					
+					opts = OptionParser.new do |opts|
+						opts.banner = "Usage: vagrant node operation last <node-name>"						
+					end
+					
+					argv = parse_options(opts)
+					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?)
+		  		  @env.ui.info("Operation queue is empty");
+		  		  
+		  		else
+  		      @env.ui.info("-------------------------------------------------------------------------------------")
+            @env.ui.info("| RESULT CODE |          RESUL  T INFO                              |")       
+            @env.ui.info("-------------------------------------------------------------------------------------")
+            
+            result.each do |operation|            
+              @env.ui.info("|     #{operation[0]}     |#{operation[1].ljust(5)}")
+              @env.ui.info("-------------------------------------------------------------------------------------")    
+            end
+		  		end	  		
+		  		
+          
+            		  		
+					
+					0
+			end
+  
+  	end
+  
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'vagrant-nodemaster/node/nodedbmanager'
+require 'vagrant-nodemaster/requestcontroller'
+
+module Vagrant
+  module NodeMaster
+  
+		class NodeOperationShow < Vagrant.plugin(2, :command)
+
+			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
+		  		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.")
+		  		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/noderemove.rb

@@ -24,12 +24,12 @@ module Vagrant
 					return if !argv
 		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if (argv.length < 1 && !options[:clean]) || (argv.length >1)
 		  		
-		  		dbmanager=DB::NodeDBManager.new
+		  		#dbmanager=DB::NodeDBManager.new
 		  		
 		  		if (options[:clean])
-		  			dbmanager.remove_nodes
+		  			DB::NodeDBManager.remove_nodes
 		  		elsif
-		  			dbmanager.remove_node(argv[0])
+		  			DB::NodeDBManager.remove_node(argv[0])
 		  		end
 					
 					0

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

@@ -19,13 +19,13 @@ module Vagrant
 					return if !argv
 		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 0
 		  		
-		  		dbmanager=DB::NodeDBManager.new
+		  		#dbmanager=DB::NodeDBManager.new
 
 					status = {}
 							  		
 
 
-					dbmanager.get_nodes.each do |entry|							
+					DB::NodeDBManager.get_nodes.each do |entry|							
 							status[entry[:name]]=ERROR
 							if port_open?(entry[:address],entry[:port])
 								status[entry[:name]]=OK

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

@@ -27,10 +27,10 @@ module Vagrant
 					return if !argv
 		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 3
 		  		
-		  		dbmanager=DB::NodeDBManager.new	  		
+		  		#dbmanager=DB::NodeDBManager.new	  		
 		  		
 		  				
-		  		dbmanager.update_node(argv[0],argv[1],argv[2].to_i,options[:dns])
+		  		DB::NodeDBManager.update_node(argv[0],argv[1],argv[2].to_i,options[:dns])
 					
 					0
 			end

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

@@ -0,0 +1,72 @@
+require 'vagrant-nodemaster/node/nodedbmanager'
+require 'vagrant-nodemaster/requestcontroller'
+
+module Vagrant
+  module NodeMaster
+  
+		class NodeUpdatePw < Vagrant.plugin(2, :command)
+			def execute
+					
+					options = {}
+					options[:remote] = false
+					
+					opts = OptionParser.new do |opts|
+						opts.banner = "Usage: vagrant node updatepw <node-name> --remote"
+						opts.on("--remote", "Change also remote node pasword") do |r|
+							options[:remote] = r
+						end
+						
+					end
+					
+					argv = parse_options(opts)
+					
+		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 1
+		  		
+		  		
+		  		
+		  		
+		  		pass_m = "Insert your new password for the Node #{argv[0]}: "
+          confirm_m = "Please Insert again the new password: "
+          
+          if STDIN.respond_to?(:noecho)
+            print pass_m
+            password=STDIN.noecho(&:gets).chomp
+            print "\n#{confirm_m}"
+            confirm=STDIN.noecho(&:gets).chomp
+            print "\n"
+          else            
+            password = @env.ui.ask(pass_m)
+            confirm = @env.ui.ask(confirm_m)
+          end
+
+          
+          raise "Passwords does not match!" if (password!=confirm)
+          
+          
+          #First, change Password at remote node
+          if (options[:remote])             
+             if (!RequestController.node_password_change(argv[0],password))
+              @env.ui.error("Remote password change failed! No changes have been comitted locally")  
+              return             
+             end
+          end
+         
+          #If everything is ok then change the password locally
+ 		  		#db=DB::NodeDBManager.new
+		  		DB::NodeDBManager.update_node_password(argv[0],password)
+		  		
+		  		if options[:remote]
+            @env.ui.success("Password change performed successfully locally and remotely")
+          else
+            @env.ui.success("Password change performed successfully locally")
+          end
+					
+					0
+			end
+  
+  	end
+  
+  
+  
+  end
+end

data/lib/vagrant-nodemaster/nodecommand.rb

@@ -1,5 +1,6 @@
 require 'vagrant/plugin'
 require 'sqlite3'
+require 'vagrant-nodemaster/node/nodedbmanager' 
 
 module Vagrant
   module NodeMaster
@@ -11,6 +12,9 @@ module Vagrant
 				
 				@main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 				
+				#Initializing db structure
+        DB::NodeDBManager.new(@env.data_dir)
+				
 #				puts "MAIN ARGS #{@main_args}"
 #				puts "SUB COMMAND #{@sub_command}"
 #				puts "SUB ARGS #{@sub_args}"
@@ -36,12 +40,22 @@ module Vagrant
 					require File.expand_path("../node/nodeupdate", __FILE__)
 					NodeUpdate
 				end
+				
+				@subcommands.register(:updatepw) do
+          require File.expand_path("../node/nodeupdatepw", __FILE__)
+          NodeUpdatePw
+        end
 
 				@subcommands.register(:status) do
 					require File.expand_path("../node/nodestatus", __FILE__)
 					NodeStatus
 				end
 				
+				@subcommands.register(:operation) do
+          require File.expand_path("../node/nodeoperationcommand", __FILE__)
+          NodeOperationCommand
+        end
+				
 			end
 
 			

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

@@ -0,0 +1,16 @@
+module Vagrant
+  module NodeMaster
+    
+    class ConfigManager
+      
+      def initialize(env)
+        @env = env
+      end
+      
+      
+      
+    end
+    
+    
+  end
+end

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

@@ -5,9 +5,14 @@ module Vagrant
 		class BoxAdd < Vagrant.plugin(2, :command)
 			def execute
 				options = {}
+        options[:async] = true
 	
 				opts = OptionParser.new do |opts|
-					opts.banner = "Usage: vagrant remote box add <node-name> <box-name> <url>"
+					opts.banner = "Usage: vagrant remote box add <node-name> <box-name> <url> [--synchronous]"
+					opts.separator ""
+          opts.on("-s", "--synchronous", "Wait until the operation finishes") do |f|
+            options[:async] = false
+          end
 				end
 				
 				
@@ -17,14 +22,12 @@ module Vagrant
 				raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 3
 		
 				
-					
-#				begin
+				res = RequestController.box_add(argv[0],argv[1],argv[2],options[:async])
 				
-					RequestController.box_add(argv[0],argv[1],argv[2])
-#					@env.ui.info("Remote Client \"#{argv[0]}\": Box \"#{argv[1]}\" with provider \"#{argv[2]}\" removed")
-#				rescue RestClient::ResourceNotFound => e          
-#					@env.ui.error("Remote Client \"#{argv[0]}\": Box \"#{argv[1]}\" with provider \"#{argv[2]}\" could not be found")			
-#				end
+				@env.ui.success("Remote Client \"#{argv[0]}\": Box \"#{argv[1]}\" added") if options[:async]==false
+ 
+				@env.ui.info("Remote Client \"#{argv[0]}\": The operation ID is \"#{res.gsub!(/\D/, "")}\"") if options[:async]==true
+
 						
 				0
 			end

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

@@ -0,0 +1,46 @@
+require 'optparse'
+require 'vagrant-nodemaster/requestcontroller'
+module Vagrant
+	module NodeMaster
+		class AddVM < Vagrant.plugin(2, :command)
+			
+			def execute
+				options = {}
+				options[:rename] = false
+				
+				opts = OptionParser.new do |opts|
+				
+					opts.banner = "Usage: vagrant remote config addvm <node-name> <vm_config_file> [--rename]"
+					opts.separator ""
+					opts.on("-r", "--rename", "Rename VM automatically if another VM with the same name exists") do |r|
+						options[:rename] = r
+					end
+				
+				end
+				
+				
+				
+				argv = parse_options(opts)
+				      
+				return if !argv
+						
+				raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if (argv.length != 2)
+				
+				#Add machines 
+				result=RequestController.vm_add(argv[0],argv[1],options[:rename])				
+				
+ 			  @env.ui.success("Operation successfully performed") if result
+ 			  
+ 			  	
+				# @env.ui.info("Remote Client: #{argv[0]}", :prefix => false)
+				# machines.each do |machine|
+					# @env.ui.info(" * Virtual Machine '#{machine}' destroyed", :prefix => false) 
+				# end
+# 				
+				# @env.ui.info(" ")
+				
+				
+			end
+		end
+	end
+end