vagrant-nodemaster 0.0.2 → 1.0.0

data/README.md

@@ -0,0 +1,95 @@
+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).
+
+
+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
+
+```bash
+$ vagrant plugin install vagrant-nodemaster
+```
+
+##Usage
+This plugin provides two main commands: `vagrant remote` and `vagrant node`.
+
+The command `Vagrant node` allows you to manage a set of computers as *nodes*. This set is composed by the an id of the node, the ip address/dns name and the port where it is listening.
+
+This command is composed by the following subcommands:
+
+* `vagrant node add <node-name> <node-address> <node-port> --hostname`:
+Adds a node identified by node-name, with the ip node-address (or dns name if `--hostname` parameter is present) and the node-port where the node is listening.
+
+* `vagrant node remove [node-name] --clean`: Removes a node identified by its *node-name* from the set of nodes. Also you can use the parameter --clean to remove all nodes from the list.
+
+* `vagrant node update <node-name> <node-address> <node-port> --hostname`: Updates the information of the node identified by its *node-name*.
+
+* `vagrant node updatepw <node-name> --remote`: Updates the password stored locally to login into the node. Furthermore you can update the password in the node using the `--remote`option.
+
+* `vagrant node status`: Shows the list of nodes and its status, e.g. if they are listening.
+
+* `vagrant node list`: Shows the list of nodes and its configurations
+
+* `vagrant node operation last <node-name>`: Shows the last operations performed in the nodes and its result.
+
+* `vagrant node operation show <node-name> <operation-id>`: Shows the result of the operation with the identifier operation-id.
+
+
+The command `Vagrant remote` enables you to execute in remote nodes those commands that you can use locally. Also, some new ones have been added. Commands are performed, by default, asynchronous.
+
+* `vagrant remote box`
+  * `vagrant remote box add <node-name> <box-name> <url> [--synchronous]`: Executes `vagrant box add <box-name> <url>` in node identified by *node-name*.
+
+  * `vagrant remote box list <node-name>`: Executes `vagrant box list` in node identified by *node-name*.
+
+  * `vagrant remote box remove <node-name> <box-name> <box-provider>`: Executes `vagrant box remove <box-name> <box-provider>` in node identified by *node-name*.
+
+* `vagrant remote destroy <node-name> [vm_name] [--force]`: Executes `vagrant destroy [vm_name] [--force]` in node identified by *node-name*.
+
+* `vagrant remote halt <node-name> [vm_name] [--force] [--synchronous]`: Executes `vagrant halt [vm_name] [--force]` in node identified by *node-name*.
+
+* `vagrant remote provision <node-name> [vm_name] [--synchronous]`: Executes `vagrant provision [vm_name]` in node identified by *node-name* .
+
+* `vagrant remote resume <node-name> [vm_name] [--synchronous]`: Executes `vagrant resume [vm_name]` in node identified by *node-name* .
+
+* `vagrant remote status <node-name> [vm_name]`: Executes `vagrant status [vm_name]` in node identified by *node-name*.
+
+* `vagrant remote up <node-name> [vm_name] [--synchronous]`: Executes `vagrant up [vm_name]` in node identified by *node-name*.
+
+* `vagrant remote suspend <node-name> [vm_name] [--synchronous]`: Executes `vagrant suspend [vm_name]` in node identified by *node-name*.
+
+* `vagrant remote ssh <node-name> <vm_name>`: Executes `vagrant ssh <vm_name>` in node identified by *node-name*. This command enables you to connect by ssh to every vm in remote nodes.
+
+
+* `vagrant remote snapshot` (New command)
+
+  * `vagrant remote snapshot take <node-name> <vmname> <name> [description] [--synchronous]`: Takes a snapshot of the current state of the virtual machine *vmname* in remote node *node-name*. This snapshot is identified by *name* and optionally can have a *description*.
+
+  * `vagrant remote snapshot restore <node-name> <vmname> <snapshot-uuid|snapshot-name]> [--synchronous]`: Restores the snapshot identified by its *snapshot-uuid* or by its *snapshot-name* of the virtual machine *vmname* in remote node *node-name*.
+
+  * `vagrant remote snapshot list <node-name> [vmname]`: Shows the list of snapshots of the virtual machine *vmname* in remote *node-name*. This list also shows the current snapshot that is in use.
+
+
+* `vagrant remote backup` (New command)
+
+  * `vagrant remote backup take [node-name] [vmname] [--download target_directory][--background]`: This command allows you to make a backup of the virtual machine *vmname* in remote node *node-name*. This backup includes all the virtual machine images, and it is stored in a fixed place of the remote node. Also you can use the parameter `--download` to download the backup at the same time that is is taking. With parameter `--background`, this operation is donde in background.
+ 
+  * `vagrant remote backup log <node-name> [vmname]`: Shows the log of backup operations done in virtual machine *vmname* in remote node *node-name*.
+ 
+
+* `vagrant remote config` (New command)
+
+  * `vagrant remote config addvm <node-name> <vm_config_file> [--rename]`: Adds the machines configured in `vm_config_file`to the remote node. To avoid name collision you can use the `--rename` option to rename them automatically.
+
+  * `vagrant remote config deletevm <node-name> <vm_name> [--remove]`: Deletes the machine with name `vm_name`from the remote node config file. Also, if the parameter `--remove` is used, all the virtual machine information and data will be removed.
+
+  * `vagrant remote config show <node-name>`: Downloads the remote node config file.
+
+  * `vagrant remote config upload <node-name> <config_file>`: Uploads a config file to the remote node overwritting the current one.
+
+
+
+
+

data/lib/vagrant-nodemaster.rb

@@ -1,15 +1,17 @@
 require "vagrant-nodemaster/version"
-
+require 'vagrant-nodemaster/node/nodedbmanager' 
 module Vagrant
   module NodeMaster
     class Plugin < Vagrant.plugin("2")
     
+      
     	name "remote"
     	description <<-DESC
     	Este es mi primer plugin y estoy probando la estructura
     	DESC
 
-
+      
+      
     	command ('remote') do
     		require_relative "vagrant-nodemaster/remotecommand"
     		Command

data/lib/vagrant-nodemaster/apidesc.rb

@@ -36,6 +36,10 @@ module RestRoutes
 			VM_DESTROY_ROUTE
 		end
 		
+		def self.vm_add_route
+      VM_ADD_ROUTE
+    end
+		
 		def self.vm_status_route
 			VM_STATUS_ROUTE
 		end
@@ -64,6 +68,14 @@ module RestRoutes
 			VM_SNAPSHOT_TAKE_ROUTE
 		end
 		
+		def self.vm_snapshot_delete_route
+      VM_SNAPSHOT_DELETE_ROUTE
+    end
+		
+		def self.vm_delete_route
+      VM_DELETE_ROUTE
+    end
+		
 		def self.vm_snapshot_restore_route
 			VM_SNAPSHOT_RESTORE_ROUTE
 		end
@@ -72,11 +84,42 @@ module RestRoutes
 			NODE_BACKUP_LOG_ROUTE
 		end
 		
+		def self.node_password_change_route
+      NODE_PASSWORD_CHANGE
+    end
+		
+		
+		
 		def self.vm_backup_log_route
 			VM_BACKUP_LOG_ROUTE
 		end
 		
 		
+		def self.config_show_route
+      NODE_CONFIG_SHOW_ROUTE
+    end
+    
+    def self.config_upload_route
+      NODE_CONFIG_UPLOAD_ROUTE
+    end
+		
+		
+		def self.login_route
+		  LOGIN_ROUTE
+		end
+		
+		def self.node_queue_route
+		  NODE_QUEUE_ROUTE
+		end
+		
+		def self.node_queue_last_route
+      NODE_QUEUE_LAST_ROUTE
+    end
+		
+		
+		
+		
+		
 		def self.box_list_url(host,port)
 			"http://#{host}:#{port}#{box_list_route}"
 		end
@@ -95,8 +138,20 @@ module RestRoutes
 			url
 			
 		end
-
 		
+		def self.node_queue_url(host,port,id)
+		  url=String.new(node_queue_route)		  
+		  url[":id"] = id		  
+		  url="http://#{host}:#{port}#{url}"
+		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
 		
 		def self.vm_up_url(host,port)
 			"http://#{host}:#{port}#{vm_up_route}"
@@ -110,6 +165,10 @@ module RestRoutes
 			"http://#{host}:#{port}#{vm_destroy_route}"
 		end			
 		
+		def self.vm_add_url(host,port)
+      "http://#{host}:#{port}#{vm_add_route}"
+    end
+		
 		def self.vm_suspend_url(host,port)
 			"http://#{host}:#{port}#{vm_suspend_route}"
 		end
@@ -168,6 +227,16 @@ module RestRoutes
 			
 		end
 		
+		def self.vm_snapshot_delete_url(host,port,vmname,snapid)       
+      url=String.new(vm_snapshot_delete_route)        
+      url[":vm"]=vmname
+      url[":snapid"]=snapid
+      url="http://#{host}:#{port}#{url}"            
+      
+      url
+      
+    end
+		
 		def self.vm_snapshot_restore_url(host,port,vmname)
 			url=String.new(vm_snapshot_restore_route)
 			url[":vm"]=vmname
@@ -177,6 +246,17 @@ module RestRoutes
 			
 		end
 		
+		def self.vm_delete_url(host,port,vmname)
+		  url=String.new(vm_delete_route)
+      url[":vm"]=vmname
+      url="http://#{host}:#{port}#{url}"    
+      
+      url
+		end
+		
+		
+				
+		
 		def self.backup_log_url(host,port,vmname=nil)
 			url="http://#{host}:#{port}#{node_backup_log_route}"
 		
@@ -190,6 +270,17 @@ module RestRoutes
 			
 		end
 		
+		def self.config_show_url(host,port)
+      "http://#{host}:#{port}#{config_show_route}"
+    end
+    
+    def self.node_password_change_url(host,port)
+      "http://#{host}:#{port}#{node_password_change_route}"
+    end
+    
+    def self.config_upload_url(host,port)
+      "http://#{host}:#{port}#{config_upload_route}"
+    end
 		
 		
 		private
@@ -200,6 +291,8 @@ module RestRoutes
 			VM_UP_ROUTE = "/api/vm/up"
 			VM_HALT_ROUTE = "/api/vm/halt"
 			VM_DESTROY_ROUTE =	"/api/vm/destroy"
+			VM_DELETE_ROUTE = "/api/vm/:vm/delete"
+			VM_ADD_ROUTE = "/api/vm/add"
 			VM_SUSPEND_ROUTE = "/api/vm/suspend"
 			VM_RESUME_ROUTE = "/api/vm/resume"
 			VM_PROVISION_ROUTE = "/api/vm/provision"
@@ -210,11 +303,22 @@ module RestRoutes
 			SNAPSHOTS_ALL_ROUTE = "/api/vm/snapshots"
 			VM_SNAPSHOTS_ROUTE = "/api/vm/:vm/snapshots"
 			VM_SNAPSHOT_TAKE_ROUTE = "/api/vm/:vm/take"
+			VM_SNAPSHOT_DELETE_ROUTE = "/api/vm/:vm/:snapid/delete"
 			VM_SNAPSHOT_RESTORE_ROUTE = "/api/vm/:vm/restore"
 			
 			VM_BACKUP_LOG_ROUTE = "/api/vm/:vm/backuplog"
 			NODE_BACKUP_LOG_ROUTE = "/api/backuplog"
 			
+			NODE_CONFIG_SHOW_ROUTE = "/api/config/show"
+			NODE_CONFIG_UPLOAD_ROUTE = "/api/config/upload"
+			
+			NODE_PASSWORD_CHANGE = "/api/password/change"
+			
+			NODE_QUEUE_ROUTE = "/api/queue/:id"
+			NODE_QUEUE_LAST_ROUTE = "/api/queuelast"
+			
+			LOGIN_ROUTE = "/api/login"
+			
 	end
 	
 end

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

@@ -10,7 +10,7 @@ module Vagrant
 					options = {}
 					
 					opts = OptionParser.new do |opts|
-						opts.banner = "Usage: vagrant node add <node-name> <node-address> <node-port> --hostname"
+						opts.banner = "Usage: vagrant node add <node-name> <node-address> <node-port> <node-password> --hostname"
 						opts.on("--hostname", "Address in dns format") do |d|
 							options[:dns] = d
 						end
@@ -18,11 +18,11 @@ 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 != 4
 		  		
-		  		dbmanager=DB::NodeDBManager.new
+		  		#dbmanager=DB::NodeDBManager.new
 		  		
-		  		dbmanager.add_node(argv[0],argv[1],argv[2].to_i,options[:dns])
+		  		DB::NodeDBManager.add_node(argv[0],argv[1],argv[2].to_i,argv[3],options[:dns])
 					
 					0
 			end

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

@@ -5,11 +5,17 @@ module Vagrant
 		module DB
 			class NodeDBManager
 				
-				def initialize
-					@db=check_database					
+				def initialize(data_dir=nil)			  				  	
+				   
+					 @@db=check_database(data_dir) if data_dir
+					 
 				end
 				
-				def add_node(node_name,node_address,node_port,dnsformat)
+				def self.get_reference
+				  @@db
+				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"
@@ -28,12 +34,12 @@ module Vagrant
 					end				
 														
 					
-					sql="INSERT INTO #{TABLE_NAME} VALUES ( ? , ? , ?)"
-					@db.execute(sql,node_name,node_address,node_port)
+					sql="INSERT INTO #{TABLE_NAME} VALUES ( ? , ? , ?,?)"
+					@@db.execute(sql,node_name,node_address,node_port,Digest::MD5.hexdigest(node_password))
 					
 				end
 				
-				def update_node(node_name,node_address,node_port,dnsformat)
+				def self.update_node(node_name,node_address,node_port,dnsformat)
 					
 					if (!portvalid?(node_port))						
 					
@@ -49,52 +55,60 @@ module Vagrant
 					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)
+					@@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 remove_node(node_name)
+				def self.remove_node(node_name)
 					sql="DELETE FROM #{TABLE_NAME} WHERE #{NODE_NAME_COLUMN}=?"
-					@db.execute(sql,node_name)
+					@@db.execute(sql,node_name)
 				end
 				
-				def remove_nodes
+				def self.remove_nodes
 					sql="DELETE FROM #{TABLE_NAME}"
-					@db.execute(sql)
+					@@db.execute(sql)
 				end
 
 				
-				def get_node_names
+				def self.get_node_names
 					sql="SELECT #{NODE_NAME_COLUMN} FROM #{TABLE_NAME}"
-					return @db.execute(sql);
+					@@db.execute(sql);
 				end				
 				
-				def get_nodes				
+				def self.get_nodes				
 					sql="SELECT * FROM #{TABLE_NAME}"
-					rows=@db.execute(sql);
+					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
 
-					return nodes
+					nodes
+
 				end
 				
-				def get_node(node_name)
+				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?
+					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]
-					return node
+					node[:password]=nodear[0][3]
+					node
+
 				end
 				
 				private
@@ -103,23 +117,24 @@ module Vagrant
 				NODE_NAME_COLUMN = 'node_name'
 				NODE_ADDRESS_COLUMN = 'node_address'
 				NODE_PORT_COLUMN = 'node_port'
+				NODE_PASSWORD_COLUMN = 'node_password'
 				
-				def check_database					
+				def check_database(data_dir)
 					#Creates and/or open the database
-					db = SQLite3::Database.new( "/tmp/test.db" )
+					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);" )
+						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
-					return db
+					
+					db
+
 				end
 		
-				def ipvalid?(node_address)
+				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])$'
 						
@@ -131,11 +146,11 @@ module Vagrant
 							return true
 						end
 						
-						return false 
+						false 
 						
 				end
 				
-				def dnsvalid?(node_address)
+				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])$'
@@ -147,27 +162,28 @@ module Vagrant
 							return true
 						end
 						
-						return false 
+						false 
 						
 				end
 				
 						
-				def namevalid?(node_name)
+				def self.namevalid?(node_name)
 					#only allowing '_' and '-'
 					namereg = '^[a-z0-9_-]*$'
 					nameregex = Regexp.new(namereg)
 					if (node_name =~nameregex)
 						return true
 					end
-						return false
+
+					false
 						
 				end
 				
-				def portvalid?(node_port)
+				def self.portvalid?(node_port)
 					if (node_port>=1024)
 						return true
 					end
-					return false
+					false
 				end
 						
 			end