vagrant-nodemaster 1.0.0 → 1.1.1

data/lib/vagrant-nodemaster/apidesc.rb

@@ -4,9 +4,17 @@ module RestRoutes
 	
 	class RouteManager
 	
+		def self.node_info_route
+			NODE_INFO
+		end
+
 		def self.box_list_route
 			BOX_LIST_ROUTE
 		end
+
+		def self.box_download_route
+			BOX_DOWNLOAD_ROUTE
+		end
 		
 		def self.box_delete_route
 			BOX_DELETE_ROUTE
@@ -37,8 +45,8 @@ module RestRoutes
 		end
 		
 		def self.vm_add_route
-      VM_ADD_ROUTE
-    end
+      		VM_ADD_ROUTE
+    	end
 		
 		def self.vm_status_route
 			VM_STATUS_ROUTE
@@ -69,12 +77,12 @@ module RestRoutes
 		end
 		
 		def self.vm_snapshot_delete_route
-      VM_SNAPSHOT_DELETE_ROUTE
-    end
+      		VM_SNAPSHOT_DELETE_ROUTE
+    	end
 		
 		def self.vm_delete_route
-      VM_DELETE_ROUTE
-    end
+      		VM_DELETE_ROUTE
+    	end
 		
 		def self.vm_snapshot_restore_route
 			VM_SNAPSHOT_RESTORE_ROUTE
@@ -85,10 +93,12 @@ module RestRoutes
 		end
 		
 		def self.node_password_change_route
-      NODE_PASSWORD_CHANGE
-    end
-		
+	      	NODE_PASSWORD_CHANGE
+	    end
 		
+		def self.vm_info_route
+			VM_INFO_ROUTE
+		end
 		
 		def self.vm_backup_log_route
 			VM_BACKUP_LOG_ROUTE
@@ -96,12 +106,12 @@ module RestRoutes
 		
 		
 		def self.config_show_route
-      NODE_CONFIG_SHOW_ROUTE
-    end
+      		NODE_CONFIG_SHOW_ROUTE
+    	end
     
-    def self.config_upload_route
-      NODE_CONFIG_UPLOAD_ROUTE
-    end
+    	def self.config_upload_route
+      		NODE_CONFIG_UPLOAD_ROUTE
+    	end
 		
 		
 		def self.login_route
@@ -113,12 +123,18 @@ module RestRoutes
 		end
 		
 		def self.node_queue_last_route
-      NODE_QUEUE_LAST_ROUTE
-    end
-		
+      		NODE_QUEUE_LAST_ROUTE
+    	end
 		
 		
+
+		def self.node_info_url(host,port)
+			"http://#{host}:#{port}#{node_info_route}"
+		end
 		
+		def self.box_download_url(host,port)
+			"http://#{host}:#{port}#{box_download_route}"
+		end
 		
 		def self.box_list_url(host,port)
 			"http://#{host}:#{port}#{box_list_route}"
@@ -145,11 +161,12 @@ module RestRoutes
 		  url="http://#{host}:#{port}#{url}"
 		end
 
-    def self.node_queue_last_url(host,port)
-      "http://#{host}:#{port}#{node_queue_last_route}"
-    end
+	    def self.node_queue_last_url(host,port)
+	      "http://#{host}:#{port}#{node_queue_last_route}"
+	    end
 
 		def self.login_url(host,port)
+			
 		  "http://#{host}:#{port}#{login_route}"
 		end
 		
@@ -182,7 +199,12 @@ module RestRoutes
 		end
 		
 			
-		
+		def self.vm_info_url(host,port,vmname)
+			url="http://#{host}:#{port}#{vm_info_route}"
+			url=String.new(vm_info_route)
+			url[":vm"]=vmname
+			url="http://#{host}:#{port}#{url}"		
+		end		
 		
 		def self.vm_status_url(host,port,vmname=nil)	
 			url="http://#{host}:#{port}#{vm_status_all_route}"
@@ -285,8 +307,11 @@ module RestRoutes
 		
 		private
 			BOX_LIST_ROUTE =	"/api/box/list"
+			BOX_DOWNLOAD_ROUTE =	"/api/box/download"
 			BOX_DELETE_ROUTE =	"/api/box/:box/:provider/delete"
 			BOX_ADD_ROUTE = "/api/box/add" 
+
+			NODE_INFO = "/api/info"
 			
 			VM_UP_ROUTE = "/api/vm/up"
 			VM_HALT_ROUTE = "/api/vm/halt"
@@ -298,6 +323,7 @@ module RestRoutes
 			VM_PROVISION_ROUTE = "/api/vm/provision"
 			VM_STATUS_ALL_ROUTE = "/api/vm/status"
 			VM_STATUS_ROUTE = "/api/vm/:vm/status"			
+			VM_INFO_ROUTE = "/api/vm/:vm/info"			
 			SSH_CONFIG_ROUTE = "/api/vm/:vm/sshconfig"
 			
 			SNAPSHOTS_ALL_ROUTE = "/api/vm/snapshots"

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

@@ -0,0 +1,58 @@
+require 'vagrant-nodemaster/node/nodedbmanager'
+require 'vagrant-nodemaster/requestcontroller'
+
+module Vagrant
+  module NodeMaster
+  
+		class NodeInfo < Vagrant.plugin(2, :command)
+
+			def execute
+					
+					options = {}
+					
+					opts = OptionParser.new do |opts|
+						opts.banner = "Usage: vagrant node info <node-name>"
+						
+					end
+					
+					argv = parse_options(opts)
+					
+
+					return if !argv
+		  			raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 1
+		  		
+		  		
+		  		
+		  			begin
+						result=RequestController.node_info(argv[0])
+						#@env.ui.info(result)
+						@env.ui.info("Node '#{argv[0]}' Information:")
+						@env.ui.info("#{"Operating System:".ljust(25)} #{result[:lsbdistdescription]}")
+						@env.ui.info("#{"Processor Count:".ljust(25)} #{result[:physicalprocessorcount]}")
+						@env.ui.info("#{"Architecture:".ljust(25)} #{result[:architecture]}")						
+						@env.ui.info("#{"Core Count:".ljust(25)} #{result[:processorcount]}")
+						
+						for i in 0..(result[:processorcount].to_i-1)
+						   puts "processor #{i} => "+result[("processor"+i.to_s).to_sym]
+						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")
+
+						interfaces = result[:interfaces].split(",")
+						
+						interfaces.each do |i|
+							interface=("ipaddress_"+i).to_sym
+							puts "Interface #{i} => "+result[interface] if result[interface]
+						end
+						
+					end
+					
+					0
+			end
+  
+  	end
+  
+  end
+end

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

@@ -8,14 +8,14 @@ module Vagrant
 
 			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
+				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])
@@ -25,14 +25,14 @@ module Vagrant
 		  		  @env.ui.info("Operation queue is empty");
 		  		  
 		  		else
-  		      @env.ui.info("-------------------------------------------------------------------------------------")
-            @env.ui.info("| RESULT CODE |          RESUL  T INFO                              |")       
-            @env.ui.info("-------------------------------------------------------------------------------------")
+  		      		@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
+		            result.each do |operation|            
+		              @env.ui.info("|     #{operation[0]}     |#{operation[1].ljust(5)}")
+		              @env.ui.info("-------------------------------------------------------------------------------------")    
+		            end
 		  		end	  		
 		  		
           

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

@@ -25,12 +25,12 @@ module Vagrant
 					
 					argv = parse_options(opts)
 					return if !argv
-		  		raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 3
+		  			raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 3
+		  		
 		  		
-		  		#dbmanager=DB::NodeDBManager.new	  		
 		  		
 		  				
-		  		DB::NodeDBManager.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/nodecommand.rb

@@ -40,6 +40,11 @@ module Vagrant
 					require File.expand_path("../node/nodeupdate", __FILE__)
 					NodeUpdate
 				end
+
+				@subcommands.register(:info) do
+					require File.expand_path("../node/nodeinfo", __FILE__)
+					NodeInfo
+				end
 				
 				@subcommands.register(:updatepw) do
           require File.expand_path("../node/nodeupdatepw", __FILE__)

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

@@ -35,6 +35,11 @@ module Vagrant
             require File.expand_path("../remoteboxadd", __FILE__)
             BoxAdd
           end
+
+          @subcommands.register(:downloads) do
+            require File.expand_path("../remoteboxdownload", __FILE__)
+            BoxDownload
+          end
                   
         end
 

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

@@ -0,0 +1,44 @@
+require 'optparse'
+require 'vagrant-nodemaster/requestcontroller'
+module Vagrant
+  module NodeMaster
+		class BoxDownload < Vagrant.plugin(2, :command)
+			def execute
+				options = {}
+        		options[:async] = false
+	
+				opts = OptionParser.new do |opts|
+					opts.banner = "Usage: vagrant remote box downloads <node-name>"
+					opts.separator ""          
+				end
+				
+				
+				argv = parse_options(opts)          
+									
+				return if !argv
+				raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 1
+		
+				
+				res = RequestController.box_downloads(argv[0])
+				
+				
+				#@env.ui.info("Remote Client \"#{argv[0]}\": Box \"#{argv[1]}\" added") if options[:async]==false
+				@env.ui.info("----------------------------------------------------------------------------------------------")
+	            @env.ui.info("|     BOX NAME    |   BOX URL                                | PROGRESS | TIME REMAINING     |")       
+	            @env.ui.info("----------------------------------------------------------------------------------------------")
+            
+	            res.each do |operation|            
+	              @env.ui.info("|     #{operation[:box_name].rjust(5)}     |    #{operation[:box_url]}     | #{operation[:box_progress]}      |#{operation[:box_remaining]}")
+	              @env.ui.info("--------------------------------------------------------------------------------------------")    
+	            end
+ 
+				#@env.ui.info("Remote Client \"#{argv[0]}\": The operation ID is \"#{res.gsub!(/\D/, "")}\"") if options[:async]==true
+
+						
+				0
+			end
+			
+			
+		end
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'optparse'
+require 'vagrant-nodemaster/requestcontroller'
+module Vagrant
+  module NodeMaster
+		class InfoVM < Vagrant.plugin(2, :command)
+			def execute
+				options = {}
+	
+				opts = OptionParser.new do |opts|
+					opts.banner = "Usage: vagrant remote info <node-name> <vm_name>"
+				end
+				
+				argv = parse_options(opts)
+				return if !argv  
+				raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if (argv.length != 2)
+				
+
+				vmstatus=RequestController.vm_info(argv[0],argv[1])
+
+				@env.ui.info("Remote Client: #{argv[0]}", :prefix => false)
+
+				#pp vmstatus
+
+				         				
+
+				@env.ui.info(" #{"Operating System:".ljust(25)} #{vmstatus["ostype"].ljust(25)}", :prefix => false) 
+				@env.ui.info(" #{"Num. CPUS:".ljust(25)} #{vmstatus["cpus"]}", :prefix => false) 
+				@env.ui.info(" #{"CPU Limit:".ljust(25)} #{vmstatus["cpuexecutioncap"]}%", :prefix => false) 					
+				@env.ui.info(" #{"PAE:".ljust(25)} #{vmstatus["pae"]}", :prefix => false) 
+				@env.ui.info(" #{"3D acceleration:".ljust(25)} #{vmstatus["accelerate3d"]}", :prefix => false) 
+				@env.ui.info(" #{"2D acceleration:".ljust(25)} #{vmstatus["accelerate2dvideo"]}", :prefix => false) 
+				@env.ui.info(" #{"Memory:".ljust(25)} #{vmstatus["memory"]} MB", :prefix => false) 
+				@env.ui.info(" #{"Boot Order:".ljust(25)} #{vmstatus["boot1"]}, #{vmstatus["boot2"]}, #{vmstatus["boot3"]}, #{vmstatus["boot4"]}", :prefix => false) 
+				@env.ui.info(" #{"Clipboard:".ljust(25)} #{vmstatus["clipboard"]}", :prefix => false) 
+				@env.ui.info(" #{"Remote Desktop:".ljust(25)} #{vmstatus["vrde"]}", :prefix => false) 
+				@env.ui.info(" #{"USB:".ljust(25)} #{vmstatus["usb"]}", :prefix => false) 
+				(1..8).each {|key|
+					#If interface exists
+					if vmstatus.has_key?("nic#{key}") && !vmstatus["nic#{key}"].eql?("none") 							
+						@env.ui.info(" ")
+						@env.ui.info(" #{"Interface:".ljust(25)} nic#{key}", :prefix => false) 
+						@env.ui.info(" #{"Network Type:".ljust(25)} #{vmstatus["nic#{key}"]}", :prefix => false) 
+						@env.ui.info(" #{"MAC Address:".ljust(25)} #{vmstatus["macaddress#{key}"]}", :prefix => false) 
+						@env.ui.info(" #{"Cable connected:".ljust(25)} #{vmstatus["cableconnected#{key}"]}", :prefix => false) 
+					end
+				}
+				
+				@env.ui.info(" ")
+				
+				0
+			end
+		end
+  end
+end

data/lib/vagrant-nodemaster/remotecommand.rb

@@ -29,69 +29,74 @@ module Vagrant
 #            BoxList
 #          end
 				
-				@subcommands.register(:box) do
-					require File.expand_path("../remote/remoteboxcommand", __FILE__)            
-					BoxCommand
-				end
-				
-				@subcommands.register(:up) do
-					require File.expand_path("../remote/remoteup", __FILE__)
-					UpVM
-				end
-				
-				@subcommands.register(:halt) do
-					require File.expand_path("../remote/remotehalt", __FILE__)
-					HaltVM
-				end
+			@subcommands.register(:box) do
+				require File.expand_path("../remote/remoteboxcommand", __FILE__)            
+				BoxCommand
+			end
+			
+			@subcommands.register(:up) do
+				require File.expand_path("../remote/remoteup", __FILE__)
+				UpVM
+			end
+			
+			@subcommands.register(:halt) do
+				require File.expand_path("../remote/remotehalt", __FILE__)
+				HaltVM
+			end
 				
 				# @subcommands.register(:add) do
           # require File.expand_path("../remote/remoteadd", __FILE__)
           # AddVM
         # end
 				
-				@subcommands.register(:suspend) do
-					require File.expand_path("../remote/remotesuspend", __FILE__)
-					SuspendVM
-				end
-				
-				@subcommands.register(:resume) do
-					require File.expand_path("../remote/remoteresume", __FILE__)
-					ResumeVM
-				end
-				
-				@subcommands.register(:status) do
-					require File.expand_path("../remote/remotevmstatus", __FILE__)
-					StatusVM
-				end
-				
-				@subcommands.register(:destroy) do
-					require File.expand_path("../remote/remotedestroy", __FILE__)
-					DestroyVM
-				end
-				
-				@subcommands.register(:provision) do
-					require File.expand_path("../remote/remoteprovision", __FILE__)
-					ProvisionVM
-				end
+			@subcommands.register(:suspend) do
+				require File.expand_path("../remote/remotesuspend", __FILE__)
+				SuspendVM
+			end
+			
+			@subcommands.register(:resume) do
+				require File.expand_path("../remote/remoteresume", __FILE__)
+				ResumeVM
+			end
+			
+			@subcommands.register(:status) do
+				require File.expand_path("../remote/remotevmstatus", __FILE__)
+				StatusVM
+			end
+			
+			@subcommands.register(:destroy) do
+				require File.expand_path("../remote/remotedestroy", __FILE__)
+				DestroyVM
+			end
+			
+			@subcommands.register(:provision) do
+				require File.expand_path("../remote/remoteprovision", __FILE__)
+				ProvisionVM
+			end
 
-				@subcommands.register(:ssh) do
-					require File.expand_path("../remote/remotessh", __FILE__)
-					SSHVM
-				end
+			@subcommands.register(:info) do
+				require File.expand_path("../remote/remotevminfo", __FILE__)
+				InfoVM
+			end
 
-				@subcommands.register(:snapshot) do
-					require File.expand_path("../remote/remotesnapshotcommand", __FILE__)
-					SnapshotCommand
-				end
-				
-				@subcommands.register(:backup) do
-					require File.expand_path("../remote/remotebackupcommand", __FILE__)            
-					BackupCommand
-				end
-				
-				@subcommands.register(:config) do
-          require File.expand_path("../remote/remoteconfigcommand", __FILE__)            
-          ConfigCommand
+			@subcommands.register(:ssh) do
+				require File.expand_path("../remote/remotessh", __FILE__)
+				SSHVM
+			end
+
+			@subcommands.register(:snapshot) do
+				require File.expand_path("../remote/remotesnapshotcommand", __FILE__)
+				SnapshotCommand
+			end
+			
+			@subcommands.register(:backup) do
+				require File.expand_path("../remote/remotebackupcommand", __FILE__)            
+				BackupCommand
+			end
+			
+			@subcommands.register(:config) do
+				require File.expand_path("../remote/remoteconfigcommand", __FILE__)            
+			ConfigCommand
         end
 				
 			end