socsvn commit: r305038 - in soc2016/litong/vagrant-bhyve/trunk/lib: . vagrant-bhyve

[litong at FreeBSD.org]

Author: litong
Date: Fri Jun 10 12:36:12 2016
New Revision: 305038
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305038

Log:
  update the structure

Deleted:
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/util.rb
Modified:
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve.rb
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/action.rb
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/config.rb
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/driver.rb
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/errors.rb

Modified: soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve.rb
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve.rb	Fri Jun 10 12:36:00 2016	(r305037)
+++ soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve.rb	Fri Jun 10 12:36:12 2016	(r305038)
@@ -7,7 +7,6 @@
     autoload :Action, lib_path.join('action')
     autoload :Driver, lib_path.join('driver')
     autoload :Errors, lib_path.join('errors')
-    autoload :Util, lib_path.join('util')
 
 
     # This function returns the path to the source of this plugin

Modified: soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/action.rb
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/action.rb	Fri Jun 10 12:36:00 2016	(r305037)
+++ soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/action.rb	Fri Jun 10 12:36:12 2016	(r305038)
@@ -0,0 +1,15 @@
+require "pathname"
+require "vagrant/action/builder"
+
+
+module VagrantPlugins
+  module ProviderBhyve
+    module Action
+      include Vagrant::Action::Builtin
+      
+
+
+
+    end
+  end
+end

Modified: soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/config.rb
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/config.rb	Fri Jun 10 12:36:00 2016	(r305037)
+++ soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/config.rb	Fri Jun 10 12:36:12 2016	(r305038)
@@ -0,0 +1,32 @@
+require "vagrant"
+
+module VagrantPlugins
+  module ProviderBhyve
+    class Config < Vagrant.plugin('2', :config)
+      # Loader used to load kernel before invoking bhyve.(grub2-bhyve or bhyveload)
+      attr_accessor :loader
+      
+      # Resources needed for the VM.
+      
+      # Specify the number of virtual CPUs.
+      attr_accessor :cups
+      # Specify the size of guest physical memory.
+      attr_accessor :memory
+      # Specify virtual devices will be attached to bhyve's emulated
+      # PCI bus. Network interface and disk will both attched as this kind
+      # of devices.
+      attr_accessor :pcis
+      # Specify console device which will be attached to the VM
+      attr_accessor :lpc
+
+      def initialize
+	@loader		= UNSET_VALUE
+	@cpus		= UNSET_VALUE
+	@memory		= UNSET_VALUE
+	@pcis		= UNSET_VALUE
+	@lpc		= UNSET_VALUE
+      end
+
+    end
+  end
+end

Modified: soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/driver.rb
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/driver.rb	Fri Jun 10 12:36:00 2016	(r305037)
+++ soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/driver.rb	Fri Jun 10 12:36:12 2016	(r305038)
@@ -1,3 +1,4 @@
+require "vagrant/util/subprocess"
 require "log4r"
 
 module VagrantPlugins
@@ -19,3 +20,14 @@
 	  @@sudo = ''
 	else
 	  @@sudo = 'sudo'
+	end
+      end
+
+      def execute(command)
+	process = Subprocess.new(command)
+	process.execute
+      end
+
+    end
+  end
+end

Modified: soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/errors.rb
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/errors.rb	Fri Jun 10 12:36:00 2016	(r305037)
+++ soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/errors.rb	Fri Jun 10 12:36:12 2016	(r305038)
@@ -0,0 +1,16 @@
+require "vagrant"
+
+module VagrantPlugins
+  module ProviderBhyve
+    module Errors
+      class VagrantBhyveError < Vagrant::Errors::VagrantError
+	error_namespace('vagrant_bhyve.errors')
+      end
+
+      class NotRootUser << VagrantError
+	error_key(:has_no_root_privilege)
+      end
+
+    end
+  end
+end