Commit graph

821 commits

Author SHA1 Message Date
Glenn Sarti
c7b37dec75 (POOLER-70) Update revert_vm_snapshot for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
2017-05-17 13:52:27 -07:00
Glenn Sarti
a56d61c8bf (POOLER-70) Update create_vm_snapshot for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
2017-05-17 13:52:27 -07:00
Glenn Sarti
fd54c4ca18 (POOLER-70) Update create_vm_disk for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
2017-05-17 13:52:27 -07:00
Glenn Sarti
64bca33d45 (POOLER-70) Update destroy_vm for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
- Splits the destroy_vm function into two.  One function spawns the thread
  while the other actually does the work.  This makes testing much easier.
2017-05-17 13:52:27 -07:00
Glenn Sarti
b21d78fa49 (POOLER-70) Update _clone_vm for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
2017-05-17 13:52:27 -07:00
Glenn Sarti
cc1910fd76 (POOLER-70) Update check_running_vm for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
2017-05-17 13:52:27 -07:00
Glenn Sarti
8c421aa3bd (POOLER-70) Update check_ready_vm for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
- Splits the check_ready_vm function into two.  One function spawns the thread
  while the other actually does the work.  This makes testing much easier.
2017-05-17 13:52:27 -07:00
Glenn Sarti
760dc1c67e (POOLER-70) Update move_pending_vm_to_ready for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
2017-05-17 13:52:27 -07:00
Glenn Sarti
9f4fc903b9 (POOLER-70) Update fail_pending_vm for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
- Modified to return true or false to indicate that the VM was failed
2017-05-17 13:52:27 -07:00
Glenn Sarti
199bf4a070 (POOLER-70) Update check_pending_vm for VM Provider
Previously the Pool Manager would use vSphere objects directly.  This commit
- Modifies the pool_manager to use the VM provider methods instead
- Removes the open_socket method and tests as it is only required in the vSphere
  VM provider
2017-05-17 13:52:27 -07:00
Glenn Sarti
4bf32be87e (POOLER-70) Update base VM provider
Previously the base VM provider class was added however it was missing various
functions from its definition.  This commit:
- Modifies the VMPooler configuration to add an empty provider config. if the
  provider config is missing
- Helper method to return all of the pools this provider is responsible for
2017-05-17 13:52:27 -07:00
Glenn Sarti
5aa5019822 (POOLER-70) Add mock provider test fixture
This commit creates a VM Provider test fixture for spec tests that merely uses
the Base Provider class with a name of mock_provider.  This will then be used
by unit tests in further commits.
2017-05-17 13:52:27 -07:00
Glenn Sarti
77afc86aeb (POOLER-72) Add Dummy Provider
Previously the only VM Provider was vSphere however this made testing and making
changes difficult as it required a functioning vSphere instance.  This commit
adds a Dummy Provider which presents a VM provider to Pool Manager but manages
provisioned "VM"s in a hashtable.  The Dummy Provider can also be configured to
randomly fail operations and take random amounts of time to perform operations,
 such as cloning a VM, which is useful to see how the Pool Manager copes with
these events.

This commit also updates the configuration YAML documentation and adds
appropriate unit tests.
2017-05-17 13:52:27 -07:00
mattkirby
d9d45109f2 Merge pull request #219 from glennsarti/pin_rack
(maint) Pin rack to 1.x
2017-05-15 13:20:49 -07:00
Glenn Sarti
e399087dc1 (maint) Pin rack to 1.x
Rack was updated recently and 2.x requires ruby 2.2 or above. As VMPooler should
work in older jruby, we need to be Ruby 1.9.3 compatible.  This commit pins
the rack gem to 1.x.
2017-05-12 15:09:27 -07:00
Rob Braden
e3cda9d743 Merge pull request #215 from glennsarti/ticket/maint/add-debug
(maint) Emit console messages when debugging is enabled
2017-04-04 15:16:31 -07:00
mattkirby
f0f3504c05 Merge pull request #214 from glennsarti/ticket/master/POOLER-73-begin-vsphere-migrate
(POOLER-70)(POOLER-52) Create a functional vSphere Provider
2017-04-03 11:46:28 -07:00
Glenn Sarti
d94b5e6896 (maint) Update rubocop.yml to ignore 2 cops
This commit updates the rubocop_todo.yml file for all of the new code that has
been introduced.

This commit adds two cops to the ignore list
- Style/ConditionalAssignment
- Next

In some cases the readability of code is better even when the cops are raised.
This commit disables the cops so they will not be flagged as violations
2017-04-03 11:30:02 -07:00
Glenn Sarti
a155dca081 (POOLER-70) Add Pool Manager based functions to vSphere Provider
Previously the vSphere provider did not implement any of the required methods
from the base class.  This commit modifies the vSphere provider so that in
can properly implement the following methods:

- name
- vms_in_pool
- get_vm_host
- find_least_used_compatible_host
- migrate_vm_to_host
- get_vm
- create_vm
- destroy_vm
- vm_ready?
- vm_exists?
- create_disk
- create_snapshot
- revert_snapshot

This commit also includes changes to syntax for rubocop violations.
2017-04-03 11:30:02 -07:00
Glenn Sarti
821dcf45c2 (POOLER-70) Update the provider base class
Previously it was expected that the timeout setting should be passed when
determining whether a VM was ready.  However this should be in the pool
configuration and is not required to be a method parameter.

Previously many of the methods did not have a pool name passed as a parameter.
While this may be ok for the vSphere provider, it may not for other providers.
This commit changes the base provider to consistently use (pool,vm,other..) as
method parameters.  This commit also updates the base spec tests as well.

Additionally:
- Updated documentation around expected error states
- Updated documentation to be more consistent in format
- Added snapshot and disk manager functions and unit tests
- Update the initialization method to take in a more formal defintion with
  required global objects for metrics, logging and configuration
- Added helper functions
  - logger : Allows providers to log information as per Pool Manager
  - metrics : Allows providers to submit metrics as per Pool Manager
  - provider_options : Allows providers to access initialization options for a
    provider
  - pool_config : Get the configuration for a specific pool
  - provider_config : Get the configuration of this specific provider
  - global_config: Get the VMPooler global configuration
2017-04-02 21:23:09 -07:00
Glenn Sarti
e04f380f42 (maint) Emit console messages when debugging is enabled
Previously all log messages may be written to a text file, however during
development or debugging it is also useful if the log messages are written to
the console.  This commit changes the logger class to emit messages to the
console, via `puts`, if the VMPOOLER_DEBUG environment variable is set.
2017-03-31 17:57:06 -07:00
Glenn Sarti
901ddde7c3 (POOLER-52) Prepare the vSphere Provider for a connection pooler
Previously, all calls to the vSphere API assumed an instance variable called
`@connection`.  This commit prepares the provider for a connection pooler:

- Removes all references to `@connection` where needed and funnels all calls to
  get a vSphere connection through the newly renamed method `get_connection`.
  For the moment, this still uses `@connection` behind the scenes but will make
  it easier in the future to migrate to a connection pooler
- Removes all references and tests for the ensure_connected method as it's no
  longer required
- All methods that explicitly need a connection object will have this as part of
  the method parameters
- The connect_to_vsphere method has been changed so that instead of setting the
  instance level `@connection` object it just returns the newly created connection.
  This can then be easily consumed by a connection pooler later.
2017-03-22 10:23:43 -07:00
Glenn Sarti
e5db02b44f (POOLER-70) Rename conflicting method in vSphere Provider
Previously, the vSphere Provider had two methods called
`find_least_used_compatible_host`: one in the base class and one in the vSphere
helper methods.  This commit renames the vSphere helper methods and tests to
`find_least_used_vsphere_compatible_host` to stop the conflict.
2017-03-22 10:10:51 -07:00
Glenn Sarti
8cf3d043bf (POOLER-70) Copy vSphere helper into the vSphere Provider
This commit copies the code and tests from the vSphere Helper into the vSphere
Provider and modifies the test initialisation for the new class name.
2017-03-22 08:58:35 -07:00
Morgan Rhodes
d4a50e5e56 Merge pull request #208 from glennsarti/maint-rubocop
(maint) Fix rubocop violations
2017-03-21 15:21:20 -07:00
Morgan Rhodes
4dbe7ef39a Merge pull request #196 from glennsarti/ticket/master/POOLER-73-vsphere-helper
(POOLER-73) Add spec tests for vsphere_helper
2017-03-21 15:11:05 -07:00
Glenn Sarti
bcaad0a15b (POOLER-73) Add spec tests for vsphere_helper
Previously there were no spec tests to document the behaviour of the
vsphere_helper.  This commit adds the behavioural spec tests in prepration of
the refactoring work as part of POOLER-70, the connection pooling work in
POOLER-52 and various bugs found in vsphere_helper while these spec tests were
being created.
2017-03-20 17:31:59 -07:00
Glenn Sarti
fd93c5bea8 (GH-203) Change use of abort to raise in in vsphere_helper.rb
Previously, in `find_vm` and `find_pool` if in an expected object was found the
entire pool manager, and probably API process, will terminate due to the use of
`abort`.  This commit changes the use of abort to raise so that the error can be
trapped  and handled instead of the entire process being shutdown.  This is also
required so that the methods can be tested, otherwise rspec is shutdown
prematurely.
2017-03-17 10:48:32 -07:00
Glenn Sarti
07eb4f579a (POOLER-73) Update find_pool in vsphere_helper.rb to enable testing
Previously, it was not able to mock objects to impersonate various RBVMOMI
objects.  This commit changes the case statement to use `base.is_a?`
which can be mocked and allow mocked objects to mimic real objects.
2017-03-17 10:47:25 -07:00
Glenn Sarti
a276542098 (maint) Ignore the crashing WordArray cop in rubocop
Previously the Style/WordArray cop was crashing in the following fil:
lib/vmpooler/api/helpers.rb

This commit disables this cop until the root cause can be determined.
2017-03-16 16:00:32 -07:00
Glenn Sarti
04c91588af (maint) Update Rubobop Todo for 16th March
Quite a few rubocop violations have been resolved.  This commit updates the
rubocop todo file to reflect this.
2017-03-16 15:43:18 -07:00
Glenn Sarti
885d8d2b1c (maint) Add additional rubocop exceptions
This commit adds the following exceptions:

- Style/EmptyMethod
  Methods which are empty are typically supposed to not spread over two lines
  however this is a matter of readability and should not be considered a
  violation
- Metrics/BlockNesting
  Due to a legacy codebase there are instances where the block depth is quite
  high.  Ignore these violations for the time being.
2017-03-16 15:41:02 -07:00
Glenn Sarti
06100ddea6 (maint) Fix rubocop violations
This commit fixes minor rubocopy violations in eleven source files.  Minor
violations are those that include formatting, single quotes, and recently added
classes.
2017-03-16 15:39:15 -07:00
Glenn Sarti
88052ac85a (POOLER-73) Update find_folder in vsphere_helper.rb to enable testing
Previously, it was not able to mock objects to impersonate a RbVmomi::VIM::Folder
object.  This commit changes the case statement to an if statement using is_a?
which can be mocked and allow mocked objects to mimic real objects.
2017-03-14 13:05:30 -07:00
mattkirby
42b7d2d222 Merge pull request #200 from glennsarti/fix-vsphere-credential
(maint) Fix credentials in vsphere_helper
2017-03-14 11:10:33 -07:00
mattkirby
7d82716ad5 Merge pull request #190 from glennsarti/ticket/master/POOLER-73-begin-vsphere-migrate
(POOLER-70) Prepare to refactor VSphere code into a VM Provider
2017-03-14 07:18:33 -07:00
Glenn Sarti
c724d90d90 (POOLER-70) Add initial VSphere VM Provider
This commit adds a skeleton VM Provider for VSphere based VM operations.
2017-03-08 17:14:52 -08:00
Glenn Sarti
ac8a34de86 (POOLER-70) Rename the use of vsphere to provider
VM provisioning will be handled by VM Providers.  This commit renames the use of
vsphere to provider where appropriate and changes the per-pool helper from
vsphere to providers to more accurately represent it's intended use.
2017-03-08 17:14:52 -08:00
Glenn Sarti
c502f92cd3 (POOLER-70) Add initial VM Provider service
Previously all of the VM provisioning code was intertwined with the VM lifecycle
code e.g. The VSphere specific code is mixed with Redis code.  This makes it
impossible to add aditional providers or disable VSphere integration.  This
commit begins the process to refactor the VSphere code out of the lifecycle code
by introducing the concept of VM Providers.  A Provider will contain the logic/
code to manage VMs i.e. create/destroy/inquire.  Therefore the Pool Manager can
query a strict interface into one or more Providers.  Initially only a VSphere
provider will be available.

This commit adds the base class for all providers and describes the API or
contract that the Pool Manager will use to manage VMs.
2017-03-08 17:14:12 -08:00
Glenn Sarti
0e0e1c2fac (maint) Fix credentials in vsphere_helper
In commit 03ad7bfa46 the global variables for credentials was change to an
instance variable however one reference was missed.  This commit fixes this
omission.
2017-03-08 16:11:07 -08:00
Rob Braden
03ad7bfa46 Merge pull request #198 from mattkirby/helper_no_global_vars
Update usage of global variablesin vsphere_helper
2017-03-08 15:22:56 -08:00
kirby@puppetlabs.com
80c01eb29d Update usage of global variablesin vsphere_helper
This commit updates usage of global variables in vsphere_helper to be instance variables. They do not need to be global variables as brought up in issue #194. Without this change we are setting global variables when they are not needed.
2017-03-08 15:14:34 -08:00
Rob Braden
04124a0e7a Merge pull request #191 from glennsarti/maint-rubocop
(maint) Fix rubocop offenses
2017-03-08 15:09:12 -08:00
Glenn Sarti
c14403682a (maint) Fix rubocop offenses
This commit updates VM Pooler to fix any existing rubocop offenses and also
fixes any offenses in the lib/vmpooler.rb file.  This commit also regenerates
the Todo file.
2017-03-07 20:17:32 -08:00
Rob Braden
e4cd64e47e Merge pull request #197 from mattkirby/double_connect_open
Remove duplicate of metrics.connect.open
2017-03-07 16:14:22 -08:00
kirby@puppetlabs.com
9eb6788148 Remove duplicate of metrics.connect.open
This commit removes a duplicate increment of the metrics.connect.open count. Without this change two connections will be reported when one is made.
2017-03-06 09:15:54 -08:00
Morgan Rhodes
850919f5db Merge pull request #189 from glennsarti/ticket/maint/rename-moves-and-clonevm
(POOLER-70) Refactor clone_vm to take pool configuration object
2017-03-02 11:39:29 -08:00
Morgan Rhodes
cc79bced17 Merge pull request #188 from glennsarti/ticket/master/gh-185
(GH-185) Remove unnecessary checks in check_ready_vm
2017-03-02 11:34:35 -08:00
Glenn Sarti
ac7d7009d2 (POOLER-70) Refactor clone_vm to take pool configuration object
Previously, the clone_vm method took various VSphere specific parameters e.g.
template folder.  However in order make VMPooler less VSphere specific this
method should just take the pool configuration and then it can determine the
appropriate settings itself.  This commit also moves the threading to a clone_vm
while the actual method which does the work is now _clone_vm as per all other
multithread worker methods in pool_manager.  This commit also updates the spec
tests appropriately.
2017-03-01 21:53:42 -08:00
Glenn Sarti
f433056734 (GH-185) Remove unnecessary checks in check_ready_vm
Previously in check_ready_vm, if the VM is powered off, the VM is moved in
redis however the function doesn't return there, and instead then checks if the
hostname is the same, and then if TCP socket 22 is open. This is unnecessary as
we already know the VM is turned off so of course the hostname is wrong and TCP
22 is unavailable. The same applies for the VM hostname.

This commit instead returns after it is found a VM is no longer ready.  This
commit also amends the spec tests for the correct behaviour.
2017-03-01 20:28:36 -08:00