From cd7242af11b7d5caa7b366d18ea4a6af3c1dae19 Mon Sep 17 00:00:00 2001
From: John O'Connor <john.oconnor@puppet.com>
Date: Fri, 28 Aug 2020 09:29:54 +0100
Subject: [PATCH] (POOLER-190) TBD Markers only

---
 lib/vmpooler/pool_manager.rb      | 9 +++++++++
 lib/vmpooler/providers/vsphere.rb | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 95927d4..f1d760f 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -326,6 +326,8 @@ module Vmpooler
           else
             $logger.log('s', "[!] [#{pool_name}] failed while cloning VM with an error: #{e}")
           end
+          # TBD: not convinced we need a raise here
+          # Check with Matt.
           raise
         end
       end
@@ -991,6 +993,8 @@ module Vmpooler
           end
         end
       end
+      # TBD - we should NOT set this as prepared if it doesn't exist
+      # TBD - Look for error creating template delta disks more than once.
       redis.hset('vmpooler__template__prepared', pool['name'], pool['template'])
     end
 
@@ -1045,6 +1049,7 @@ module Vmpooler
     def update_pool_template(pool, provider, configured_template, prepared_template, redis)
       pool['template'] = configured_template
       $logger.log('s', "[*] [#{pool['name']}] template updated from #{prepared_template} to #{configured_template}")
+      # TBD - Before we drain pool check if new template exists.
       # Remove all ready and pending VMs so new instances are created from the new template
       drain_pool(pool['name'], redis)
       # Prepare template for deployment
@@ -1298,6 +1303,8 @@ module Vmpooler
           end
         end
 
+        # TBD - add limit check here.
+
         (pool_size - total.to_i).times do
           if redis.get('vmpooler__tasks__clone').to_i < $config[:config]['task_limit'].to_i
             begin
@@ -1347,6 +1354,8 @@ module Vmpooler
       # Evaluates a pool template to ensure templates are prepared adequately for the configured provider
       # If a pool template configuration change is detected then template preparation is repeated for the new template
       # Additionally, a pool will drain ready and pending instances
+      # TBD - Should we really be checking if the template actually exists - lets do this .....
+      # and down pool or empty it ....
       evaluate_template(pool, provider)
 
       # Check to see if a pool size change has been made via the configuration API
diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb
index 63373ec..2405046 100644
--- a/lib/vmpooler/providers/vsphere.rb
+++ b/lib/vmpooler/providers/vsphere.rb
@@ -304,6 +304,7 @@ module Vmpooler
             # Get the template VM object
             raise("Pool #{pool_name} did not specify a full path for the template for the provider #{name}") unless valid_template_path? template_path
 
+            # TBD - check that template exists?
             template_vm_object = find_template_vm(pool, connection)
 
             # Annotate with creation time, origin template, etc.
@@ -1131,6 +1132,7 @@ module Vmpooler
         def create_template_delta_disks(pool)
           @connection_pool.with_metrics do |pool_object|
             connection = ensured_vsphere_connection(pool_object)
+            # TBD - Verify template exists.
             template_vm_object = find_template_vm(pool, connection)
 
             template_vm_object.add_delta_disk_layer_on_all_disks