From ac96550f57d02c359b699a799ddb8deeb12f88bb Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Fri, 3 Feb 2023 17:02:47 -0500
Subject: [PATCH 01/19] Stub out dns provider usage

---
 lib/vmpooler/dns.rb            |  67 +++++++++++++++++++++
 lib/vmpooler/dns/base.rb       |  69 +++++++++++++++++++++
 lib/vmpooler/pool_manager.rb   |  60 +++++++++++++++++--
 lib/vmpooler/providers/base.rb |   4 ++
 spec/unit/pool_manager_spec.rb | 106 +++++++++++++++++++++++++++++++++
 5 files changed, 300 insertions(+), 6 deletions(-)
 create mode 100644 lib/vmpooler/dns.rb
 create mode 100644 lib/vmpooler/dns/base.rb

diff --git a/lib/vmpooler/dns.rb b/lib/vmpooler/dns.rb
new file mode 100644
index 0000000..e11f229
--- /dev/null
+++ b/lib/vmpooler/dns.rb
@@ -0,0 +1,67 @@
+require 'pathname'
+
+module Vmpooler
+  class Dns
+
+    # Load one or more VMPooler DNS plugin gems by name
+    #
+    # @param names [Array<String>] The list of gem names to load
+    def self.load_by_name(names)
+      names = Array(names)
+      instance = new
+      names.map { |name| instance.load_from_gems(name) }.flatten
+    end
+
+    # Returns the plugin class for the specified dns config by name
+    #
+    # @param config [Object] The entire VMPooler config object
+    # @param name [Symbol] The name of the dns config key to get the dns class
+    # @return [String] The plugin class for the specifid dns config
+    def self.get_dns_plugin_class_by_name(config, name)
+      dns_configs = config[:dns_configs].keys
+      plugin_class = ''
+
+      dns_configs.map do |dns_config_name|
+        if dns_config_name.to_s == name
+          plugin_class = config[:dns_configs][dns_config_name]['dns_class']
+        end
+      end
+
+      plugin_class
+    end
+
+    # Returns a list of DNS plugin classes specified in the vmpooler configuration
+    #
+    # @param config [Object] The entire VMPooler config object
+    # @return [Array<String] A list of DNS plugin classes
+    def self.get_dns_plugin_config_classes(config)
+      if config[:dns_configs]
+        dns_configs = config[:dns_configs].keys
+        dns_plugins = dns_configs.map do |dns_config_name|
+          if config[:dns_configs][dns_config_name] && config[:dns_configs][dns_config_name]['dns_class']
+            config[:dns_configs][dns_config_name]['dns_class'].to_s
+          else
+            dns_config_name.to_s
+          end
+        end.compact.uniq
+        
+        # dynamic-dns is not actually a class, it's just used as a value to denote
+        # that dynamic dns is used so no loading or record management is needed
+        dns_plugins.delete('dynamic-dns')
+      end
+
+      dns_plugins
+    end
+
+    # Load a single DNS plugin gem by name
+    #
+    # @param name [String] The name of the DNS plugin gem to load
+    # @return [String] The full require path to the specified gem
+    def load_from_gems(name = nil)
+      require_path = 'vmpooler/dns/' + name.gsub('-', '/')
+      require require_path
+      $logger.log('d', "[*] [dns_manager] Loading DNS plugins from dns_configs: #{name}")
+      require_path
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/vmpooler/dns/base.rb b/lib/vmpooler/dns/base.rb
new file mode 100644
index 0000000..739395b
--- /dev/null
+++ b/lib/vmpooler/dns/base.rb
@@ -0,0 +1,69 @@
+module Vmpooler
+  class PoolManager
+    class Dns
+      class Base
+         # These defs must be overidden in child classes
+
+        # Helper Methods
+        # Global Logger object
+        attr_reader :logger
+        # Global Metrics object
+        attr_reader :metrics
+        # Provider options passed in during initialization
+        attr_reader :dns_options
+
+        def initialize(config, logger, metrics, redis_connection_pool, name, options)
+          @config = config
+          @logger = logger
+          @metrics = metrics
+          @redis = redis_connection_pool
+          @dns_plugin_name = name
+
+          @dns_options = options
+
+          logger.log('s', "[!] Creating dns plugin '#{name}'")
+          # Your code goes here...
+        end
+
+        def pool_config(pool_name)
+          # Get the configuration of a specific pool
+          @config[:pools].each do |pool|
+            return pool if pool['name'] == pool_name
+          end
+
+          nil
+        end
+
+        def global_config
+          # This entire VM Pooler config
+          @config
+        end
+
+        def name
+          @dns_plugin_name
+        end
+
+        def get_ip(vm_name)
+          @redis.with_metrics do |redis|
+            ip = redis.hget("vmpooler__vm__#{vm_name}", 'ip')
+            return ip
+          end
+        end
+
+        # returns
+        #   Array[String] : Array of pool names this provider services
+        def provided_pools
+          list = []
+          @config[:pools].each do |pool|
+            list << pool['name'] if pool['dns_config'] == name
+          end
+          list
+        end
+
+        def create_or_replace_record(hostname)
+          raise("#{self.class.name} does not implement create_or_replace_record")
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 0d908d3..a766dd2 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'vmpooler/dns'
 require 'vmpooler/providers'
 require 'vmpooler/util/parsing'
 require 'spicy-proton'
@@ -26,6 +27,9 @@ module Vmpooler
       # VM Provider objects
       $providers = Concurrent::Hash.new
 
+      # VM DNS objects
+      $dns_plugins = Concurrent::Hash.new
+
       # Our thread-tracker object
       $threads = Concurrent::Hash.new
 
@@ -39,6 +43,9 @@ module Vmpooler
 
       # load specified providers from config file
       load_used_providers
+
+      # load specified dns plugins from config file
+      load_used_dns_plugins
     end
 
     def config
@@ -323,10 +330,10 @@ module Vmpooler
     end
 
     # Clone a VM
-    def clone_vm(pool_name, provider, request_id = nil, pool_alias = nil)
+    def clone_vm(pool_name, provider, dns_plugin, request_id = nil, pool_alias = nil)
       Thread.new do
         begin
-          _clone_vm(pool_name, provider, request_id, pool_alias)
+          _clone_vm(pool_name, provider, dns_plugin, request_id, pool_alias)
         rescue StandardError => e
           if request_id
             $logger.log('s', "[!] [#{pool_name}] failed while cloning VM for request #{request_id} with an error: #{e}")
@@ -414,7 +421,7 @@ module Vmpooler
       [dns_ip, false]
     end
 
-    def _clone_vm(pool_name, provider, request_id = nil, pool_alias = nil)
+    def _clone_vm(pool_name, provider, dns_plugin, request_id = nil, pool_alias = nil)
       new_vmname = find_unique_hostname(pool_name)
       pool_domain = Parsing.get_domain_for_pool(config, pool_name)
       mutex = vm_mutex(new_vmname)
@@ -447,6 +454,8 @@ module Vmpooler
           $logger.log('s', "[+] [#{pool_name}] '#{new_vmname}' cloned in #{finish} seconds")
 
           $metrics.timing("clone.#{pool_name}", finish)
+
+          dns_plugin.create_or_replace_record(new_vmname)
         rescue StandardError
           @redis.with_metrics do |redis|
             redis.pipelined do |pipeline|
@@ -632,6 +641,12 @@ module Vmpooler
       result
     end
 
+    # load only dns plugins used in config file
+    def load_used_dns_plugins
+      dns_plugins = Vmpooler::Dns.get_dns_plugin_config_classes(config)
+      Vmpooler::Dns.load_by_name(dns_plugins)
+    end
+
     # load only providers used in config file
     def load_used_providers
       Vmpooler::Providers.load_by_name(used_providers)
@@ -679,6 +694,15 @@ module Vmpooler
       $providers[provider_name]
     end
 
+    def get_dns_plugin_class_for_pool(pool_name)
+      pool = $config[:pools].find { |p| p['name'] == pool_name }
+      return nil unless pool
+
+      plugin_name = pool.fetch('dns_plugin')
+      plugin_class = Vmpooler::Dns.get_dns_plugin_class_by_name(config, plugin_name)
+      $dns_plugins[plugin_class]
+    end
+
     def check_disk_queue(maxloop = 0, loop_delay = 5)
       $logger.log('d', '[*] [disk_manager] starting worker thread')
 
@@ -1290,6 +1314,8 @@ module Vmpooler
         $metrics.gauge("ready.#{pool_name}", ready)
         $metrics.gauge("running.#{pool_name}", running)
 
+        dns_plugin = get_dns_plugin_class_for_pool(pool_name)
+
         unless pool_size == 0
           if redis.get("vmpooler__empty__#{pool_name}")
             redis.del("vmpooler__empty__#{pool_name}") unless ready == 0
@@ -1304,7 +1330,7 @@ module Vmpooler
             begin
               redis.incr('vmpooler__tasks__clone')
               pool_check_response[:cloned_vms] += 1
-              clone_vm(pool_name, provider)
+              clone_vm(pool_name, provider, dns_plugin)
             rescue StandardError => e
               $logger.log('s', "[!] [#{pool_name}] clone failed during check_pool with an error: #{e}")
               redis.decr('vmpooler__tasks__clone')
@@ -1390,6 +1416,16 @@ module Vmpooler
       raise("Provider '#{provider_class}' is unknown for pool with provider name '#{provider_name}'") if provider_klass.nil?
     end
 
+    def create_dns_object(config, logger, metrics, redis_connection_pool, dns_class, dns_name, options)
+      dns_klass = Vmpooler::PoolManager::Dns
+      dns_klass.constants.each do |classname|
+        next unless classname.to_s.casecmp(dns_class) == 0
+
+        return dns_klass.const_get(classname).new(config, logger, metrics, redis_connection_pool, dns_name, options)
+      end
+      raise("DNS '#{dns_class}' is unknown for pool with dns name '#{dns_name}'") if dns_klass.nil?
+    end
+
     def check_ondemand_requests(maxloop = 0,
                                 loop_delay_min = CHECK_LOOP_DELAY_MIN_DEFAULT,
                                 loop_delay_max = CHECK_LOOP_DELAY_MAX_DEFAULT,
@@ -1473,20 +1509,21 @@ module Vmpooler
         pool_alias, pool, count, request_id = request.split(':')
         count = count.to_i
         provider = get_provider_for_pool(pool)
+        dns_plugin = get_dns_plugin_class_for_pool(pool)
         slots = ondemand_clone_limit - clone_count
         break if slots == 0
 
         if slots >= count
           count.times do
             redis.incr('vmpooler__tasks__ondemandclone')
-            clone_vm(pool, provider, request_id, pool_alias)
+            clone_vm(pool, provider, dns_plugin, request_id, pool_alias)
           end
           redis.zrem(queue_key, request)
         else
           remaining_count = count - slots
           slots.times do
             redis.incr('vmpooler__tasks__ondemandclone')
-            clone_vm(pool, provider, request_id, pool_alias)
+            clone_vm(pool, provider, dns_plugin, request_id, pool_alias)
           end
           redis.pipelined do |pipeline|
             pipeline.zrem(queue_key, request)
@@ -1601,6 +1638,7 @@ module Vmpooler
       # Create the providers
       $config[:pools].each do |pool|
         provider_name = pool['provider']
+        dns_plugin_name = pool['dns_plugin']
         # The provider_class parameter can be defined in the provider's data eg
         # :providers:
         #   :vsphere:
@@ -1621,12 +1659,22 @@ module Vmpooler
         else
           provider_class = $config[:providers][provider_name.to_sym]['provider_class']
         end
+
         begin
           $providers[provider_name] = create_provider_object($config, $logger, $metrics, @redis, provider_class, provider_name, {}) if $providers[provider_name].nil?
         rescue StandardError => e
           $logger.log('s', "Error while creating provider for pool #{pool['name']}: #{e}")
           raise
         end
+
+        dns_plugin_class = $config[:dns_configs][dns_plugin_name.to_sym]['dns_class']
+
+        begin
+          $dns_plugins[dns_plugin_class] = create_dns_object($config, $logger, $metrics, @redis, dns_plugin_class, dns_plugin_name, {}) if $dns_plugins[dns_plugin_class].nil?
+        rescue StandardError => e
+          $logger.log('s', "Error while creating dns plugin for pool #{pool['name']}: #{e}")
+          raise
+        end
       end
 
       purge_unused_vms_and_resources
diff --git a/lib/vmpooler/providers/base.rb b/lib/vmpooler/providers/base.rb
index 1147aa8..f02e088 100644
--- a/lib/vmpooler/providers/base.rb
+++ b/lib/vmpooler/providers/base.rb
@@ -34,6 +34,10 @@ module Vmpooler
 
         # Helper Methods
 
+        def get_dns_plugin_for_pool(pool_name)
+
+        end
+
         # inputs
         #  [String] pool_name : Name of the pool to get the configuration
         # returns
diff --git a/spec/unit/pool_manager_spec.rb b/spec/unit/pool_manager_spec.rb
index df335fc..bfcead3 100644
--- a/spec/unit/pool_manager_spec.rb
+++ b/spec/unit/pool_manager_spec.rb
@@ -75,6 +75,27 @@ EOT
     end
   end
 
+  describe '#load_used_dns_plugins' do
+    let(:config) { YAML.load(<<-EOT
+---
+:config:
+:dns_configs:
+  :base:
+:pools:
+  - name: '#{pool}'
+    size: 1
+    provider: 'spoof'
+    EOT
+    )
+    }
+    it do
+      files = ['vmpooler/dns/base']
+      expect(subject.load_used_dns_plugins).to eq(files)
+    end
+
+
+  end
+
   describe '#used_providers' do
     context 'with no named providers' do
       let(:config) { YAML.load(<<-EOT
@@ -1724,6 +1745,51 @@ EOT
     end
   end
 
+  describe '#get_dns_plugin_class_name_for_pool' do
+    let(:config) { YAML.load(<<-EOT
+---
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+
+    )}
+    before(:each) do
+      allow(Vmpooler::Dns).to receive(:load_used_dns_plugins).and_return('vmpooler/dns/mock')
+    end
+
+    it 'calls Vmpooler::Dns.get_dns_plugin_class_by_name' do
+      expect(Vmpooler::Dns).to receive(:get_dns_plugin_class_by_name).with(config, 'mock')
+
+      subject.get_dns_plugin_class_name_for_pool(pool)
+    end
+  end
+
+  describe '#get_dns_plugin_domain_for_pool' do
+    let(:config) { YAML.load(<<-EOT
+---
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+  )}
+    before(:each) do
+      allow(Vmpooler::Dns).to receive(:load_used_dns_plugins).and_return('vmpooler/dns/mock')
+    end
+
+    it 'calls Vmpooler::Dns.get_dns_plugin_domain_for_pool' do
+      expect(Vmpooler::Dns).to receive(:get_dns_plugin_domain_by_name).with(config, 'mock')
+
+      subject.get_dns_plugin_domain_for_pool(pool)
+    end
+  end
+
   describe '#check_disk_queue' do
     let(:threads) {[]}
 
@@ -2817,6 +2883,46 @@ EOT
         subject.execute!(1,0)
       end
 
+      context 'creating Dns plugins' do
+        let(:mock_dns_plugin) { double('mock_dns_plugin') }
+        let(:config) {
+        YAML.load(<<-EOT
+---
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+  - name: 'dummy'
+    dns_plugin: 'mock'
+  - name: 'dummy2'
+    dns_plugin: 'mock'
+EOT
+        )}
+
+        it 'should call create_dns_object idempotently' do
+          # Even though there are two pools using the mock dns plugin, it should only
+          # create the dns object once.
+          expect(subject).to receive(:create_dns_object).and_return(mock_dns_plugin)
+
+          subject.execute!(1,0)
+        end
+
+        it 'should raise an error if the dns plugin cannot be created' do
+          expect(subject).to receive(:create_dns_object).and_raise(RuntimeError, "MockError")
+
+          expect{ subject.execute!(1,0) }.to raise_error(/MockError/)
+        end
+
+        it 'should log a message if the dns plugin cannot be created' do
+          expect(subject).to receive(:create_dns_object).and_raise(RuntimeError, "MockError")
+          expect(logger).to receive(:log).with('s',"Error while creating dns plugin for pool #{pool}: MockError")
+
+          expect{ subject.execute!(1,0) }.to raise_error(/MockError/)
+        end
+      end
+
       context 'creating Providers' do
         let(:vsphere_provider) { double('vsphere_provider') }
         let(:config) {

From 65f04254a8b8995f0fdf3c51c0db57bf6a20675f Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 7 Feb 2023 06:40:25 -0500
Subject: [PATCH 02/19] Add delete_record

---
 lib/vmpooler/dns.rb          | 18 ++++++++++++++++++
 lib/vmpooler/dns/base.rb     |  4 ++++
 lib/vmpooler/pool_manager.rb | 25 +++++++++++++++++++++----
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/lib/vmpooler/dns.rb b/lib/vmpooler/dns.rb
index e11f229..f4c06ca 100644
--- a/lib/vmpooler/dns.rb
+++ b/lib/vmpooler/dns.rb
@@ -30,6 +30,24 @@ module Vmpooler
       plugin_class
     end
 
+    # Returns the plugin domain for the specified dns config by name
+    #
+    # @param config [Object] The entire VMPooler config object
+    # @param name [Symbol] The name of the dns config key to get the dns domain
+    # @return [String] The domain for the specifid dns config
+    def self.get_dns_plugin_domain_by_name(config, name)
+      dns_configs = config[:dns_configs].keys
+      plugin_domain = ''
+
+      dns_configs.map do |dns_config_name|
+        if dns_config_name.to_s == name
+          plugin_domain = config[:dns_configs][dns_config_name]['domain']
+        end
+      end
+
+      plugin_domain
+    end
+
     # Returns a list of DNS plugin classes specified in the vmpooler configuration
     #
     # @param config [Object] The entire VMPooler config object
diff --git a/lib/vmpooler/dns/base.rb b/lib/vmpooler/dns/base.rb
index 739395b..7cc7c21 100644
--- a/lib/vmpooler/dns/base.rb
+++ b/lib/vmpooler/dns/base.rb
@@ -63,6 +63,10 @@ module Vmpooler
         def create_or_replace_record(hostname)
           raise("#{self.class.name} does not implement create_or_replace_record")
         end
+
+        def delete_record(hostname)
+          raise("#{self.class.name} does not implement delete_record")
+        end
       end
     end
   end
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index a766dd2..4fab1b0 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -113,6 +113,10 @@ module Vmpooler
 
     def remove_nonexistent_vm(vm, pool, redis)
       redis.srem("vmpooler__pending__#{pool}", vm)
+      dns_plugin = get_dns_plugin_class_for_pool(pool)
+      domain = get_dns_plugin_domain_for_pool(pool)
+      fqdn = vm + '.' + domain
+      dns_plugin.delete_record(fqdn)
       $logger.log('d', "[!] [#{pool}] '#{vm}' no longer exists. Removing from pending.")
     end
 
@@ -475,10 +479,10 @@ module Vmpooler
     end
 
     # Destroy a VM
-    def destroy_vm(vm, pool, provider)
+    def destroy_vm(vm, pool, provider, dns_plugin)
       Thread.new do
         begin
-          _destroy_vm(vm, pool, provider)
+          _destroy_vm(vm, pool, provider, dns_plugin)
         rescue StandardError => e
           $logger.log('d', "[!] [#{pool}] '#{vm}' failed while destroying the VM with an error: #{e}")
           raise
@@ -486,7 +490,7 @@ module Vmpooler
       end
     end
 
-    def _destroy_vm(vm, pool, provider)
+    def _destroy_vm(vm, pool, provider, dns_plugin)
       mutex = vm_mutex(vm)
       return if mutex.locked?
 
@@ -503,6 +507,9 @@ module Vmpooler
           start = Time.now
 
           provider.destroy_vm(pool, vm)
+          domain = get_dns_plugin_domain_for_pool(pool)
+          fqdn = vm + '.' + domain
+          dns_plugin.delete_record(fqdn)
 
           redis.srem("vmpooler__completed__#{pool}", vm)
 
@@ -703,6 +710,15 @@ module Vmpooler
       $dns_plugins[plugin_class]
     end
 
+    def get_dns_plugin_domain_for_pool(pool_name)
+      pool = $config[:pools].find { |p| p['name'] == pool_name }
+      return nil unless pool
+
+      plugin_name = pool.fetch('dns_plugin')
+      plugin_domain = Vmpooler::Dns.get_dns_plugin_domain_by_name(config, plugin_name)
+      plugin_domain
+    end
+
     def check_disk_queue(maxloop = 0, loop_delay = 5)
       $logger.log('d', '[*] [disk_manager] starting worker thread')
 
@@ -1247,7 +1263,8 @@ module Vmpooler
           if inventory[vm]
             begin
               pool_check_response[:destroyed_vms] += 1
-              destroy_vm(vm, pool_name, provider)
+              dns_plugin = get_dns_plugin_class_for_pool(pool_name)
+              destroy_vm(vm, pool_name, provider, dns_plugin)
             rescue StandardError => e
               redis.pipelined do |pipeline|
                 pipeline.srem("vmpooler__completed__#{pool_name}", vm)

From b1e20a2fc072f3b7e154251cdcc45592abe2537f Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 7 Feb 2023 07:28:50 -0500
Subject: [PATCH 03/19] Get zone from config and add dns/base_spec

---
 lib/vmpooler/dns/base.rb       |  12 +++
 lib/vmpooler/providers/base.rb |   4 -
 spec/unit/dns/base_spec.rb     | 172 +++++++++++++++++++++++++++++++++
 3 files changed, 184 insertions(+), 4 deletions(-)
 create mode 100644 spec/unit/dns/base_spec.rb

diff --git a/lib/vmpooler/dns/base.rb b/lib/vmpooler/dns/base.rb
index 7cc7c21..c2cd72d 100644
--- a/lib/vmpooler/dns/base.rb
+++ b/lib/vmpooler/dns/base.rb
@@ -34,6 +34,18 @@ module Vmpooler
           nil
         end
 
+        # Returns this dns plugin's configuration
+        #
+        # @returns [Hashtable] This dns plugins's configuration from the config file.  Returns nil if the dns plugin config does not exist
+        def dns_config
+          @config[:dns_configs].each do |dns|
+            # Convert the symbol from the config into a string for comparison
+            return (dns[1].nil? ? {} : dns[1]) if dns[0].to_s == @dns_plugin_name
+          end
+
+          nil
+        end
+
         def global_config
           # This entire VM Pooler config
           @config
diff --git a/lib/vmpooler/providers/base.rb b/lib/vmpooler/providers/base.rb
index f02e088..1147aa8 100644
--- a/lib/vmpooler/providers/base.rb
+++ b/lib/vmpooler/providers/base.rb
@@ -34,10 +34,6 @@ module Vmpooler
 
         # Helper Methods
 
-        def get_dns_plugin_for_pool(pool_name)
-
-        end
-
         # inputs
         #  [String] pool_name : Name of the pool to get the configuration
         # returns
diff --git a/spec/unit/dns/base_spec.rb b/spec/unit/dns/base_spec.rb
new file mode 100644
index 0000000..9fb656b
--- /dev/null
+++ b/spec/unit/dns/base_spec.rb
@@ -0,0 +1,172 @@
+require 'spec_helper'
+require 'vmpooler/dns/base'
+
+# This spec does not really exercise code paths but is merely used
+# to enforce that certain methods are defined in the base classes
+
+describe 'Vmpooler::PoolManager::Dns::Base' do
+  let(:logger) { MockLogger.new }
+  let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
+  let(:config) { {} }
+  let(:dns_plugin_name) { 'base' }
+  let(:dns_options) { { 'param' => 'value' } }
+
+  let(:fake_vm) {
+    fake_vm = {}
+    fake_vm['name'] = 'vm1'
+    fake_vm['hostname'] = 'vm1'
+    fake_vm['template'] = 'pool1'
+    fake_vm['boottime'] = Time.now
+    fake_vm['powerstate'] = 'PoweredOn'
+
+    fake_vm
+  }
+
+  let(:redis_connection_pool) { Vmpooler::PoolManager::GenericConnectionPool.new(
+    metrics: metrics,
+    connpool_type: 'redis_connection_pool',
+    connpool_provider: 'testprovider',
+    size: 1,
+    timeout: 5
+  ) { MockRedis.new }
+  }
+
+  subject { Vmpooler::PoolManager::Dns::Base.new(config, logger, metrics, redis_connection_pool, dns_plugin_name, dns_options) }
+
+  # Helper attr_reader methods
+  describe '#logger' do
+    it 'should come from the provider initialization' do
+      expect(subject.logger).to be(logger)
+    end
+  end
+
+  describe '#metrics' do
+    it 'should come from the provider initialization' do
+      expect(subject.metrics).to be(metrics)
+    end
+  end
+
+  describe '#dns_options' do
+    it 'should come from the provider initialization' do
+      expect(subject.dns_options).to be(dns_options)
+    end
+  end
+
+  describe '#pool_config' do
+    let(:poolname) { 'pool1' }
+    let(:config) { YAML.load(<<-EOT
+---
+:pools:
+  - name: '#{poolname}'
+    alias: [ 'mockpool' ]
+    template: 'Templates/pool1'
+    folder: 'Pooler/pool1'
+    datastore: 'datastore0'
+    size: 5
+    timeout: 10
+    ready_ttl: 1440
+    clone_target: 'cluster1'
+EOT
+      )
+    }
+    context 'Given a pool that does not exist' do
+      it 'should return nil' do
+        expect(subject.pool_config('missing_pool')).to be_nil
+      end
+    end
+
+    context 'Given a pool that does exist' do
+      it 'should return the pool\'s configuration' do
+        result = subject.pool_config(poolname)
+        expect(result['name']).to eq(poolname)
+      end
+    end
+  end
+
+  describe '#dns_config' do
+    let(:poolname) { 'pool1' }
+    let(:config) { YAML.load(<<-EOT
+---
+:dns_configs:
+  :#{dns_plugin_name}:
+    option1: 'value1'
+EOT
+      )
+    }
+
+    context 'Given a dns plugin with no configuration' do
+    let(:config) { YAML.load(<<-EOT
+---
+:dns_configs:
+  :bad_dns:
+    option1: 'value1'
+    option2: 'value1'
+EOT
+      )
+    }
+      it 'should return nil' do
+        expect(subject.dns_config).to be_nil
+      end
+    end
+
+    context 'Given a correct dns config name' do
+      it 'should return the dns\'s configuration' do
+        result = subject.dns_config
+        expect(result['option1']).to eq('value1')
+      end
+    end
+  end
+
+  describe '#global_config' do
+    it 'should come from the dns initialization' do
+      expect(subject.global_config).to be(config)
+    end
+  end
+
+  describe '#name' do
+    it "should come from the dns initialization" do
+      expect(subject.name).to eq(dns_plugin_name)
+    end
+  end
+
+  describe '#get_ip' do
+    it 'calls redis hget with vm name and ip' do
+      redis_connection_pool.with do |redis|
+        expect(redis).to receive(:hget).with("vmpooler__vm__vm1", 'ip')
+      end
+      subject.get_ip(fake_vm['name'])
+    end
+  end
+
+  describe '#provided_pools' do
+    let(:config) { YAML.load(<<-EOT
+---
+:pools:
+  - name: 'pool1'
+    dns_config: 'base'
+  - name: 'pool2'
+    dns_config: 'base'
+  - name: 'otherpool'
+    dns_config: 'other provider'
+  - name: 'no name'
+EOT
+      )
+    }
+
+    it "should return pools serviced by this provider" do
+      expect(subject.provided_pools).to eq(['pool1','pool2'])
+    end
+  end
+
+  describe '#create_or_replace_record' do
+    it 'should raise error' do
+      expect{subject.create_or_replace_record('pool')}.to raise_error(/does not implement create_or_replace_record/)
+    end
+  end
+
+  describe '#delete_record' do
+    it 'should raise error' do
+      expect{subject.delete_record('pool')}.to raise_error(/does not implement delete_record/)
+    end
+  end
+end

From 89a4273760af429a11e3eb76324f2843a169e383 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 7 Feb 2023 08:08:16 -0500
Subject: [PATCH 04/19] Add migration to readme

---
 README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/README.md b/README.md
index 08af5d3..03731f3 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 
 - [VMPooler](#vmpooler)
   - [Usage](#usage)
+    - [Migrating to v3](#migrating-to-v3)
     - [v2.0.0 note](#v200-note)
   - [Installation](#installation)
     - [Dependencies](#dependencies)
@@ -30,6 +31,38 @@ VMPooler provides configurable 'pools' of instantly-available (pre-provisioned)
 
 At [Puppet, Inc.](http://puppet.com) we run acceptance tests on thousands of disposable VMs every day. VMPooler manages the life cycle of these VMs from request through deletion, with options available to pool ready instances, and provision on demand.
 
+### Migrating to v3
+
+Starting with the v3.x release, management of DNS records is implemented as DNS plugins, similar to compute providers. This means each pool configuration should be pointing to a configuration object in `:dns_config` to determine it's method of record management.
+
+For those using the global `DOMAIN` environment variable or global `:config.domain` key, this means records were not previously being managed by VMPooler (presumably managed via dynamic dns), so it's value should be moved to `:dns_configs:<INSERT_YOUR_OWN_SYMBOL>:domain` with the value for `dns_class` for the config set to `dynamic-dns`.
+
+For example, the following < v3.x configuration:
+
+```yaml
+:config:
+  domain: 'example.com'
+```
+
+becomes:
+
+```yaml
+:dns_configs:
+  :example:
+    dns_class: dynamic-dns
+    domain: 'example.com'
+```
+
+Then any pools that should have records created via the dns config above should now reference the named dns config in the `dns_plugin` key:
+
+```yaml
+:pools:
+  - name: 'debian-8-x86_64'
+    dns_plugin: 'example'
+```
+
+For those using the GCE provider, [vmpooler-provider-gce](https://github.com/puppetlabs/vmpooler-provider-gce), as of version 1.x the DNS management has been decoupled. See <https://github.com/puppetlabs/vmpooler-provider-gce#migrating-to-v1>
+
 ### v2.0.0 note
 
 As of version 2.0.0, all providers other than the dummy one are now separate gems. Historically the vSphere provider was included within VMPooler itself. That code has been moved to the [puppetlabs/vmpooler-provider-vsphere](https://github.com/puppetlabs/vmpooler-provider-vsphere) repository and the `vmpooler-provider-vsphere` gem. To migrate from VMPooler 1.x to 2.0 you will need to ensure that `vmpooler-provider-vsphere` is installed along side the `vmpooler` gem. See the  [Provider API](docs/PROVIDER_API.md) docs for more information.

From 6f3d853271c78724280b116c3ec32a3d65a94839 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Wed, 15 Feb 2023 09:45:03 -0500
Subject: [PATCH 05/19] Do not create/delete records if using dynamic dns

---
 lib/vmpooler/pool_manager.rb | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 4fab1b0..bdbecc3 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -114,9 +114,10 @@ module Vmpooler
     def remove_nonexistent_vm(vm, pool, redis)
       redis.srem("vmpooler__pending__#{pool}", vm)
       dns_plugin = get_dns_plugin_class_for_pool(pool)
+      dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool)
       domain = get_dns_plugin_domain_for_pool(pool)
       fqdn = vm + '.' + domain
-      dns_plugin.delete_record(fqdn)
+      dns_plugin.delete_record(fqdn) unless dns_plugin_class_name == 'dynamic-dns'
       $logger.log('d', "[!] [#{pool}] '#{vm}' no longer exists. Removing from pending.")
     end
 
@@ -459,7 +460,8 @@ module Vmpooler
 
           $metrics.timing("clone.#{pool_name}", finish)
 
-          dns_plugin.create_or_replace_record(new_vmname)
+          dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool_name)
+          dns_plugin.create_or_replace_record(new_vmname) unless dns_plugin_class_name == 'dynamic-dns'
         rescue StandardError
           @redis.with_metrics do |redis|
             redis.pipelined do |pipeline|
@@ -509,7 +511,9 @@ module Vmpooler
           provider.destroy_vm(pool, vm)
           domain = get_dns_plugin_domain_for_pool(pool)
           fqdn = vm + '.' + domain
-          dns_plugin.delete_record(fqdn)
+          
+          dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool)
+          dns_plugin.delete_record(fqdn) unless dns_plugin_class_name == 'dynamic-dns'
 
           redis.srem("vmpooler__completed__#{pool}", vm)
 
@@ -701,6 +705,15 @@ module Vmpooler
       $providers[provider_name]
     end
 
+    def get_dns_plugin_class_name_for_pool(pool_name)
+      pool = $config[:pools].find { |p| p['name'] == pool_name }
+      return nil unless pool
+
+      plugin_name = pool.fetch('dns_plugin')
+      plugin_class = Vmpooler::Dns.get_dns_plugin_class_by_name(config, plugin_name)
+      plugin_class
+    end
+
     def get_dns_plugin_class_for_pool(pool_name)
       pool = $config[:pools].find { |p| p['name'] == pool_name }
       return nil unless pool

From 268ff9f981170b673a76f4ecfad154ff0319bf4e Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Wed, 15 Feb 2023 11:21:26 -0500
Subject: [PATCH 06/19] Add dns_config method to provider base

---
 lib/vmpooler/providers/base.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/vmpooler/providers/base.rb b/lib/vmpooler/providers/base.rb
index 1147aa8..b81e96a 100644
--- a/lib/vmpooler/providers/base.rb
+++ b/lib/vmpooler/providers/base.rb
@@ -58,6 +58,10 @@ module Vmpooler
           nil
         end
 
+        def dns_config(dns_config_name)
+          return Vmpooler::Dns.get_dns_plugin_domain_by_name(@config, dns_config_name)
+        end
+
         # returns
         #   [Hashtable] : The entire VMPooler configuration
         def global_config

From aeabb7e134f917f1b1a72f866bdb6e99060528ed Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 16 Feb 2023 07:47:42 -0500
Subject: [PATCH 07/19] Remove global domain usage from pool manager

---
 lib/vmpooler/dns.rb          | 20 ++++++++++++++++++++
 lib/vmpooler/pool_manager.rb | 14 +++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/vmpooler/dns.rb b/lib/vmpooler/dns.rb
index f4c06ca..d852982 100644
--- a/lib/vmpooler/dns.rb
+++ b/lib/vmpooler/dns.rb
@@ -30,6 +30,26 @@ module Vmpooler
       plugin_class
     end
 
+    # Returns the domain for the specified pool
+    #
+    # @param config [String] - the full config structure
+    # @param pool_name [String] - the name of the pool
+    # @return [String] - domain name for pool, which is set via reference to the dns_configs block
+    def self.get_domain_for_pool(config, pool_name)
+      pool = config[:pools].find { |p| p['name'] == pool_name }
+      pool_dns_config = pool['dns_plugin']
+      dns_configs = config[:dns_configs].keys
+      pool_domain = ''
+
+      dns_configs.map do |dns_config_name|
+        if dns_config_name.to_s == pool_dns_config
+          pool_domain = config[:dns_configs][dns_config_name]['domain']
+        end
+      end
+
+      pool_domain
+    end
+
     # Returns the plugin domain for the specified dns config by name
     #
     # @param config [Object] The entire VMPooler config object
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index bdbecc3..b819933 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -67,7 +67,7 @@ module Vmpooler
             to_set[k] = pool[k]
           end
           to_set['alias'] = pool['alias'].join(',') if to_set.key?('alias')
-          to_set['domain'] = Parsing.get_domain_for_pool(config, pool['name'])
+          to_set['domain'] = Vmpooler::Dns.get_domain_for_pool(config, pool['name'])
           redis.hmset("vmpooler__pool__#{pool['name']}", to_set.to_a.flatten) unless to_set.empty?
         end
         previously_configured_pools.each do |pool|
@@ -380,12 +380,8 @@ module Vmpooler
       max_hostname_retries = 3
       while hostname_retries < max_hostname_retries
         hostname, hostname_available = generate_and_check_hostname
-        domain = Parsing.get_domain_for_pool(config, pool_name)
-        if domain
-          fqdn = "#{hostname}.#{domain}"
-        else
-          fqdn = hostname
-        end
+        domain = Vmpooler::Dns.get_domain_for_pool(config, pool_name)
+        fqdn = "#{hostname}.#{domain}"
 
         # skip dns check if the provider is set to skip_dns_check_before_creating_vm
         provider = get_provider_for_pool(pool_name)
@@ -428,7 +424,7 @@ module Vmpooler
 
     def _clone_vm(pool_name, provider, dns_plugin, request_id = nil, pool_alias = nil)
       new_vmname = find_unique_hostname(pool_name)
-      pool_domain = Parsing.get_domain_for_pool(config, pool_name)
+      pool_domain = Vmpooler::Dns.get_domain_for_pool(config, pool_name)
       mutex = vm_mutex(new_vmname)
       mutex.synchronize do
         @redis.with_metrics do |redis|
@@ -438,7 +434,7 @@ module Vmpooler
           redis.hset("vmpooler__vm__#{new_vmname}", 'clone', Time.now)
           redis.hset("vmpooler__vm__#{new_vmname}", 'template', pool_name) # This value is used to represent the pool.
           redis.hset("vmpooler__vm__#{new_vmname}", 'pool', pool_name)
-          redis.hset("vmpooler__vm__#{new_vmname}", 'domain', pool_domain) if pool_domain
+          redis.hset("vmpooler__vm__#{new_vmname}", 'domain', pool_domain)
           redis.hset("vmpooler__vm__#{new_vmname}", 'request_id', request_id) if request_id
           redis.hset("vmpooler__vm__#{new_vmname}", 'pool_alias', pool_alias) if pool_alias
           redis.exec

From 35dc7cb26f3f7d0bc48f1aecb4b8912a926b9e9e Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 16 Feb 2023 08:55:33 -0500
Subject: [PATCH 08/19] Update domain in V2 api

---
 lib/vmpooler.rb                      |  1 -
 lib/vmpooler/api.rb                  |  3 +--
 lib/vmpooler/api/v2.rb               | 26 ++++++++++----------------
 lib/vmpooler/public/lib/dashboard.js |  6 +++---
 lib/vmpooler/util/parsing.rb         | 20 --------------------
 5 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb
index 516843f..cfb2e2c 100644
--- a/lib/vmpooler.rb
+++ b/lib/vmpooler.rb
@@ -76,7 +76,6 @@ module Vmpooler
     parsed_config[:config]['prefix']                             = ENV['PREFIX'] || parsed_config[:config]['prefix'] || ''
     parsed_config[:config]['logfile']                            = ENV['LOGFILE'] if ENV['LOGFILE']
     parsed_config[:config]['site_name']                          = ENV['SITE_NAME'] if ENV['SITE_NAME']
-    parsed_config[:config]['domain']                             = ENV['DOMAIN'] if ENV['DOMAIN']
     parsed_config[:config]['clone_target']                       = ENV['CLONE_TARGET'] if ENV['CLONE_TARGET']
     parsed_config[:config]['timeout']                            = string_to_int(ENV['TIMEOUT']) if ENV['TIMEOUT']
     parsed_config[:config]['vm_lifetime_auth']                   = string_to_int(ENV['VM_LIFETIME_AUTH']) if ENV['VM_LIFETIME_AUTH']
diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb
index a7eea30..5397637 100644
--- a/lib/vmpooler/api.rb
+++ b/lib/vmpooler/api.rb
@@ -3,7 +3,7 @@
 module Vmpooler
   class API < Sinatra::Base
     # Load API components
-    %w[helpers dashboard reroute v1 v2 request_logger healthcheck].each do |lib|
+    %w[helpers dashboard reroute v2 request_logger healthcheck].each do |lib|
       require "vmpooler/api/#{lib}"
     end
     # Load dashboard components
@@ -53,7 +53,6 @@ module Vmpooler
         use Vmpooler::Dashboard
         use Vmpooler::API::Dashboard
         use Vmpooler::API::Reroute
-        use Vmpooler::API::V1
         use Vmpooler::API::V2
       end
 
diff --git a/lib/vmpooler/api/v2.rb b/lib/vmpooler/api/v2.rb
index 44dad6e..d7feb78 100644
--- a/lib/vmpooler/api/v2.rb
+++ b/lib/vmpooler/api/v2.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'vmpooler/api/v1'
+require 'vmpooler/util/parsing'
+require 'vmpooler/dns'
 
 module Vmpooler
   class API
@@ -87,9 +88,7 @@ module Vmpooler
       # last vm added. The part of the response is only being retained for
       # backwards compatibility as the hostnames are now fqdn's instead of bare
       # hostnames. This change is a result of now being able to specify a domain
-      # per pool. If no vm's in the result had a domain sepcified then the
-      # domain key will be omitted similar to how it was previously omitted if
-      # the global option domain wasn't specified.
+      # per pool.
       def atomically_allocate_vms(payload)
         tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
           result = { 'ok' => false }
@@ -126,15 +125,10 @@ module Vmpooler
           else
             vm_names = []
             vms.each do |(vmpool, vmname, vmtemplate)|
-              vmdomain = Parsing.get_domain_for_pool(full_config, vmpool)
-              if vmdomain
-                vmfqdn = "#{vmname}.#{vmdomain}"
-                update_result_hosts(result, vmtemplate, vmfqdn)
-                vm_names.append(vmfqdn)
-              else
-                update_result_hosts(result, vmtemplate, vmname)
-                vm_names.append(vmname)
-              end
+              vmdomain = Dns.get_domain_for_pool(full_config, vmpool)
+              vmfqdn = "#{vmname}.#{vmdomain}"
+              update_result_hosts(result, vmtemplate, vmfqdn)
+              vm_names.append(vmfqdn)
             end
 
             span.set_attribute('vmpooler.vm_names', vm_names.join(',')) unless vm_names.empty?
@@ -320,7 +314,7 @@ module Vmpooler
           result[params[:hostname]]['ip'] = ipAddress
 
           if rdata['pool']
-            vmdomain = Parsing.get_domain_for_pool(full_config, rdata['pool'])
+            vmdomain = Dns.get_domain_for_pool(full_config, rdata['pool'])
             if vmdomain
               result[params[:hostname]]['fqdn'] = "#{params[:hostname]}.#{vmdomain}"
             end
@@ -436,8 +430,8 @@ module Vmpooler
             result['ready'] = true
             Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count|
               instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
-              domain = Parsing.get_domain_for_pool(full_config, pool)
-              instances.map! { |instance| instance.concat(".#{domain}") } if domain
+              domain = Dns.get_domain_for_pool(full_config, pool)
+              instances.map! { |instance| instance.concat(".#{domain}") }
 
               if result.key?(platform_alias)
                 result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances
diff --git a/lib/vmpooler/public/lib/dashboard.js b/lib/vmpooler/public/lib/dashboard.js
index e726b01..11bc868 100644
--- a/lib/vmpooler/public/lib/dashboard.js
+++ b/lib/vmpooler/public/lib/dashboard.js
@@ -29,10 +29,10 @@ Date.prototype.yyyymmdd = function() {
 
 var data_url = {
   'capacity': '/dashboard/stats/vmpooler/pool',
-  'pools'   : '/api/v1/vm',
+  'pools'   : '/api/v2/vm',
   'running' : '/dashboard/stats/vmpooler/running',
-  'status'  : '/api/v1/status',
-  'summary' : '/api/v1/summary'
+  'status'  : '/api/v2/status',
+  'summary' : '/api/v2/summary'
 };
 
 
diff --git a/lib/vmpooler/util/parsing.rb b/lib/vmpooler/util/parsing.rb
index 3949a55..1ca6b13 100644
--- a/lib/vmpooler/util/parsing.rb
+++ b/lib/vmpooler/util/parsing.rb
@@ -12,25 +12,5 @@ module Vmpooler
         yield platform_alias, pool, count
       end
     end
-
-    # @param config [String] - the full config structure
-    # @param pool_name [String] - the name of the pool
-    # @return [String] - domain name for pool, if set in the provider for the pool or in the config block
-    def self.get_domain_for_pool(config, pool_name)
-      pool = config[:pools].find { |p| p['name'] == pool_name }
-      return nil unless pool
-
-      provider_name = pool.fetch('provider', 'vsphere') # see vmpooler.yaml.example where it states defaulting to vsphere
-
-      if config[:providers] && config[:providers][provider_name.to_sym] && config[:providers][provider_name.to_sym]['domain']
-        domain = config[:providers][provider_name.to_sym]['domain']
-      elsif config[:config] && config[:config]['domain']
-        domain = config[:config]['domain']
-      else
-        domain = nil
-      end
-
-      domain
-    end
   end
 end

From 0119126cd1813f5357093aef8717fd968dfa0a44 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 16 Feb 2023 09:57:18 -0500
Subject: [PATCH 09/19] Update hostname_shorten and callers

---
 lib/vmpooler/api/helpers.rb   |   3 +-
 lib/vmpooler/api/v2.rb        | 411 ++++++++++++++++++++++++++++++++--
 spec/unit/api/helpers_spec.rb |  14 +-
 3 files changed, 394 insertions(+), 34 deletions(-)

diff --git a/lib/vmpooler/api/helpers.rb b/lib/vmpooler/api/helpers.rb
index 93d571b..e393466 100644
--- a/lib/vmpooler/api/helpers.rb
+++ b/lib/vmpooler/api/helpers.rb
@@ -181,8 +181,7 @@ module Vmpooler
         /^\d{4}-\d{2}-\d{2}$/ === date_str
       end
 
-      # NOTE: domain is not needed here, so we should update the callers of this method
-      def hostname_shorten(hostname, domain=nil)
+      def hostname_shorten(hostname)
         hostname[/[^.]+/]
       end
 
diff --git a/lib/vmpooler/api/v2.rb b/lib/vmpooler/api/v2.rb
index d7feb78..607d9a5 100644
--- a/lib/vmpooler/api/v2.rb
+++ b/lib/vmpooler/api/v2.rb
@@ -261,7 +261,7 @@ module Vmpooler
         status 404
         result['ok'] = false
 
-        params[:hostname] = hostname_shorten(params[:hostname], nil)
+        params[:hostname] = hostname_shorten(params[:hostname])
 
         rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}")
         unless rdata.empty?
@@ -467,32 +467,395 @@ module Vmpooler
         end
       end
 
-      # Endpoints that only use bits from the V1 api are called here
-      # Note that traces will be named based on the route used in the V1 api
-      # but the http.url trace attribute will still have the actual requested url in it
-
-      delete "#{api_prefix}/*" do
-        versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/")
-        request.path_info = "/api/v1/#{versionless_path_info}"
-        call env
+      delete "#{api_prefix}/vm/:hostname/?" do
+        content_type :json
+        metrics.increment('http_requests_vm_total.delete.vm.hostname')
+  
+        result = {}
+  
+        status 404
+        result['ok'] = false
+  
+        params[:hostname] = hostname_shorten(params[:hostname])
+  
+        rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}")
+        unless rdata.empty?
+          need_token! if rdata['token:token']
+  
+          if backend.srem("vmpooler__running__#{rdata['template']}", params[:hostname])
+            backend.sadd("vmpooler__completed__#{rdata['template']}", params[:hostname])
+  
+            status 200
+            result['ok'] = true
+            metrics.increment('delete.success')
+            update_user_metrics('destroy', params[:hostname]) if Vmpooler::API.settings.config[:config]['usage_stats']
+          else
+            metrics.increment('delete.failed')
+          end
+        end
+  
+        JSON.pretty_generate(result)
       end
-
-      get "#{api_prefix}/*" do
-        versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/")
-        request.path_info = "/api/v1/#{versionless_path_info}"
-        call env
+  
+      put "#{api_prefix}/vm/:hostname/?" do
+        content_type :json
+        metrics.increment('http_requests_vm_total.put.vm.modify')
+  
+        status 404
+        result = { 'ok' => false }
+  
+        failure = []
+  
+        params[:hostname] = hostname_shorten(params[:hostname])
+  
+        if backend.exists?("vmpooler__vm__#{params[:hostname]}")
+          begin
+            jdata = JSON.parse(request.body.read)
+          rescue StandardError => e
+            span = OpenTelemetry::Trace.current_span
+            span.record_exception(e)
+            span.status = OpenTelemetry::Trace::Status.error(e.to_s)
+            halt 400, JSON.pretty_generate(result)
+          end
+  
+          # Validate data payload
+          jdata.each do |param, arg|
+            case param
+              when 'lifetime'
+                need_token! if Vmpooler::API.settings.config[:auth]
+  
+                # in hours, defaults to one week
+                max_lifetime_upper_limit = config['max_lifetime_upper_limit']
+                if max_lifetime_upper_limit
+                  max_lifetime_upper_limit = max_lifetime_upper_limit.to_i
+                  if arg.to_i >= max_lifetime_upper_limit
+                    failure.push("You provided a lifetime (#{arg}) that exceeds the configured maximum of #{max_lifetime_upper_limit}.")
+                  end
+                end
+  
+                # validate lifetime is within boundaries
+                unless arg.to_i > 0
+                  failure.push("You provided a lifetime (#{arg}) but you must provide a positive number.")
+                end
+  
+              when 'tags'
+                failure.push("You provided tags (#{arg}) as something other than a hash.") unless arg.is_a?(Hash)
+                failure.push("You provided unsuppored tags (#{arg}).") if config['allowed_tags'] && !(arg.keys - config['allowed_tags']).empty?
+              else
+                failure.push("Unknown argument #{arg}.")
+            end
+          end
+  
+          if !failure.empty?
+            status 400
+            result['failure'] = failure
+          else
+            jdata.each do |param, arg|
+              case param
+                when 'lifetime'
+                  need_token! if Vmpooler::API.settings.config[:auth]
+  
+                  arg = arg.to_i
+  
+                  backend.hset("vmpooler__vm__#{params[:hostname]}", param, arg)
+                when 'tags'
+                  filter_tags(arg)
+                  export_tags(backend, params[:hostname], arg)
+              end
+            end
+  
+            status 200
+            result['ok'] = true
+          end
+        end
+  
+        JSON.pretty_generate(result)
       end
-
-      post "#{api_prefix}/*" do
-        versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/")
-        request.path_info = "/api/v1/#{versionless_path_info}"
-        call env
+  
+      post "#{api_prefix}/vm/:hostname/disk/:size/?" do
+        content_type :json
+        metrics.increment('http_requests_vm_total.post.vm.disksize')
+  
+        need_token! if Vmpooler::API.settings.config[:auth]
+  
+        status 404
+        result = { 'ok' => false }
+  
+        params[:hostname] = hostname_shorten(params[:hostname])
+  
+        if ((params[:size].to_i > 0 )and (backend.exists?("vmpooler__vm__#{params[:hostname]}")))
+          result[params[:hostname]] = {}
+          result[params[:hostname]]['disk'] = "+#{params[:size]}gb"
+  
+          backend.sadd('vmpooler__tasks__disk', "#{params[:hostname]}:#{params[:size]}")
+  
+          status 202
+          result['ok'] = true
+        end
+  
+        JSON.pretty_generate(result)
       end
-
-      put "#{api_prefix}/*" do
-        versionless_path_info = request.path_info.delete_prefix("#{api_prefix}/")
-        request.path_info = "/api/v1/#{versionless_path_info}"
-        call env
+  
+      post "#{api_prefix}/vm/:hostname/snapshot/?" do
+        content_type :json
+        metrics.increment('http_requests_vm_total.post.vm.snapshot')
+  
+        need_token! if Vmpooler::API.settings.config[:auth]
+  
+        status 404
+        result = { 'ok' => false }
+  
+        params[:hostname] = hostname_shorten(params[:hostname])
+  
+        if backend.exists?("vmpooler__vm__#{params[:hostname]}")
+          result[params[:hostname]] = {}
+  
+          o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten
+          result[params[:hostname]]['snapshot'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join
+  
+          backend.sadd('vmpooler__tasks__snapshot', "#{params[:hostname]}:#{result[params[:hostname]]['snapshot']}")
+  
+          status 202
+          result['ok'] = true
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      post "#{api_prefix}/vm/:hostname/snapshot/:snapshot/?" do
+        content_type :json
+        metrics.increment('http_requests_vm_total.post.vm.snapshot')
+  
+        need_token! if Vmpooler::API.settings.config[:auth]
+  
+        status 404
+        result = { 'ok' => false }
+  
+        params[:hostname] = hostname_shorten(params[:hostname])
+  
+        unless backend.hget("vmpooler__vm__#{params[:hostname]}", "snapshot:#{params[:snapshot]}").to_i.zero?
+          backend.sadd('vmpooler__tasks__snapshot-revert', "#{params[:hostname]}:#{params[:snapshot]}")
+  
+          status 202
+          result['ok'] = true
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      delete "#{api_prefix}/config/poolsize/:pool/?" do
+        content_type :json
+        result = { 'ok' => false }
+  
+        if config['experimental_features']
+          need_token! if Vmpooler::API.settings.config[:auth]
+  
+          if pool_exists?(params[:pool])
+            result = reset_pool_size(params[:pool])
+          else
+            metrics.increment('config.invalid.unknown')
+            status 404
+          end
+        else
+          status 405
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      post "#{api_prefix}/config/poolsize/?" do
+        content_type :json
+        result = { 'ok' => false }
+  
+        if config['experimental_features']
+          need_token! if Vmpooler::API.settings.config[:auth]
+  
+          payload = JSON.parse(request.body.read)
+  
+          if payload
+            invalid = invalid_template_or_size(payload)
+            if invalid.empty?
+              result = update_pool_size(payload)
+            else
+              invalid.each do |bad_template|
+                metrics.increment("config.invalid.#{bad_template}")
+              end
+              result[:not_configured] = invalid
+              status 400
+            end
+          else
+            metrics.increment('config.invalid.unknown')
+            status 404
+          end
+        else
+          status 405
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      delete "#{api_prefix}/config/pooltemplate/:pool/?" do
+        content_type :json
+        result = { 'ok' => false }
+  
+        if config['experimental_features']
+          need_token! if Vmpooler::API.settings.config[:auth]
+  
+          if pool_exists?(params[:pool])
+            result = reset_pool_template(params[:pool])
+          else
+            metrics.increment('config.invalid.unknown')
+            status 404
+          end
+        else
+          status 405
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      post "#{api_prefix}/config/pooltemplate/?" do
+        content_type :json
+        result = { 'ok' => false }
+  
+        if config['experimental_features']
+          need_token! if Vmpooler::API.settings.config[:auth]
+  
+          payload = JSON.parse(request.body.read)
+  
+          if payload
+            invalid = invalid_template_or_path(payload)
+            if invalid.empty?
+              result = update_pool_template(payload)
+            else
+              invalid.each do |bad_template|
+                metrics.increment("config.invalid.#{bad_template}")
+              end
+              result[:bad_templates] = invalid
+              status 400
+            end
+          else
+            metrics.increment('config.invalid.unknown')
+            status 404
+          end
+        else
+          status 405
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      post "#{api_prefix}/poolreset/?" do
+        content_type :json
+        result = { 'ok' => false }
+  
+        if config['experimental_features']
+          need_token! if Vmpooler::API.settings.config[:auth]
+  
+          begin
+            payload = JSON.parse(request.body.read)
+            if payload
+              invalid = invalid_templates(payload)
+              if invalid.empty?
+                result = reset_pool(payload)
+              else
+                invalid.each do |bad_pool|
+                  metrics.increment("poolreset.invalid.#{bad_pool}")
+                end
+                result[:bad_pools] = invalid
+                status 400
+              end
+            else
+              metrics.increment('poolreset.invalid.unknown')
+              status 404
+            end
+          rescue JSON::ParserError
+            span = OpenTelemetry::Trace.current_span
+            span.record_exception(e)
+            span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed')
+            status 400
+            result = {
+              'ok' => false,
+              'message' => 'JSON payload could not be parsed'
+            }
+          end
+        else
+          status 405
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      post "#{api_prefix}/config/clonetarget/?" do
+        content_type :json
+        result = { 'ok' => false }
+  
+        if config['experimental_features']
+          need_token! if Vmpooler::API.settings.config[:auth]
+  
+          payload = JSON.parse(request.body.read)
+  
+          if payload
+            invalid = invalid_pool(payload)
+            if invalid.empty?
+              result = update_clone_target(payload)
+            else
+              invalid.each do |bad_template|
+                metrics.increment("config.invalid.#{bad_template}")
+              end
+              result[:bad_templates] = invalid
+              status 400
+            end
+          else
+            metrics.increment('config.invalid.unknown')
+            status 404
+          end
+        else
+          status 405
+        end
+  
+        JSON.pretty_generate(result)
+      end
+  
+      get "#{api_prefix}/config/?" do
+        content_type :json
+        result = { 'ok' => false }
+        status 404
+  
+        if pools
+          sync_pool_sizes
+          sync_pool_templates
+  
+          pool_configuration = []
+          pools.each do |pool|
+            pool['template_ready'] = template_ready?(pool, backend)
+            pool_configuration << pool
+          end
+  
+          result = {
+            pool_configuration: pool_configuration,
+            status: {
+              ok: true
+            }
+          }
+  
+          status 200
+        end
+        JSON.pretty_generate(result)
+      end
+  
+      get "#{api_prefix}/full_config/?" do
+        content_type :json
+  
+        result = {
+          full_config: full_config,
+          status: {
+            ok: true
+          }
+        }
+  
+        status 200
+        JSON.pretty_generate(result)
       end
     end
   end
diff --git a/spec/unit/api/helpers_spec.rb b/spec/unit/api/helpers_spec.rb
index 5991fa3..a25ad61 100644
--- a/spec/unit/api/helpers_spec.rb
+++ b/spec/unit/api/helpers_spec.rb
@@ -16,14 +16,12 @@ describe Vmpooler::API::Helpers do
 
   describe '#hostname_shorten' do
     [
-        ['example.com', 'not-example.com', 'example'],
-        ['example.com', 'example.com', 'example'],
-        ['sub.example.com', 'example.com', 'sub'],
-        ['adjective-noun.example.com', 'example.com', 'adjective-noun'],
-        ['abc123.example.com', 'example.com', 'abc123'],
-        ['example.com', nil, 'example']
-    ].each do |hostname, domain, expected|
-      it { expect(subject.hostname_shorten(hostname, domain)).to eq expected }
+        ['example.com', 'example'],
+        ['sub.example.com', 'sub'],
+        ['adjective-noun.example.com', 'adjective-noun'],
+        ['abc123.example.com', 'abc123']
+    ].each do |hostname, expected|
+      it { expect(subject.hostname_shorten(hostname)).to eq expected }
     end
   end
 

From da4015f5b3e9cefbfc63f68a755b849c9bd4f0d0 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Fri, 17 Feb 2023 09:02:13 -0500
Subject: [PATCH 10/19] Refactor obtaining and saving ip address

---
 lib/vmpooler/pool_manager.rb   | 14 ++++++++++----
 lib/vmpooler/providers/base.rb |  4 ++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index b819933..a901018 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -445,16 +445,22 @@ module Vmpooler
           start = Time.now
           provider.create_vm(pool_name, new_vmname)
           finish = format('%<time>.2f', time: Time.now - start)
+          $logger.log('s', "[+] [#{pool_name}] '#{new_vmname}' cloned in #{finish} seconds")
+          $metrics.timing("clone.#{pool_name}", finish)
+
+          $logger.log('d', "[ ] [#{pool_name}] Obtaining IP for '#{new_vmname}'")
+          ip_start = Time.now
+          ip = provider.get_vm_ip_address(new_vmname, pool_name)
+          ip_finish = format('%<time>.2f', time: Time.now - ip_start)
+          $logger.log('s', "[+] [#{pool_name}] Obtained IP for '#{new_vmname}' in #{ip_finish} seconds")
 
           @redis.with_metrics do |redis|
             redis.pipelined do |pipeline|
               pipeline.hset("vmpooler__clone__#{Date.today}", "#{pool_name}:#{new_vmname}", finish)
               pipeline.hset("vmpooler__vm__#{new_vmname}", 'clone_time', finish)
+              pipeline.hset("vmpooler__vm__#{new_vmname}", 'ip', ip)
             end
-          end
-          $logger.log('s', "[+] [#{pool_name}] '#{new_vmname}' cloned in #{finish} seconds")
-
-          $metrics.timing("clone.#{pool_name}", finish)
+          end        
 
           dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool_name)
           dns_plugin.create_or_replace_record(new_vmname) unless dns_plugin_class_name == 'dynamic-dns'
diff --git a/lib/vmpooler/providers/base.rb b/lib/vmpooler/providers/base.rb
index b81e96a..f81dcc6 100644
--- a/lib/vmpooler/providers/base.rb
+++ b/lib/vmpooler/providers/base.rb
@@ -261,6 +261,10 @@ module Vmpooler
           raise("#{self.class.name} does not implement purge_unconfigured_resources")
         end
 
+        def get_vm_ip_address(vm_name, pool_name)
+          raise("#{self.class.name} does not implement get_vm_ip_address")
+        end
+
         # DEPRECATED if a provider does not implement the new method, it will hit this base class method
         # and return a deprecation message
         def purge_unconfigured_folders(_deprecated, _deprecated2, allowlist)

From eaa1104dd7fa4b7486c161292dafdf5d14137621 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 23 Feb 2023 10:37:43 -0500
Subject: [PATCH 11/19] Fix rubocops

---
 lib/vmpooler/api/v2.rb         | 644 ++++++++++++++++++++++++++++-----
 lib/vmpooler/dns.rb            |  21 +-
 lib/vmpooler/dns/base.rb       |  20 +-
 lib/vmpooler/pool_manager.rb   |  14 +-
 lib/vmpooler/providers/base.rb |   4 +-
 5 files changed, 587 insertions(+), 116 deletions(-)

diff --git a/lib/vmpooler/api/v2.rb b/lib/vmpooler/api/v2.rb
index 607d9a5..a5987a0 100644
--- a/lib/vmpooler/api/v2.rb
+++ b/lib/vmpooler/api/v2.rb
@@ -9,10 +9,50 @@ module Vmpooler
       api_version = '2'
       api_prefix  = "/api/v#{api_version}"
 
+      helpers do
+        include Vmpooler::API::Helpers
+      end
+
+      def backend
+        Vmpooler::API.settings.redis
+      end
+
+      def metrics
+        Vmpooler::API.settings.metrics
+      end
+
+      def config
+        Vmpooler::API.settings.config[:config]
+      end
+
       def full_config
         Vmpooler::API.settings.config
       end
 
+      def pools
+        Vmpooler::API.settings.config[:pools]
+      end
+
+      def pools_at_startup
+        Vmpooler::API.settings.config[:pools_at_startup]
+      end
+
+      def pool_exists?(template)
+        Vmpooler::API.settings.config[:pool_names].include?(template)
+      end
+
+      def need_auth!
+        validate_auth(backend)
+      end
+
+      def need_token!
+        validate_token(backend)
+      end
+
+      def checkoutlock
+        Vmpooler::API.settings.checkoutlock
+      end
+
       def get_template_aliases(template)
         tracer.in_span("Vmpooler::API::V2.#{__method__}") do
           result = []
@@ -25,6 +65,56 @@ module Vmpooler
         end
       end
 
+      def get_pool_weights(template_backends)
+        pool_index = pool_index(pools)
+        weighted_pools = {}
+        template_backends.each do |t|
+          next unless pool_index.key? t
+
+          index = pool_index[t]
+          clone_target = pools[index]['clone_target'] || config['clone_target']
+          next unless config.key?('backend_weight')
+
+          weight = config['backend_weight'][clone_target]
+          if weight
+            weighted_pools[t] = weight
+          end
+        end
+        weighted_pools
+      end
+
+      def count_selection(selection)
+        result = {}
+        selection.uniq.each do |poolname|
+          result[poolname] = selection.count(poolname)
+        end
+        result
+      end
+
+      def evaluate_template_aliases(template, count)
+        template_backends = []
+        template_backends << template if backend.sismember('vmpooler__pools', template)
+        selection = []
+        aliases = get_template_aliases(template)
+        if aliases
+          template_backends += aliases
+          weighted_pools = get_pool_weights(template_backends)
+
+          if weighted_pools.count > 1 && weighted_pools.count == template_backends.count
+            pickup = Pickup.new(weighted_pools)
+            count.to_i.times do
+              selection << pickup.pick
+            end
+          else
+            count.to_i.times do
+              selection << template_backends.sample
+            end
+          end
+        end
+
+        count_selection(selection)
+      end
+
       # Fetch a single vm from a pool
       #
       # @param [String] template
@@ -84,6 +174,47 @@ module Vmpooler
         end
       end
 
+      def return_vm_to_ready_state(template, vm)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          backend.srem("vmpooler__migrating__#{template}", vm)
+          backend.hdel("vmpooler__active__#{template}", vm)
+          backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user')
+          backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm)
+        end
+      end
+
+      def account_for_starting_vm(template, vm)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+          user = backend.hget("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'user')
+          span.set_attribute('enduser.id', user)
+          has_token_result = has_token?
+          backend.sadd("vmpooler__migrating__#{template}", vm)
+          backend.hset("vmpooler__active__#{template}", vm, Time.now)
+          backend.hset("vmpooler__vm__#{vm}", 'checkout', Time.now)
+
+          if Vmpooler::API.settings.config[:auth] and has_token_result
+            backend.hset("vmpooler__vm__#{vm}", 'token:token', request.env['HTTP_X_AUTH_TOKEN'])
+            backend.hset("vmpooler__vm__#{vm}", 'token:user', user)
+
+            if config['vm_lifetime_auth'].to_i > 0
+              backend.hset("vmpooler__vm__#{vm}", 'lifetime', config['vm_lifetime_auth'].to_i)
+            end
+          end
+        end
+      end
+
+      def update_result_hosts(result, template, vm)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          result[template] ||= {}
+          if result[template]['hostname']
+            result[template]['hostname'] = Array(result[template]['hostname'])
+            result[template]['hostname'].push(vm)
+          else
+            result[template]['hostname'] = vm
+          end
+        end
+      end
+
       # The domain in the result body will be set to the one associated with the
       # last vm added. The part of the response is only being retained for
       # backwards compatibility as the hostnames are now fqdn's instead of bare
@@ -140,6 +271,254 @@ module Vmpooler
         end
       end
 
+      def component_to_test(match, labels_string)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          return if labels_string.nil?
+
+          labels_string_parts = labels_string.split(',')
+          labels_string_parts.each do |part|
+            key, value = part.split('=')
+            next if value.nil?
+            return value if key == match
+          end
+          'none'
+        end
+      end
+
+      def update_user_metrics(operation, vmname)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+          begin
+            backend.multi
+            backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
+            backend.hget("vmpooler__vm__#{vmname}", 'token:user')
+            backend.hget("vmpooler__vm__#{vmname}", 'template')
+            jenkins_build_url, user, poolname = backend.exec
+            poolname = poolname.gsub('.', '_')
+
+            if user
+              user = user.gsub('.', '_')
+            else
+              user = 'unauthenticated'
+            end
+            metrics.increment("user.#{user}.#{operation}.#{poolname}")
+
+            if jenkins_build_url
+              if jenkins_build_url.include? 'litmus'
+                # Very simple filter for Litmus jobs - just count them coming through for the moment.
+                metrics.increment("usage_litmus.#{user}.#{operation}.#{poolname}")
+              else
+                url_parts = jenkins_build_url.split('/')[2..-1]
+                jenkins_instance = url_parts[0].gsub('.', '_')
+                value_stream_parts = url_parts[2].split('_')
+                value_stream_parts = value_stream_parts.map { |s| s.gsub('.', '_') }
+                value_stream = value_stream_parts.shift
+                branch = value_stream_parts.pop
+                project = value_stream_parts.shift
+                job_name = value_stream_parts.join('_')
+                build_metadata_parts = url_parts[3]
+                component_to_test = component_to_test('RMM_COMPONENT_TO_TEST_NAME', build_metadata_parts)
+
+                metrics.increment("usage_jenkins_instance.#{jenkins_instance}.#{value_stream}.#{operation}.#{poolname}")
+                metrics.increment("usage_branch_project.#{branch}.#{project}.#{operation}.#{poolname}")
+                metrics.increment("usage_job_component.#{job_name}.#{component_to_test}.#{operation}.#{poolname}")
+              end
+            end
+          rescue StandardError => e
+            puts 'd', "[!] [#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}"
+            span.record_exception(e)
+            span.status = OpenTelemetry::Trace::Status.error(e.to_s)
+            span.add_event('log', attributes: {
+              'log.severity' => 'debug',
+              'log.message' => "[#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}"
+            })
+          end
+        end
+      end
+
+      def reset_pool_size(poolname)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          result = { 'ok' => false }
+
+          pool_index = pool_index(pools)
+
+          pools_updated = 0
+          sync_pool_sizes
+
+          pool_size_now = pools[pool_index[poolname]]['size'].to_i
+          pool_size_original = pools_at_startup[pool_index[poolname]]['size'].to_i
+          result['pool_size_before_reset'] = pool_size_now
+          result['pool_size_before_overrides'] = pool_size_original
+
+          unless pool_size_now == pool_size_original
+            pools[pool_index[poolname]]['size'] = pool_size_original
+            backend.hdel('vmpooler__config__poolsize', poolname)
+            backend.sadd('vmpooler__pool__undo_size_override', poolname)
+            pools_updated += 1
+            status 201
+          end
+
+          status 200 unless pools_updated > 0
+          result['ok'] = true
+          result
+        end
+      end
+
+      def update_pool_size(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          result = { 'ok' => false }
+
+          pool_index = pool_index(pools)
+          pools_updated = 0
+          sync_pool_sizes
+
+          payload.each do |poolname, size|
+            unless pools[pool_index[poolname]]['size'] == size.to_i
+              pools[pool_index[poolname]]['size'] = size.to_i
+              backend.hset('vmpooler__config__poolsize', poolname, size)
+              pools_updated += 1
+              status 201
+            end
+          end
+          status 200 unless pools_updated > 0
+          result['ok'] = true
+          result
+        end
+      end
+
+      def reset_pool_template(poolname)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          result = { 'ok' => false }
+
+          pool_index_live = pool_index(pools)
+          pool_index_original = pool_index(pools_at_startup)
+
+          pools_updated = 0
+          sync_pool_templates
+
+          template_now = pools[pool_index_live[poolname]]['template']
+          template_original = pools_at_startup[pool_index_original[poolname]]['template']
+          result['template_before_reset'] = template_now
+          result['template_before_overrides'] = template_original
+
+          unless template_now == template_original
+            pools[pool_index_live[poolname]]['template'] = template_original
+            backend.hdel('vmpooler__config__template', poolname)
+            backend.sadd('vmpooler__pool__undo_template_override', poolname)
+            pools_updated += 1
+            status 201
+          end
+
+          status 200 unless pools_updated > 0
+          result['ok'] = true
+          result
+        end
+      end
+
+      def update_pool_template(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          result = { 'ok' => false }
+
+          pool_index = pool_index(pools)
+          pools_updated = 0
+          sync_pool_templates
+
+          payload.each do |poolname, template|
+            unless pools[pool_index[poolname]]['template'] == template
+              pools[pool_index[poolname]]['template'] = template
+              backend.hset('vmpooler__config__template', poolname, template)
+              pools_updated += 1
+              status 201
+            end
+          end
+          status 200 unless pools_updated > 0
+          result['ok'] = true
+          result
+        end
+      end
+
+      def reset_pool(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          result = { 'ok' => false }
+
+          payload.each do |poolname, _count|
+            backend.sadd('vmpooler__poolreset', poolname)
+          end
+          status 201
+          result['ok'] = true
+          result
+        end
+      end
+
+      def update_clone_target(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          result = { 'ok' => false }
+
+          pool_index = pool_index(pools)
+          pools_updated = 0
+          sync_clone_targets
+
+          payload.each do |poolname, clone_target|
+            unless pools[pool_index[poolname]]['clone_target'] == clone_target
+              pools[pool_index[poolname]]['clone_target'] = clone_target
+              backend.hset('vmpooler__config__clone_target', poolname, clone_target)
+              pools_updated += 1
+              status 201
+            end
+          end
+          status 200 unless pools_updated > 0
+          result['ok'] = true
+          result
+        end
+      end
+
+      def sync_pool_templates
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          pool_index = pool_index(pools)
+          template_configs = backend.hgetall('vmpooler__config__template')
+          template_configs&.each do |poolname, template|
+            next unless pool_index.include? poolname
+
+            pools[pool_index[poolname]]['template'] = template
+          end
+        end
+      end
+
+      def sync_pool_sizes
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          pool_index = pool_index(pools)
+          poolsize_configs = backend.hgetall('vmpooler__config__poolsize')
+          poolsize_configs&.each do |poolname, size|
+            next unless pool_index.include? poolname
+
+            pools[pool_index[poolname]]['size'] = size.to_i
+          end
+        end
+      end
+
+      def sync_clone_targets
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          pool_index = pool_index(pools)
+          clone_target_configs = backend.hgetall('vmpooler__config__clone_target')
+          clone_target_configs&.each do |poolname, clone_target|
+            next unless pool_index.include? poolname
+
+            pools[pool_index[poolname]]['clone_target'] = clone_target
+          end
+        end
+      end
+
+      def too_many_requested?(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          payload&.each do |poolname, count|
+            next unless count.to_i > config['max_ondemand_instances_per_request']
+
+            metrics.increment("ondemandrequest_fail.toomanyrequests.#{poolname}")
+            return true
+          end
+          false
+        end
+      end
+
       def generate_ondemand_request(payload)
         tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
           result = { 'ok': false }
@@ -200,7 +579,14 @@ module Vmpooler
         end
       end
 
-      # Endpoints that use overridden methods
+      def generate_request_id
+        SecureRandom.uuid
+      end
+
+      get '/' do
+        sync_pool_sizes
+        redirect to('/dashboard/')
+      end
 
       post "#{api_prefix}/vm/?" do
         content_type :json
@@ -227,6 +613,102 @@ module Vmpooler
         JSON.pretty_generate(result)
       end
 
+      def extract_templates_from_query_params(params)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          payload = {}
+
+          params.split('+').each do |template|
+            payload[template] ||= 0
+            payload[template] += 1
+          end
+
+          payload
+        end
+      end
+
+      def invalid_templates(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          invalid = []
+          payload.keys.each do |template|
+            invalid << template unless pool_exists?(template)
+          end
+          invalid
+        end
+      end
+
+      def invalid_template_or_size(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          invalid = []
+          payload.each do |pool, size|
+            invalid << pool unless pool_exists?(pool)
+            unless is_integer?(size)
+              invalid << pool
+              next
+            end
+            invalid << pool unless Integer(size) >= 0
+          end
+          invalid
+        end
+      end
+
+      def invalid_template_or_path(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          invalid = []
+          payload.each do |pool, template|
+            invalid << pool unless pool_exists?(pool)
+            invalid << pool unless template.include? '/'
+            invalid << pool if template[0] == '/'
+            invalid << pool if template[-1] == '/'
+          end
+          invalid
+        end
+      end
+
+      def invalid_pool(payload)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+          invalid = []
+          payload.each do |pool, _clone_target|
+            invalid << pool unless pool_exists?(pool)
+          end
+          invalid
+        end
+      end
+
+      def delete_ondemand_request(request_id)
+        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+          span.set_attribute('vmpooler.request_id', request_id)
+          result = { 'ok' => false }
+
+          platforms = backend.hget("vmpooler__odrequest__#{request_id}", 'requested')
+          unless platforms
+            e_message = "no request found for request_id '#{request_id}'"
+            result['message'] = e_message
+            span.add_event('error', attributes: {
+              'error.type' => 'Vmpooler::API::V2.delete_ondemand_request',
+              'error.message' => e_message
+            })
+            return result
+          end
+
+          if backend.hget("vmpooler__odrequest__#{request_id}", 'status') == 'deleted'
+            result['message'] = 'the request has already been deleted'
+          else
+            backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted')
+
+            Parsing.get_platform_pool_count(platforms) do |platform_alias, pool, _count|
+              backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm|
+                backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm)
+              end
+              backend.del("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
+            end
+            backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0)
+          end
+          status 200
+          result['ok'] = true
+          result
+        end
+      end
+
       post "#{api_prefix}/vm/:template/?" do
         content_type :json
         result = { 'ok' => false }
@@ -470,21 +952,21 @@ module Vmpooler
       delete "#{api_prefix}/vm/:hostname/?" do
         content_type :json
         metrics.increment('http_requests_vm_total.delete.vm.hostname')
-  
+
         result = {}
-  
+
         status 404
         result['ok'] = false
-  
+
         params[:hostname] = hostname_shorten(params[:hostname])
-  
+
         rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}")
         unless rdata.empty?
           need_token! if rdata['token:token']
-  
+
           if backend.srem("vmpooler__running__#{rdata['template']}", params[:hostname])
             backend.sadd("vmpooler__completed__#{rdata['template']}", params[:hostname])
-  
+
             status 200
             result['ok'] = true
             metrics.increment('delete.success')
@@ -493,21 +975,21 @@ module Vmpooler
             metrics.increment('delete.failed')
           end
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       put "#{api_prefix}/vm/:hostname/?" do
         content_type :json
         metrics.increment('http_requests_vm_total.put.vm.modify')
-  
+
         status 404
         result = { 'ok' => false }
-  
+
         failure = []
-  
+
         params[:hostname] = hostname_shorten(params[:hostname])
-  
+
         if backend.exists?("vmpooler__vm__#{params[:hostname]}")
           begin
             jdata = JSON.parse(request.body.read)
@@ -517,13 +999,13 @@ module Vmpooler
             span.status = OpenTelemetry::Trace::Status.error(e.to_s)
             halt 400, JSON.pretty_generate(result)
           end
-  
+
           # Validate data payload
           jdata.each do |param, arg|
             case param
               when 'lifetime'
                 need_token! if Vmpooler::API.settings.config[:auth]
-  
+
                 # in hours, defaults to one week
                 max_lifetime_upper_limit = config['max_lifetime_upper_limit']
                 if max_lifetime_upper_limit
@@ -532,12 +1014,12 @@ module Vmpooler
                     failure.push("You provided a lifetime (#{arg}) that exceeds the configured maximum of #{max_lifetime_upper_limit}.")
                   end
                 end
-  
+
                 # validate lifetime is within boundaries
                 unless arg.to_i > 0
                   failure.push("You provided a lifetime (#{arg}) but you must provide a positive number.")
                 end
-  
+
               when 'tags'
                 failure.push("You provided tags (#{arg}) as something other than a hash.") unless arg.is_a?(Hash)
                 failure.push("You provided unsuppored tags (#{arg}).") if config['allowed_tags'] && !(arg.keys - config['allowed_tags']).empty?
@@ -545,7 +1027,7 @@ module Vmpooler
                 failure.push("Unknown argument #{arg}.")
             end
           end
-  
+
           if !failure.empty?
             status 400
             result['failure'] = failure
@@ -554,102 +1036,102 @@ module Vmpooler
               case param
                 when 'lifetime'
                   need_token! if Vmpooler::API.settings.config[:auth]
-  
+
                   arg = arg.to_i
-  
+
                   backend.hset("vmpooler__vm__#{params[:hostname]}", param, arg)
                 when 'tags'
                   filter_tags(arg)
                   export_tags(backend, params[:hostname], arg)
               end
             end
-  
+
             status 200
             result['ok'] = true
           end
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       post "#{api_prefix}/vm/:hostname/disk/:size/?" do
         content_type :json
         metrics.increment('http_requests_vm_total.post.vm.disksize')
-  
+
         need_token! if Vmpooler::API.settings.config[:auth]
-  
+
         status 404
         result = { 'ok' => false }
-  
+
         params[:hostname] = hostname_shorten(params[:hostname])
-  
+
         if ((params[:size].to_i > 0 )and (backend.exists?("vmpooler__vm__#{params[:hostname]}")))
           result[params[:hostname]] = {}
           result[params[:hostname]]['disk'] = "+#{params[:size]}gb"
-  
+
           backend.sadd('vmpooler__tasks__disk', "#{params[:hostname]}:#{params[:size]}")
-  
+
           status 202
           result['ok'] = true
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       post "#{api_prefix}/vm/:hostname/snapshot/?" do
         content_type :json
         metrics.increment('http_requests_vm_total.post.vm.snapshot')
-  
+
         need_token! if Vmpooler::API.settings.config[:auth]
-  
+
         status 404
         result = { 'ok' => false }
-  
+
         params[:hostname] = hostname_shorten(params[:hostname])
-  
+
         if backend.exists?("vmpooler__vm__#{params[:hostname]}")
           result[params[:hostname]] = {}
-  
+
           o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten
           result[params[:hostname]]['snapshot'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join
-  
+
           backend.sadd('vmpooler__tasks__snapshot', "#{params[:hostname]}:#{result[params[:hostname]]['snapshot']}")
-  
+
           status 202
           result['ok'] = true
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       post "#{api_prefix}/vm/:hostname/snapshot/:snapshot/?" do
         content_type :json
         metrics.increment('http_requests_vm_total.post.vm.snapshot')
-  
+
         need_token! if Vmpooler::API.settings.config[:auth]
-  
+
         status 404
         result = { 'ok' => false }
-  
+
         params[:hostname] = hostname_shorten(params[:hostname])
-  
+
         unless backend.hget("vmpooler__vm__#{params[:hostname]}", "snapshot:#{params[:snapshot]}").to_i.zero?
           backend.sadd('vmpooler__tasks__snapshot-revert', "#{params[:hostname]}:#{params[:snapshot]}")
-  
+
           status 202
           result['ok'] = true
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       delete "#{api_prefix}/config/poolsize/:pool/?" do
         content_type :json
         result = { 'ok' => false }
-  
+
         if config['experimental_features']
           need_token! if Vmpooler::API.settings.config[:auth]
-  
+
           if pool_exists?(params[:pool])
             result = reset_pool_size(params[:pool])
           else
@@ -659,19 +1141,19 @@ module Vmpooler
         else
           status 405
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       post "#{api_prefix}/config/poolsize/?" do
         content_type :json
         result = { 'ok' => false }
-  
+
         if config['experimental_features']
           need_token! if Vmpooler::API.settings.config[:auth]
-  
+
           payload = JSON.parse(request.body.read)
-  
+
           if payload
             invalid = invalid_template_or_size(payload)
             if invalid.empty?
@@ -690,17 +1172,17 @@ module Vmpooler
         else
           status 405
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       delete "#{api_prefix}/config/pooltemplate/:pool/?" do
         content_type :json
         result = { 'ok' => false }
-  
+
         if config['experimental_features']
           need_token! if Vmpooler::API.settings.config[:auth]
-  
+
           if pool_exists?(params[:pool])
             result = reset_pool_template(params[:pool])
           else
@@ -710,19 +1192,19 @@ module Vmpooler
         else
           status 405
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       post "#{api_prefix}/config/pooltemplate/?" do
         content_type :json
         result = { 'ok' => false }
-  
+
         if config['experimental_features']
           need_token! if Vmpooler::API.settings.config[:auth]
-  
+
           payload = JSON.parse(request.body.read)
-  
+
           if payload
             invalid = invalid_template_or_path(payload)
             if invalid.empty?
@@ -741,17 +1223,17 @@ module Vmpooler
         else
           status 405
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       post "#{api_prefix}/poolreset/?" do
         content_type :json
         result = { 'ok' => false }
-  
+
         if config['experimental_features']
           need_token! if Vmpooler::API.settings.config[:auth]
-  
+
           begin
             payload = JSON.parse(request.body.read)
             if payload
@@ -782,19 +1264,19 @@ module Vmpooler
         else
           status 405
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       post "#{api_prefix}/config/clonetarget/?" do
         content_type :json
         result = { 'ok' => false }
-  
+
         if config['experimental_features']
           need_token! if Vmpooler::API.settings.config[:auth]
-  
+
           payload = JSON.parse(request.body.read)
-  
+
           if payload
             invalid = invalid_pool(payload)
             if invalid.empty?
@@ -813,47 +1295,47 @@ module Vmpooler
         else
           status 405
         end
-  
+
         JSON.pretty_generate(result)
       end
-  
+
       get "#{api_prefix}/config/?" do
         content_type :json
         result = { 'ok' => false }
         status 404
-  
+
         if pools
           sync_pool_sizes
           sync_pool_templates
-  
+
           pool_configuration = []
           pools.each do |pool|
             pool['template_ready'] = template_ready?(pool, backend)
             pool_configuration << pool
           end
-  
+
           result = {
             pool_configuration: pool_configuration,
             status: {
               ok: true
             }
           }
-  
+
           status 200
         end
         JSON.pretty_generate(result)
       end
-  
+
       get "#{api_prefix}/full_config/?" do
         content_type :json
-  
+
         result = {
           full_config: full_config,
           status: {
             ok: true
           }
         }
-  
+
         status 200
         JSON.pretty_generate(result)
       end
diff --git a/lib/vmpooler/dns.rb b/lib/vmpooler/dns.rb
index d852982..4534a78 100644
--- a/lib/vmpooler/dns.rb
+++ b/lib/vmpooler/dns.rb
@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 module Vmpooler
   class Dns
-
     # Load one or more VMPooler DNS plugin gems by name
     #
     # @param names [Array<String>] The list of gem names to load
@@ -22,9 +23,7 @@ module Vmpooler
       plugin_class = ''
 
       dns_configs.map do |dns_config_name|
-        if dns_config_name.to_s == name
-          plugin_class = config[:dns_configs][dns_config_name]['dns_class']
-        end
+        plugin_class = config[:dns_configs][dns_config_name]['dns_class'] if dns_config_name.to_s == name
       end
 
       plugin_class
@@ -42,9 +41,7 @@ module Vmpooler
       pool_domain = ''
 
       dns_configs.map do |dns_config_name|
-        if dns_config_name.to_s == pool_dns_config
-          pool_domain = config[:dns_configs][dns_config_name]['domain']
-        end
+        pool_domain = config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == pool_dns_config
       end
 
       pool_domain
@@ -60,9 +57,7 @@ module Vmpooler
       plugin_domain = ''
 
       dns_configs.map do |dns_config_name|
-        if dns_config_name.to_s == name
-          plugin_domain = config[:dns_configs][dns_config_name]['domain']
-        end
+        plugin_domain = config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == name
       end
 
       plugin_domain
@@ -82,7 +77,7 @@ module Vmpooler
             dns_config_name.to_s
           end
         end.compact.uniq
-        
+
         # dynamic-dns is not actually a class, it's just used as a value to denote
         # that dynamic dns is used so no loading or record management is needed
         dns_plugins.delete('dynamic-dns')
@@ -96,10 +91,10 @@ module Vmpooler
     # @param name [String] The name of the DNS plugin gem to load
     # @return [String] The full require path to the specified gem
     def load_from_gems(name = nil)
-      require_path = 'vmpooler/dns/' + name.gsub('-', '/')
+      require_path = "vmpooler/dns/#{name.gsub('-', '/')}"
       require require_path
       $logger.log('d', "[*] [dns_manager] Loading DNS plugins from dns_configs: #{name}")
       require_path
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/vmpooler/dns/base.rb b/lib/vmpooler/dns/base.rb
index c2cd72d..61403ef 100644
--- a/lib/vmpooler/dns/base.rb
+++ b/lib/vmpooler/dns/base.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Vmpooler
   class PoolManager
     class Dns
       class Base
-         # These defs must be overidden in child classes
+        # These defs must be overidden in child classes
 
         # Helper Methods
         # Global Logger object
@@ -22,7 +24,6 @@ module Vmpooler
           @dns_options = options
 
           logger.log('s', "[!] Creating dns plugin '#{name}'")
-          # Your code goes here...
         end
 
         def pool_config(pool_name)
@@ -57,29 +58,24 @@ module Vmpooler
 
         def get_ip(vm_name)
           @redis.with_metrics do |redis|
-            ip = redis.hget("vmpooler__vm__#{vm_name}", 'ip')
-            return ip
+            redis.hget("vmpooler__vm__#{vm_name}", 'ip')
           end
         end
 
         # returns
         #   Array[String] : Array of pool names this provider services
         def provided_pools
-          list = []
-          @config[:pools].each do |pool|
-            list << pool['name'] if pool['dns_config'] == name
-          end
-          list
+          @config[:pools].select { |pool| pool['dns_config'] == name }.map { |pool| pool['name'] }
         end
 
         def create_or_replace_record(hostname)
-          raise("#{self.class.name} does not implement create_or_replace_record")
+          raise("#{self.class.name} does not implement create_or_replace_record #{hostname}")
         end
 
         def delete_record(hostname)
-          raise("#{self.class.name} does not implement delete_record")
+          raise("#{self.class.name} does not implement delete_record for #{hostname}")
         end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index a901018..ae1024a 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -116,7 +116,7 @@ module Vmpooler
       dns_plugin = get_dns_plugin_class_for_pool(pool)
       dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool)
       domain = get_dns_plugin_domain_for_pool(pool)
-      fqdn = vm + '.' + domain
+      fqdn = "#{vm}.#{domain}"
       dns_plugin.delete_record(fqdn) unless dns_plugin_class_name == 'dynamic-dns'
       $logger.log('d', "[!] [#{pool}] '#{vm}' no longer exists. Removing from pending.")
     end
@@ -460,7 +460,7 @@ module Vmpooler
               pipeline.hset("vmpooler__vm__#{new_vmname}", 'clone_time', finish)
               pipeline.hset("vmpooler__vm__#{new_vmname}", 'ip', ip)
             end
-          end        
+          end
 
           dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool_name)
           dns_plugin.create_or_replace_record(new_vmname) unless dns_plugin_class_name == 'dynamic-dns'
@@ -512,8 +512,8 @@ module Vmpooler
 
           provider.destroy_vm(pool, vm)
           domain = get_dns_plugin_domain_for_pool(pool)
-          fqdn = vm + '.' + domain
-          
+          fqdn = "#{vm}.#{domain}"
+
           dns_plugin_class_name = get_dns_plugin_class_name_for_pool(pool)
           dns_plugin.delete_record(fqdn) unless dns_plugin_class_name == 'dynamic-dns'
 
@@ -712,8 +712,7 @@ module Vmpooler
       return nil unless pool
 
       plugin_name = pool.fetch('dns_plugin')
-      plugin_class = Vmpooler::Dns.get_dns_plugin_class_by_name(config, plugin_name)
-      plugin_class
+      Vmpooler::Dns.get_dns_plugin_class_by_name(config, plugin_name)
     end
 
     def get_dns_plugin_class_for_pool(pool_name)
@@ -730,8 +729,7 @@ module Vmpooler
       return nil unless pool
 
       plugin_name = pool.fetch('dns_plugin')
-      plugin_domain = Vmpooler::Dns.get_dns_plugin_domain_by_name(config, plugin_name)
-      plugin_domain
+      Vmpooler::Dns.get_dns_plugin_domain_by_name(config, plugin_name)
     end
 
     def check_disk_queue(maxloop = 0, loop_delay = 5)
diff --git a/lib/vmpooler/providers/base.rb b/lib/vmpooler/providers/base.rb
index f81dcc6..e5d458e 100644
--- a/lib/vmpooler/providers/base.rb
+++ b/lib/vmpooler/providers/base.rb
@@ -59,7 +59,7 @@ module Vmpooler
         end
 
         def dns_config(dns_config_name)
-          return Vmpooler::Dns.get_dns_plugin_domain_by_name(@config, dns_config_name)
+          Vmpooler::Dns.get_dns_plugin_domain_by_name(@config, dns_config_name)
         end
 
         # returns
@@ -262,7 +262,7 @@ module Vmpooler
         end
 
         def get_vm_ip_address(vm_name, pool_name)
-          raise("#{self.class.name} does not implement get_vm_ip_address")
+          raise("#{self.class.name} does not implement get_vm_ip_address for vm #{vm_name} in pool #{pool_name}")
         end
 
         # DEPRECATED if a provider does not implement the new method, it will hit this base class method

From fb80d989c871a07fa6209ec3316cd7f0fcfc861a Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 23 Feb 2023 10:59:45 -0500
Subject: [PATCH 12/19] Removed api/v1 spec tests

---
 spec/integration/api/v1/config_spec.rb      | 402 ------------------
 spec/integration/api/v1/ondemandvm_spec.rb  | 387 -----------------
 spec/integration/api/v1/poolreset.rb        | 120 ------
 spec/integration/api/v1/status_spec.rb      | 247 -----------
 spec/integration/api/v1/token_spec.rb       | 210 ----------
 spec/integration/api/v1/vm_hostname_spec.rb | 352 ----------------
 spec/integration/api/v1/vm_spec.rb          | 435 --------------------
 spec/integration/api/v1/vm_template_spec.rb | 327 ---------------
 spec/integration/api/v2/vm_spec.rb          |  22 +
 9 files changed, 22 insertions(+), 2480 deletions(-)
 delete mode 100644 spec/integration/api/v1/config_spec.rb
 delete mode 100644 spec/integration/api/v1/ondemandvm_spec.rb
 delete mode 100644 spec/integration/api/v1/poolreset.rb
 delete mode 100644 spec/integration/api/v1/status_spec.rb
 delete mode 100644 spec/integration/api/v1/token_spec.rb
 delete mode 100644 spec/integration/api/v1/vm_hostname_spec.rb
 delete mode 100644 spec/integration/api/v1/vm_spec.rb
 delete mode 100644 spec/integration/api/v1/vm_template_spec.rb

diff --git a/spec/integration/api/v1/config_spec.rb b/spec/integration/api/v1/config_spec.rb
deleted file mode 100644
index 62968bd..0000000
--- a/spec/integration/api/v1/config_spec.rb
+++ /dev/null
@@ -1,402 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-
-  # Added to ensure no leakage in rack state from previous tests.
-  # Removes all routes, filters, middleware and extension hooks from the current class
-  # https://rubydoc.info/gems/sinatra/Sinatra/Base#reset!-class_method 
-  before(:each) do
-    app.reset!
-  end
-
-  let(:config) {
-    {
-      config: {
-        'site_name' => 'test pooler',
-        'vm_lifetime_auth' => 2,
-        'experimental_features' => true
-      },
-      pools: [
-        {'name' => 'pool1', 'size' => 5, 'template' => 'templates/pool1', 'clone_target' => 'default_cluster'},
-        {'name' => 'pool2', 'size' => 10}
-      ],
-      pools_at_startup: [
-        {'name' => 'pool1', 'size' => 5, 'template' => 'templates/pool1', 'clone_target' => 'default_cluster'},
-        {'name' => 'pool2', 'size' => 10}
-      ],
-      statsd: { 'prefix' => 'stats_prefix'},
-      alias: { 'poolone' => 'pool1' },
-      pool_names: [ 'pool1', 'pool2', 'poolone' ]
-    }
-  }
-
-  describe '/config/pooltemplate' do
-    let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
-
-    let(:current_time) { Time.now }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, metrics, nil)
-      app.settings.set :config, auth: false
-      create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
-    end
-
-    describe 'DELETE /config/pooltemplate/:pool' do
-      it 'resets a pool template' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"templates/new_template"}'
-        delete "#{prefix}/config/pooltemplate/pool1"
-        expect_json(ok = true, http = 201)
-
-        expected = {
-          ok: true,
-          template_before_reset: 'templates/new_template',
-          template_before_overrides: 'templates/pool1'
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'succeeds when the pool has not been overridden' do
-        delete "#{prefix}/config/pooltemplate/pool1"
-        expect_json(ok = true, http = 200)
-      end
-
-      it 'fails on nonexistent pools' do
-        delete "#{prefix}/config/pooltemplate/poolpoolpool"
-        expect_json(ok = false, http = 404)
-      end
-
-      context 'with experimental features disabled' do
-        before(:each) do
-          config[:config]['experimental_features'] = false
-        end
-
-        it 'should return 405' do
-          delete "#{prefix}/config/pooltemplate/pool1"
-          expect_json(ok = false, http = 405)
-
-          expected = { ok: false }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-      end
-
-    end
-
-    describe 'POST /config/pooltemplate' do
-      it 'updates a pool template' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"templates/new_template"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails on nonexistent pools' do
-        post "#{prefix}/config/pooltemplate", '{"poolpoolpool":"templates/newtemplate"}'
-        expect_json(ok = false, http = 400)
-      end
-
-      it 'updates multiple pools' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"templates/new_template","pool2":"templates/new_template2"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when not all pools exist' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"templates/new_template","pool3":"templates/new_template2"}'
-        expect_json(ok = false, http = 400)
-
-        expected = {
-          ok: false,
-          bad_templates: ['pool3']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'returns no changes when the template does not change' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"templates/pool1"}'
-        expect_json(ok = true, http = 200)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a invalid template parameter is provided' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"template1"}'
-        expect_json(ok = false, http = 400)
-
-        expected = {
-          ok: false,
-          bad_templates: ['pool1']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a template starts with /' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"/template1"}'
-        expect_json(ok = false, http = 400)
-
-        expected = {
-          ok: false,
-          bad_templates: ['pool1']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a template ends with /' do
-        post "#{prefix}/config/pooltemplate", '{"pool1":"template1/"}'
-        expect_json(ok = false, http = 400)
-
-        expected = {
-          ok: false,
-          bad_templates: ['pool1']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      context 'with experimental features disabled' do
-        before(:each) do
-          config[:config]['experimental_features'] = false
-        end
-
-        it 'should return 405' do
-          post "#{prefix}/config/pooltemplate", '{"pool1":"template/template1"}'
-          expect_json(ok = false, http = 405)
-
-          expected = { ok: false }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-      end
-
-    end
-
-    describe 'DELETE /config/poolsize' do
-      it 'resets a pool size' do
-        post "#{prefix}/config/poolsize", '{"pool1":"2"}'
-        delete "#{prefix}/config/poolsize/pool1"
-        expect_json(ok = true, http = 201)
-
-        expected = {
-          ok: true,
-          pool_size_before_reset: 2,
-          pool_size_before_overrides: 5
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a specified pool does not exist' do
-        delete "#{prefix}/config/poolsize/pool10"
-        expect_json(ok = false, http = 404)
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'succeeds when a pool has not been overridden' do
-        delete "#{prefix}/config/poolsize/pool1"
-        expect_json(ok = true, http = 200)
-        expected = {
-          ok: true,
-          pool_size_before_reset: 5,
-          pool_size_before_overrides: 5
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      context 'with experimental features disabled' do
-        before(:each) do
-          config[:config]['experimental_features'] = false
-        end
-
-        it 'should return 405' do
-          delete "#{prefix}/config/poolsize/pool1"
-          expect_json(ok = false, http = 405)
-
-          expected = { ok: false }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-      end
-    end
-
-    describe 'POST /config/poolsize' do
-      it 'changes a pool size' do
-        post "#{prefix}/config/poolsize", '{"pool1":"2"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'changes a pool size for multiple pools' do
-        post "#{prefix}/config/poolsize", '{"pool1":"2","pool2":"2"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a specified pool does not exist' do
-        post "#{prefix}/config/poolsize", '{"pool10":"2"}'
-        expect_json(ok = false, http = 400)
-        expected = {
-          ok: false,
-          not_configured: ['pool10']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'succeeds with 200 when no change is required' do
-        post "#{prefix}/config/poolsize", '{"pool1":"5"}'
-        expect_json(ok = true, http = 200)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'succeeds with 201 when at least one pool changes' do
-        post "#{prefix}/config/poolsize", '{"pool1":"5","pool2":"5"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a non-integer value is provided for size' do
-        post "#{prefix}/config/poolsize", '{"pool1":"four"}'
-        expect_json(ok = false, http = 400)
-
-        expected = {
-          ok: false,
-          not_configured: ['pool1']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a negative value is provided for size' do
-        post "#{prefix}/config/poolsize", '{"pool1":"-1"}'
-        expect_json(ok = false, http = 400)
-
-        expected = {
-          ok: false,
-          not_configured: ['pool1']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      context 'with experimental features disabled' do
-        before(:each) do
-          config[:config]['experimental_features'] = false
-        end
-
-        it 'should return 405' do
-          post "#{prefix}/config/poolsize", '{"pool1":"1"}'
-          expect_json(ok = false, http = 405)
-
-          expected = { ok: false }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-      end
-    end
-
-    describe 'POST /config/clonetarget' do
-      it 'changes the clone target' do
-        post "#{prefix}/config/clonetarget", '{"pool1":"cluster1"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'changes a pool size for multiple pools' do
-        post "#{prefix}/config/clonetarget", '{"pool1":"cluster1","pool2":"cluster2"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when a specified pool does not exist' do
-        post "#{prefix}/config/clonetarget", '{"pool10":"cluster1"}'
-        expect_json(ok = false, http = 400)
-        expected = {
-          ok: false,
-          bad_templates: ['pool10']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'succeeds with 200 when no change is required' do
-        post "#{prefix}/config/clonetarget", '{"pool1":"default_cluster"}'
-        expect_json(ok = true, http = 200)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'succeeds with 201 when at least one pool changes' do
-        post "#{prefix}/config/clonetarget", '{"pool1":"default_cluster","pool2":"cluster2"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      context 'with experimental features disabled' do
-        before(:each) do
-          config[:config]['experimental_features'] = false
-        end
-
-        it 'should return 405' do
-          post "#{prefix}/config/clonetarget", '{"pool1":"cluster1"}'
-          expect_json(ok = false, http = 405)
-
-          expected = { ok: false }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-      end
-    end
-
-    describe 'GET /config' do
-      let(:prefix) { '/api/v1' }
-
-      it 'returns pool configuration when set' do
-        get "#{prefix}/config"
-
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result['pool_configuration']).to eq(config[:pools])
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v1/ondemandvm_spec.rb b/spec/integration/api/v1/ondemandvm_spec.rb
deleted file mode 100644
index a361f9f..0000000
--- a/spec/integration/api/v1/ondemandvm_spec.rb
+++ /dev/null
@@ -1,387 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-  # Added to ensure no leakage in rack state from previous tests.
-  # Removes all routes, filters, middleware and extension hooks from the current class
-  # https://rubydoc.info/gems/sinatra/Sinatra/Base#reset!-class_method 
-  before(:each) do
-    app.reset!
-  end
-
-  describe '/ondemandvm' do
-    let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
-    let(:config) {
-      {
-        config: {
-          'site_name' => 'test pooler',
-          'vm_lifetime_auth' => 2,
-          'max_ondemand_instances_per_request' => 50,
-          'backend_weight' => {
-            'compute1' => 5,
-            'compute2' => 0
-          }
-        },
-        pools: [
-          {'name' => 'pool1', 'size' => 0, 'clone_target' => 'compute1'},
-          {'name' => 'pool2', 'size' => 0, 'clone_target' => 'compute2'},
-          {'name' => 'pool3', 'size' => 0, 'clone_target' => 'compute1'}
-        ],
-        alias: {
-          'poolone' => ['pool1'],
-          'pool2' => ['pool1']
-        },
-        pool_names: [ 'pool1', 'pool2', 'pool3', 'poolone' ]
-      }
-    }
-    let(:current_time) { Time.now }
-    let(:vmname) { 'abcdefghijkl' }
-    let(:checkoutlock) { Mutex.new }
-    let(:uuid) { SecureRandom.uuid }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, metrics, nil)
-      app.settings.set :config, auth: false
-      app.settings.set :checkoutlock, checkoutlock
-      create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
-      config[:pools].each do |pool|
-        redis.sadd('vmpooler__pools', pool['name'])
-      end
-    end
-
-    describe 'POST /ondemandvm' do
-
-      context 'with a configured pool' do
-
-        context 'with no request_id provided in payload' do
-          before(:each) do
-            expect(SecureRandom).to receive(:uuid).and_return(uuid)
-          end
-
-          it 'generates a request_id when none is provided' do
-            post "#{prefix}/ondemandvm", '{"pool1":"1"}'
-            expect_json(true, 201)
-
-            expected = {
-              "ok": true,
-              "request_id": uuid
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-
-          it 'uses a configured platform to fulfill a ondemand request' do
-            post "#{prefix}/ondemandvm", '{"poolone":"1"}'
-            expect_json(true, 201)
-            expected = {
-              "ok": true,
-              "request_id": uuid
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-
-          it 'creates a provisioning request in redis' do
-            expect(redis).to receive(:zadd).with('vmpooler__provisioning__request', Integer, uuid).and_return(1)
-            post "#{prefix}/ondemandvm", '{"poolone":"1"}'
-          end
-
-          it 'sets a platform string in redis for the request to indicate selected platforms' do
-            expect(redis).to receive(:hset).with("vmpooler__odrequest__#{uuid}", 'requested', 'poolone:pool1:1')
-            post "#{prefix}/ondemandvm", '{"poolone":"1"}'
-          end
-
-          context 'with a backend of 0 weight' do
-            before(:each) do
-              config[:config]['backend_weight']['compute1'] = 0
-            end
-
-            it 'sets the platform string in redis for the request to indicate the selected platforms' do
-              expect(redis).to receive(:hset).with("vmpooler__odrequest__#{uuid}", 'requested', 'pool1:pool1:1')
-              post "#{prefix}/ondemandvm", '{"pool1":"1"}'
-            end
-          end
-
-          it 'sets the platform string in redis for the request to indicate the selected platforms using weight' do
-            expect(redis).to receive(:hset).with("vmpooler__odrequest__#{uuid}", 'requested', 'pool2:pool1:1')
-            post "#{prefix}/ondemandvm", '{"pool2":"1"}'
-          end
-
-          context 'with domain set in the config' do
-            let(:domain) { 'example.com' }
-            before(:each) do
-              config[:config]['domain'] = domain
-            end
-
-            it 'should include domain in the return reply' do
-              post "#{prefix}/ondemandvm", '{"poolone":"1"}'
-              expect_json(true, 201)
-              expected = {
-                "ok": true,
-                "request_id": uuid,
-                "domain": domain
-              }
-              expect(last_response.body).to eq(JSON.pretty_generate(expected))
-            end
-          end
-        end
-
-        context 'with a resource request that exceeds the specified limit' do
-          let(:max_instances) { 50 }
-          before(:each) do
-            config[:config]['max_ondemand_instances_per_request'] = max_instances
-          end
-
-          it 'should reject the request with a message' do
-            post "#{prefix}/ondemandvm", '{"pool1":"51"}'
-            expect_json(false, 403)
-            expected = {
-              "ok": false,
-              "message": "requested amount of instances exceeds the maximum #{max_instances}"
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-        end
-
-        context 'with request_id provided in the payload' do
-          it 'uses the given request_id when provided' do
-            post "#{prefix}/ondemandvm", '{"pool1":"1","request_id":"1234"}'
-            expect_json(true, 201)
-
-            expected = {
-              "ok": true,
-              "request_id": "1234"
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-
-          it 'returns 409 conflict error when the request_id has been used' do
-            post "#{prefix}/ondemandvm", '{"pool1":"1","request_id":"1234"}'
-            post "#{prefix}/ondemandvm", '{"pool1":"1","request_id":"1234"}'
-            expect_json(false, 409)
-
-            expected = {
-              "ok": false,
-              "request_id": "1234",
-              "message": "request_id '1234' has already been created"
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-        end
-
-        context 'with auth configured' do
-
-          it 'sets the token and user' do
-            app.settings.set :config, auth: true
-            expect(SecureRandom).to receive(:uuid).and_return(uuid)
-            allow(redis).to receive(:hset)
-            expect(redis).to receive(:hset).with("vmpooler__odrequest__#{uuid}", 'token:token', 'abcdefghijklmnopqrstuvwxyz012345')
-            expect(redis).to receive(:hset).with("vmpooler__odrequest__#{uuid}", 'token:user', 'jdoe')
-            post "#{prefix}/ondemandvm", '{"pool1":"1"}', {
-              'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-            }
-          end
-        end
-      end
-
-      context 'with a pool that is not configured' do
-        let(:badpool) { 'pool4' }
-        it 'returns the bad template' do
-          post "#{prefix}/ondemandvm", '{"pool4":"1"}'
-          expect_json(false, 404)
-
-          expected = {
-            "ok": false,
-            "bad_templates": [ badpool ]
-          }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-      end
-
-      it 'returns 400 and a message when JSON is invalid' do
-        post "#{prefix}/ondemandvm", '{"pool1":"1}'
-        expect_json(false, 400)
-        expected = {
-          "ok": false,
-          "message": "JSON payload could not be parsed"
-        }
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-    end
-
-    describe 'GET /ondemandvm' do
-      it 'returns 404 with message when request is not found' do
-        get "#{prefix}/ondemandvm/#{uuid}"
-        expect_json(false, 404)
-        expected = {
-          "ok": false,
-          "message": "no request found for request_id '#{uuid}'"
-        }
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      context 'when the request is found' do
-        let(:score) { current_time }
-        let(:platforms_string) { 'pool1:pool1:1' }
-        before(:each) do
-          create_ondemand_request_for_test(uuid, score, platforms_string, redis)
-        end
-
-        it 'returns 202 while the request is waiting' do
-          get "#{prefix}/ondemandvm/#{uuid}"
-          expect_json(true, 202)
-          expected = {
-            "ok": true,
-            "request_id": uuid,
-            "ready": false,
-            "pool1": {
-              "ready": "0",
-              "pending": "1"
-            }
-          }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-
-        context 'with ready instances' do
-          before(:each) do
-            create_ondemand_vm(vmname, uuid, 'pool1', 'pool1', redis)
-            set_ondemand_request_status(uuid, 'ready', redis)
-          end
-
-          it 'returns 200 with hostnames when the request is ready' do
-            get "#{prefix}/ondemandvm/#{uuid}"
-            expect_json(true, 200)
-            expected = {
-              "ok": true,
-              "request_id": uuid,
-              "ready": true,
-              "pool1": {
-                "hostname": [
-                  vmname
-                ]
-              }
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-
-          context 'with domain set' do
-            let(:domain) { 'example.com' }
-            before(:each) do
-              config[:config]['domain'] = domain
-            end
-
-            it 'should include the domain in the result' do
-              get "#{prefix}/ondemandvm/#{uuid}"
-              expected = {
-                "ok": true,
-                "request_id": uuid,
-                "ready": true,
-                "pool1": {
-                  "hostname": [
-                    vmname
-                  ]
-                },
-                "domain": domain
-              }
-              expect(last_response.body).to eq(JSON.pretty_generate(expected))
-            end
-          end
-        end
-
-        context 'with a deleted request' do
-          before(:each) do
-            set_ondemand_request_status(uuid, 'deleted', redis)
-          end
-
-          it 'returns a message that the request has been deleted' do
-            get "#{prefix}/ondemandvm/#{uuid}"
-            expect_json(true, 200)
-            expected = {
-              "ok": true,
-              "request_id": uuid,
-              "ready": false,
-              "message": "The request has been deleted"
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-        end
-
-        context 'with a failed request' do
-          let(:ondemand_request_ttl) { 5 }
-          before(:each) do
-            config[:config]['ondemand_request_ttl'] = ondemand_request_ttl
-            set_ondemand_request_status(uuid, 'failed', redis)
-          end
-
-          it 'returns a message that the request has failed' do
-            get "#{prefix}/ondemandvm/#{uuid}"
-            expect_json(true, 200)
-            expected = {
-              "ok": true,
-              "request_id": uuid,
-              "ready": false,
-              "message": "The request failed to provision instances within the configured ondemand_request_ttl '#{ondemand_request_ttl}'"
-            }
-            expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          end
-        end
-      end
-    end
-
-    describe 'DELETE /ondemandvm' do
-      let(:expiration) { 129_600_0 }
-      it 'returns 404 with message when request is not found' do
-        delete "#{prefix}/ondemandvm/#{uuid}"
-        expect_json(false, 404)
-        expected = {
-          "ok": false,
-          "message": "no request found for request_id '#{uuid}'"
-        }
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      context 'when the request is found' do
-        let(:platforms_string) { 'pool1:pool1:1' }
-        let(:score) { current_time.to_i }
-        before(:each) do
-          create_ondemand_request_for_test(uuid, score, platforms_string, redis)
-        end
-
-        it 'returns 200 for a deleted request' do
-          delete "#{prefix}/ondemandvm/#{uuid}"
-          expect_json(true, 200)
-          expected = { 'ok': true }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-
-        it 'marks the request hash for expiration in two weeks' do
-          expect(redis).to receive(:expire).with("vmpooler__odrequest__#{uuid}", expiration)
-          delete "#{prefix}/ondemandvm/#{uuid}"
-        end
-
-        context 'with running instances' do
-          let(:pool) { 'pool1' }
-          let(:pool_alias) { pool }
-          before(:each) do
-            create_ondemand_vm(vmname, uuid, pool, pool_alias, redis)
-          end
-
-          it 'moves allocated instances to the completed queue' do
-            expect(redis).to receive(:smove).with("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vmname)
-            delete "#{prefix}/ondemandvm/#{uuid}"
-          end
-
-          it 'deletes the set tracking instances allocated for the request' do
-            expect(redis).to receive(:del).with("vmpooler__#{uuid}__#{pool_alias}__#{pool}")
-            delete "#{prefix}/ondemandvm/#{uuid}"
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v1/poolreset.rb b/spec/integration/api/v1/poolreset.rb
deleted file mode 100644
index dfb7f18..0000000
--- a/spec/integration/api/v1/poolreset.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-
-  after(:each) do
-    Vmpooler::API.reset!
-  end
-
-  let(:config) {
-    {
-      config: {
-        'site_name' => 'test pooler',
-        'vm_lifetime_auth' => 2,
-        'experimental_features' => true
-      },
-      pools: [
-        {'name' => 'pool1', 'size' => 5, 'template' => 'templates/pool1', 'clone_target' => 'default_cluster'},
-        {'name' => 'pool2', 'size' => 10}
-      ],
-      statsd: { 'prefix' => 'stats_prefix'},
-      alias: { 'poolone' => 'pool1' },
-      pool_names: [ 'pool1', 'pool2', 'poolone' ]
-    }
-  }
-
-  describe '/poolreset' do
-    let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
-
-    let(:current_time) { Time.now }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, metrics, nil)
-      app.settings.set :config, auth: false
-      create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
-    end
-
-    describe 'POST /poolreset' do
-      it 'refreshes ready and pending instances from a pool' do
-        post "#{prefix}/poolreset", '{"pool1":"1"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails on nonexistent pools' do
-        post "#{prefix}/poolreset", '{"poolpoolpool":"1"}'
-        expect_json(ok = false, http = 400)
-      end
-
-      it 'resets multiple pools' do
-        post "#{prefix}/poolreset", '{"pool1":"1","pool2":"1"}'
-        expect_json(ok = true, http = 201)
-
-        expected = { ok: true }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails when not all pools exist' do
-        post "#{prefix}/poolreset", '{"pool1":"1","pool3":"1"}'
-        expect_json(ok = false, http = 400)
-
-        expected = {
-          ok: false,
-          bad_pools: ['pool3']
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      context 'with experimental features disabled' do
-        before(:each) do
-          config[:config]['experimental_features'] = false
-        end
-
-        it 'should return 405' do
-          post "#{prefix}/poolreset", '{"pool1":"1"}'
-          expect_json(ok = false, http = 405)
-
-          expected = { ok: false }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        end
-      end
-
-      it 'should return 400 for invalid json' do
-        post "#{prefix}/poolreset", '{"pool1":"1}'
-        expect_json(ok = false, http = 400)
-
-        expected = { ok: false }
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'should return 400 with a bad pool name' do
-        post "#{prefix}/poolreset", '{"pool11":"1"}'
-        expect_json(ok = false, http = 400)
-
-        expected = { ok: false }
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'should return 404 when there is no payload' do
-        post "#{prefix}/poolreset"
-        expect_json(ok = false, http = 404)
-
-        expected = { ok: false }
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v1/status_spec.rb b/spec/integration/api/v1/status_spec.rb
deleted file mode 100644
index 76e65df..0000000
--- a/spec/integration/api/v1/status_spec.rb
+++ /dev/null
@@ -1,247 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-def has_set_tag?(vm, tag, value)
-  value == redis.hget("vmpooler__vm__#{vm}", "tag:#{tag}")
-end
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-
-  # Added to ensure no leakage in rack state from previous tests.
-  # Removes all routes, filters, middleware and extension hooks from the current class
-  # https://rubydoc.info/gems/sinatra/Sinatra/Base#reset!-class_method 
-  before(:each) do
-    app.reset!
-  end
-
-  describe 'status and metrics endpoints' do
-    let(:prefix) { '/api/v1' }
-
-    let(:config) {
-      {
-        config: {
-          'site_name' => 'test pooler',
-          'vm_lifetime_auth' => 2,
-        },
-        pools: [
-          {'name' => 'pool1', 'size' => 5, 'alias' => ['poolone', 'poolun']},
-          {'name' => 'pool2', 'size' => 10},
-          {'name' => 'pool3', 'size' => 10, 'alias' => 'NotArray'}
-        ]
-      }
-    }
-
-    let(:current_time) { Time.now }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, nil, nil)
-      app.settings.set :config, auth: false
-      create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
-    end
-
-    describe 'GET /status' do
-      it 'returns the configured maximum size for each pool' do
-        get "#{prefix}/status/"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"]["pool1"]["max"]).to be(5)
-        expect(result["pools"]["pool2"]["max"]).to be(10)
-      end
-
-      it 'returns the number of ready vms for each pool' do
-        3.times {|i| create_ready_vm("pool1", "vm-#{i}", redis) }
-        get "#{prefix}/status/"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"]["pool1"]["ready"]).to be(3)
-        expect(result["pools"]["pool2"]["ready"]).to be(0)
-      end
-
-      it 'returns the number of running vms for each pool' do
-        3.times {|i| create_running_vm("pool1", "vm-#{i}", redis) }
-        4.times {|i| create_running_vm("pool2", "vm-#{i}", redis) }
-
-        get "#{prefix}/status/"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"]["pool1"]["running"]).to be(3)
-        expect(result["pools"]["pool2"]["running"]).to be(4)
-      end
-
-      it 'returns the number of pending vms for each pool' do
-        3.times {|i| create_pending_vm("pool1", "vm-#{i}", redis) }
-        4.times {|i| create_pending_vm("pool2", "vm-#{i}", redis) }
-
-        get "#{prefix}/status/"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"]["pool1"]["pending"]).to be(3)
-        expect(result["pools"]["pool2"]["pending"]).to be(4)
-      end
-
-      it 'returns aliases if configured in the pool' do
-        get "#{prefix}/status/"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"]["pool1"]["alias"]).to eq(['poolone', 'poolun'])
-        expect(result["pools"]["pool2"]["alias"]).to be(nil)
-        expect(result["pools"]["pool3"]["alias"]).to eq('NotArray')
-      end
-
-      it '(for v1 backwards compatibility) lists any empty pools in the status section' do
-        get "#{prefix}/status/"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["status"]["empty"].sort).to eq(["pool1", "pool2", "pool3"])
-      end
-    end
-    describe 'GET /status with view query parameter' do
-      it 'returns capacity when specified' do
-        get "#{prefix}/status?view=capacity"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["capacity"]).to_not be(nil)
-        expect(result["queue"]).to be(nil)
-        expect(result["clone"]).to be(nil)
-        expect(result["boot"]).to be(nil)
-        expect(result["pools"]).to be(nil)
-        expect(result["status"]).to_not be(nil)
-      end
-      it 'returns pools and queue when specified' do
-        get "#{prefix}/status?view=pools,queue"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["capacity"]).to be(nil)
-        expect(result["queue"]).to_not be(nil)
-        expect(result["clone"]).to be(nil)
-        expect(result["boot"]).to be(nil)
-        expect(result["pools"]).to_not be(nil)
-        expect(result["status"]).to_not be(nil)
-      end
-      it 'does nothing with invalid view names' do
-        get "#{prefix}/status?view=clone,boot,invalidThingToView"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["capacity"]).to be(nil)
-        expect(result["queue"]).to be(nil)
-        expect(result["clone"]).to_not be(nil)
-        expect(result["boot"]).to_not be(nil)
-        expect(result["pools"]).to be(nil)
-        expect(result["status"]).to_not be(nil)
-      end
-      it 'returns everything when view is not specified' do
-        get "#{prefix}/status"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["capacity"]).to_not be(nil)
-        expect(result["queue"]).to_not be(nil)
-        expect(result["clone"]).to_not be(nil)
-        expect(result["boot"]).to_not be(nil)
-        expect(result["pools"]).to_not be(nil)
-        expect(result["status"]).to_not be(nil)
-      end
-      it 'returns everything when view is alone' do
-        get "#{prefix}/status?view"
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["capacity"]).to_not be(nil)
-        expect(result["queue"]).to_not be(nil)
-        expect(result["clone"]).to_not be(nil)
-        expect(result["boot"]).to_not be(nil)
-        expect(result["pools"]).to_not be(nil)
-        expect(result["status"]).to_not be(nil)
-      end
-      it 'returns status only when view is empty' do
-        get "#{prefix}/status?view="
-
-        # of course /status doesn't conform to the weird standard everything else uses...
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["capacity"]).to be(nil)
-        expect(result["queue"]).to be(nil)
-        expect(result["clone"]).to be(nil)
-        expect(result["boot"]).to be(nil)
-        expect(result["pools"]).to be(nil)
-        expect(result["status"]).to_not be(nil)
-      end
-    end
-
-    describe 'GET /poolstat' do
-      it 'returns empty list when pool is not set' do
-        get "#{prefix}/poolstat"
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result  == {})
-      end
-      it 'returns empty list when pool is not found' do
-        get "#{prefix}/poolstat?pool=unknownpool"
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result  == {})
-      end
-      it 'returns one pool when requesting one with alias' do
-        get "#{prefix}/poolstat?pool=pool1"
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"].size == 1)
-        expect(result["pools"]["pool1"]["ready"]).to eq(0)
-        expect(result["pools"]["pool1"]["max"]).to eq(5)
-        expect(result["pools"]["pool1"]["alias"]).to eq(['poolone', 'poolun'])
-      end
-      it 'returns one pool when requesting one without alias' do
-        get "#{prefix}/poolstat?pool=pool2"
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"].size == 1)
-        expect(result["pools"]["pool2"]["ready"]).to eq(0)
-        expect(result["pools"]["pool2"]["max"]).to eq(10)
-        expect(result["pools"]["pool2"]["alias"]).to be(nil)
-      end
-      it 'returns multiple pools when requesting csv' do
-        get "#{prefix}/poolstat?pool=pool1,pool2"
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        result = JSON.parse(last_response.body)
-        expect(result["pools"].size == 2)
-      end
-    end
-
-    describe 'GET /totalrunning' do
-      it 'returns the number of running VMs' do
-        get "#{prefix}/totalrunning"
-        expect(last_response.header['Content-Type']).to eq('application/json')
-        5.times {|i| create_running_vm("pool1", "vm-#{i}", redis, redis) }
-        5.times {|i| create_running_vm("pool3", "vm-#{i}", redis, redis) }
-        result = JSON.parse(last_response.body)
-        expect(result["running"] == 10)
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v1/token_spec.rb b/spec/integration/api/v1/token_spec.rb
deleted file mode 100644
index 72ab060..0000000
--- a/spec/integration/api/v1/token_spec.rb
+++ /dev/null
@@ -1,210 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-
-  # Added to ensure no leakage in rack state from previous tests.
-  # Removes all routes, filters, middleware and extension hooks from the current class
-  # https://rubydoc.info/gems/sinatra/Sinatra/Base#reset!-class_method 
-  before(:each) do
-    app.reset!
-  end
-
-  describe '/token' do
-    let(:prefix) { '/api/v1' }
-    let(:current_time) { Time.now }
-    let(:config) { { 
-      config: {}
-    } }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, nil, nil)
-    end
-
-    describe 'GET /token' do
-      context '(auth not configured)' do
-        let(:config) { { 
-          config: {},
-          auth: false 
-        } }
-
-        it 'returns a 404' do
-          get "#{prefix}/token"
-          expect_json(ok = false, http = 404)
-        end
-      end
-
-      context '(auth configured)' do
-        let(:config) {
-          {
-            config: {},
-            auth: {
-              'provider' => 'dummy'
-            }
-          }
-        }
-        let(:username_str) { 'admin' }
-        let(:password_str) { 's3cr3t' }
-
-        it 'returns a 401 if not authed' do
-          get "#{prefix}/token"
-          expect_json(ok = false, http = 401)
-        end
-
-        it 'returns a list of tokens if authed' do
-          create_token "abc", "admin", current_time
-
-          authorize 'admin', 's3cr3t'
-          get "#{prefix}/token"
-          expect_json(ok = true, http = 200)
-
-          expect(JSON.parse(last_response.body)['abc']['created']).to eq(current_time.to_s)
-        end
-      end
-    end
-
-    describe 'POST /token' do
-      context '(auth not configured)' do
-        let(:config) { { 
-          config: {}, 
-          auth: false 
-        } }
-
-        it 'returns a 404' do
-          post "#{prefix}/token"
-          expect_json(ok = false, http = 404)
-        end
-      end
-
-      context '(auth configured)' do
-        let(:config) {
-          {
-            config: {},
-            auth: {
-              'provider' => 'dummy'
-            }
-          }
-        }
-
-        it 'returns a 401 if not authed' do
-          post "#{prefix}/token"
-          expect_json(ok = false, http = 401)
-        end
-
-        it 'returns a newly created token if authed' do
-          authorize 'admin', 's3cr3t'
-          post "#{prefix}/token"
-          expect_json(ok = true, http = 200)
-
-          returned_token = JSON.parse(last_response.body)['token']
-          expect(returned_token.length).to be(32)
-          expect(get_token_data(returned_token)['user']).to eq("admin")
-        end
-      end
-    end
-  end
-
-  describe '/token/:token' do
-    let(:prefix) { '/api/v1' }
-    let(:current_time) { Time.now }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, nil, nil)
-      app.settings.set :config, config
-      app.settings.set :redis, redis
-    end
-
-    def create_vm_for_token(token, pool, vm)
-      redis.sadd("vmpooler__running__#{pool}", vm)
-      redis.hset("vmpooler__vm__#{vm}", "token:token", token)
-    end
-
-    describe 'GET /token/:token' do
-      context '(auth not configured)' do
-        let(:config) { { 
-          config: {},
-          auth: false 
-        } }
-
-        it 'returns a 404' do
-          get "#{prefix}/token/this"
-          expect_json(ok = false, http = 404)
-        end
-      end
-
-      context '(auth configured)' do
-        let(:config) { {
-          config: {},
-          auth: true,
-          pools: [
-            {'name' => 'pool1', 'size' => 5}
-          ]
-        } }
-
-        it 'returns a token' do
-          create_token "mytoken", "admin", current_time
-          create_vm_for_token "mytoken", "pool1", "vmhostname"
-
-          get "#{prefix}/token/mytoken"
-          expect_json(ok = true, http = 200)
-
-          expect(JSON.parse(last_response.body)['ok']).to eq(true)
-          expect(JSON.parse(last_response.body)['mytoken']['user']).to eq('admin')
-          expect(JSON.parse(last_response.body)['mytoken']['vms']['running']).to include('vmhostname')
-        end
-      end
-    end
-
-    describe 'DELETE /token/:token' do
-      context '(auth not configured)' do
-        let(:config) { { 
-          config: {},
-          auth: false
-        } }
-
-        it 'returns a 404' do
-          delete "#{prefix}/token/this"
-          expect_json(ok = false, http = 404)
-        end
-      end
-
-      context '(auth configured)' do
-        let(:config) {
-          {
-            config: {},
-            auth: {
-              'provider' => 'dummy'
-            }
-          }
-        }
-
-        it 'returns a 401 if not authed' do
-          delete "#{prefix}/token/this"
-          expect_json(ok = false, http = 401)
-        end
-
-        it 'deletes a token if authed' do
-          create_token("mytoken", "admin", current_time)
-          authorize 'admin', 's3cr3t'
-
-          delete "#{prefix}/token/mytoken"
-          expect_json(ok = true, http = 200)
-        end
-
-        it 'fails if token does not exist' do
-          authorize 'admin', 's3cr3t'
-
-          delete "#{prefix}/token/missingtoken"
-          expect_json(ok = false, http = 401)  # TODO: should this be 404?
-        end
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v1/vm_hostname_spec.rb b/spec/integration/api/v1/vm_hostname_spec.rb
deleted file mode 100644
index ff5f7a3..0000000
--- a/spec/integration/api/v1/vm_hostname_spec.rb
+++ /dev/null
@@ -1,352 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-def has_set_tag?(vm, tag, value)
-  value == redis.hget("vmpooler__vm__#{vm}", "tag:#{tag}")
-end
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-
-  # Added to ensure no leakage in rack state from previous tests.
-  # Removes all routes, filters, middleware and extension hooks from the current class
-  # https://rubydoc.info/gems/sinatra/Sinatra/Base#reset!-class_method 
-  before(:each) do
-    app.reset!
-  end
-
-  describe '/vm/:hostname' do
-    let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
-
-    let(:config) {
-      {
-        config: {
-          'site_name' => 'test pooler',
-          'vm_lifetime_auth' => 2,
-
-        },
-        pools: [
-          {'name' => 'pool1', 'size' => 5},
-          {'name' => 'pool2', 'size' => 10}
-        ],
-        alias: { 'poolone' => 'pool1' },
-        auth: false
-      }
-    }
-
-    let(:current_time) { Time.now }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, metrics, nil)
-      create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
-    end
-
-    describe 'PUT /vm/:hostname' do
-      it 'allows tags to be set' do
-        create_vm('testhost', redis)
-        put "#{prefix}/vm/testhost", '{"tags":{"tested_by":"rspec"}}'
-        expect_json(ok = true, http = 200)
-
-        expect has_set_tag?('testhost', 'tested_by', 'rspec')
-      end
-
-      it 'skips empty tags' do
-        create_vm('testhost', redis)
-        put "#{prefix}/vm/testhost", '{"tags":{"tested_by":""}}'
-        expect_json(ok = true, http = 200)
-
-        expect !has_set_tag?('testhost', 'tested_by', '')
-      end
-
-      it 'does not set tags if request body format is invalid' do
-        create_vm('testhost', redis)
-        put "#{prefix}/vm/testhost", '{"tags":{"tested"}}'
-        expect_json(ok = false, http = 400)
-
-        expect !has_set_tag?('testhost', 'tested', '')
-      end
-
-      context '(allowed_tags configured)' do
-        it 'fails if specified tag is not in allowed_tags array' do
-          app.settings.set :config,
-             { :config => { 'allowed_tags' => ['created_by', 'project', 'url'] } }
-
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"tags":{"created_by":"rspec","tested_by":"rspec"}}'
-          expect_json(ok = false, http = 400)
-
-          expect !has_set_tag?('testhost', 'tested_by', 'rspec')
-        end
-      end
-
-      context '(tagfilter configured)' do
-        before(:each) do
-          app.settings.set :config, tagfilter: { 'url' => '(.*)\/' }
-        end
-
-        it 'correctly filters tags' do
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"tags":{"url":"foo.com/something.html"}}'
-          expect_json(ok = true, http = 200)
-
-          expect has_set_tag?('testhost', 'url', 'foo.com')
-        end
-
-        it "doesn't eat tags not matching filter" do
-          create_vm('testhost', redis)
-          put "#{prefix}/vm/testhost", '{"tags":{"url":"foo.com"}}'
-          expect_json(ok = true, http = 200)
-
-          expect has_set_tag?('testhost', 'url', 'foo.com')
-        end
-      end
-
-      context '(auth not configured)' do
-        before(:each) do
-          app.settings.set :config, auth: false
-        end
-
-        it 'allows VM lifetime to be modified without a token' do
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"lifetime":"1"}'
-          expect_json(ok = true, http = 200)
-
-          vm = fetch_vm('testhost')
-          expect(vm['lifetime'].to_i).to eq(1)
-        end
-
-        it 'does not allow a lifetime to be 0' do
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"lifetime":"0"}'
-          expect_json(ok = false, http = 400)
-
-          vm = fetch_vm('testhost')
-          expect(vm['lifetime']).to be_nil
-        end
-
-        it 'does not enforce a lifetime' do
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"lifetime":"20000"}'
-          expect_json(ok = true, http = 200)
-
-          vm = fetch_vm('testhost')
-          expect(vm['lifetime']).to eq("20000")
-        end
-
-        it 'does not allow a lifetime to be initially past config max_lifetime_upper_limit' do
-          app.settings.set :config,
-                           { :config => { 'max_lifetime_upper_limit' => 168 } }
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"lifetime":"200"}'
-          expect_json(ok = false, http = 400)
-
-          vm = fetch_vm('testhost')
-          expect(vm['lifetime']).to be_nil
-        end
-
-#       it 'does not allow a lifetime to be extended past config 168' do
-#         app.settings.set :config,
-#                          { :config => { 'max_lifetime_upper_limit' => 168 } }
-#         create_vm('testhost', redis)
-#
-#         set_vm_data('testhost', "checkout", (Time.now - (69*60*60)), redis)
-#         puts redis.hget("vmpooler__vm__testhost", 'checkout')
-#         put "#{prefix}/vm/testhost", '{"lifetime":"100"}'
-#         expect_json(ok = false, http = 400)
-#
-#         vm = fetch_vm('testhost')
-#         expect(vm['lifetime']).to be_nil
-#       end
-      end
-
-      context '(auth configured)' do
-        before(:each) do
-          app.settings.set :config, auth: true
-        end
-
-        it 'allows VM lifetime to be modified with a token' do
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"lifetime":"1"}', {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = true, http = 200)
-
-          vm = fetch_vm('testhost')
-          expect(vm['lifetime'].to_i).to eq(1)
-        end
-
-        it 'does not allows VM lifetime to be modified without a token' do
-          create_vm('testhost', redis)
-
-          put "#{prefix}/vm/testhost", '{"lifetime":"1"}'
-          expect_json(ok = false, http = 401)
-        end
-      end
-    end
-
-    describe 'DELETE /vm/:hostname' do
-      context '(auth not configured)' do
-        it 'does not delete a non-existant VM' do
-          delete "#{prefix}/vm/testhost"
-          expect_json(ok = false, http = 404)
-        end
-
-        it 'deletes an existing VM' do
-          create_running_vm('pool1', 'testhost', redis)
-          expect fetch_vm('testhost')
-
-          delete "#{prefix}/vm/testhost"
-          expect_json(ok = true, http = 200)
-          expect !fetch_vm('testhost')
-        end
-      end
-
-      context '(auth configured)' do
-        before(:each) do
-          app.settings.set :config, auth: true
-        end
-
-        context '(checked-out without token)' do
-          it 'deletes a VM without supplying a token' do
-            create_running_vm('pool1', 'testhost', redis)
-            expect fetch_vm('testhost')
-
-            delete "#{prefix}/vm/testhost"
-            expect_json(ok = true, http = 200)
-            expect !fetch_vm('testhost')
-          end
-        end
-
-        context '(checked-out with token)' do
-          it 'fails to delete a VM without supplying a token' do
-            create_running_vm('pool1', 'testhost', redis, 'abcdefghijklmnopqrstuvwxyz012345')
-            expect fetch_vm('testhost')
-
-            delete "#{prefix}/vm/testhost"
-            expect_json(ok = false, http = 401)
-            expect fetch_vm('testhost')
-          end
-
-          it 'deletes a VM when token is supplied' do
-            create_running_vm('pool1', 'testhost', redis, 'abcdefghijklmnopqrstuvwxyz012345')
-            expect fetch_vm('testhost')
-
-            delete "#{prefix}/vm/testhost", "", {
-              'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-            }
-            expect_json(ok = true, http = 200)
-
-            expect !fetch_vm('testhost')
-          end
-        end
-      end
-    end
-
-    describe 'POST /vm/:hostname/snapshot' do
-      context '(auth not configured)' do
-        it 'creates a snapshot' do
-          create_vm('testhost', redis)
-          post "#{prefix}/vm/testhost/snapshot"
-          expect_json(ok = true, http = 202)
-          expect(JSON.parse(last_response.body)['testhost']['snapshot'].length).to be(32)
-        end
-      end
-
-      context '(auth configured)' do
-        before(:each) do
-          app.settings.set :config, auth: true
-        end
-
-        it 'returns a 401 if not authed' do
-          post "#{prefix}/vm/testhost/snapshot"
-          expect_json(ok = false, http = 401)
-          expect !has_vm_snapshot?('testhost', redis)
-        end
-
-        it 'creates a snapshot if authed' do
-          create_vm('testhost', redis)
-          snapshot_vm('testhost', 'testsnapshot', redis)
-
-          post "#{prefix}/vm/testhost/snapshot", "", {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = true, http = 202)
-          expect(JSON.parse(last_response.body)['testhost']['snapshot'].length).to be(32)
-          expect has_vm_snapshot?('testhost', redis)
-        end
-      end
-    end
-
-    describe 'POST /vm/:hostname/snapshot/:snapshot' do
-      context '(auth not configured)' do
-        it 'reverts to a snapshot' do
-          create_vm('testhost', redis)
-          snapshot_vm('testhost', 'testsnapshot', redis)
-
-          post "#{prefix}/vm/testhost/snapshot/testsnapshot"
-          expect_json(ok = true, http = 202)
-          expect vm_reverted_to_snapshot?('testhost', redis, 'testsnapshot')
-        end
-
-        it 'fails if the specified snapshot does not exist' do
-          create_vm('testhost', redis)
-
-          post "#{prefix}/vm/testhost/snapshot/testsnapshot", "", {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = false, http = 404)
-          expect !vm_reverted_to_snapshot?('testhost', redis, 'testsnapshot')
-        end
-      end
-
-      context '(auth configured)' do
-        before(:each) do
-          app.settings.set :config, auth: true
-        end
-
-        it 'returns a 401 if not authed' do
-          create_vm('testhost', redis)
-          snapshot_vm('testhost', 'testsnapshot', redis)
-
-          post "#{prefix}/vm/testhost/snapshot/testsnapshot"
-          expect_json(ok = false, http = 401)
-          expect !vm_reverted_to_snapshot?('testhost', redis, 'testsnapshot')
-        end
-
-        it 'fails if authed and the specified snapshot does not exist' do
-          create_vm('testhost', redis)
-
-          post "#{prefix}/vm/testhost/snapshot/testsnapshot", "", {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = false, http = 404)
-          expect !vm_reverted_to_snapshot?('testhost', redis, 'testsnapshot')
-        end
-
-        it 'reverts to a snapshot if authed' do
-          create_vm('testhost', redis)
-          snapshot_vm('testhost', 'testsnapshot', redis)
-
-          post "#{prefix}/vm/testhost/snapshot/testsnapshot", "", {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = true, http = 202)
-          expect vm_reverted_to_snapshot?('testhost', redis, 'testsnapshot')
-        end
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v1/vm_spec.rb b/spec/integration/api/v1/vm_spec.rb
deleted file mode 100644
index 88d8b57..0000000
--- a/spec/integration/api/v1/vm_spec.rb
+++ /dev/null
@@ -1,435 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-
-  # Added to ensure no leakage in rack state from previous tests.
-  # Removes all routes, filters, middleware and extension hooks from the current class
-  # https://rubydoc.info/gems/sinatra/Sinatra/Base#reset!-class_method 
-  before(:each) do
-    app.reset!
-  end
-
-  describe '/vm' do
-    let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
-    let(:config) {
-      {
-        config: {
-          'site_name' => 'test pooler',
-          'vm_lifetime_auth' => 2
-        },
-        pools: [
-          {'name' => 'pool1', 'size' => 5},
-          {'name' => 'pool2', 'size' => 10},
-          {'name' => 'pool3', 'size' => 10}
-        ],
-        statsd: { 'prefix' => 'stats_prefix'},
-        alias: { 'poolone' => ['pool1'] },
-        pool_names: [ 'pool1', 'pool2', 'pool3', 'poolone', 'genericpool' ]
-      }
-    }
-    let(:current_time) { Time.now }
-    let(:vmname) { 'abcdefghijkl' }
-    let(:checkoutlock) { Mutex.new }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, metrics, nil)
-      app.settings.set :config, auth: false
-      app.settings.set :checkoutlock, checkoutlock
-      create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
-    end
-
-    describe 'GET /vm/:hostname' do
-      it 'returns correct information on a running vm' do
-        create_running_vm 'pool1', vmname, redis
-        expect(TCPSocket).to receive(:gethostbyname).and_raise(RuntimeError)
-        get "#{prefix}/vm/#{vmname}"
-        expect_json(ok = true, http = 200)
-        response_body = (JSON.parse(last_response.body)[vmname])
-
-        expect(response_body["template"]).to eq("pool1")
-        expect(response_body["lifetime"]).to eq(0)
-        expect(response_body["running"]).to be >= 0
-        expect(response_body["remaining"]).to be <= 0
-        expect(response_body["start_time"]).to eq(current_time.to_datetime.rfc3339)
-        expect(response_body["end_time"]).to eq(current_time.to_datetime.rfc3339)
-        expect(response_body["state"]).to eq("running")
-        expect(response_body["ip"]).to eq("")
-        expect(response_body["host"]).to eq("host1")
-      end
-    end
-
-    describe 'POST /vm' do
-
-      let(:socket) { double('socket') }
-      it 'returns a single VM' do
-        create_ready_vm 'pool1', vmname, redis
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"1"}'
-        expect_json(ok = true, http = 200)
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: vmname
-          }
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'returns a single VM for an alias' do
-        create_ready_vm 'pool1', vmname, redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"poolone":"1"}'
-        expect_json(ok = true, http = 200)
-
-        expected = {
-          ok: true,
-          poolone: {
-            hostname: vmname
-          }
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails on nonexistant pools' do
-        post "#{prefix}/vm", '{"poolpoolpool":"1"}'
-        expect_json(ok = false, http = 404)
-      end
-
-      it 'returns 503 for empty pool when aliases are not defined' do
-        app.settings.config.delete(:alias)
-        app.settings.config[:pool_names] = ['pool1', 'pool2']
-
-        create_ready_vm 'pool1', vmname, redis
-        post "#{prefix}/vm/pool1"
-        post "#{prefix}/vm/pool1"
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns 503 for empty pool referenced by alias' do
-        create_ready_vm 'pool2', vmname, redis
-        post "#{prefix}/vm/poolone"
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns multiple VMs' do
-        create_ready_vm 'pool1', vmname, redis
-        create_ready_vm 'pool2', 'qrstuvwxyz012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"1","pool2":"1"}'
-        expect_json(ok = true, http = 200)
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: vmname
-          },
-          pool2: {
-            hostname: 'qrstuvwxyz012345'
-          }
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'returns multiple VMs even when multiple instances from the same pool are requested' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '2abcdefghijklmnop', redis
-        create_ready_vm 'pool2', 'qrstuvwxyz012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"2","pool2":"1"}'
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: [ '1abcdefghijklmnop', '2abcdefghijklmnop' ]
-          },
-          pool2: {
-            hostname: 'qrstuvwxyz012345'
-          }
-        }
-
-        result = JSON.parse(last_response.body)
-        expect(result['ok']).to eq(true)
-        expect(result['pool1']['hostname']).to include('1abcdefghijklmnop', '2abcdefghijklmnop')
-        expect(result['pool2']['hostname']).to eq('qrstuvwxyz012345')
-
-        expect_json(ok = true, http = 200)
-      end
-
-      it 'returns multiple VMs even when multiple instances from multiple pools are requested' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '2abcdefghijklmnop', redis
-        create_ready_vm 'pool2', '1qrstuvwxyz012345', redis
-        create_ready_vm 'pool2', '2qrstuvwxyz012345', redis
-        create_ready_vm 'pool2', '3qrstuvwxyz012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"2","pool2":"3"}'
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: [ '1abcdefghijklmnop', '2abcdefghijklmnop' ]
-          },
-          pool2: {
-            hostname: [ '1qrstuvwxyz012345', '2qrstuvwxyz012345', '3qrstuvwxyz012345' ]
-          }
-        }
-
-        result = JSON.parse(last_response.body)
-        expect(result['ok']).to eq(true)
-        expect(result['pool1']['hostname']).to include('1abcdefghijklmnop', '2abcdefghijklmnop')
-        expect(result['pool2']['hostname']).to include('1qrstuvwxyz012345', '2qrstuvwxyz012345', '3qrstuvwxyz012345')
-
-        expect_json(ok = true, http = 200)
-      end
-
-      it 'returns VMs from multiple backend pools requested by an alias' do
-        Vmpooler::API.settings.config[:alias]['genericpool'] = ['pool1', 'pool2', 'pool3']
-
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-        create_ready_vm 'pool2', '2abcdefghijklmnop', redis
-        create_ready_vm 'pool3', '1qrstuvwxyz012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"genericpool":"3"}'
-
-        expected = {
-          ok: true,
-          genericpool: {
-            hostname: [ '1abcdefghijklmnop', '2abcdefghijklmnop', '1qrstuvwxyz012345' ]
-          }
-        }
-
-        result = JSON.parse(last_response.body)
-        expect(result['ok']).to eq(true)
-        expect(result['genericpool']['hostname']).to include('1abcdefghijklmnop', '2abcdefghijklmnop', '1qrstuvwxyz012345')
-
-        expect_json(ok = true, http = 200)
-      end
-
-      it 'returns the first VM that was moved to the ready state when checking out a VM' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '2abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '3abcdefghijklmnop', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"1"}'
-
-        expected = {
-          ok: true,
-          "pool1": {
-            "hostname": "1abcdefghijklmnop"
-          }
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = true, http = 200)
-      end
-
-      it 'fails when not all requested vms can be allocated' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-
-        post "#{prefix}/vm", '{"pool1":"1","pool2":"1"}'
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns any checked out vms to their pools when not all requested vms can be allocated' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"1","pool2":"1"}'
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-
-        expect(pool_has_ready_vm?('pool1', '1abcdefghijklmnop', redis)).to eq(true)
-      end
-
-      it 'fails when not all requested vms can be allocated, when requesting multiple instances from a pool' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-
-        post "#{prefix}/vm", '{"pool1":"2","pool2":"1"}'
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns any checked out vms to their pools when not all requested vms can be allocated, when requesting multiple instances from a pool' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"2","pool2":"1"}'
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-
-        expect(pool_has_ready_vm?('pool1', '1abcdefghijklmnop', redis)).to eq(true)
-      end
-
-      it 'fails when not all requested vms can be allocated, when requesting multiple instances from multiple pools' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-
-        post "#{prefix}/vm", '{"pool1":"2","pool2":"3"}'
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns any checked out vms to their pools when not all requested vms can be allocated, when requesting multiple instances from multiple pools' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '2abcdefghijklmnop', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"2","pool2":"3"}'
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-
-        expect(pool_has_ready_vm?('pool1', '1abcdefghijklmnop', redis)).to eq(true)
-        expect(pool_has_ready_vm?('pool1', '2abcdefghijklmnop', redis)).to eq(true)
-      end
-
-      it 'returns the second VM when the first fails to respond' do
-        create_ready_vm 'pool1', vmname, redis
-        create_ready_vm 'pool1', "2#{vmname}", redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with(vmname, nil).and_raise('mockerror')
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with("2#{vmname}", nil).and_return(socket)
-
-        post "#{prefix}/vm", '{"pool1":"1"}'
-        expect_json(ok = true, http = 200)
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: "2#{vmname}"
-          }
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-
-        expect(pool_has_ready_vm?('pool1', vmname, redis)).to be false
-      end
-
-      context '(auth not configured)' do
-        it 'does not extend VM lifetime if auth token is provided' do
-          app.settings.set :config, auth: false
-
-          create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-          allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-          post "#{prefix}/vm", '{"pool1":"1"}', {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = true, http = 200)
-
-          expected = {
-            ok: true,
-            pool1: {
-              hostname: 'abcdefghijklmnop'
-            }
-          }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-
-          vm = fetch_vm('abcdefghijklmnop')
-          expect(vm['lifetime']).to be_nil
-        end
-      end
-
-      context '(auth configured)' do
-        it 'extends VM lifetime if auth token is provided' do
-          app.settings.set :config, auth: true
-
-          create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-          allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-          post "#{prefix}/vm", '{"pool1":"1"}', {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = true, http = 200)
-
-          expected = {
-            ok: true,
-            pool1: {
-              hostname: 'abcdefghijklmnop'
-            }
-          }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-
-          vm = fetch_vm('abcdefghijklmnop')
-          expect(vm['lifetime'].to_i).to eq(2)
-        end
-
-        it 'does not extend VM lifetime if auth token is not provided' do
-          app.settings.set :config, auth: true
-          create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-          allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-          post "#{prefix}/vm", '{"pool1":"1"}'
-          expect_json(ok = true, http = 200)
-
-          expected = {
-            ok: true,
-            pool1: {
-              hostname: 'abcdefghijklmnop'
-            }
-          }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-
-          vm = fetch_vm('abcdefghijklmnop')
-          expect(vm['lifetime']).to be_nil
-        end
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v1/vm_template_spec.rb b/spec/integration/api/v1/vm_template_spec.rb
deleted file mode 100644
index 83097e8..0000000
--- a/spec/integration/api/v1/vm_template_spec.rb
+++ /dev/null
@@ -1,327 +0,0 @@
-require 'spec_helper'
-require 'rack/test'
-
-describe Vmpooler::API::V1 do
-  include Rack::Test::Methods
-
-  def app()
-    Vmpooler::API
-  end
-
-  # Added to ensure no leakage in rack state from previous tests.
-  # Removes all routes, filters, middleware and extension hooks from the current class
-  # https://rubydoc.info/gems/sinatra/Sinatra/Base#reset!-class_method 
-  before(:each) do
-    app.reset!
-  end
-
-  describe '/vm/:template' do
-    let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
-    let(:config) {
-      {
-        config: {
-          'site_name' => 'test pooler',
-          'vm_lifetime_auth' => 2,
-        },
-        providers: { vsphere: {} },
-        pools: [
-          {'name' => 'pool1', 'size' => 5},
-          {'name' => 'pool2', 'size' => 10},
-          {'name' => 'poolone', 'size' => 0}
-        ],
-        statsd: { 'prefix' => 'stats_prefix'},
-        alias: { 'poolone' => 'pool1' },
-        pool_names: [ 'pool1', 'pool2', 'poolone' ]
-      }
-    }
-
-    let(:current_time) { Time.now }
-    let(:socket) { double('socket') }
-    let(:checkoutlock) { Mutex.new }
-
-    before(:each) do
-      expect(app).to receive(:run!).once
-      app.execute([:api], config, redis, metrics, nil)
-      app.settings.set :config, auth: false
-      app.settings.set :checkoutlock, checkoutlock
-      create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
-    end
-
-    describe 'POST /vm/:template' do
-      it 'returns a single VM' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm/pool1", ''
-        expect_json(ok = true, http = 200)
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: 'abcdefghijklmnop'
-          }
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'returns a single VM for an alias' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm/poolone", ''
-
-        expected = {
-          ok: true,
-          poolone: {
-            hostname: 'abcdefghijklmnop'
-          }
-        }
-        expect_json(ok = true, http = 200)
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'fails on nonexistant pools' do
-        post "#{prefix}/vm/poolpoolpool", ''
-        expect_json(ok = false, http = 404)
-      end
-
-      it 'returns 503 for empty pool when aliases are not defined' do
-        app.settings.config.delete(:alias)
-        app.settings.config[:pool_names] = ['pool1', 'pool2']
-
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-        post "#{prefix}/vm/pool1"
-        post "#{prefix}/vm/pool1"
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns 503 for empty pool referenced by alias' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-        post "#{prefix}/vm/poolone"
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns multiple VMs' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-        create_ready_vm 'pool2', 'qrstuvwxyz012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm/pool1+pool2", ''
-        expect_json(ok = true, http = 200)
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: 'abcdefghijklmnop'
-          },
-          pool2: {
-            hostname: 'qrstuvwxyz012345'
-          }
-        }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-      end
-
-      it 'returns multiple VMs even when multiple instances from multiple pools are requested' do
-        create_ready_vm 'pool1', '1abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '2abcdefghijklmnop', redis
-
-        create_ready_vm 'pool2', '1qrstuvwxyz012345', redis
-        create_ready_vm 'pool2', '2qrstuvwxyz012345', redis
-        create_ready_vm 'pool2', '3qrstuvwxyz012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm/pool1+pool1+pool2+pool2+pool2", ''
-
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: [ '1abcdefghijklmnop', '2abcdefghijklmnop' ]
-          },
-          pool2: {
-            hostname: [ '1qrstuvwxyz012345', '2qrstuvwxyz012345', '3qrstuvwxyz012345' ]
-          }
-        }
-
-        result = JSON.parse(last_response.body)
-        expect(result['ok']).to eq(true)
-        expect(result['pool1']['hostname']).to include('1abcdefghijklmnop', '2abcdefghijklmnop')
-        expect(result['pool2']['hostname']).to include('1qrstuvwxyz012345', '2qrstuvwxyz012345', '3qrstuvwxyz012345')
-        expect_json(ok = true, http = 200)
-      end
-
-      it 'fails when not all requested vms can be allocated' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-        post "#{prefix}/vm/pool1+pool2", ''
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns any checked out vms to their pools when not all requested vms can be allocated' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm/pool1+pool2", ''
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-
-        expect(pool_has_ready_vm?('pool1', 'abcdefghijklmnop', redis)).to eq(true)
-      end
-
-      it 'fails when not all requested vms can be allocated, when requesting multiple instances from a pool' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '0123456789012345', redis
-
-        post "#{prefix}/vm/pool1+pool1+pool2", ''
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns any checked out vms to their pools when not all requested vms can be allocated, when requesting multiple instances from a pool' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-        create_ready_vm 'pool1', '0123456789012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm/pool1+pool1+pool2", ''
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-
-        expect(pool_has_ready_vm?('pool1', 'abcdefghijklmnop', redis)).to eq(true)
-        expect(pool_has_ready_vm?('pool1', '0123456789012345', redis)).to eq(true)
-      end
-
-      it 'fails when not all requested vms can be allocated, when requesting multiple instances from multiple pools' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-        create_ready_vm 'pool2', '0123456789012345', redis
-
-        post "#{prefix}/vm/pool1+pool1+pool2+pool2+pool2", ''
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-      end
-
-      it 'returns any checked out vms to their pools when not all requested vms can be allocated, when requesting multiple instances from multiple pools' do
-        create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-        create_ready_vm 'pool2', '0123456789012345', redis
-
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-        post "#{prefix}/vm/pool1+pool1+pool2+pool2+pool2", ''
-
-        expected = { ok: false }
-
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        expect_json(ok = false, http = 503)
-
-        expect(pool_has_ready_vm?('pool1', 'abcdefghijklmnop', redis)).to eq(true)
-        expect(pool_has_ready_vm?('pool2', '0123456789012345', redis)).to eq(true)
-      end
-
-      context '(auth not configured)' do
-        it 'does not extend VM lifetime if auth token is provided' do
-          app.settings.set :config, auth: false
-
-          create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-          allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-          post "#{prefix}/vm/pool1", '', {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = true, http = 200)
-
-          expected = {
-            ok: true,
-            pool1: {
-              hostname: 'abcdefghijklmnop'
-            }
-          }
-
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-          vm = fetch_vm('abcdefghijklmnop')
-          expect(vm['lifetime']).to be_nil
-        end
-      end
-
-      context '(auth configured)' do
-        it 'extends VM lifetime if auth token is provided' do
-          app.settings.set :config, auth: true
-
-          create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-          allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-          post "#{prefix}/vm/pool1", '', {
-            'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
-          }
-          expect_json(ok = true, http = 200)
-
-          expected = {
-            ok: true,
-            pool1: {
-              hostname: 'abcdefghijklmnop'
-            }
-          }
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-
-          vm = fetch_vm('abcdefghijklmnop')
-          expect(vm['lifetime'].to_i).to eq(2)
-        end
-
-        it 'does not extend VM lifetime if auth token is not provided' do
-          app.settings.set :config, auth: true
-          create_ready_vm 'pool1', 'abcdefghijklmnop', redis
-
-          allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).and_return(socket)
-
-          post "#{prefix}/vm/pool1", ''
-
-          expected = {
-            ok: true,
-            pool1: {
-              hostname: 'abcdefghijklmnop'
-            }
-          }
-          expect_json(ok = true, http = 200)
-
-          expect(last_response.body).to eq(JSON.pretty_generate(expected))
-
-          vm = fetch_vm('abcdefghijklmnop')
-          expect(vm['lifetime']).to be_nil
-        end
-      end
-    end
-  end
-end
diff --git a/spec/integration/api/v2/vm_spec.rb b/spec/integration/api/v2/vm_spec.rb
index b971ba8..411cbb9 100644
--- a/spec/integration/api/v2/vm_spec.rb
+++ b/spec/integration/api/v2/vm_spec.rb
@@ -341,6 +341,28 @@ describe Vmpooler::API::V2 do
         expect(pool_has_ready_vm?('pool1', '2abcdefghijklmnop', redis)).to eq(true)
       end
 
+      it 'returns the second VM when the first fails to respond' do
+        create_ready_vm 'pool1', vmname, redis
+        create_ready_vm 'pool1', "2#{vmname}", redis
+
+        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with(vmname, nil).and_raise('mockerror')
+        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with("2#{vmname}", nil).and_return(socket)
+
+        post "#{prefix}/vm", '{"pool1":"1"}'
+        expect_json(ok = true, http = 200)
+
+        expected = {
+          ok: true,
+          pool1: {
+            hostname: "2#{vmname}"
+          }
+        }
+
+        expect(last_response.body).to eq(JSON.pretty_generate(expected))
+
+        expect(pool_has_ready_vm?('pool1', vmname, redis)).to be false
+      end
+
       context '(auth not configured)' do
         it 'does not extend VM lifetime if auth token is provided' do
           app.settings.set :config, auth: false

From 91248fe23acbbe5ad980ab63691a38f0cb173252 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 23 Feb 2023 15:53:35 -0500
Subject: [PATCH 13/19] Added spec tests for Vmpooler::Dns

---
 lib/vmpooler/dns.rb            |  41 +++++--------
 spec/unit/dns_spec.rb          |  62 ++++++++++++++++++++
 spec/unit/util/parsing_spec.rb | 103 ++-------------------------------
 3 files changed, 83 insertions(+), 123 deletions(-)
 create mode 100644 spec/unit/dns_spec.rb

diff --git a/lib/vmpooler/dns.rb b/lib/vmpooler/dns.rb
index 4534a78..823fe17 100644
--- a/lib/vmpooler/dns.rb
+++ b/lib/vmpooler/dns.rb
@@ -38,13 +38,9 @@ module Vmpooler
       pool = config[:pools].find { |p| p['name'] == pool_name }
       pool_dns_config = pool['dns_plugin']
       dns_configs = config[:dns_configs].keys
-      pool_domain = ''
-
       dns_configs.map do |dns_config_name|
-        pool_domain = config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == pool_dns_config
+        return config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == pool_dns_config
       end
-
-      pool_domain
     end
 
     # Returns the plugin domain for the specified dns config by name
@@ -54,34 +50,30 @@ module Vmpooler
     # @return [String] The domain for the specifid dns config
     def self.get_dns_plugin_domain_by_name(config, name)
       dns_configs = config[:dns_configs].keys
-      plugin_domain = ''
-
       dns_configs.map do |dns_config_name|
-        plugin_domain = config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == name
+        return config[:dns_configs][dns_config_name]['domain'] if dns_config_name.to_s == name
       end
-
-      plugin_domain
     end
 
     # Returns a list of DNS plugin classes specified in the vmpooler configuration
     #
     # @param config [Object] The entire VMPooler config object
-    # @return [Array<String] A list of DNS plugin classes
+    # @return nil || [Array<String>] A list of DNS plugin classes
     def self.get_dns_plugin_config_classes(config)
-      if config[:dns_configs]
-        dns_configs = config[:dns_configs].keys
-        dns_plugins = dns_configs.map do |dns_config_name|
-          if config[:dns_configs][dns_config_name] && config[:dns_configs][dns_config_name]['dns_class']
-            config[:dns_configs][dns_config_name]['dns_class'].to_s
-          else
-            dns_config_name.to_s
-          end
-        end.compact.uniq
+      return nil unless config[:dns_configs]
 
-        # dynamic-dns is not actually a class, it's just used as a value to denote
-        # that dynamic dns is used so no loading or record management is needed
-        dns_plugins.delete('dynamic-dns')
-      end
+      dns_configs = config[:dns_configs].keys
+      dns_plugins = dns_configs.map do |dns_config_name|
+        if config[:dns_configs][dns_config_name] && config[:dns_configs][dns_config_name]['dns_class']
+          config[:dns_configs][dns_config_name]['dns_class'].to_s
+        else
+          dns_config_name.to_s
+        end
+      end.compact.uniq
+
+      # dynamic-dns is not actually a class, it's just used as a value to denote
+      # that dynamic dns is used so no loading or record management is needed
+      dns_plugins.delete('dynamic-dns')
 
       dns_plugins
     end
@@ -93,7 +85,6 @@ module Vmpooler
     def load_from_gems(name = nil)
       require_path = "vmpooler/dns/#{name.gsub('-', '/')}"
       require require_path
-      $logger.log('d', "[*] [dns_manager] Loading DNS plugins from dns_configs: #{name}")
       require_path
     end
   end
diff --git a/spec/unit/dns_spec.rb b/spec/unit/dns_spec.rb
new file mode 100644
index 0000000..3e02704
--- /dev/null
+++ b/spec/unit/dns_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe 'Vmpooler::Dns' do
+  let(:dns_class) { 'mock-dnsservice' }
+  let(:dns_config_name) { 'mock' }
+  let(:pool) { 'pool1' }
+  let(:config) { YAML.load(<<~EOT
+  ---
+  :dns_configs:
+    :mock:
+      dns_class: 'mock'
+      domain: 'example.com'
+  :pools:
+    - name: 'pool1'
+      dns_plugin: 'mock'
+EOT
+  )}
+  subject { Vmpooler::Dns.new }
+
+  describe '.get_dns_plugin_class_by_name' do
+    it 'returns the plugin class for the specified config' do
+      result = Vmpooler::Dns.get_dns_plugin_class_by_name(config, dns_config_name)
+      expect(result).to eq('mock')
+    end
+  end
+
+  describe '.get_domain_for_pool' do
+    it 'returns the domain for the specified pool' do
+      result = Vmpooler::Dns.get_domain_for_pool(config, pool)
+      expect(result).to eq('example.com')
+    end
+  end
+
+  describe '.get_dns_plugin_domain_by_name' do
+    it 'returns the domain for the specified config' do
+      result = Vmpooler::Dns.get_dns_plugin_domain_by_name(config, dns_config_name)
+      expect(result).to eq('example.com')
+    end
+  end
+
+  describe '.get_dns_plugin_config_classes' do
+    it 'returns the list of dns plugin classes' do
+      result = Vmpooler::Dns.get_dns_plugin_config_classes(config)
+      expect(result).to eq(['mock'])
+    end
+  end
+
+  describe '#load_from_gems' do
+    let(:gem_name) { 'mock-dnsservice' }
+    let(:translated_gem_name) { 'mock/dnsservice' }
+
+    before(:each) do
+      allow(subject).to receive(:require).with(gem_name).and_return(true)
+    end
+
+    it 'loads the specified gem' do
+      expect(subject).to receive(:require).with("vmpooler/dns/#{translated_gem_name}")
+      result = subject.load_from_gems(gem_name)
+      expect(result).to eq("vmpooler/dns/#{translated_gem_name}")
+    end
+  end
+end
diff --git a/spec/unit/util/parsing_spec.rb b/spec/unit/util/parsing_spec.rb
index 3546600..c0277f9 100644
--- a/spec/unit/util/parsing_spec.rb
+++ b/spec/unit/util/parsing_spec.rb
@@ -1,104 +1,11 @@
 require 'spec_helper'
 
-describe 'Parser' do
+# The only method previously tested here was '#get_domain_for_pool'
+# which was moved to Vmpooler::Dns as the more appropriate class
+#
+# TODO: Add tests for last remaining method, or move to more appropriate class
+describe 'Vmpooler::Parsing' do
   let(:pool) { 'pool1' }
   subject { Vmpooler::Parsing }
-  describe '.get_domain_for_pool' do
-    let(:provider_name) { 'mock_provider' }
-    context 'No provider is set' do
-      let(:config) { YAML.load(<<~EOT
-          ---
-          :config:
-          :providers:
-            :mock_provider:
-          :pools:
-            - name: '#{pool}'
-              size: 1
-      EOT
-      )}
 
-      it 'should return nil' do
-        result = subject.get_domain_for_pool(config, pool)
-        expect(result).to be_nil
-      end
-    end
-    context 'Provider is vsphere by default' do
-      let(:config) { YAML.load(<<~EOT
-          ---
-          :config:
-          :providers:
-            :vsphere:
-              domain: myown.com
-          :pools:
-            - name: '#{pool}'
-              size: 1
-      EOT
-      )}
-
-      it 'should return the domain set for vsphere' do
-        result = subject.get_domain_for_pool(config, pool)
-        expect(result).to eq('myown.com')
-      end
-    end
-    context 'No domain is set' do
-      let(:config) { YAML.load(<<~EOT
-          ---
-          :config:
-          :providers:
-            :mock_provider:
-          :pools:
-            - name: '#{pool}'
-              size: 1
-              provider: #{provider_name}
-      EOT
-      )}
-
-      it 'should return nil' do
-        result = subject.get_domain_for_pool(config, pool)
-        expect(result).to be_nil
-      end
-    end
-
-    context 'Only a global domain is set' do
-      let(:config) { YAML.load(<<~EOT
-          ---
-          :config:
-            domain: example.com
-          :providers:
-            :mock_provider:
-          :pools:
-            - name: '#{pool}'
-              size: 1
-              provider: #{provider_name}
-      EOT
-      )}
-
-      it 'should return the domain set in the config section' do
-        result = subject.get_domain_for_pool(config, pool)
-        expect(result).to_not be_nil
-        expect(result).to eq('example.com')
-      end
-    end
-
-    context 'A provider specified a domain to use' do
-      let(:config) { YAML.load(<<~EOT
-          ---
-          :config:
-          :providers:
-            :mock_provider:
-              domain: m.example.com
-          :pools:
-            - name: '#{pool}'
-              size: 1
-              provider: #{provider_name}
-      EOT
-      )}
-
-      it 'should return the domain set in the config section' do
-        result = subject.get_domain_for_pool(config, pool)
-        expect(result).to_not be_nil
-        expect(result).to eq('m.example.com')
-      end
-    end
-  end
 end

From 1df7ab6d34be9991f2ccaa448d36d032aedd9ccd Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Fri, 24 Feb 2023 09:55:49 -0500
Subject: [PATCH 14/19] Fix tests based on new dns config

---
 spec/fixtures/extra_config2.yaml            |   1 +
 spec/fixtures/vmpooler.yaml                 |   8 +-
 spec/fixtures/vmpooler2.yaml                |   8 +-
 spec/helpers.rb                             |  10 +
 spec/integration/api/v2/ondemandvm_spec.rb  |  93 ++----
 spec/integration/api/v2/vm_spec.rb          |  60 ++--
 spec/integration/api/v2/vm_template_spec.rb |  34 ++-
 spec/unit/env_config.rb                     |   1 -
 spec/unit/pool_manager_spec.rb              | 306 +++++++++++++++++---
 spec/unit/vmpooler_spec.rb                  |   6 +-
 10 files changed, 386 insertions(+), 141 deletions(-)

diff --git a/spec/fixtures/extra_config2.yaml b/spec/fixtures/extra_config2.yaml
index e9f30d8..af122c2 100644
--- a/spec/fixtures/extra_config2.yaml
+++ b/spec/fixtures/extra_config2.yaml
@@ -8,4 +8,5 @@
   - name: 'pool05'
     size: 5
     provider: dummy
+    dns_plugin: 'example'
     ready_ttl: 5
\ No newline at end of file
diff --git a/spec/fixtures/vmpooler.yaml b/spec/fixtures/vmpooler.yaml
index c5c0522..c7dad1b 100644
--- a/spec/fixtures/vmpooler.yaml
+++ b/spec/fixtures/vmpooler.yaml
@@ -23,9 +23,13 @@
   allowed_tags:
     - 'created_by'
     - 'project'
-  domain: 'example.com'
   prefix: 'poolvm-'
 
+:dns_configs:
+  :example:
+    dns_class: dynamic-dns
+    domain: 'example.com'
+
 # Uncomment the lines below to suppress metrics to STDOUT
 # :statsd:
 #   server: 'localhost'
@@ -36,8 +40,10 @@
   - name: 'pool01'
     size: 5
     provider: dummy
+    dns_plugin: 'example'
     ready_ttl: 5
   - name: 'pool02'
     size: 5
     provider: dummy
+    dns_plugin: 'example'
     ready_ttl: 5
diff --git a/spec/fixtures/vmpooler2.yaml b/spec/fixtures/vmpooler2.yaml
index a016d30..92731a5 100644
--- a/spec/fixtures/vmpooler2.yaml
+++ b/spec/fixtures/vmpooler2.yaml
@@ -23,9 +23,13 @@
   allowed_tags:
     - 'created_by'
     - 'project'
-  domain: 'example.com'
   prefix: 'poolvm-'
 
+:dns_configs:
+  :example:
+    dns_class: dynamic-dns
+    domain: 'example.com'
+
 # Uncomment the lines below to suppress metrics to STDOUT
 # :statsd:
 #   server: 'localhost'
@@ -36,8 +40,10 @@
   - name: 'pool03'
     size: 5
     provider: dummy
+    dns_plugin: 'example'
     ready_ttl: 5
   - name: 'pool04'
     size: 5
     provider: dummy
+    dns_plugin: 'example'
     ready_ttl: 5
diff --git a/spec/helpers.rb b/spec/helpers.rb
index 87245db..53af74c 100644
--- a/spec/helpers.rb
+++ b/spec/helpers.rb
@@ -14,6 +14,16 @@ class MockLogger
   end
 end
 
+class MockPoolManagerDnsBase
+  def delete_record(hostname)
+
+  end
+
+  def create_or_replace_record(hostname)
+
+  end
+end
+
 def expect_json(ok = true, http = 200)
   expect(last_response.header['Content-Type']).to eq('application/json')
 
diff --git a/spec/integration/api/v2/ondemandvm_spec.rb b/spec/integration/api/v2/ondemandvm_spec.rb
index 5d6d887..446b071 100644
--- a/spec/integration/api/v2/ondemandvm_spec.rb
+++ b/spec/integration/api/v2/ondemandvm_spec.rb
@@ -28,10 +28,16 @@ describe Vmpooler::API::V2 do
             'compute2' => 0
           }
         },
+        dns_configs: {
+          :mock => {
+            'dns_class' => 'mock',
+            'domain' => 'example.com'
+          }
+        },
         pools: [
-          {'name' => 'pool1', 'size' => 0, 'clone_target' => 'compute1'},
-          {'name' => 'pool2', 'size' => 0, 'clone_target' => 'compute2'},
-          {'name' => 'pool3', 'size' => 0, 'clone_target' => 'compute1'}
+          {'name' => 'pool1', 'size' => 0, 'clone_target' => 'compute1', 'dns_plugin' => 'mock'},
+          {'name' => 'pool2', 'size' => 0, 'clone_target' => 'compute2', 'dns_plugin' => 'mock'},
+          {'name' => 'pool3', 'size' => 0, 'clone_target' => 'compute1', 'dns_plugin' => 'mock'}
         ],
         alias: {
           'poolone' => ['pool1'],
@@ -39,9 +45,7 @@ describe Vmpooler::API::V2 do
         },
         pool_names: [ 'pool1', 'pool2', 'pool3', 'poolone' ],
         providers: {
-          :dummy => {
-            'domain' => 'dummy.com'
-          }
+          :dummy => {},
         }
       }
     }
@@ -117,22 +121,23 @@ describe Vmpooler::API::V2 do
             post "#{prefix}/ondemandvm", '{"pool2":"1"}'
           end
 
-          context 'with domain set in the config' do
-            let(:domain) { 'example.com' }
-            before(:each) do
-              config[:config]['domain'] = domain
-            end
+        # Domain is always included in reply now
+        #   context 'with domain set in the config' do
+        #     let(:domain) { 'example.com' }
+        #     before(:each) do
+        #       config[:config]['domain'] = domain
+        #     end
 
-            it 'should include domain in the return reply' do
-              post "#{prefix}/ondemandvm", '{"poolone":"1"}'
-              expect_json(true, 201)
-              expected = {
-                "ok": true,
-                "request_id": uuid,
-              }
-              expect(last_response.body).to eq(JSON.pretty_generate(expected))
-            end
-          end
+        #     it 'should include domain in the return reply' do
+        #       post "#{prefix}/ondemandvm", '{"poolone":"1"}'
+        #       expect_json(true, 201)
+        #       expected = {
+        #         "ok": true,
+        #         "request_id": uuid,
+        #       }
+        #       expect(last_response.body).to eq(JSON.pretty_generate(expected))
+        #     end
+        #   end
         end
 
         context 'with a resource request that exceeds the specified limit' do
@@ -266,56 +271,12 @@ describe Vmpooler::API::V2 do
               "ready": true,
               "pool1": {
                 "hostname": [
-                  vmname
+                  "#{vmname}.example.com"
                 ]
               }
             }
             expect(last_response.body).to eq(JSON.pretty_generate(expected))
           end
-
-          context 'with domain set' do
-            let(:domain) { 'example.com' }
-            before(:each) do
-              config[:config]['domain'] = domain
-            end
-
-            it 'should include the domain in the hostname as fqdn, not a separate key unlike in v1' do
-              get "#{prefix}/ondemandvm/#{uuid}"
-              expected = {
-                "ok": true,
-                "request_id": uuid,
-                "ready": true,
-                "pool1": {
-                  "hostname": [
-                    "#{vmname}.#{domain}"
-                  ]
-                }
-              }
-              expect(last_response.body).to eq(JSON.pretty_generate(expected))
-            end
-          end
-
-          context 'with domain set in the provider' do
-            let(:domain) { 'dummy.com' }
-            before(:each) do
-              config[:pools][0]['provider'] = 'dummy'
-            end
-
-            it 'should include the domain in the hostname as fqdn, not a separate key unlike in v1' do
-              get "#{prefix}/ondemandvm/#{uuid}"
-              expected = {
-                "ok": true,
-                "request_id": uuid,
-                "ready": true,
-                "pool1": {
-                  "hostname": [
-                    "#{vmname}.#{domain}"
-                  ]
-                }
-              }
-              expect(last_response.body).to eq(JSON.pretty_generate(expected))
-            end
-          end
         end
 
         context 'with a deleted request' do
diff --git a/spec/integration/api/v2/vm_spec.rb b/spec/integration/api/v2/vm_spec.rb
index 411cbb9..13f80d2 100644
--- a/spec/integration/api/v2/vm_spec.rb
+++ b/spec/integration/api/v2/vm_spec.rb
@@ -25,14 +25,28 @@ describe Vmpooler::API::V2 do
           'vm_lifetime_auth' => 2
         },
         providers: {
-          vsphere: {'domain' => 'one.example.com'},
-          gce: {'domain' => 'two.example.com'},
-          foo: {'domain' => 'three.example.com'}
+          vsphere: {},
+          gce: {},
+          foo: {}
+        },
+        dns_configs: {
+          :one => {
+            'dns_class' => 'mock',
+            'domain' => 'one.example.com'
+          },
+          :two => {
+            'dns_class' => 'mock',
+            'domain' => 'two.example.com'
+          },
+          :three => {
+            'dns_class' => 'mock',
+            'domain' => 'three.example.com'
+          }
         },
         pools: [
-          {'name' => 'pool1', 'size' => 5, 'provider' => 'vsphere'},
-          {'name' => 'pool2', 'size' => 10, 'provider' => 'gce'},
-          {'name' => 'pool3', 'size' => 10, 'provider' => 'foo'}
+          {'name' => 'pool1', 'size' => 5, 'provider' => 'vsphere', 'dns_plugin' => 'one'},
+          {'name' => 'pool2', 'size' => 10, 'provider' => 'gce', 'dns_plugin' => 'two'},
+          {'name' => 'pool3', 'size' => 10, 'provider' => 'foo', 'dns_plugin' => 'three'}
         ],
         statsd: { 'prefix' => 'stats_prefix'},
         alias: { 'poolone' => ['pool1'] },
@@ -341,27 +355,29 @@ describe Vmpooler::API::V2 do
         expect(pool_has_ready_vm?('pool1', '2abcdefghijklmnop', redis)).to eq(true)
       end
 
-      it 'returns the second VM when the first fails to respond' do
-        create_ready_vm 'pool1', vmname, redis
-        create_ready_vm 'pool1', "2#{vmname}", redis
+      # The helper create_ready_vm inherently means that the vm has already reached a
+      # ready state and that open_socket already returned sucessfully before being moved to ready.
+      # it 'returns the second VM when the first fails to respond' do
+      #   create_running_vm 'pool1', vmname, redis
+      #   create_ready_vm 'pool1', "2#{vmname}", redis
 
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with(vmname, nil).and_raise('mockerror')
-        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with("2#{vmname}", nil).and_return(socket)
+      #   allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with(vmname, nil).and_raise('mockerror')
+      #   allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with("2#{vmname}", nil).and_return(socket)
 
-        post "#{prefix}/vm", '{"pool1":"1"}'
-        expect_json(ok = true, http = 200)
+      #   post "#{prefix}/vm", '{"pool1":"1"}'
+      #   expect_json(ok = true, http = 200)
 
-        expected = {
-          ok: true,
-          pool1: {
-            hostname: "2#{vmname}"
-          }
-        }
+      #   expected = {
+      #     ok: true,
+      #     pool1: {
+      #       hostname: "2#{vmname}.one.example.com"
+      #     }
+      #   }
 
-        expect(last_response.body).to eq(JSON.pretty_generate(expected))
+      #   expect(last_response.body).to eq(JSON.pretty_generate(expected))
 
-        expect(pool_has_ready_vm?('pool1', vmname, redis)).to be false
-      end
+      #   expect(pool_has_ready_vm?('pool1', vmname, redis)).to be false
+      # end
 
       context '(auth not configured)' do
         it 'does not extend VM lifetime if auth token is provided' do
diff --git a/spec/integration/api/v2/vm_template_spec.rb b/spec/integration/api/v2/vm_template_spec.rb
index 862df25..3c6d037 100644
--- a/spec/integration/api/v2/vm_template_spec.rb
+++ b/spec/integration/api/v2/vm_template_spec.rb
@@ -24,11 +24,17 @@ describe Vmpooler::API::V2 do
           'site_name' => 'test pooler',
           'vm_lifetime_auth' => 2,
         },
+        dns_configs: {
+          :example => {
+            'dns_class' => 'mock',
+            'domain' => 'example.com'
+          }
+        },
         providers: { vsphere: {} },
         pools: [
-          {'name' => 'pool1', 'size' => 5},
-          {'name' => 'pool2', 'size' => 10},
-          {'name' => 'poolone', 'size' => 1}
+          {'name' => 'pool1', 'size' => 5, 'provider' => 'vsphere', 'dns_plugin' => 'example'},
+          {'name' => 'pool2', 'size' => 10, 'provider' => 'vsphere', 'dns_plugin' => 'example'},
+          {'name' => 'poolone', 'size' => 1, 'provider' => 'vsphere', 'dns_plugin' => 'example'}
         ],
         statsd: { 'prefix' => 'stats_prefix'},
         alias: { 'poolone' => 'pool1' },
@@ -60,7 +66,7 @@ describe Vmpooler::API::V2 do
         expected = {
           ok: true,
           pool1: {
-            hostname: 'abcdefghijklmnop'
+            hostname: 'abcdefghijklmnop.example.com'
           }
         }
 
@@ -77,7 +83,7 @@ describe Vmpooler::API::V2 do
         expected = {
           ok: true,
           poolone: {
-            hostname: 'abcdefghijklmnop'
+            hostname: 'abcdefghijklmnop.example.com'
           }
         }
         expect_json(ok = true, http = 200)
@@ -126,10 +132,10 @@ describe Vmpooler::API::V2 do
         expected = {
           ok: true,
           pool1: {
-            hostname: 'abcdefghijklmnop'
+            hostname: 'abcdefghijklmnop.example.com'
           },
           pool2: {
-            hostname: 'qrstuvwxyz012345'
+            hostname: 'qrstuvwxyz012345.example.com'
           }
         }
 
@@ -151,17 +157,17 @@ describe Vmpooler::API::V2 do
         expected = {
           ok: true,
           pool1: {
-            hostname: [ '1abcdefghijklmnop', '2abcdefghijklmnop' ]
+            hostname: [ '1abcdefghijklmnop.example.com', '2abcdefghijklmnop.example.com' ]
           },
           pool2: {
-            hostname: [ '1qrstuvwxyz012345', '2qrstuvwxyz012345', '3qrstuvwxyz012345' ]
+            hostname: [ '1qrstuvwxyz012345.example.com', '2qrstuvwxyz012345.example.com', '3qrstuvwxyz012345.example.com' ]
           }
         }
 
         result = JSON.parse(last_response.body)
         expect(result['ok']).to eq(true)
-        expect(result['pool1']['hostname']).to include('1abcdefghijklmnop', '2abcdefghijklmnop')
-        expect(result['pool2']['hostname']).to include('1qrstuvwxyz012345', '2qrstuvwxyz012345', '3qrstuvwxyz012345')
+        expect(result['pool1']['hostname']).to include('1abcdefghijklmnop.example.com', '2abcdefghijklmnop.example.com')
+        expect(result['pool2']['hostname']).to include('1qrstuvwxyz012345.example.com', '2qrstuvwxyz012345.example.com', '3qrstuvwxyz012345.example.com')
         expect_json(ok = true, http = 200)
       end
 
@@ -265,7 +271,7 @@ describe Vmpooler::API::V2 do
           expected = {
             ok: true,
             pool1: {
-              hostname: 'abcdefghijklmnop'
+              hostname: 'abcdefghijklmnop.example.com'
             }
           }
 
@@ -291,7 +297,7 @@ describe Vmpooler::API::V2 do
           expected = {
             ok: true,
             pool1: {
-              hostname: 'abcdefghijklmnop'
+              hostname: 'abcdefghijklmnop.example.com'
             }
           }
           expect(last_response.body).to eq(JSON.pretty_generate(expected))
@@ -311,7 +317,7 @@ describe Vmpooler::API::V2 do
           expected = {
             ok: true,
             pool1: {
-              hostname: 'abcdefghijklmnop'
+              hostname: 'abcdefghijklmnop.example.com'
             }
           }
           expect_json(ok = true, http = 200)
diff --git a/spec/unit/env_config.rb b/spec/unit/env_config.rb
index c64c78f..1529cf7 100644
--- a/spec/unit/env_config.rb
+++ b/spec/unit/env_config.rb
@@ -22,7 +22,6 @@ describe 'Vmpooler' do
         ['prefix', test_string, ""],
         ['logfile', test_string, nil],
         ['site_name', test_string, nil],
-        ['domain', test_string, nil],
         ['clone_target', test_string, nil],
         ['create_folders', test_bool, nil],
         ['create_template_delta_disks', test_bool, nil],
diff --git a/spec/unit/pool_manager_spec.rb b/spec/unit/pool_manager_spec.rb
index bfcead3..0e9c5e6 100644
--- a/spec/unit/pool_manager_spec.rb
+++ b/spec/unit/pool_manager_spec.rb
@@ -20,6 +20,7 @@ describe 'Pool Manager' do
   let(:current_time) { Time.now }
 
   let(:provider_options) { {} }
+  let(:dns_options) { {} }
   let(:redis_connection_pool) { Vmpooler::PoolManager::GenericConnectionPool.new(
     metrics: metrics,
     connpool_type: 'redis_connection_pool',
@@ -30,16 +31,19 @@ describe 'Pool Manager' do
   }
 
   let(:provider) { Vmpooler::PoolManager::Provider::Base.new(config, logger, metrics, redis_connection_pool, 'mock_provider', provider_options) }
-
+  let(:dns_plugin) { MockPoolManagerDnsBase.new }
   let(:config) { YAML.load(<<-EOT
 ---
 :config: {}
+:dns_configs: {}
 :providers:
   :mock:
+    dns_class: base
 :redis: {}
 :pools:
   - name: '#{pool}'
     size: 1
+    dns_plugin: 'mock'
 EOT
     )
   }
@@ -233,6 +237,8 @@ EOT
 
   describe '#remove_nonexistent_vm' do
     before do
+      expect(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      expect(dns_plugin).to receive(:delete_record)
       expect(subject).not_to be_nil
     end
 
@@ -876,17 +882,17 @@ EOT
     end
 
     it 'calls _clone_vm' do
-      expect(subject).to receive(:_clone_vm).with(pool_object,provider,nil,nil)
+      expect(subject).to receive(:_clone_vm).with(pool_object,provider,dns_plugin,nil,nil)
 
-      subject.clone_vm(pool_object,provider)
+      subject.clone_vm(pool_object,provider,dns_plugin)
     end
 
     it 'logs a message if an error is raised' do
       allow(logger).to receive(:log)
       expect(logger).to receive(:log).with('s',"[!] [#{pool}] failed while cloning VM with an error: MockError")
-      expect(subject).to receive(:_clone_vm).with(pool,provider,nil,nil).and_raise('MockError')
+      expect(subject).to receive(:_clone_vm).with(pool,provider,dns_plugin,nil,nil).and_raise('MockError')
 
-      expect{subject.clone_vm(pool,provider)}.to raise_error(/MockError/)
+      expect{subject.clone_vm(pool,provider,dns_plugin)}.to raise_error(/MockError/)
     end
   end
 
@@ -901,18 +907,23 @@ EOT
       let(:config) {
         YAML.load(<<-EOT
 ---
+:dns_configs:
+  :mock:
+    dns_class: base
 :providers:
   :mock_provider:
     skip_dns_check_before_creating_vm: true
 :pools:
   - name: '#{pool}'
     size: 1
+    dns_config: 'mock'
         EOT
         )
       }
       it 'should skip the dns check' do
         #method is skipped
         expect(subject).not_to receive(:check_dns_available)
+        allow(subject).to receive(:get_domain_for_pool).and_return('example.com')
         expect(subject.find_unique_hostname(pool)).to eq("spicy-proton")
       end
     end
@@ -920,11 +931,15 @@ EOT
       let(:config) {
         YAML.load(<<-EOT
 ---
+:dns_configs:
+  :mock:
+    dns_class: base
 :providers:
   :mock_provider:
 :pools:
   - name: '#{pool}'
     size: 1
+    dns_config: 'mock'
         EOT
         )
       }
@@ -953,10 +968,17 @@ EOT
     let(:config) {
       YAML.load(<<-EOT
 ---
+:dns_configs:
+  :mock:
+    dns_class: base
 :config:
   prefix: "prefix"
 :redis:
   ttl: #{redis_ttl}
+:pools:
+  - name: 'pool1'
+    size: 1
+    dns_config: 'mock'
 EOT
       )
     }
@@ -966,6 +988,9 @@ EOT
         allow(metrics).to receive(:timing)
         expect(metrics).to receive(:timing).with(/clone\./,/0/)
         expect(provider).to receive(:create_vm).with(pool, String)
+        allow(provider).to receive(:get_vm_ip_address)
+        allow(subject).to receive(:get_domain_for_pool).and_return('example.com')
+        allow(subject).to receive(:get_dns_plugin_class_name_for_pool).and_return(dns_plugin)
         allow(logger).to receive(:log)
         redis_connection_pool.with do |redis|
           expect(subject).to receive(:find_unique_hostname).with(pool).and_return(vm)
@@ -976,7 +1001,7 @@ EOT
         redis_connection_pool.with do |redis|
           expect(redis.scard("vmpooler__pending__#{pool}")).to eq(0)
 
-          subject._clone_vm(pool,provider)
+          subject._clone_vm(pool,provider,dns_plugin)
 
           expect(redis.scard("vmpooler__pending__#{pool}")).to eq(1)
           expect(redis.hget("vmpooler__vm__#{vm}", 'clone')).to_not be_nil
@@ -991,7 +1016,7 @@ EOT
           redis.incr('vmpooler__tasks__clone')
           redis.incr('vmpooler__tasks__clone')
           expect(redis.get('vmpooler__tasks__clone')).to eq('2')
-          subject._clone_vm(pool,provider)
+          subject._clone_vm(pool,provider,dns_plugin)
           expect(redis.get('vmpooler__tasks__clone')).to eq('1')
         end
       end
@@ -999,19 +1024,20 @@ EOT
       it 'should log a message that is being cloned from a template' do
         expect(logger).to receive(:log).with('d',/\[ \] \[#{pool}\] Starting to clone '(.+)'/)
 
-        subject._clone_vm(pool,provider)
+        subject._clone_vm(pool,provider,dns_plugin)
       end
 
       it 'should log a message that it completed being cloned' do
         expect(logger).to receive(:log).with('s',/\[\+\] \[#{pool}\] '(.+)' cloned in [0-9.]+ seconds/)
 
-        subject._clone_vm(pool,provider)
+        subject._clone_vm(pool,provider,dns_plugin)
       end
     end
 
     context 'with an error during cloning' do
       before(:each) do
         expect(provider).to receive(:create_vm).with(pool, String).and_raise('MockError')
+        allow(subject).to receive(:get_domain_for_pool)
         allow(logger).to receive(:log)
         redis_connection_pool.with do |redis|
           expect(subject).to receive(:find_unique_hostname).with(pool).and_return(vm)
@@ -1022,7 +1048,7 @@ EOT
         redis_connection_pool.with do |redis|
           expect(redis.scard("vmpooler__pending__#{pool}")).to eq(0)
 
-          expect{subject._clone_vm(pool,provider)}.to raise_error(/MockError/)
+          expect{subject._clone_vm(pool,provider,dns_plugin)}.to raise_error(/MockError/)
 
           expect(redis.scard("vmpooler__pending__#{pool}")).to eq(0)
           # Get the new VM Name from the pending pool queue as it should be the only entry
@@ -1036,7 +1062,7 @@ EOT
           redis.incr('vmpooler__tasks__clone')
           redis.incr('vmpooler__tasks__clone')
           expect(redis.get('vmpooler__tasks__clone')).to eq('2')
-          expect{subject._clone_vm(pool,provider)}.to raise_error(/MockError/)
+          expect{subject._clone_vm(pool,provider,dns_plugin)}.to raise_error(/MockError/)
           expect(redis.get('vmpooler__tasks__clone')).to eq('1')
         end
       end
@@ -1046,12 +1072,12 @@ EOT
           redis.pipelined do |pipe|
             expect(pipe).to receive(:expire)
           end
-          expect{subject._clone_vm(pool,provider)}.to raise_error(/MockError/)
+          expect{subject._clone_vm(pool,provider,dns_plugin)}.to raise_error(/MockError/)
         end
       end
 
       it 'should raise the error' do
-        expect{subject._clone_vm(pool,provider)}.to raise_error(/MockError/)
+        expect{subject._clone_vm(pool,provider,dns_plugin)}.to raise_error(/MockError/)
       end
 
     end
@@ -1061,6 +1087,9 @@ EOT
         allow(metrics).to receive(:timing)
         expect(metrics).to receive(:timing).with(/clone\./,/0/)
         expect(provider).to receive(:create_vm).with(pool, String)
+        allow(provider).to receive(:get_vm_ip_address).with(vm,pool)
+        allow(subject).to receive(:get_dns_plugin_class_name_for_pool).and_return(dns_plugin)
+        expect(dns_plugin).to receive(:create_or_replace_record)
         allow(logger).to receive(:log)
         redis_connection_pool.with do |redis|
           expect(subject).to receive(:find_unique_hostname).with(pool).and_return(vm)
@@ -1069,7 +1098,7 @@ EOT
 
       it 'should set request_id and pool_alias on the vm data' do
         redis_connection_pool.with do |redis|
-          subject._clone_vm(pool,provider,request_id,pool)
+          subject._clone_vm(pool,provider,dns_plugin,request_id,pool)
           expect(redis.hget("vmpooler__vm__#{vm}", 'pool_alias')).to eq(pool)
           expect(redis.hget("vmpooler__vm__#{vm}", 'request_id')).to eq(request_id)
         end
@@ -1078,7 +1107,7 @@ EOT
       it 'should reduce the clone count' do
         redis_connection_pool.with do |redis|
           expect(redis).to receive(:decr).with('vmpooler__tasks__ondemandclone')
-          subject._clone_vm(pool,provider,request_id,pool)
+          subject._clone_vm(pool,provider,dns_plugin,request_id,pool)
         end
       end
     end
@@ -1086,6 +1115,8 @@ EOT
     context 'with #check_dns_available' do
       before(:each) do
         allow(logger).to receive(:log)
+        allow(provider).to receive(:get_vm_ip_address).and_return(true)
+        allow(subject).to receive(:get_dns_plugin_class_name_for_pool).and_return(dns_plugin)
       end
       it 'should error out if DNS already exists' do
         vm_name = "foo"
@@ -1093,15 +1124,16 @@ EOT
         expect(subject).to receive(:generate_and_check_hostname).exactly(3).times.and_return([vm_name, true]) #skip this, make it available all times
         expect(resolv).to receive(:getaddress).exactly(3).times.and_return("1.2.3.4")
         expect(metrics).to receive(:increment).with("errors.staledns.#{pool}").exactly(3).times
-        expect{subject._clone_vm(pool,provider)}.to raise_error(/Unable to generate a unique hostname after/)
+        expect{subject._clone_vm(pool,provider,dns_plugin)}.to raise_error(/Unable to generate a unique hostname after/)
       end
       it 'should be successful if DNS does not exist' do
         vm_name = "foo"
         resolv = class_double("Resolv").as_stubbed_const(:transfer_nested_constants => true)
         expect(subject).to receive(:generate_and_check_hostname).and_return([vm_name, true])
         expect(resolv).to receive(:getaddress).exactly(1).times.and_raise(Resolv::ResolvError)
+        expect(provider).to receive(:get_vm_ip_address)
         expect(provider).to receive(:create_vm).with(pool, String)
-        subject._clone_vm(pool,provider)
+        subject._clone_vm(pool,provider,dns_plugin)
       end
     end
   end
@@ -1113,17 +1145,17 @@ EOT
     end
 
     it 'calls _destroy_vm' do
-      expect(subject).to receive(:_destroy_vm).with(vm,pool,provider)
+      expect(subject).to receive(:_destroy_vm).with(vm,pool,provider,dns_plugin)
 
-      subject.destroy_vm(vm,pool,provider)
+      subject.destroy_vm(vm,pool,provider,dns_plugin)
     end
 
     it 'logs a message if an error is raised' do
       allow(logger).to receive(:log)
       expect(logger).to receive(:log).with('d',"[!] [#{pool}] '#{vm}' failed while destroying the VM with an error: MockError")
-      expect(subject).to receive(:_destroy_vm).with(vm,pool,provider).and_raise('MockError')
+      expect(subject).to receive(:_destroy_vm).with(vm,pool,provider,dns_plugin).and_raise('MockError')
 
-      expect{subject.destroy_vm(vm,pool,provider)}.to raise_error(/MockError/)
+      expect{subject.destroy_vm(vm,pool,provider,dns_plugin)}.to raise_error(/MockError/)
     end
   end
 
@@ -1152,7 +1184,7 @@ EOT
           redis.pipelined do |pipe|
             expect(pipe).to receive(:expire).with("vmpooler__vm__#{vm}", 0)
           end
-          subject._destroy_vm(vm,pool,provider)
+          subject._destroy_vm(vm,pool,provider,dns_plugin)
         end
       end
     end
@@ -1163,7 +1195,7 @@ EOT
       end
 
       it 'should raise an error' do
-        expect{ subject._destroy_vm(vm,pool,provider) }.to raise_error(NoMethodError)
+        expect{ subject._destroy_vm(vm,pool,provider,dns_plugin) }.to raise_error(NoMethodError)
       end
     end
 
@@ -1174,7 +1206,7 @@ EOT
       end
 
       it 'should not raise an error' do
-        subject._destroy_vm(vm,pool,provider)
+        subject._destroy_vm(vm,pool,provider,dns_plugin)
       end
     end
 
@@ -1183,7 +1215,7 @@ EOT
         expect(logger).to receive(:log).with('s', /\[-\] \[#{pool}\] '#{vm}' destroyed in [0-9.]+ seconds/)
         allow(logger).to receive(:log)
 
-        subject._destroy_vm(vm,pool,provider)
+        subject._destroy_vm(vm,pool,provider,dns_plugin)
       end
 
       it 'should emit a timing metric' do
@@ -1191,13 +1223,13 @@ EOT
         allow(metrics).to receive(:timing)
         expect(metrics).to receive(:timing).with("destroy.#{pool}", String)
 
-        subject._destroy_vm(vm,pool,provider)
+        subject._destroy_vm(vm,pool,provider,dns_plugin)
       end
 
       it 'should dereference the mutex' do
         expect(subject).to receive(:dereference_mutex)
 
-        subject._destroy_vm(vm,pool,provider)
+        subject._destroy_vm(vm,pool,provider,dns_plugin)
       end
     end
 
@@ -1211,13 +1243,13 @@ EOT
         expect(logger).to receive(:log).with('s', /\[-\] \[#{pool}\] '#{vm}' destroyed in [0-9.]+ seconds/).exactly(0).times
         allow(logger).to receive(:log)
 
-        expect{ subject._destroy_vm(vm,pool,provider) }.to raise_error(/MockError/)
+        expect{ subject._destroy_vm(vm,pool,provider,dns_plugin) }.to raise_error(/MockError/)
       end
 
       it 'should not emit a timing metric' do
         expect(metrics).to receive(:timing).with("destroy.#{pool}", String).exactly(0).times
 
-        expect{ subject._destroy_vm(vm,pool,provider) }.to raise_error(/MockError/)
+        expect{ subject._destroy_vm(vm,pool,provider,dns_plugin) }.to raise_error(/MockError/)
       end
     end
 
@@ -1230,7 +1262,7 @@ EOT
       it 'should return' do
         expect(subject).to receive(:vm_mutex).with(vm).and_return(mutex)
 
-        expect(subject._destroy_vm(vm,pool,provider)).to eq(nil)
+        expect(subject._destroy_vm(vm,pool,provider,dns_plugin)).to eq(nil)
       end
     end
   end
@@ -1942,6 +1974,7 @@ EOT
 
     before(:each) do
       expect(Thread).to receive(:new).and_yield
+      allow(Vmpooler::Dns).to receive(:load_used_dns_plugins).and_return('vmpooler/dns/mock')
       allow(subject).to receive(:_check_snapshot_queue).with(no_args)
     end
 
@@ -1987,6 +2020,10 @@ EOT
       let(:maxloop) { 5 }
       # Note a maxloop of zero can not be tested as it never terminates
 
+      before(:each) do
+        allow(subject).to receive(:load_used_dns_plugins).and_return('vmpooler/dns/mock')
+      end
+
       after(:each) do
         # Reset the global variable - Note this is a code smell
         $threads = nil
@@ -2837,6 +2874,23 @@ EOT
     end
 
     context 'on startup' do
+      let(:config) {
+        YAML.load(<<-EOT
+---
+:config:
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+        )}
+
+      before(:each) do
+        allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
+      end
+
       it 'should log a message that VMPooler has started' do
         expect(logger).to receive(:log).with('d', 'starting vmpooler')
 
@@ -2930,14 +2984,23 @@ EOT
 ---
 :providers:
   :vsphere: {}
+:dns_configs:
+  :mock:
+    dns_class: base
 :pools:
   - name: #{pool}
     provider: 'vsphere'
+    dns_plugin: 'mock'
   - name: 'dummy'
     provider: 'vsphere'
+    dns_plugin: 'mock'
 EOT
         )}
 
+        before(:each) do
+          allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
+        end
+
         it 'should call create_provider_object idempotently' do
           # Even though there are two pools using the vsphere provider, it should only
           # create the provider object once.
@@ -2965,14 +3028,21 @@ EOT
       context 'move vSphere configuration to providers location' do
         let(:config) {
         YAML.load(<<-EOT
+:dns_configs:
+  :mock:
+    dns_class: base
 :vsphere:
   server: 'vsphere.example.com'
   username: 'vmpooler'
   password: 'password'
 :pools:
   - name: #{pool}
+    dns_plugin: 'mock'
 EOT
         )}
+        before(:each) do
+          allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
+        end
 
         it 'should set providers with no provider to vsphere' do
           expect(subject.config[:providers]).to be nil
@@ -2995,13 +3065,22 @@ EOT
         let(:config) {
         YAML.load(<<-EOT
 ---
+:dns_configs:
+  :mock:
+    dns_class: base
 :pools:
   - name: #{pool}
+    dns_plugin: 'mock'
   - name: 'dummy'
     provider: 'dummy'
+    dns_plugin: 'mock'
 EOT
         )}
 
+        before(:each) do
+          allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
+        end
+
         it 'should set providers with no provider to dummy' do
           expect(subject.config[:pools][0]['provider']).to be_nil
           expect(subject.config[:pools][1]['provider']).to eq('dummy')
@@ -3022,11 +3101,31 @@ EOT
 
     context 'with dead disk_manager thread' do
       let(:disk_manager_thread) { double('thread', :alive? => false) }
+      let(:check_loop_delay_min) { 7 }
+      let(:check_loop_delay_max) { 20 }
+      let(:check_loop_delay_decay) { 2.1 }
+      let(:config) {
+      YAML.load(<<-EOT
+---
+:config:
+  check_loop_delay_min: #{check_loop_delay_min}
+  check_loop_delay_max: #{check_loop_delay_max}
+  check_loop_delay_decay: #{check_loop_delay_decay}
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+          )
+        }
 
       before(:each) do
         # Reset the global variable - Note this is a code smell
         $threads = {}
         $threads['disk_manager'] = disk_manager_thread
+        allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
       end
 
       it 'should run the check_disk_queue method and log a message' do
@@ -3039,10 +3138,30 @@ EOT
 
     context 'with dead snapshot_manager thread' do
       let(:snapshot_manager_thread) { double('thread', :alive? => false) }
+      let(:check_loop_delay_min) { 7 }
+      let(:check_loop_delay_max) { 20 }
+      let(:check_loop_delay_decay) { 2.1 }
+      let(:config) {
+      YAML.load(<<-EOT
+---
+:config:
+  check_loop_delay_min: #{check_loop_delay_min}
+  check_loop_delay_max: #{check_loop_delay_max}
+  check_loop_delay_decay: #{check_loop_delay_decay}
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+          )
+        }
       before(:each) do
         # Reset the global variable - Note this is a code smell
         $threads = {}
         $threads['snapshot_manager'] = snapshot_manager_thread
+        allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
       end
 
       it 'should run the check_snapshot_queue method and log a message' do
@@ -3060,10 +3179,27 @@ EOT
         let(:default_check_loop_delay_min) { 5 }
         let(:default_check_loop_delay_max) { 60 }
         let(:default_check_loop_delay_decay) { 2.0 }
+        let(:check_loop_delay_min) { 7 }
+        let(:check_loop_delay_max) { 20 }
+        let(:check_loop_delay_decay) { 2.1 }
+        let(:config) {
+      YAML.load(<<-EOT
+---
+:config:
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+          )
+        }
         before(:each) do
           # Reset the global variable - Note this is a code smell
           $threads = {}
           $threads[pool] = pool_thread
+          allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
         end
 
         it 'should run the check_pool method and log a message' do
@@ -3082,6 +3218,19 @@ EOT
         let(:default_check_loop_delay_min) { 5 }
         let(:default_check_loop_delay_max) { 60 }
         let(:default_check_loop_delay_decay) { 2.0 }
+        let(:config) {
+      YAML.load(<<-EOT
+---
+:config:
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+          )
+        }
         before(:each) do
           # Reset the global variable - Note this is a code smell
           $threads = {}
@@ -3108,8 +3257,12 @@ EOT
   check_loop_delay_min: #{check_loop_delay_min}
   check_loop_delay_max: #{check_loop_delay_max}
   check_loop_delay_decay: #{check_loop_delay_decay}
+:dns_configs:
+  :mock:
+    dns_class: base
 :pools:
   - name: #{pool}
+    dns_plugin: 'mock'
 EOT
           )
         }
@@ -3117,6 +3270,8 @@ EOT
           # Reset the global variable - Note this is a code smell
           $threads = {}
           $threads[pool] = pool_thread
+          allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
+          # allow(subject).to receive(:load_used_dns_plugins).and_return('vmpooler/dns/mock')
         end
 
         it 'should run the check_pool method and log a message' do
@@ -3134,6 +3289,26 @@ EOT
     context 'delays between loops' do
       let(:maxloop) { 2 }
       let(:loop_delay) { 1 }
+      let(:check_loop_delay_min) { 7 }
+      let(:check_loop_delay_max) { 20 }
+      let(:check_loop_delay_decay) { 2.1 }
+      let(:maxloop) { 5 }
+      let(:config) {
+      YAML.load(<<-EOT
+---
+:config:
+  check_loop_delay_min: #{check_loop_delay_min}
+  check_loop_delay_max: #{check_loop_delay_max}
+  check_loop_delay_decay: #{check_loop_delay_decay}
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+          )
+        }
       # Note a maxloop of zero can not be tested as it never terminates
       before(:each) do
 
@@ -3141,6 +3316,7 @@ EOT
         allow(subject).to receive(:check_snapshot_queue)
         allow(subject).to receive(:check_pool)
         allow(subject).to receive(:check_ondemand_requests)
+        allow(Vmpooler::Dns).to receive(:get_domain_for_pool)
       end
 
       it 'when a non-default loop delay is specified' do
@@ -3152,10 +3328,31 @@ EOT
 
     context 'loops specified number of times (5)' do
       let(:alive_thread) { double('thread', :alive? => true) }
+      let(:check_loop_delay_min) { 7 }
+      let(:check_loop_delay_max) { 20 }
+      let(:check_loop_delay_decay) { 2.1 }
       let(:maxloop) { 5 }
+      let(:config) {
+      YAML.load(<<-EOT
+---
+:config:
+  check_loop_delay_min: #{check_loop_delay_min}
+  check_loop_delay_max: #{check_loop_delay_max}
+  check_loop_delay_decay: #{check_loop_delay_decay}
+:dns_configs:
+  :mock:
+    dns_class: base
+:pools:
+  - name: #{pool}
+    dns_plugin: 'mock'
+EOT
+          )
+        }
       # Note a maxloop of zero can not be tested as it never terminates
       before(:each) do
-        end
+        allow(subject).to receive(:get_domain_for_pool)
+        allow(subject).to receive(:get_dns_plugin_config_classes)
+      end
 
       it 'should run startup tasks only once' do
         redis_connection_pool.with do |redis|
@@ -4226,6 +4423,10 @@ EOT
       }
     }
 
+    before(:each) do
+      allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+    end
+
     it 'should not call clone_vm when number of VMs is equal to the pool size' do
       expect(subject).to receive(:clone_vm).exactly(0).times
 
@@ -4280,6 +4481,9 @@ EOT
     end
 
     context 'when pool is marked as empty' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
 
       before(:each) do
         redis_connection_pool.with do |redis|
@@ -4305,6 +4509,9 @@ EOT
     end
 
     context 'when number of VMs is less than the pool size' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
 
       it 'should return the number of cloned VMs' do
         pool_size = 5
@@ -4361,6 +4568,10 @@ EOT
     end
 
     context 'export metrics' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
+
       it 'increments metrics for ready queue' do
         redis_connection_pool.with do |redis|
           create_ready_vm(pool,'vm1',redis)
@@ -4451,6 +4662,7 @@ EOT
         allow(subject).to receive(:destroy_vm)
         allow(subject).to receive(:clone_vm)
         allow(provider).to receive(:vms_in_pool).with(pool).and_return(new_vm_response)
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
       end
 
       it 'calls inventory correctly' do
@@ -4555,6 +4767,10 @@ EOT
 
     # RUNNING
     context 'when checking running VMs' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
+
       let(:pool_check_response) {
         {
           discovered_vms: 0,
@@ -4577,6 +4793,10 @@ EOT
 
     # READY
     context 'when checking ready VMs' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
+
       let(:pool_check_response) {
         {
           discovered_vms: 0,
@@ -4599,6 +4819,10 @@ EOT
 
     # PENDING
     context 'when checking ready VMs' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
+
       let(:pool_check_response) {
         {
           discovered_vms: 0,
@@ -4622,6 +4846,10 @@ EOT
 
     # COMPLETED
     context 'when checking completed VMs' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
+
       let(:pool_check_response) {
         {
             discovered_vms: 0,
@@ -4644,6 +4872,10 @@ EOT
 
     # DISCOVERED
     context 'when checking discovered VMs' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
+
       let(:pool_check_response) {
         {
             discovered_vms: 0,
@@ -4666,6 +4898,10 @@ EOT
 
     # MIGRATIONS
     context 'when checking migrating VMs' do
+      before(:each) do
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
+      end
+
       let(:pool_check_response) {
         {
           discovered_vms: 0,
@@ -4695,6 +4931,7 @@ EOT
         redis_connection_pool.with do |redis|
           redis.hset('vmpooler__config__poolsize', pool, newpoolsize)
         end
+        allow(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
       end
 
       it 'should change the pool size configuration' do
@@ -4736,6 +4973,7 @@ EOT
           expect(redis).to receive(:scard).with("vmpooler__ready__#{pool}").and_return(1)
           expect(redis).to receive(:scard).with("vmpooler__pending__#{pool}").and_return(1)
         end
+        expect(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
       end
 
       it 'should call remove_excess_vms' do
@@ -4845,6 +5083,7 @@ EOT
       before(:each) do
         config[:config]['ondemand_clone_limit'] = 10
         expect(subject).to receive(:get_provider_for_pool).and_return(provider)
+        expect(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
         redis_connection_pool.with do |redis|
           create_ondemand_creationtask("#{request_string}:#{request_id}", current_time.to_i, redis)
         end
@@ -4852,7 +5091,7 @@ EOT
 
       it 'creates the vm' do
         redis_connection_pool.with do |redis|
-          expect(subject).to receive(:clone_vm).with(pool, provider, request_id, pool_alias)
+          expect(subject).to receive(:clone_vm).with(pool, provider, dns_plugin, request_id, pool_alias)
           subject.process_ondemand_vms(redis)
         end
       end
@@ -4865,6 +5104,7 @@ EOT
       before(:each) do
         config[:config]['ondemand_clone_limit'] = 3
         expect(subject).to receive(:get_provider_for_pool).and_return(provider)
+        expect(subject).to receive(:get_dns_plugin_class_for_pool).and_return(dns_plugin)
         redis_connection_pool.with do |redis|
           create_ondemand_creationtask("#{request_string}:#{request_id}", current_time.to_i, redis)
         end
@@ -4872,7 +5112,7 @@ EOT
 
       it 'should create the maximum number of vms' do
         redis_connection_pool.with do |redis|
-          expect(subject).to receive(:clone_vm).with(pool, provider, request_id, pool_alias).exactly(3).times
+          expect(subject).to receive(:clone_vm).with(pool, provider, dns_plugin, request_id, pool_alias).exactly(3).times
           subject.process_ondemand_vms(redis)
         end
       end
diff --git a/spec/unit/vmpooler_spec.rb b/spec/unit/vmpooler_spec.rb
index 84d43ed..2e9831f 100644
--- a/spec/unit/vmpooler_spec.rb
+++ b/spec/unit/vmpooler_spec.rb
@@ -63,9 +63,9 @@ describe 'Vmpooler' do
         expect(Vmpooler.config[:providers].keys).to include(:dummy)
         expect(Vmpooler.config[:providers].keys).to include(:alice)
         expect(Vmpooler.config[:providers].keys).to include(:bob)
-        merged_pools = [{"name"=>"pool03", "provider"=>"dummy", "ready_ttl"=>5, "size"=>5},
-                        {"name"=>"pool04", "provider"=>"dummy", "ready_ttl"=>5, "size"=>5},
-                        {"name"=>"pool05", "provider"=>"dummy", "ready_ttl"=>5, "size"=>5}]
+        merged_pools = [{"name"=>"pool03", "provider"=>"dummy", "dns_plugin"=>"example", "ready_ttl"=>5, "size"=>5},
+                        {"name"=>"pool04", "provider"=>"dummy", "dns_plugin"=>"example", "ready_ttl"=>5, "size"=>5},
+                        {"name"=>"pool05", "provider"=>"dummy", "dns_plugin"=>"example", "ready_ttl"=>5, "size"=>5}]
         expect(Vmpooler.config[:pools]).to eq(merged_pools)
         expect(Vmpooler.config[:config]).not_to be_nil #merge does not deleted existing keys
       end

From d0d97dd0a8cfcc0a34a3618cf733dba79b0ddfe6 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Mon, 27 Feb 2023 14:35:47 -0500
Subject: [PATCH 15/19] Update docs

---
 docs/API-v1.md                                | 936 ------------------
 docs/API-v2.md                                |   9 +
 docs/configuration.md                         |   5 -
 .../vmpooler.yaml.dummy-example.aliasedpools  |  12 +-
 vmpooler.yaml.dummy-example                   |  11 +-
 vmpooler.yaml.example                         |  36 +-
 6 files changed, 56 insertions(+), 953 deletions(-)
 delete mode 100644 docs/API-v1.md

diff --git a/docs/API-v1.md b/docs/API-v1.md
deleted file mode 100644
index ee6fa26..0000000
--- a/docs/API-v1.md
+++ /dev/null
@@ -1,936 +0,0 @@
-# Table of contents
-1. [API](#API)
-2. [Token operations](#token)
-3. [VM operations](#vmops)
-4. [Add disks](#adddisks)
-5. [VM snapshots](#vmsnapshots)
-6. [Status and metrics](#statusmetrics)
-7. [Pool configuration](#poolconfig)
-8. [Ondemand VM provisioning](#ondemandvm)
-
-### API <a name="API"></a>
-
-vmpooler provides a REST API for VM management.  The following examples use `curl` for communication.
-
-#### Token operations <a name="token"></a>
-
-Token-based authentication can be used when requesting or modifying VMs.  The `/token` route can be used to create, query, or delete tokens.  See the provided YAML configuration example, [vmpooler.yaml.example](vmpooler.yaml.example), for information on configuring an authentication store to use when performing token operations.
-
-##### GET /token
-
-Get a list of issued tokens.
-
-Return codes:
-* 200  OK
-* 401  when not authorized
-* 404  when config:auth not found or other error
-
-```
-$ curl -u jdoe --url vmpooler.example.com/api/v1/token
-Enter host password for user 'jdoe':
-```
-```json
-{
-    "ok": true,
-    "utpg2i2xswor6h8ttjhu3d47z53yy47y": {
-      "created": "2015-04-28 19:17:47 -0700"
-    }
-}
-```
-
-##### POST /token
-
-Generate a new authentication token.
-
-Return codes:
-* 200  OK
-* 401  when not authorized
-* 404  when config:auth not found
-
-```
-$ curl -X POST -u jdoe --url vmpooler.example.com/api/v1/token
-Enter host password for user 'jdoe':
-```
-```json
-{
-    "ok": true,
-    "token": "utpg2i2xswor6h8ttjhu3d47z53yy47y"
-}
-```
-
-##### GET /token/&lt;token&gt;
-
-Get information about an existing token (including associated VMs).
-
-Return codes:
-* 200  OK
-* 404  when config:auth or token not found
-
-```
-$ curl --url vmpooler.example.com/api/v1/token/utpg2i2xswor6h8ttjhu3d47z53yy47y
-```
-```json
-{
-  "ok": true,
-  "utpg2i2xswor6h8ttjhu3d47z53yy47y": {
-    "user": "jdoe",
-    "created": "2015-04-28 19:17:47 -0700",
-    "last": "2015-11-04 12:28:37 -0700",
-    "vms": {
-      "running": [
-        "dqs4914g2wjyy5w",
-        "hul7ib0ssr0f4o0"
-      ]
-    }
-  }
-}
-```
-
-##### DELETE /token/&lt;token&gt;
-
-Delete an authentication token.
-
-Return codes:
-* 200  OK
-* 401  when not authorized
-* 404  when config:auth not found
-
-```
-$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v1/token/utpg2i2xswor6h8ttjhu3d47z53yy47y
-Enter host password for user 'jdoe':
-```
-```json
-{
-  "ok": true
-}
-```
-
-#### VM operations <a name="vmops"></a>
-
-##### GET /vm
-
-Retrieve a list of available VM pools.
-
-Return codes:
-* 200  OK
-
-```
-$ curl --url vmpooler.example.com/api/v1/vm
-```
-```json
-[
-  "debian-7-i386",
-  "debian-7-x86_64"
-]
-```
-
-##### POST /vm
-
-Useful for batch operations; post JSON (see format below), get back allocated VMs.
-
-If an authentication store is configured, an authentication token supplied via the `X-AUTH-TOKEN` HTTP header will modify a VM's default lifetime.  See the provided YAML configuration example, [vmpooler.yaml.example](vmpooler.yaml.example), and the 'token operations' section above for more information.
-
-Return codes:
-* 200  OK
-* 404  when sending invalid JSON in the request body or requesting an invalid VM pool name
-* 503  when the vm failed to allocate a vm, or the pool is empty
-
-```
-$ curl -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url vmpooler.example.com/api/v1/vm
-```
-```json
-{
-  "ok": true,
-  "debian-7-i386": {
-    "hostname": [
-      "o41xtodlvnvu5cw",
-      "khirruvwfjlmx3y"
-    ]
-  },
-  "debian-7-x86_64": {
-    "hostname": "y91qbrpbfj6d13q"
-  },
-  "domain": "example.com"
-}
-```
-
-**NOTE: Returns either all requested VMs or no VMs.**
-
-##### POST /vm/&lt;pool&gt;
-
-Check-out a VM or VMs.
-
-Return codes:
-* 200  OK
-* 404  when sending invalid JSON in the request body or requesting an invalid VM pool name
-* 503  when the vm failed to allocate a vm, or the pool is empty
-
-```
-$ curl -d --url vmpooler.example.com/api/v1/vm/debian-7-i386
-```
-```json
-{
-  "ok": true,
-  "debian-7-i386": {
-    "hostname": "fq6qlpjlsskycq6"
-  },
-  "domain": "example.com"
-}
-```
-
-Multiple VMs can be requested by using multiple query parameters in the URL:
-
-```
-$ curl -d --url vmpooler.example.com/api/v1/vm/debian-7-i386+debian-7-i386+debian-7-x86_64
-```
-
-```json
-{
-  "ok": true,
-  "debian-7-i386": {
-    "hostname": [
-      "sc0o4xqtodlul5w",
-      "4m4dkhqiufnjmxy"
-    ]
-  },
-  "debian-7-x86_64": {
-    "hostname": "zb91y9qbrbf6d3q"
-  },
-  "domain": "example.com"
-}
-```
-
-**NOTE: Returns either all requested VMs or no VMs.**
-
-##### GET /vm/&lt;hostname&gt;
-
-Query metadata information for a checked-out VM.
-
-Return codes:
-* 200  OK
-* 404  when requesting an invalid VM hostname
-
-```
-$ curl --url vmpooler.example.com/api/v1/vm/pxpmtoonx7fiqg6
-```
-```json
-{
-  "ok": true,
-  "pxpmtoonx7fiqg6": {
-    "template": "centos-6-x86_64",
-    "lifetime": 12,
-    "running": 3,
-    "remaining": 9, 
-    "state": "running",
-    "tags": {
-      "department": "engineering",
-      "user": "jdoe"
-    },
-    "ip": "192.168.0.1",
-    "domain": "example.com",
-    "host": "host1.example.com",
-    "migrated": "true"
-  }
-}
-```
-
-##### PUT /vm/&lt;hostname&gt;
-
-Modify a checked-out VM.
-
-The following are valid PUT parameters and their required data structures:
-
-parameter | description | required structure
---------- | ----------- | ------------------
-*lifetime* | VM TTL (in hours) | integer
-*tags* | free-form VM tagging | hash
-
-Any modifications can be verified using the [GET /vm/&lt;hostname&gt;](#get-vmhostname) endpoint.
-
-If an authentication store is configured, an authentication token is required (via the `X-AUTH-TOKEN` HTTP header) to access this route.  See the provided YAML configuration example, [vmpooler.yaml.example](vmpooler.yaml.example), and the 'token operations' section above for more information.
-
-Return codes:
-* 200  OK
-* 401  when you need an auth token
-* 404  when requesting an invalid VM hostname
-* 400  when supplied PUT parameters fail validation
-
-```
-$ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6
-```
-```json
-{
-  "ok": true
-}
-```
-
-```
-$ curl -X PUT -d '{"tags":{"department":"engineering","user":"jdoe"}}' --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6
-```
-```json
-{
-  "ok": true
-}
-```
-
-##### DELETE /vm/&lt;hostname&gt;
-
-Schedule a checked-out VM for deletion.
-
-Return codes:
-* 200  OK
-* 401  when you need an auth token
-* 404  when requesting an invalid VM hostname
-
-```
-$ curl -X DELETE --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6
-```
-```json
-{
-  "ok": true
-}
-```
-
-#### Adding additional disk(s) <a name="adddisks"></a>
-
-##### POST /vm/&lt;hostname&gt;/disk/&lt;size&gt;
-
-Add an additional disk to a running VM.
-
-Return codes:
-* 202  OK
-* 401  when you need an auth token
-* 404  when requesting an invalid VM hostname or size is not an integer
-
-````
-$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6/disk/8
-````
-````json
-{
-  "ok": true,
-  "fq6qlpjlsskycq6": {
-    "disk": "+8gb"
-  }
-}
-````
-
-Provisioning and attaching disks can take a moment, but once the task completes it will be reflected in a `GET /vm/<hostname>` query:
-
-````
-$ curl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6
-````
-````json
-{
-  "ok": true,
-  "fq6qlpjlsskycq6": {
-    "template": "debian-7-x86_64",
-    "lifetime": 2,
-    "running": 0.08,
-    "state": "running",
-    "disk": [
-      "+8gb"
-    ],
-    "domain": "delivery.puppetlabs.net"
-  }
-}
-
-````
-
-#### VM snapshots <a name="vmsnapshots"></a>
-
-##### POST /vm/&lt;hostname&gt;/snapshot
-
-Create a snapshot of a running VM.
-
-Return codes:
-* 202  OK
-* 401  when you need an auth token
-* 404  when requesting an invalid VM hostname
-
-````
-$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6/snapshot
-````
-````json
-{
-  "ok": true,
-  "fq6qlpjlsskycq6": {
-    "snapshot": "n4eb4kdtp7rwv4x158366vd9jhac8btq"
-  }
-}
-````
-
-Snapshotting a live VM can take a moment, but once the snapshot task completes it will be reflected in a `GET /vm/<hostname>` query:
-
-````
-$ curl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6
-````
-````json
-{
-  "ok": true,
-  "fq6qlpjlsskycq6": {
-    "template": "debian-7-x86_64",
-    "lifetime": 2,
-    "running": 0.08,
-    "state": "running",
-    "snapshots": [
-      "n4eb4kdtp7rwv4x158366vd9jhac8btq"
-    ],
-    "domain": "delivery.puppetlabs.net"
-  }
-}
-````
-
-##### POST /vm/&lt;hostname&gt;/snapshot/&lt;snapshot&gt;
-
-Revert a VM back to a snapshot.
-
-Return codes:
-* 202  OK
-* 401  when you need an auth token
-* 404  when requesting an invalid VM hostname or snapshot is not valid
-
-````
-$ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v1/vm/fq6qlpjlsskycq6/snapshot/n4eb4kdtp7rwv4x158366vd9jhac8btq
-````
-````json
-{
-  "ok": true
-}
-````
-
-#### Status and metrics <a name="statusmetrics"></a>
-
-##### GET /status
-
-A "live" status endpoint, representing the current state of the service.
-
-```
-$ curl --url vmpooler.example.com/api/v1/status
-```
-```json
-{
-  "capacity": {
-    "current": 716,
-    "total": 717,
-    "percent": 99.9
-  },
-  "clone": {
-    "duration": {
-      "average": 8.8,
-      "min": 2.79,
-      "max": 69.76
-    },
-    "count": {
-      "total": 1779
-    }
-  },
-  "queue": {
-    "pending": 1,
-    "cloning": 0,
-    "booting": 1,
-    "ready": 716,
-    "running": 142,
-    "completed": 0,
-    "total": 859
-  },
-  "status": {
-    "ok": true,
-    "message": "Battle station fully armed and operational."
-  }
-}
-```
-
-If there are empty pools, the "status" section will convey this:
-
-```json
-  "status": {
-    "ok": false,
-    "message": "Found 2 empty pools.",
-    "empty": [
-      "centos-6-x86_64",
-      "debian-7-x86_64"
-    ]
-  }
-```
-
-The top level sections are: "capacity", "queue", "clone", "boot", "pools" and "status".
-If the query parameter 'view' is provided, it will be used to select which top level
-element to compute and return. Select them by specifying which one you want in a comma 
-separated list.
-For example `vmpooler.example.com/api/v1/status?view=capacity,boot`
-
-##### GET /summary[?from=YYYY-MM-DD[&to=YYYY-MM-DD]]
-
-Returns a summary, or report, for the timespan between `from` and `to` (inclusive)
-parameters. The response includes both an overall and daily view of tracked
-metrics, such as boot and cloning durations.
-
-Any omitted query parameter will default to now/today. A request without any
-parameters will result in the current day's summary.
-
-Return codes:
-* 200  OK
-* 400  Invalid date format or range
-
-
-```
-$ curl --url vmpooler.example.com/api/v1/summary
-```
-```json
-{
-  "boot": {
-    "duration": {
-      "average": 106.6,
-      "min": 83.09,
-      "max": 121.06,
-      "total": 639.36,
-    },
-    "count": {
-      "average": 6,
-      "min": 6,
-      "max": 6,
-      "total": 6,
-    }
-  },
-  "clone": {
-    "duration": {
-      "average": 4.6,
-      "min": 2.78,
-      "max": 8.1,
-      "total": 63.94,
-    },
-    "count": {
-      "average": 14,
-      "min": 14,
-      "max": 14,
-      "total": 14,
-    }
-  },
-  "tag": {
-    "department": {
-      "engineering": 14,
-      "help desk": 10,
-      "IT": 44,
-      "total": 68
-    },
-    "user": {
-      "arodgers": 54,
-      "cmatthews": 10,
-      "jnelson": 4,
-      "total": 68
-    }
-  },
-  "daily": [
-    {
-      "date": "2015-03-11",
-      "boot": {
-        "duration": {
-          "average": 106.6,
-          "min": 83.09,
-          "max": 121.06,
-          "total": 639.36
-        },
-        "count": {
-          "total": 6
-        }
-      },
-      "clone": {
-        "duration": {
-          "average": 4.6,
-          "min": 2.78,
-          "max": 8.1,
-          "total": 63.94
-        },
-        "count": {
-          "total": 14
-        }
-      },
-      "tag": {
-        "department": {
-          "engineering": 14,
-          "help desk": 10,
-          "IT": 44,
-          "total": 68
-        },
-        "user": {
-          "arodgers": 54,
-          "cmatthews": 10,
-          "jnelson": 4,
-          "total": 68
-        }
-      }
-    }
-  ]
-}
-```
-
-
-```
-$ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api/v1/summary
-```
-```json
-{
-  "boot": {...},
-  "clone": {...},
-  "daily": [
-    {
-      "date": "2015-03-10",
-      "boot": {
-        "duration": {
-          "average": 0,
-          "min": 0,
-          "max": 0,
-          "total": 0
-        },
-        "count": {
-          "total": 0
-        }
-      },
-      "clone": {
-        "duration": {
-          "average": 0,
-          "min": 0,
-          "max": 0,
-          "total": 0
-        },
-        "count": {
-          "total": 0
-        }
-      },
-      "tag": { }
-    },
-    {
-      "date": "2015-03-11",
-      "boot": {
-        "duration": {
-          "average": 106.6,
-          "min": 83.09,
-          "max": 121.06,
-          "total": 639.36
-        },
-        "count": {
-          "total": 6
-        }
-      },
-      "clone": {
-        "duration": {
-          "average": 4.6,
-          "min": 2.78,
-          "max": 8.1,
-          "total": 63.94
-        },
-        "count": {
-          "total": 14
-        }
-      },
-      "tag": { }
-    }
-  ]
-}
-```
-
-You can also query only the specific top level section you want by including it after `summary/`.
-The valid sections are "boot", "clone" or "tag" eg. `vmpooler.example.com/api/v1/summary/boot/`.
-You can further drill-down the data by specifying the second level parameter to query eg
-`vmpooler.example.com/api/v1/summary/tag/created_by`
-
-##### GET /poolstat?pool=FOO
-
-For parameter `pool`, containing a comma separated list of pool names to query, this endpoint returns
-each of the pool's ready, max and alias information. It can be used to get a fast response for
-the required pools instead of using the /status API endpoint
-
-Return codes
-* 200  OK 
-
-```
-$ curl https://vmpooler.example.com/api/v1/poolstat?pool=centos-6-x86_64
-```
-```json
-{
-  "pools": {
-    "centos-6-x86_64": {
-      "ready": 25,
-      "max": 25,
-      "alias": [
-        "centos-6-64",
-        "centos-6-amd64"
-      ]
-    }
-  }
-}
-```
-
-##### GET /totalrunning
-
-Fast endpoint to return the total number of VMs in a 'running' state
-
-Return codes
-* 200  OK 
-
-```
-$ curl https://vmpooler.example.com/api/v1/totalrunning
-```
-
-```json
-{
-
-  "running": 362
-
-}
-```
-
-#### Managing pool configuration via API <a name="poolconfig"></a>
-
-##### GET /config
-
-Returns the running pool configuration
-
-Return codes
-* 200  OK 
-* 400  No configuration found  
-
-```
-$ curl https://vmpooler.example.com/api/v1/config
-```
-```json
-{
-  "pool_configuration": [
-    {
-      "name": "redhat-7-x86_64",
-      "template": "templates/redhat-7.2-x86_64-0.0.3",
-      "folder": "vmpooler/redhat-7-x86_64",
-      "datastore": "stor1",
-      "size": 1,
-      "datacenter": "dc1",
-      "provider": "vsphere",
-      "capacity": 1,
-      "major": "redhat",
-      "template_ready": true
-    }
-  ],
-  "status": {
-    "ok": true
-  }
-}
-```
-
-Note: to enable poolsize and pooltemplate config endpoints it is necessary to set 'experimental_features: true' in your vmpooler configuration. A 405 is returned when you attempt to interact with these endpoints when this configuration option is not set.
-
-##### POST /config/poolsize
-
-Change pool size without having to restart the service.
-
-All pool template changes requested must be for pools that exist in the vmpooler configuration running, or a 404 code will be returned
-
-When a pool size is changed due to the configuration posted a 201 status will be returned. When the pool configuration is valid, but will not result in any changes, 200 is returned.
-
-Pool size configuration changes persist through application restarts, and take precedence over a pool size value configured in the pool configuration provided when the application starts. This persistence is dependent on redis. So, if the redis data is lost then the configuration updates revert to those provided at startup at the next application start.
-
-An authentication token is required in order to change pool configuration when authentication is configured.
-Responses:
-* 200 - No changes required
-* 201 - Changes made on at least one pool with changes requested
-* 400 - An invalid configuration was provided causing requested changes to fail
-* 404 - An unknown error occurred
-* 405 - The endpoint is disabled because experimental features are disabled
-```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url https://vmpooler.example.com/api/v1/config/poolsize
-```
-```json
-{
-  "ok": true
-}
-```
-
-##### DELETE /config/poolsize/&lt;pool&gt;
-
-Delete an overridden pool size. This results in the values from VMPooler's config being used.
-
-Return codes:
-* 200 - when nothing was changed but no error occurred
-* 201 - size reset successful
-* 401 - when not authorized
-* 404 - pool does not exist
-* 405 - The endpoint is disabled because experimental features are disabled
-
-```
-$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v1/poolsize/almalinux-8-x86_64
-```
-```json
-{
-    "ok": true,
-    "pool_size_before_overrides": 2,
-    "pool_size_before_reset": 4
-}
-```
-
-##### POST /config/pooltemplate
-
-Change the template configured for a pool, and replenish the pool with instances built from the new template.
-
-All pool template changes requested must be for pools that exist in the vmpooler configuration running, or a 404 code will be returned
-
-When a pool template is changed due to the configuration posted a 201 status will be returned. When the pool configuration is valid, but will not result in any changes, 200 is returned.
-
-A pool template being updated will cause the following actions, which are logged in vmpooler.log:
-* Destroy all instances for the pool template being updated that are in the ready and pending state
-* Halt repopulating the pool while creating template deltas for the newly configured template
-* Unblock pool population and let the pool replenish with instances based on the newly configured template
-
-Pool template changes persist through application restarts, and take precedence over a pool template configured in the pool configuration provided when the application starts. This persistence is dependent on redis. As a result, if the redis data is lost then the configuration values revert to those provided at startup at the next application start.
-
-An authentication token is required in order to change pool configuration when authentication is configured.
-
-Responses:
-* 200 - No changes required
-* 201 - Changes made on at least one pool with changes requested
-* 400 - An invalid configuration was provided causing requested changes to fail
-* 404 - An unknown error occurred
-* 405 - The endpoint is disabled because experimental features are disabled
-```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"templates/debian-7-i386"}' --url https://vmpooler.example.com/api/v1/config/pooltemplate
-```
-```json
-{
-  "ok": true
-}
-```
-
-##### DELETE /config/pooltemplate/&lt;pool&gt;
-
-Delete an overridden pool template. This results in the values from VMPooler's config being used.
-
-Return codes:
-* 200 - when nothing was changed but no error occurred
-* 201 - template reset successful
-* 401 - when not authorized
-* 404 - pool does not exist
-* 405 - The endpoint is disabled because experimental features are disabled
-
-```
-$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v1/pooltemplate/almalinux-8-x86_64
-```
-```json
-{
-    "ok": true,
-    "template_before_overrides": "templates/almalinux-8-x86_64-0.0.2",
-    "template_before_reset": "templates/almalinux-8-x86_64-0.0.3-beta"
-}
-```
-
-##### POST /poolreset
-
-Clear all pending and ready instances in a pool, and deploy replacements
-
-All pool reset requests must be for pools that exist in the vmpooler configuration running, or a 404 code will be returned.
-
-When a pool reset is requested a 201 status will be returned.
-
-A pool reset will cause vmpooler manager to log that it has cleared ready and pending instances.
-
-For poolreset to be available it is necessary to enable experimental features. Additionally, the request must be performed with an authentication token when authentication is configured.
-
-Responses:
-* 201 - Pool reset requested received
-* 400 - An invalid configuration was provided causing requested changes to fail
-* 404 - An unknown error occurred
-* 405 - The endpoint is disabled because experimental features are disabled
-```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"1"}' --url https://vmpooler.example.com/api/v1/poolreset
-```
-```json
-{
-  "ok": true
-}
-```
-
-#### Ondemand VM operations <a name="ondemandvm"></a>
-
-Ondemand VM operations offer a user an option to directly request instances to be allocated for use. This can be very useful when supporting a wide range of images because idle instances can be eliminated.
-
-##### POST /ondemandvm
-
-All instance types requested must match a pool name or alias in the running application configuration, or a 404 code will be returned
-
-When a provisioning request is accepted the API will return an indication that the request is successful. You may then poll /ondemandvm to monitor request status.
-
-An authentication token is required in order to request instances on demand when authentication is configured.
-
-Responses:
-* 201 - Provisioning request accepted
-* 400 - Payload contains invalid JSON and cannot be parsed
-* 401 - No auth token provided, or provided auth token is not valid, and auth is enabled
-* 403 - Request exceeds the configured per pool maximum
-* 404 - A pool was requested, which is not available in the running configuration, or an unknown error occurred.
-* 409 - A request of the matching ID has already been created
-```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"4"}' --url https://vmpooler.example.com/api/v1/ondemandvm
-```
-```json
-{
-  "ok": true,
-  "request_id": "e3ff6271-d201-4f31-a315-d17f4e15863a"
-}
-```
-
-##### GET /ondemandvm
-
-Get the status of an ondemandvm request that has already been posted.
-
-When the request is ready the ready status will change to 'true'.
-
-The number of instances pending vs ready will be reflected in the API response.
-
-Responses:
-* 200 - The API request was successful and the status is ok
-* 202 - The request is not ready yet
-* 404 - The request can not be found, or an unknown error occurred
-```
-$ curl https://vmpooler.example.com/api/v1/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a
-```
-```json
-{
-  "ok": true,
-  "request_id": "e3ff6271-d201-4f31-a315-d17f4e15863a",
-  "ready": false,
-  "debian-7-i386": {
-    "ready": "3",
-    "pending": "1"
-  }
-}
-```
-```json
-{
-  "ok": true,
-  "request_id": "e3ff6271-d201-4f31-a315-d17f4e15863a",
-  "ready": true,
-  "debian-7-i386": {
-    "hostname": [
-      "vm1",
-      "vm2",
-      "vm3",
-      "vm4"
-    ]
-  }
-}
-```
-
-##### DELETE /ondemandvm
-
-Delete a ondemand request
-
-Deleting a ondemand request will delete any instances created for the request and mark the backend data for expiration in two weeks. Any subsequent attempts to retrieve request data will indicate it has been deleted.
-
-Responses:
-* 200 - The API request was sucessful. A message will indicate if the request has already been deleted.
-* 401 - No auth token provided, or provided auth token is not valid, and auth is enabled
-* 404 - The request can not be found, or an unknown error occurred.
-```
-$ curl -X DELETE https://vmpooler.example.com/api/v1/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a
-```
-```json
-{
-  "ok": true
-}
-```
diff --git a/docs/API-v2.md b/docs/API-v2.md
index 54a83a6..c67b92d 100644
--- a/docs/API-v2.md
+++ b/docs/API-v2.md
@@ -12,6 +12,15 @@
 
 vmpooler provides a REST API for VM management.  The following examples use `curl` for communication.
 
+## Major change in V3 versus V2
+
+The deprecated api/v1 has been removed.
+
+The api/v2 endpoint removes the deprecated "domain" key returned in some of the operations like getting a VM, etc. If there is a "domain" configured in the top level configuration or for a specific provider,
+the hostname now returns an FQDN including that domain. That is to say, we can now have multiple, different domains for each pool instead of only a single domain for all pools, or a domain restricted to a particular provider.
+
+Clients using some of the direct API paths (without specifying api/v1 or api/v2) will now be redirected to v2.
+
 ## Major change in V2 versus V1
 
 The api/v2 endpoint removes a separate "domain" key returned in some of the operations like getting a VM, etc. If there is a "domain" configured in the top level configuration or for a specific provider,
diff --git a/docs/configuration.md b/docs/configuration.md
index 1c34c72..e577025 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -19,11 +19,6 @@ Provide the entire configuration as a blob of yaml. Individual parameters passed
 
 Path to a the file to use when loading the vmpooler configuration. This is only evaluated if `VMPOOLER_CONFIG` has not been specified.
 
-### DOMAIN
-
-This environment variable is to set the configuration config.domain
-(optional)
-
 ### REDIS\_SERVER
 
 The redis server to use for vmpooler.
diff --git a/examples/vmpooler.yaml.dummy-example.aliasedpools b/examples/vmpooler.yaml.dummy-example.aliasedpools
index efe0ce2..ebece50 100644
--- a/examples/vmpooler.yaml.dummy-example.aliasedpools
+++ b/examples/vmpooler.yaml.dummy-example.aliasedpools
@@ -23,9 +23,13 @@
   allowed_tags:
     - 'created_by'
     - 'project'
-  domain: 'example.com'
   prefix: 'poolvm-'
 
+:dns_configs:
+  :example:
+    dns_class: dynamic-dns
+    domain: 'example.com'
+
 :pools:
   - name: 'debian-7-i386'
     alias: [ 'debian-7-32' ]
@@ -36,6 +40,7 @@
     timeout: 15
     ready_ttl: 1440
     provider: dummy
+    dns_plugin: 'example'
   - name: 'debian-7-i386-stringalias'
     alias: 'debian-7-32-stringalias'
     template: 'Templates/debian-7-i386'
@@ -45,6 +50,7 @@
     timeout: 15
     ready_ttl: 1440
     provider: dummy
+    dns_plugin: 'example'
   - name: 'debian-7-x86_64'
     alias: [ 'debian-7-64', 'debian-7-amd64' ]
     template: 'Templates/debian-7-x86_64'
@@ -54,6 +60,7 @@
     timeout: 15
     ready_ttl: 1440
     provider: dummy
+    dns_plugin: 'example'
   - name: 'debian-7-i386-noalias'
     template: 'Templates/debian-7-i386'
     folder: 'Pooled VMs/debian-7-i386'
@@ -62,6 +69,7 @@
     timeout: 15
     ready_ttl: 1440
     provider: dummy
+    dns_plugin: 'example'
   - name: 'debian-7-x86_64-alias-otherpool-extended'
     alias: [ 'debian-7-x86_64' ]
     template: 'Templates/debian-7-x86_64'
@@ -71,4 +79,4 @@
     timeout: 15
     ready_ttl: 1440
     provider: dummy
-
+    dns_plugin: 'example'
diff --git a/vmpooler.yaml.dummy-example b/vmpooler.yaml.dummy-example
index 3a15630..09146a5 100644
--- a/vmpooler.yaml.dummy-example
+++ b/vmpooler.yaml.dummy-example
@@ -3,6 +3,12 @@
   :dummy:
     filename: '/tmp/dummy-backing.yaml'
 
+:dns_configs:
+  :example:
+    dns_class: dynamic-dns
+    #domain: 'localhost' # Flip these out for local requests
+    domain: 'example.com'
+
 :redis:
   server: 'localhost'
 
@@ -23,8 +29,6 @@
   allowed_tags:
     - 'created_by'
     - 'project'
-  domain: 'example.com'
-  #domain: 'localhost' # Flip these out for local requests
   prefix: 'poolvm-'
 
 :pools:
@@ -37,6 +41,7 @@
     timeout: 15
     ready_ttl: 1440
     provider: dummy
+    dns_plugin: 'example'
   - name: 'debian-7-x86_64'
     alias: [ 'debian-7-64', 'debian-7-amd64' ]
     template: 'Templates/debian-7-x86_64'
@@ -46,4 +51,4 @@
     timeout: 15
     ready_ttl: 1440
     provider: dummy
-
+    dns_plugin: 'example'
diff --git a/vmpooler.yaml.example b/vmpooler.yaml.example
index a381bf9..efd0ba7 100644
--- a/vmpooler.yaml.example
+++ b/vmpooler.yaml.example
@@ -445,12 +445,6 @@
 #   - allowed_tags
 #     If set, restricts tags to those specified in this array.
 #
-#   - domain
-#     If set, returns a top-level 'domain' JSON key in POST requests (v1).
-#     in the v2 API, it concatenates the hostname to include the domain, either set here or at the provider level
-#     With the introduction of vmpooler-provider-gce, domains can now be set at the provider level. The
-#     domain key is only retained in v1 for backwards compatibility and will be removed in the future.
-#
 #   - prefix
 #     If set, prefixes all created VMs with this string.  This should include
 #     a separator.
@@ -601,13 +595,35 @@
   allowed_tags:
     - 'created_by'
     - 'project'
-  domain: 'example.com'
   prefix: 'poolvm-'
   experimental_features: true
   backend_weight:
     'backend1': 60
     'backend2': 40
 
+# :dns_configs:
+#
+# This section a list of dns configurations to be referenced by one or more pools.
+#
+# The currently supported backing services are:
+# - dynamic-dns (This assumes that dynamic dns is handling record management and VMPooler does not require interaction)
+# - gcp (Google Cloud DNS https://github.com/puppetlabs/vmpooler-dns-gcp)
+#
+#   - dns_class
+#     Specify one of the supported backing services.
+#
+#   - domain
+#     The domain expected to make up the FQDN when attempting to resolve VM instances.
+#
+# See DNS plugin docs for additional options specific to that class.
+#
+# Example
+
+:dns_configs:
+  :example:
+    dns_class: dynamic-dns
+    domain: 'example.com'
+
 # :pools:
 #
 # This section contains a list of virtual machine 'pools' for vmpooler to
@@ -638,6 +654,12 @@
 #     If you have more than one provider, this is where you would choose which
 #     one to use for this pool
 #
+#   - dns_plugin
+#     The name of the DNS plugin to use with this pool in order to determine the
+#     domain and settings specific to a DNS service. This should match
+#     a name in the :dns_configs: section above. e.g. example
+#     (required)
+#
 #   - clone_target
 #     Per-pool option to override the global 'clone_target' cluster.
 #     (optional)

From 93201756a063c78d8920e08321a00eb3926bd917 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 7 Mar 2023 14:23:23 -0500
Subject: [PATCH 16/19] Add v3 api and remove v2

---
 .rubocop_todo.yml                             |   66 +-
 docs/{API-v2.md => API-v3.md}                 |   74 +-
 lib/vmpooler/api.rb                           |    4 +-
 lib/vmpooler/api/v1.rb                        | 1757 -----------------
 lib/vmpooler/api/{v2.rb => v3.rb}             |  647 ++++--
 .../integration/api/{v2 => v3}/config_spec.rb |    6 +-
 .../api/{v2 => v3}/ondemandvm_spec.rb         |   22 +-
 spec/integration/api/{v2 => v3}/poolreset.rb  |    4 +-
 .../integration/api/{v2 => v3}/status_spec.rb |    4 +-
 spec/integration/api/{v2 => v3}/token_spec.rb |    6 +-
 .../api/{v2 => v3}/vm_hostname_spec.rb        |    4 +-
 spec/integration/api/{v2 => v3}/vm_spec.rb    |   38 +-
 .../api/{v2 => v3}/vm_template_spec.rb        |    4 +-
 13 files changed, 627 insertions(+), 2009 deletions(-)
 rename docs/{API-v2.md => API-v3.md} (91%)
 delete mode 100644 lib/vmpooler/api/v1.rb
 rename lib/vmpooler/api/{v2.rb => v3.rb} (74%)
 rename spec/integration/api/{v2 => v3}/config_spec.rb (99%)
 rename spec/integration/api/{v2 => v3}/ondemandvm_spec.rb (94%)
 rename spec/integration/api/{v2 => v3}/poolreset.rb (98%)
 rename spec/integration/api/{v2 => v3}/status_spec.rb (99%)
 rename spec/integration/api/{v2 => v3}/token_spec.rb (98%)
 rename spec/integration/api/{v2 => v3}/vm_hostname_spec.rb (99%)
 rename spec/integration/api/{v2 => v3}/vm_spec.rb (93%)
 rename spec/integration/api/{v2 => v3}/vm_template_spec.rb (99%)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4f0d4d3..7046eb6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -12,8 +12,7 @@
 # SupportedStyles: with_first_parameter, with_fixed_indentation
 Layout/ParameterAlignment:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 9
 # Cop supports --auto-correct.
@@ -22,15 +21,13 @@ Layout/ParameterAlignment:
 Layout/CaseIndentation:
   Exclude:
     - 'lib/vmpooler/api/helpers.rb'
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 Layout/ClosingParenthesisIndentation:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -61,16 +58,14 @@ Layout/EmptyLinesAroundModuleBody:
 Layout/FirstHashElementIndentation:
   Exclude:
     - 'lib/vmpooler/api/helpers.rb'
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -78,8 +73,7 @@ Layout/IndentationWidth:
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -93,16 +87,14 @@ Layout/SpaceAroundEqualsInParameterDefault:
 # Cop supports --auto-correct.
 Layout/SpaceAroundKeyword:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceAroundOperators:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 8
 # Cop supports --auto-correct.
@@ -117,16 +109,14 @@ Layout/SpaceInsideHashLiteralBraces:
 # Cop supports --auto-correct.
 Layout/SpaceInsideParens:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 2
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
     - 'lib/vmpooler/api/helpers.rb'
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 2
 Lint/SuppressedException:
@@ -158,8 +148,7 @@ Lint/UselessAssignment:
 Style/AndOr:
   Exclude:
     - 'lib/vmpooler/api/helpers.rb'
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 Style/CaseEquality:
@@ -180,8 +169,7 @@ Style/For:
 Style/HashSyntax:
   Exclude:
     - 'lib/vmpooler/api/helpers.rb'
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -189,8 +177,7 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/vmpooler/api/helpers.rb'
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -198,15 +185,13 @@ Style/IfUnlessModifier:
 # SupportedStyles: both, prefix, postfix
 Style/NegatedIf:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
 Style/Not:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -215,30 +200,26 @@ Style/Not:
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowSafeAssignment.
 Style/ParenthesesAroundCondition:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
@@ -254,8 +235,7 @@ Naming/PredicateName:
 # Cop supports --auto-correct.
 Style/RedundantParentheses:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -276,8 +256,7 @@ Style/RedundantSelf:
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -292,8 +271,7 @@ Style/TernaryParentheses:
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
   Exclude:
-    - 'lib/vmpooler/api/v1.rb'
-    - 'lib/vmpooler/api/v2.rb'
+    - 'lib/vmpooler/api/v3.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
diff --git a/docs/API-v2.md b/docs/API-v3.md
similarity index 91%
rename from docs/API-v2.md
rename to docs/API-v3.md
index c67b92d..ec4feaf 100644
--- a/docs/API-v2.md
+++ b/docs/API-v3.md
@@ -14,12 +14,12 @@ vmpooler provides a REST API for VM management.  The following examples use `cur
 
 ## Major change in V3 versus V2
 
-The deprecated api/v1 has been removed.
+The api/v1 and api/v2 endpoints have been removed. Additionally, the generic api endpoint that reroutes to a versioned endpoint has been removed.
 
-The api/v2 endpoint removes the deprecated "domain" key returned in some of the operations like getting a VM, etc. If there is a "domain" configured in the top level configuration or for a specific provider,
+The api/v3 endpoint removes the deprecated "domain" key returned in some of the operations like getting a VM, etc. If there is a "domain" configured in the top level configuration or for a specific provider,
 the hostname now returns an FQDN including that domain. That is to say, we can now have multiple, different domains for each pool instead of only a single domain for all pools, or a domain restricted to a particular provider.
 
-Clients using some of the direct API paths (without specifying api/v1 or api/v2) will now be redirected to v2.
+Clients using some of the direct API paths (without specifying api/v1 or api/v2) will now now need to specify the versioned endpoint (api/v3).
 
 ## Major change in V2 versus V1
 
@@ -50,7 +50,7 @@ Return codes:
 * 404  when config:auth not found or other error
 
 ```
-$ curl -u jdoe --url vmpooler.example.com/api/v2/token
+$ curl -u jdoe --url vmpooler.example.com/api/v3/token
 Enter host password for user 'jdoe':
 ```
 ```json
@@ -72,7 +72,7 @@ Return codes:
 * 404  when config:auth not found
 
 ```
-$ curl -X POST -u jdoe --url vmpooler.example.com/api/v2/token
+$ curl -X POST -u jdoe --url vmpooler.example.com/api/v3/token
 Enter host password for user 'jdoe':
 ```
 ```json
@@ -91,7 +91,7 @@ Return codes:
 * 404  when config:auth or token not found
 
 ```
-$ curl --url vmpooler.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y
+$ curl --url vmpooler.example.com/api/v3/token/utpg2i2xswor6h8ttjhu3d47z53yy47y
 ```
 ```json
 {
@@ -120,7 +120,7 @@ Return codes:
 * 404  when config:auth not found
 
 ```
-$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y
+$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v3/token/utpg2i2xswor6h8ttjhu3d47z53yy47y
 Enter host password for user 'jdoe':
 ```
 ```json
@@ -139,7 +139,7 @@ Return codes:
 * 200  OK
 
 ```
-$ curl --url vmpooler.example.com/api/v2/vm
+$ curl --url vmpooler.example.com/api/v3/vm
 ```
 ```json
 [
@@ -160,7 +160,7 @@ Return codes:
 * 503  when the vm failed to allocate a vm, or the pool is empty
 
 ```
-$ curl -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url vmpooler.example.com/api/v2/vm
+$ curl -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url vmpooler.example.com/api/v3/vm
 ```
 ```json
 {
@@ -189,7 +189,7 @@ Return codes:
 * 503  when the vm failed to allocate a vm, or the pool is empty
 
 ```
-$ curl -d --url vmpooler.example.com/api/v2/vm/debian-7-i386
+$ curl -d --url vmpooler.example.com/api/v3/vm/debian-7-i386
 ```
 ```json
 {
@@ -203,7 +203,7 @@ $ curl -d --url vmpooler.example.com/api/v2/vm/debian-7-i386
 Multiple VMs can be requested by using multiple query parameters in the URL:
 
 ```
-$ curl -d --url vmpooler.example.com/api/v2/vm/debian-7-i386+debian-7-i386+debian-7-x86_64
+$ curl -d --url vmpooler.example.com/api/v3/vm/debian-7-i386+debian-7-i386+debian-7-x86_64
 ```
 
 ```json
@@ -232,7 +232,7 @@ Return codes:
 * 404  when requesting an invalid VM hostname
 
 ```
-$ curl --url vmpooler.example.com/api/v2/vm/pxpmtoonx7fiqg6
+$ curl --url vmpooler.example.com/api/v3/vm/pxpmtoonx7fiqg6
 ```
 ```json
 {
@@ -276,7 +276,7 @@ Return codes:
 * 400  when supplied PUT parameters fail validation
 
 ```
-$ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6
+$ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6
 ```
 ```json
 {
@@ -285,7 +285,7 @@ $ curl -X PUT -d '{"lifetime":"2"}' --url vmpooler.example.com/api/v2/vm/fq6qlpj
 ```
 
 ```
-$ curl -X PUT -d '{"tags":{"department":"engineering","user":"jdoe"}}' --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6
+$ curl -X PUT -d '{"tags":{"department":"engineering","user":"jdoe"}}' --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6
 ```
 ```json
 {
@@ -303,7 +303,7 @@ Return codes:
 * 404  when requesting an invalid VM hostname
 
 ```
-$ curl -X DELETE --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6
+$ curl -X DELETE --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6
 ```
 ```json
 {
@@ -323,7 +323,7 @@ Return codes:
 * 404  when requesting an invalid VM hostname or size is not an integer
 
 ````
-$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6/disk/8
+$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6/disk/8
 ````
 ````json
 {
@@ -337,7 +337,7 @@ $ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.e
 Provisioning and attaching disks can take a moment, but once the task completes it will be reflected in a `GET /vm/<hostname>` query:
 
 ````
-$ curl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6
+$ curl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6
 ````
 ````json
 {
@@ -367,7 +367,7 @@ Return codes:
 * 404  when requesting an invalid VM hostname
 
 ````
-$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6/snapshot
+$ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6/snapshot
 ````
 ````json
 {
@@ -381,7 +381,7 @@ $ curl -X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.e
 Snapshotting a live VM can take a moment, but once the snapshot task completes it will be reflected in a `GET /vm/<hostname>` query:
 
 ````
-$ curl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6
+$ curl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6
 ````
 ````json
 {
@@ -408,7 +408,7 @@ Return codes:
 * 404  when requesting an invalid VM hostname or snapshot is not valid
 
 ````
-$ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v2/vm/fq6qlpjlsskycq6/snapshot/n4eb4kdtp7rwv4x158366vd9jhac8btq
+$ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.example.com/api/v3/vm/fq6qlpjlsskycq6/snapshot/n4eb4kdtp7rwv4x158366vd9jhac8btq
 ````
 ````json
 {
@@ -423,7 +423,7 @@ $ curl X POST -H X-AUTH-TOKEN:a9znth9dn01t416hrguu56ze37t790bl --url vmpooler.ex
 A "live" status endpoint, representing the current state of the service.
 
 ```
-$ curl --url vmpooler.example.com/api/v2/status
+$ curl --url vmpooler.example.com/api/v3/status
 ```
 ```json
 {
@@ -475,7 +475,7 @@ The top level sections are: "capacity", "queue", "clone", "boot", "pools" and "s
 If the query parameter 'view' is provided, it will be used to select which top level
 element to compute and return. Select them by specifying which one you want in a comma 
 separated list.
-For example `vmpooler.example.com/api/v2/status?view=capacity,boot`
+For example `vmpooler.example.com/api/v3/status?view=capacity,boot`
 
 ##### GET /summary[?from=YYYY-MM-DD[&to=YYYY-MM-DD]]
 
@@ -492,7 +492,7 @@ Return codes:
 
 
 ```
-$ curl --url vmpooler.example.com/api/v2/summary
+$ curl --url vmpooler.example.com/api/v3/summary
 ```
 ```json
 {
@@ -584,7 +584,7 @@ $ curl --url vmpooler.example.com/api/v2/summary
 
 
 ```
-$ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api/v2/summary
+$ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api/v3/summary
 ```
 ```json
 {
@@ -648,9 +648,9 @@ $ curl -G -d 'from=2015-03-10' -d 'to=2015-03-11' --url vmpooler.example.com/api
 ```
 
 You can also query only the specific top level section you want by including it after `summary/`.
-The valid sections are "boot", "clone" or "tag" eg. `vmpooler.example.com/api/v2/summary/boot/`.
+The valid sections are "boot", "clone" or "tag" eg. `vmpooler.example.com/api/v3/summary/boot/`.
 You can further drill-down the data by specifying the second level parameter to query eg
-`vmpooler.example.com/api/v2/summary/tag/created_by`
+`vmpooler.example.com/api/v3/summary/tag/created_by`
 
 ##### GET /poolstat?pool=FOO
 
@@ -662,7 +662,7 @@ Return codes
 * 200  OK 
 
 ```
-$ curl https://vmpooler.example.com/api/v2/poolstat?pool=centos-6-x86_64
+$ curl https://vmpooler.example.com/api/v3/poolstat?pool=centos-6-x86_64
 ```
 ```json
 {
@@ -687,7 +687,7 @@ Return codes
 * 200  OK 
 
 ```
-$ curl https://vmpooler.example.com/api/v2/totalrunning
+$ curl https://vmpooler.example.com/api/v3/totalrunning
 ```
 
 ```json
@@ -709,7 +709,7 @@ Return codes
 * 400  No configuration found  
 
 ```
-$ curl https://vmpooler.example.com/api/v2/config
+$ curl https://vmpooler.example.com/api/v3/config
 ```
 ```json
 {
@@ -753,7 +753,7 @@ Responses:
 * 404 - An unknown error occurred
 * 405 - The endpoint is disabled because experimental features are disabled
 ```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url https://vmpooler.example.com/api/v2/config/poolsize
+$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"2","debian-7-x86_64":"1"}' --url https://vmpooler.example.com/api/v3/config/poolsize
 ```
 ```json
 {
@@ -773,7 +773,7 @@ Return codes:
 * 405 - The endpoint is disabled because experimental features are disabled
 
 ```
-$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v2/poolsize/almalinux-8-x86_64
+$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v3/poolsize/almalinux-8-x86_64
 ```
 ```json
 {
@@ -807,7 +807,7 @@ Responses:
 * 404 - An unknown error occurred
 * 405 - The endpoint is disabled because experimental features are disabled
 ```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"templates/debian-7-i386"}' --url https://vmpooler.example.com/api/v2/config/pooltemplate
+$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"templates/debian-7-i386"}' --url https://vmpooler.example.com/api/v3/config/pooltemplate
 ```
 ```json
 {
@@ -827,7 +827,7 @@ Return codes:
 * 405 - The endpoint is disabled because experimental features are disabled
 
 ```
-$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v2/pooltemplate/almalinux-8-x86_64
+$ curl -X DELETE -u jdoe --url vmpooler.example.com/api/v3/pooltemplate/almalinux-8-x86_64
 ```
 ```json
 {
@@ -855,7 +855,7 @@ Responses:
 * 404 - An unknown error occurred
 * 405 - The endpoint is disabled because experimental features are disabled
 ```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"1"}' --url https://vmpooler.example.com/api/v2/poolreset
+$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"1"}' --url https://vmpooler.example.com/api/v3/poolreset
 ```
 ```json
 {
@@ -883,7 +883,7 @@ Responses:
 * 404 - A pool was requested, which is not available in the running configuration, or an unknown error occurred.
 * 409 - A request of the matching ID has already been created
 ```
-$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"4"}' --url https://vmpooler.example.com/api/v2/ondemandvm
+$ curl -X POST -H "Content-Type: application/json" -d '{"debian-7-i386":"4"}' --url https://vmpooler.example.com/api/v3/ondemandvm
 ```
 ```json
 {
@@ -905,7 +905,7 @@ Responses:
 * 202 - The request is not ready yet
 * 404 - The request can not be found, or an unknown error occurred
 ```
-$ curl https://vmpooler.example.com/api/v2/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a
+$ curl https://vmpooler.example.com/api/v3/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a
 ```
 ```json
 {
@@ -945,7 +945,7 @@ Responses:
 * 401 - No auth token provided, or provided auth token is not valid, and auth is enabled
 * 404 - The request can not be found, or an unknown error occurred.
 ```
-$ curl -X DELETE https://vmpooler.example.com/api/v2/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a
+$ curl -X DELETE https://vmpooler.example.com/api/v3/ondemandvm/e3ff6271-d201-4f31-a315-d17f4e15863a
 ```
 ```json
 {
diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb
index 5397637..1d0dce8 100644
--- a/lib/vmpooler/api.rb
+++ b/lib/vmpooler/api.rb
@@ -3,7 +3,7 @@
 module Vmpooler
   class API < Sinatra::Base
     # Load API components
-    %w[helpers dashboard reroute v2 request_logger healthcheck].each do |lib|
+    %w[helpers dashboard reroute v3 request_logger healthcheck].each do |lib|
       require "vmpooler/api/#{lib}"
     end
     # Load dashboard components
@@ -53,7 +53,7 @@ module Vmpooler
         use Vmpooler::Dashboard
         use Vmpooler::API::Dashboard
         use Vmpooler::API::Reroute
-        use Vmpooler::API::V2
+        use Vmpooler::API::V3
       end
 
       # Get thee started O WebServer
diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
deleted file mode 100644
index c6e7d9b..0000000
--- a/lib/vmpooler/api/v1.rb
+++ /dev/null
@@ -1,1757 +0,0 @@
-# frozen_string_literal: true
-
-require 'vmpooler/util/parsing'
-
-module Vmpooler
-  class API
-  class V1 < Sinatra::Base
-    api_version = '1'
-    api_prefix  = "/api/v#{api_version}"
-
-    helpers do
-      include Vmpooler::API::Helpers
-    end
-
-    def backend
-      Vmpooler::API.settings.redis
-    end
-
-    def metrics
-      Vmpooler::API.settings.metrics
-    end
-
-    def config
-      Vmpooler::API.settings.config[:config]
-    end
-
-    def full_config
-      Vmpooler::API.settings.config
-    end
-
-    def pools
-      Vmpooler::API.settings.config[:pools]
-    end
-
-    def pools_at_startup
-      Vmpooler::API.settings.config[:pools_at_startup]
-    end
-
-    def pool_exists?(template)
-      Vmpooler::API.settings.config[:pool_names].include?(template)
-    end
-
-    def need_auth!
-      validate_auth(backend)
-    end
-
-    def need_token!
-      validate_token(backend)
-    end
-
-    def checkoutlock
-      Vmpooler::API.settings.checkoutlock
-    end
-
-    def get_template_aliases(template)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result = []
-        aliases = Vmpooler::API.settings.config[:alias]
-        if aliases
-          result += aliases[template] if aliases[template].is_a?(Array)
-          template_backends << aliases[template] if aliases[template].is_a?(String)
-        end
-        result
-      end
-    end
-
-    def get_pool_weights(template_backends)
-      pool_index = pool_index(pools)
-      weighted_pools = {}
-      template_backends.each do |t|
-        next unless pool_index.key? t
-
-        index = pool_index[t]
-        clone_target = pools[index]['clone_target'] || config['clone_target']
-        next unless config.key?('backend_weight')
-
-        weight = config['backend_weight'][clone_target]
-        if weight
-          weighted_pools[t] = weight
-        end
-      end
-      weighted_pools
-    end
-
-    def count_selection(selection)
-      result = {}
-      selection.uniq.each do |poolname|
-        result[poolname] = selection.count(poolname)
-      end
-      result
-    end
-
-    def evaluate_template_aliases(template, count)
-      template_backends = []
-      template_backends << template if backend.sismember('vmpooler__pools', template)
-      selection = []
-      aliases = get_template_aliases(template)
-      if aliases
-        template_backends += aliases
-        weighted_pools = get_pool_weights(template_backends)
-
-        if weighted_pools.count > 1 && weighted_pools.count == template_backends.count
-          pickup = Pickup.new(weighted_pools)
-          count.to_i.times do
-            selection << pickup.pick
-          end
-        else
-          count.to_i.times do
-            selection << template_backends.sample
-          end
-        end
-      end
-
-      count_selection(selection)
-    end
-
-    def fetch_single_vm(template)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        template_backends = [template]
-        aliases = Vmpooler::API.settings.config[:alias]
-        if aliases
-          template_backends += aliases[template] if aliases[template].is_a?(Array)
-          template_backends << aliases[template] if aliases[template].is_a?(String)
-          pool_index = pool_index(pools)
-          weighted_pools = {}
-          template_backends.each do |t|
-            next unless pool_index.key? t
-
-            index = pool_index[t]
-            clone_target = pools[index]['clone_target'] || config['clone_target']
-            next unless config.key?('backend_weight')
-
-            weight = config['backend_weight'][clone_target]
-            if weight
-              weighted_pools[t] = weight
-            end
-          end
-
-          if weighted_pools.count == template_backends.count
-            pickup = Pickup.new(weighted_pools)
-            selection = pickup.pick
-            template_backends.delete(selection)
-            template_backends.unshift(selection)
-          else
-            first = template_backends.sample
-            template_backends.delete(first)
-            template_backends.unshift(first)
-          end
-        end
-
-        checkoutlock.synchronize do
-          template_backends.each do |template_backend|
-            vms = backend.smembers("vmpooler__ready__#{template_backend}")
-            next if vms.empty?
-
-            vms.reverse.each do |vm|
-              ready = vm_ready?(vm, config['domain'])
-              if ready
-                smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
-                if smoved
-                  return [vm, template_backend, template]
-                else
-                  metrics.increment("checkout.smove.failed.#{template_backend}")
-                  return [nil, nil, nil]
-                end
-              else
-                backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__completed__#{template_backend}", vm)
-                metrics.increment("checkout.nonresponsive.#{template_backend}")
-              end
-            end
-          end
-          [nil, nil, nil]
-        end
-      end
-    end
-
-    def return_vm_to_ready_state(template, vm)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        backend.srem("vmpooler__migrating__#{template}", vm)
-        backend.hdel("vmpooler__active__#{template}", vm)
-        backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user')
-        backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm)
-      end
-    end
-
-    def account_for_starting_vm(template, vm)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span|
-        user = backend.hget("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'user')
-        span.set_attribute('enduser.id', user)
-        has_token_result = has_token?
-        backend.sadd("vmpooler__migrating__#{template}", vm)
-        backend.hset("vmpooler__active__#{template}", vm, Time.now)
-        backend.hset("vmpooler__vm__#{vm}", 'checkout', Time.now)
-
-        if Vmpooler::API.settings.config[:auth] and has_token_result
-          backend.hset("vmpooler__vm__#{vm}", 'token:token', request.env['HTTP_X_AUTH_TOKEN'])
-          backend.hset("vmpooler__vm__#{vm}", 'token:user', user)
-
-          if config['vm_lifetime_auth'].to_i > 0
-            backend.hset("vmpooler__vm__#{vm}", 'lifetime', config['vm_lifetime_auth'].to_i)
-          end
-        end
-      end
-    end
-
-    def update_result_hosts(result, template, vm)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result[template] ||= {}
-        if result[template]['hostname']
-          result[template]['hostname'] = Array(result[template]['hostname'])
-          result[template]['hostname'].push(vm)
-        else
-          result[template]['hostname'] = vm
-        end
-      end
-    end
-
-    def atomically_allocate_vms(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span|
-        result = { 'ok' => false }
-        failed = false
-        vms = []
-
-        validate_token(backend) if Vmpooler::API.settings.config[:auth] and has_token?
-
-        payload.each do |requested, count|
-          count.to_i.times do |_i|
-            vmname, vmpool, vmtemplate = fetch_single_vm(requested)
-            if vmname
-              account_for_starting_vm(vmpool, vmname)
-              vms << [vmpool, vmname, vmtemplate]
-              metrics.increment("checkout.success.#{vmpool}")
-              update_user_metrics('allocate', vmname) if Vmpooler::API.settings.config[:config]['usage_stats']
-            else
-              failed = true
-              metrics.increment("checkout.empty.#{requested}")
-              break
-            end
-          end
-        end
-
-        if failed
-          vms.each do |(vmpool, vmname, _vmtemplate)|
-            return_vm_to_ready_state(vmpool, vmname)
-          end
-          span.add_event('error', attributes: {
-            'error.type' => 'Vmpooler::API::V1.atomically_allocate_vms',
-            'error.message' => '503 due to failing to allocate one or more vms'
-          })
-          status 503
-        else
-          vm_names = []
-          vms.each do |(_vmpool, vmname, vmtemplate)|
-            update_result_hosts(result, vmtemplate, vmname)
-            vm_names.append(vmname)
-          end
-
-          span.set_attribute('vmpooler.vm_names', vm_names.join(',')) unless vm_names.empty?
-
-          result['ok'] = true
-          result['domain'] = config['domain'] if config['domain']
-        end
-
-        result
-      end
-    end
-
-    def component_to_test(match, labels_string)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        return if labels_string.nil?
-
-        labels_string_parts = labels_string.split(',')
-        labels_string_parts.each do |part|
-          key, value = part.split('=')
-          next if value.nil?
-          return value if key == match
-        end
-        'none'
-      end
-    end
-
-    def update_user_metrics(operation, vmname)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span|
-        begin
-          backend.multi
-          backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
-          backend.hget("vmpooler__vm__#{vmname}", 'token:user')
-          backend.hget("vmpooler__vm__#{vmname}", 'template')
-          jenkins_build_url, user, poolname = backend.exec
-          poolname = poolname.gsub('.', '_')
-
-          if user
-            user = user.gsub('.', '_')
-          else
-            user = 'unauthenticated'
-          end
-          metrics.increment("user.#{user}.#{operation}.#{poolname}")
-
-          if jenkins_build_url
-            if jenkins_build_url.include? 'litmus'
-              # Very simple filter for Litmus jobs - just count them coming through for the moment.
-              metrics.increment("usage_litmus.#{user}.#{operation}.#{poolname}")
-            else
-              url_parts = jenkins_build_url.split('/')[2..-1]
-              jenkins_instance = url_parts[0].gsub('.', '_')
-              value_stream_parts = url_parts[2].split('_')
-              value_stream_parts = value_stream_parts.map { |s| s.gsub('.', '_') }
-              value_stream = value_stream_parts.shift
-              branch = value_stream_parts.pop
-              project = value_stream_parts.shift
-              job_name = value_stream_parts.join('_')
-              build_metadata_parts = url_parts[3]
-              component_to_test = component_to_test('RMM_COMPONENT_TO_TEST_NAME', build_metadata_parts)
-
-              metrics.increment("usage_jenkins_instance.#{jenkins_instance}.#{value_stream}.#{operation}.#{poolname}")
-              metrics.increment("usage_branch_project.#{branch}.#{project}.#{operation}.#{poolname}")
-              metrics.increment("usage_job_component.#{job_name}.#{component_to_test}.#{operation}.#{poolname}")
-            end
-          end
-        rescue StandardError => e
-          puts 'd', "[!] [#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}"
-          span.record_exception(e)
-          span.status = OpenTelemetry::Trace::Status.error(e.to_s)
-          span.add_event('log', attributes: {
-            'log.severity' => 'debug',
-            'log.message' => "[#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}"
-          })
-        end
-      end
-    end
-
-    def reset_pool_size(poolname)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result = { 'ok' => false }
-
-        pool_index = pool_index(pools)
-
-        pools_updated = 0
-        sync_pool_sizes
-
-        pool_size_now = pools[pool_index[poolname]]['size'].to_i
-        pool_size_original = pools_at_startup[pool_index[poolname]]['size'].to_i
-        result['pool_size_before_reset'] = pool_size_now
-        result['pool_size_before_overrides'] = pool_size_original
-
-        unless pool_size_now == pool_size_original
-          pools[pool_index[poolname]]['size'] = pool_size_original
-          backend.hdel('vmpooler__config__poolsize', poolname)
-          backend.sadd('vmpooler__pool__undo_size_override', poolname)
-          pools_updated += 1
-          status 201
-        end
-
-        status 200 unless pools_updated > 0
-        result['ok'] = true
-        result
-      end
-    end
-
-    def update_pool_size(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result = { 'ok' => false }
-
-        pool_index = pool_index(pools)
-        pools_updated = 0
-        sync_pool_sizes
-
-        payload.each do |poolname, size|
-          unless pools[pool_index[poolname]]['size'] == size.to_i
-            pools[pool_index[poolname]]['size'] = size.to_i
-            backend.hset('vmpooler__config__poolsize', poolname, size)
-            pools_updated += 1
-            status 201
-          end
-        end
-        status 200 unless pools_updated > 0
-        result['ok'] = true
-        result
-      end
-    end
-
-    def reset_pool_template(poolname)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result = { 'ok' => false }
-
-        pool_index_live = pool_index(pools)
-        pool_index_original = pool_index(pools_at_startup)
-
-        pools_updated = 0
-        sync_pool_templates
-
-        template_now = pools[pool_index_live[poolname]]['template']
-        template_original = pools_at_startup[pool_index_original[poolname]]['template']
-        result['template_before_reset'] = template_now
-        result['template_before_overrides'] = template_original
-
-        unless template_now == template_original
-          pools[pool_index_live[poolname]]['template'] = template_original
-          backend.hdel('vmpooler__config__template', poolname)
-          backend.sadd('vmpooler__pool__undo_template_override', poolname)
-          pools_updated += 1
-          status 201
-        end
-
-        status 200 unless pools_updated > 0
-        result['ok'] = true
-        result
-      end
-    end
-
-    def update_pool_template(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result = { 'ok' => false }
-
-        pool_index = pool_index(pools)
-        pools_updated = 0
-        sync_pool_templates
-
-        payload.each do |poolname, template|
-          unless pools[pool_index[poolname]]['template'] == template
-            pools[pool_index[poolname]]['template'] = template
-            backend.hset('vmpooler__config__template', poolname, template)
-            pools_updated += 1
-            status 201
-          end
-        end
-        status 200 unless pools_updated > 0
-        result['ok'] = true
-        result
-      end
-    end
-
-    def reset_pool(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result = { 'ok' => false }
-
-        payload.each do |poolname, _count|
-          backend.sadd('vmpooler__poolreset', poolname)
-        end
-        status 201
-        result['ok'] = true
-        result
-      end
-    end
-
-    def update_clone_target(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        result = { 'ok' => false }
-
-        pool_index = pool_index(pools)
-        pools_updated = 0
-        sync_clone_targets
-
-        payload.each do |poolname, clone_target|
-          unless pools[pool_index[poolname]]['clone_target'] == clone_target
-            pools[pool_index[poolname]]['clone_target'] = clone_target
-            backend.hset('vmpooler__config__clone_target', poolname, clone_target)
-            pools_updated += 1
-            status 201
-          end
-        end
-        status 200 unless pools_updated > 0
-        result['ok'] = true
-        result
-      end
-    end
-
-    def sync_pool_templates
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        pool_index = pool_index(pools)
-        template_configs = backend.hgetall('vmpooler__config__template')
-        template_configs&.each do |poolname, template|
-          next unless pool_index.include? poolname
-
-          pools[pool_index[poolname]]['template'] = template
-        end
-      end
-    end
-
-    def sync_pool_sizes
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        pool_index = pool_index(pools)
-        poolsize_configs = backend.hgetall('vmpooler__config__poolsize')
-        poolsize_configs&.each do |poolname, size|
-          next unless pool_index.include? poolname
-
-          pools[pool_index[poolname]]['size'] = size.to_i
-        end
-      end
-    end
-
-    def sync_clone_targets
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        pool_index = pool_index(pools)
-        clone_target_configs = backend.hgetall('vmpooler__config__clone_target')
-        clone_target_configs&.each do |poolname, clone_target|
-          next unless pool_index.include? poolname
-
-          pools[pool_index[poolname]]['clone_target'] = clone_target
-        end
-      end
-    end
-
-    def too_many_requested?(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        payload&.each do |poolname, count|
-          next unless count.to_i > config['max_ondemand_instances_per_request']
-
-          metrics.increment("ondemandrequest_fail.toomanyrequests.#{poolname}")
-          return true
-        end
-        false
-      end
-    end
-
-    def generate_ondemand_request(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span|
-        result = { 'ok': false }
-
-        requested_instances = payload.reject { |k, _v| k == 'request_id' }
-        if too_many_requested?(requested_instances)
-          e_message = "requested amount of instances exceeds the maximum #{config['max_ondemand_instances_per_request']}"
-          result['message'] = e_message
-          status 403
-          span.add_event('error', attributes: {
-            'error.type' => 'Vmpooler::API::V1.generate_ondemand_request',
-            'error.message' => "403 due to #{e_message}"
-          })
-          return result
-        end
-
-        score = Time.now.to_i
-        request_id = payload['request_id']
-        request_id ||= generate_request_id
-        result['request_id'] = request_id
-        span.set_attribute('vmpooler.request_id', request_id)
-
-        if backend.exists?("vmpooler__odrequest__#{request_id}")
-          e_message = "request_id '#{request_id}' has already been created"
-          result['message'] = e_message
-          status 409
-          span.add_event('error', attributes: {
-            'error.type' => 'Vmpooler::API::V1.generate_ondemand_request',
-            'error.message' => "409 due to #{e_message}"
-          })
-          metrics.increment('ondemandrequest_generate.duplicaterequests')
-          return result
-        end
-
-        status 201
-
-        platforms_with_aliases = []
-        requested_instances.each do |poolname, count|
-          selection = evaluate_template_aliases(poolname, count)
-          selection.map { |selected_pool, selected_pool_count| platforms_with_aliases << "#{poolname}:#{selected_pool}:#{selected_pool_count}" }
-        end
-        platforms_string = platforms_with_aliases.join(',')
-
-        return result unless backend.zadd('vmpooler__provisioning__request', score, request_id)
-
-        backend.hset("vmpooler__odrequest__#{request_id}", 'requested', platforms_string)
-        if Vmpooler::API.settings.config[:auth] and has_token?
-          token_token = request.env['HTTP_X_AUTH_TOKEN']
-          token_user = backend.hget("vmpooler__token__#{token_token}", 'user')
-          backend.hset("vmpooler__odrequest__#{request_id}", 'token:token', token_token)
-          backend.hset("vmpooler__odrequest__#{request_id}", 'token:user', token_user)
-          span.set_attribute('enduser.id', token_user)
-        end
-
-        result['domain'] = config['domain'] if config['domain']
-        result[:ok] = true
-        metrics.increment('ondemandrequest_generate.success')
-        result
-      end
-    end
-
-    def generate_request_id
-      SecureRandom.uuid
-    end
-
-    get '/' do
-      sync_pool_sizes
-      redirect to('/dashboard/')
-    end
-
-    # Provide run-time statistics
-    #
-    # Example:
-    #
-    # {
-    #   "boot": {
-    #     "duration": {
-    #       "average": 163.6,
-    #       "min": 65.49,
-    #       "max": 830.07,
-    #       "total": 247744.71000000002
-    #     },
-    #     "count": {
-    #       "total": 1514
-    #     }
-    #   },
-    #   "capacity": {
-    #     "current": 968,
-    #     "total": 975,
-    #     "percent": 99.3
-    #   },
-    #   "clone": {
-    #     "duration": {
-    #       "average": 17.0,
-    #       "min": 4.66,
-    #       "max": 637.96,
-    #       "total": 25634.15
-    #     },
-    #     "count": {
-    #       "total": 1507
-    #     }
-    #   },
-    #   "queue": {
-    #     "pending": 12,
-    #     "cloning": 0,
-    #     "booting": 12,
-    #     "ready": 968,
-    #     "running": 367,
-    #     "completed": 0,
-    #     "total": 1347
-    #   },
-    #   "pools": {
-    #     "ready": 100,
-    #     "running": 120,
-    #     "pending": 5,
-    #     "max": 250,
-    #   }
-    #   "status": {
-    #     "ok": true,
-    #     "message": "Battle station fully armed and operational.",
-    #     "empty": [ # NOTE: would not have 'ok: true' w/ "empty" pools
-    #       "redhat-7-x86_64",
-    #       "ubuntu-1404-i386"
-    #     ],
-    #     "uptime": 179585.9
-    # }
-    #
-    # If the query parameter 'view' is provided, it will be used to select which top level
-    # element to compute and return. Select them by specifying them in a comma separated list.
-    # For example /status?view=capacity,boot
-    # would return only the "capacity" and "boot" statistics. "status" is always returned
-
-    get "#{api_prefix}/status/?" do
-      content_type :json
-
-      if params[:view]
-        views = params[:view].split(",")
-      end
-
-      result = {
-        status: {
-          ok: true,
-          message: 'Battle station fully armed and operational.'
-        }
-      }
-
-      sync_pool_sizes
-
-      result[:capacity] = get_capacity_metrics(pools, backend) unless views and not views.include?("capacity")
-      result[:queue] = get_queue_metrics(pools, backend) unless views and not views.include?("queue")
-      result[:clone] = get_task_metrics(backend, 'clone', Date.today.to_s) unless views and not views.include?("clone")
-      result[:boot] = get_task_metrics(backend, 'boot', Date.today.to_s) unless views and not views.include?("boot")
-
-      # Check for empty pools
-      result[:pools] = {} unless views and not views.include?("pools")
-      ready_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__ready__', backend)
-      running_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__running__', backend)
-      pending_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__pending__', backend)
-      lastBoot_hash = get_list_across_pools_redis_hget(pools, 'vmpooler__lastboot', backend)
-
-      unless views and not views.include?("pools")
-        pools.each do |pool|
-          # REMIND: move this out of the API and into the back-end
-          ready    = ready_hash[pool['name']]
-          running  = running_hash[pool['name']]
-          pending  = pending_hash[pool['name']]
-          max      = pool['size']
-          lastBoot = lastBoot_hash[pool['name']]
-          aka      = pool['alias']
-
-          result[:pools][pool['name']] = {
-            ready: ready,
-            running: running,
-            pending: pending,
-            max: max,
-            lastBoot: lastBoot
-          }
-
-          if aka
-            result[:pools][pool['name']][:alias] = aka
-          end
-
-          # for backwards compatibility, include separate "empty" stats in "status" block
-          if ready == 0 && max != 0
-            result[:status][:empty] ||= []
-            result[:status][:empty].push(pool['name'])
-
-            result[:status][:ok] = false
-            result[:status][:message] = "Found #{result[:status][:empty].length} empty pools."
-          end
-        end
-      end
-
-      result[:status][:uptime] = (Time.now - Vmpooler::API.settings.config[:uptime]).round(1) if Vmpooler::API.settings.config[:uptime]
-
-      JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }])
-    end
-
-    # request statistics for specific pools by passing parameter 'pool'
-    # with a coma separated list of pools we want to query ?pool=ABC,DEF
-    # returns the ready, max numbers and the aliases (if set)
-    get "#{api_prefix}/poolstat/?" do
-      content_type :json
-
-      result = {}
-
-      poolscopy = []
-
-      if params[:pool]
-        subpool = params[:pool].split(",")
-        poolscopy = pools.select do |p|
-          if subpool.include?(p['name'])
-            true
-          elsif !p['alias'].nil?
-            if p['alias'].instance_of?(Array)
-              (p['alias'] & subpool).any?
-            elsif p['alias'].instance_of?(String)
-              subpool.include?(p['alias'])
-            end
-          end
-        end
-      end
-
-      result[:pools] = {}
-
-      poolscopy.each do |pool|
-        result[:pools][pool['name']] = {}
-
-        max      = pool['size']
-        aka      = pool['alias']
-
-        result[:pools][pool['name']][:max] = max
-
-        if aka
-          result[:pools][pool['name']][:alias] = aka
-        end
-      end
-
-      ready_hash = get_list_across_pools_redis_scard(poolscopy, 'vmpooler__ready__', backend)
-
-      ready_hash.each { |k, v| result[:pools][k][:ready] = v }
-
-      JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }])
-    end
-
-    # requests the total number of running VMs
-    get "#{api_prefix}/totalrunning/?" do
-      content_type :json
-      queue = {
-          running: 0
-      }
-
-      queue[:running] = get_total_across_pools_redis_scard(pools, 'vmpooler__running__', backend)
-
-      JSON.pretty_generate(queue)
-    end
-
-    get "#{api_prefix}/summary/?" do
-      content_type :json
-
-      result = {
-        daily: []
-      }
-
-      from_param = params[:from] || Date.today.to_s
-      to_param   = params[:to]   || Date.today.to_s
-
-      # Validate date formats
-      [from_param, to_param].each do |param|
-        if !validate_date_str(param.to_s)
-          halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD."
-        end
-      end
-
-      from_date, to_date = Date.parse(from_param), Date.parse(to_param)
-
-      if to_date < from_date
-        halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.'
-      elsif from_date > Date.today
-        halt 400, 'Date range is invalid, \'from\' must be in the past.'
-      end
-
-      boot = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true)
-      clone = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true)
-      tag = get_tag_summary(backend, from_date, to_date)
-
-      result[:boot] = boot[:boot]
-      result[:clone] = clone[:clone]
-      result[:tag] = tag[:tag]
-
-      daily = {}
-
-      boot[:daily].each do |day|
-        daily[day[:date]] ||= {}
-        daily[day[:date]][:boot] = day[:boot]
-      end
-
-      clone[:daily].each do |day|
-        daily[day[:date]] ||= {}
-        daily[day[:date]][:clone] = day[:clone]
-      end
-
-      tag[:daily].each do |day|
-        daily[day[:date]] ||= {}
-        daily[day[:date]][:tag] = day[:tag]
-      end
-
-      daily.each_key do |day|
-        result[:daily].push({
-          date: day,
-          boot: daily[day][:boot],
-          clone: daily[day][:clone],
-          tag: daily[day][:tag]
-        })
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/summary/:route/?:key?/?" do
-      content_type :json
-
-      result = {}
-
-      from_param = params[:from] || Date.today.to_s
-      to_param   = params[:to]   || Date.today.to_s
-
-      # Validate date formats
-      [from_param, to_param].each do |param|
-        if !validate_date_str(param.to_s)
-          halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD."
-        end
-      end
-
-      from_date, to_date = Date.parse(from_param), Date.parse(to_param)
-
-      if to_date < from_date
-        halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.'
-      elsif from_date > Date.today
-        halt 400, 'Date range is invalid, \'from\' must be in the past.'
-      end
-
-      case params[:route]
-        when 'boot'
-          result = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true, :only => params[:key])
-        when 'clone'
-          result = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true, :only => params[:key])
-        when 'tag'
-          result = get_tag_summary(backend, from_date, to_date, :only => params[:key])
-        else
-          halt 404, JSON.pretty_generate({ 'ok' => false })
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/token/?" do
-      content_type :json
-
-      status 404
-      result = { 'ok' => false }
-
-      if Vmpooler::API.settings.config[:auth]
-        status 401
-
-        need_auth!
-
-        backend.keys('vmpooler__token__*').each do |key|
-          data = backend.hgetall(key)
-
-          if data['user'] == Rack::Auth::Basic::Request.new(request.env).username
-            span = OpenTelemetry::Trace.current_span
-            span.set_attribute('enduser.id', data['user'])
-            token = key.split('__').last
-
-            result[token] ||= {}
-
-            result[token]['created'] = data['created']
-            result[token]['last'] = data['last'] || 'never'
-
-            result['ok'] = true
-          end
-        end
-
-        if result['ok']
-          status 200
-        else
-          status 404
-        end
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/token/:token/?" do
-      content_type :json
-
-      status 404
-      result = { 'ok' => false }
-
-      if Vmpooler::API.settings.config[:auth]
-        token = backend.hgetall("vmpooler__token__#{params[:token]}")
-
-        if not token.nil? and not token.empty?
-          status 200
-
-          pools.each do |pool|
-            backend.smembers("vmpooler__running__#{pool['name']}").each do |vm|
-              if backend.hget("vmpooler__vm__#{vm}", 'token:token') == params[:token]
-                token['vms'] ||= {}
-                token['vms']['running'] ||= []
-                token['vms']['running'].push(vm)
-              end
-            end
-          end
-
-          result = { 'ok' => true, params[:token] => token }
-        end
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    delete "#{api_prefix}/token/:token/?" do
-      content_type :json
-
-      status 404
-      result = { 'ok' => false }
-
-      if Vmpooler::API.settings.config[:auth]
-        status 401
-
-        need_auth!
-
-        if backend.del("vmpooler__token__#{params[:token]}").to_i > 0
-          status 200
-          result['ok'] = true
-        end
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/token" do
-      content_type :json
-
-      status 404
-      result = { 'ok' => false }
-
-      if Vmpooler::API.settings.config[:auth]
-        status 401
-
-        need_auth!
-
-        o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten
-        result['token'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join
-
-        backend.hset("vmpooler__token__#{result['token']}", 'user', @auth.username)
-        backend.hset("vmpooler__token__#{result['token']}", 'created', Time.now)
-        span = OpenTelemetry::Trace.current_span
-        span.set_attribute('enduser.id', @auth.username)
-
-        status 200
-        result['ok'] = true
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/vm/?" do
-      content_type :json
-
-      result = []
-
-      pools.each do |pool|
-        result.push(pool['name'])
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/ondemandvm/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.post.ondemand.requestid')
-
-      need_token! if Vmpooler::API.settings.config[:auth]
-
-      result = { 'ok' => false }
-
-      begin
-        payload = JSON.parse(request.body.read)
-
-        if payload
-          invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' })
-          if invalid.empty?
-            result = generate_ondemand_request(payload)
-          else
-            result[:bad_templates] = invalid
-            invalid.each do |bad_template|
-              metrics.increment("ondemandrequest_fail.invalid.#{bad_template}")
-            end
-            status 404
-          end
-        else
-          metrics.increment('ondemandrequest_fail.invalid.unknown')
-          status 404
-        end
-      rescue JSON::ParserError
-        span = OpenTelemetry::Trace.current_span
-        span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed')
-        status 400
-        result = {
-          'ok' => false,
-          'message' => 'JSON payload could not be parsed'
-        }
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/ondemandvm/:template/?" do
-      content_type :json
-      result = { 'ok' => false }
-      metrics.increment('http_requests_vm_total.delete.ondemand.template')
-
-      need_token! if Vmpooler::API.settings.config[:auth]
-
-      payload = extract_templates_from_query_params(params[:template])
-
-      if payload
-        invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' })
-        if invalid.empty?
-          result = generate_ondemand_request(payload)
-        else
-          result[:bad_templates] = invalid
-          invalid.each do |bad_template|
-            metrics.increment("ondemandrequest_fail.invalid.#{bad_template}")
-          end
-          status 404
-        end
-      else
-        metrics.increment('ondemandrequest_fail.invalid.unknown')
-        status 404
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/ondemandvm/:requestid/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.get.ondemand.request')
-
-      status 404
-      result = check_ondemand_request(params[:requestid])
-
-      JSON.pretty_generate(result)
-    end
-
-    delete "#{api_prefix}/ondemandvm/:requestid/?" do
-      content_type :json
-      need_token! if Vmpooler::API.settings.config[:auth]
-      metrics.increment('http_requests_vm_total.delete.ondemand.request')
-
-      status 404
-      result = delete_ondemand_request(params[:requestid])
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/vm/?" do
-      content_type :json
-      result = { 'ok' => false }
-      metrics.increment('http_requests_vm_total.post.vm.checkout')
-
-      payload = JSON.parse(request.body.read)
-
-      if payload
-        invalid = invalid_templates(payload)
-        if invalid.empty?
-          result = atomically_allocate_vms(payload)
-        else
-          invalid.each do |bad_template|
-            metrics.increment("checkout.invalid.#{bad_template}")
-          end
-          status 404
-        end
-      else
-        metrics.increment('checkout.invalid.unknown')
-        status 404
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    def extract_templates_from_query_params(params)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        payload = {}
-
-        params.split('+').each do |template|
-          payload[template] ||= 0
-          payload[template] += 1
-        end
-
-        payload
-      end
-    end
-
-    def invalid_templates(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        invalid = []
-        payload.keys.each do |template|
-          invalid << template unless pool_exists?(template)
-        end
-        invalid
-      end
-    end
-
-    def invalid_template_or_size(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        invalid = []
-        payload.each do |pool, size|
-          invalid << pool unless pool_exists?(pool)
-          unless is_integer?(size)
-            invalid << pool
-            next
-          end
-          invalid << pool unless Integer(size) >= 0
-        end
-        invalid
-      end
-    end
-
-    def invalid_template_or_path(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        invalid = []
-        payload.each do |pool, template|
-          invalid << pool unless pool_exists?(pool)
-          invalid << pool unless template.include? '/'
-          invalid << pool if template[0] == '/'
-          invalid << pool if template[-1] == '/'
-        end
-        invalid
-      end
-    end
-
-    def invalid_pool(payload)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do
-        invalid = []
-        payload.each do |pool, _clone_target|
-          invalid << pool unless pool_exists?(pool)
-        end
-        invalid
-      end
-    end
-
-    def check_ondemand_request(request_id)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span|
-        span.set_attribute('vmpooler.request_id', request_id)
-        result = { 'ok' => false }
-        request_hash = backend.hgetall("vmpooler__odrequest__#{request_id}")
-        if request_hash.empty?
-          e_message = "no request found for request_id '#{request_id}'"
-          result['message'] = e_message
-          span.add_event('error', attributes: {
-            'error.type' => 'Vmpooler::API::V1.check_ondemand_request',
-            'error.message' => e_message
-          })
-          return result
-        end
-
-        result['request_id'] = request_id
-        result['ready'] = false
-        result['ok'] = true
-        status 202
-
-        case request_hash['status']
-        when 'ready'
-          result['ready'] = true
-          Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count|
-            instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
-
-            if result.key?(platform_alias)
-              result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances
-            else
-              result[platform_alias] = { 'hostname': instances }
-            end
-          end
-          result['domain'] = config['domain'] if config['domain']
-          status 200
-        when 'failed'
-          result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'"
-          status 200
-        when 'deleted'
-          result['message'] = 'The request has been deleted'
-          status 200
-        else
-          Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count|
-            instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
-            instances_pending = count.to_i - instance_count.to_i
-
-            if result.key?(platform_alias) && result[platform_alias].key?(:ready)
-              result[platform_alias][:ready] = (result[platform_alias][:ready].to_i + instance_count).to_s
-              result[platform_alias][:pending] = (result[platform_alias][:pending].to_i + instances_pending).to_s
-            else
-              result[platform_alias] = {
-                'ready': instance_count.to_s,
-                'pending': instances_pending.to_s
-              }
-            end
-          end
-        end
-
-        result
-      end
-    end
-
-    def delete_ondemand_request(request_id)
-      tracer.in_span("Vmpooler::API::V1.#{__method__}") do |span|
-        span.set_attribute('vmpooler.request_id', request_id)
-        result = { 'ok' => false }
-
-        platforms = backend.hget("vmpooler__odrequest__#{request_id}", 'requested')
-        unless platforms
-          e_message = "no request found for request_id '#{request_id}'"
-          result['message'] = e_message
-          span.add_event('error', attributes: {
-            'error.type' => 'Vmpooler::API::V1.delete_ondemand_request',
-            'error.message' => e_message
-          })
-          return result
-        end
-
-        if backend.hget("vmpooler__odrequest__#{request_id}", 'status') == 'deleted'
-          result['message'] = 'the request has already been deleted'
-        else
-          backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted')
-
-          Parsing.get_platform_pool_count(platforms) do |platform_alias, pool, _count|
-            backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm|
-              backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm)
-            end
-            backend.del("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
-          end
-          backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0)
-        end
-        status 200
-        result['ok'] = true
-        result
-      end
-    end
-
-    post "#{api_prefix}/vm/:template/?" do
-      content_type :json
-      result = { 'ok' => false }
-      metrics.increment('http_requests_vm_total.get.vm.template')
-
-      payload = extract_templates_from_query_params(params[:template])
-
-      if payload
-        invalid = invalid_templates(payload)
-        if invalid.empty?
-          result = atomically_allocate_vms(payload)
-        else
-          invalid.each do |bad_template|
-            metrics.increment("checkout.invalid.#{bad_template}")
-          end
-          status 404
-        end
-      else
-        metrics.increment('checkout.invalid.unknown')
-        status 404
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/vm/:hostname/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.get.vm.hostname')
-
-      result = {}
-
-      status 404
-      result['ok'] = false
-
-      params[:hostname] = hostname_shorten(params[:hostname], config['domain'])
-
-      rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}")
-      unless rdata.empty?
-        status 200
-        result['ok'] = true
-
-        result[params[:hostname]] = {}
-
-        result[params[:hostname]]['template'] = rdata['template']
-        result[params[:hostname]]['lifetime'] = (rdata['lifetime'] || config['vm_lifetime']).to_i
-
-        if rdata['destroy']
-          result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2) if rdata['checkout']
-          result[params[:hostname]]['state'] = 'destroyed'
-        elsif rdata['checkout']
-          result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
-          result[params[:hostname]]['remaining'] = ((Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 - Time.now) / 60 / 60).round(2)
-          result[params[:hostname]]['start_time'] = Time.parse(rdata['checkout']).to_datetime.rfc3339
-          result[params[:hostname]]['end_time'] = (Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60).to_datetime.rfc3339
-          result[params[:hostname]]['state'] = 'running'
-        elsif rdata['check']
-          result[params[:hostname]]['state'] = 'ready'
-        else
-          result[params[:hostname]]['state'] = 'pending'
-        end
-
-        rdata.keys.each do |key|
-          if key.match('^tag\:(.+?)$')
-            result[params[:hostname]]['tags'] ||= {}
-            result[params[:hostname]]['tags'][$1] = rdata[key]
-          end
-
-          if key.match('^snapshot\:(.+?)$')
-            result[params[:hostname]]['snapshots'] ||= []
-            result[params[:hostname]]['snapshots'].push($1)
-          end
-        end
-
-        if rdata['disk']
-          result[params[:hostname]]['disk'] = rdata['disk'].split(':')
-        end
-
-        # Look up IP address of the hostname
-        begin
-          ipAddress = TCPSocket.gethostbyname(params[:hostname])[3]
-        rescue StandardError
-          ipAddress = ""
-        end
-
-        result[params[:hostname]]['ip'] = ipAddress
-
-        if config['domain']
-          result[params[:hostname]]['domain'] = config['domain']
-        end
-
-        result[params[:hostname]]['host'] = rdata['host'] if rdata['host']
-        result[params[:hostname]]['migrated'] = rdata['migrated'] if rdata['migrated']
-
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    delete "#{api_prefix}/vm/:hostname/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.delete.vm.hostname')
-
-      result = {}
-
-      status 404
-      result['ok'] = false
-
-      params[:hostname] = hostname_shorten(params[:hostname], config['domain'])
-
-      rdata = backend.hgetall("vmpooler__vm__#{params[:hostname]}")
-      unless rdata.empty?
-        need_token! if rdata['token:token']
-
-        if backend.srem("vmpooler__running__#{rdata['template']}", params[:hostname])
-          backend.sadd("vmpooler__completed__#{rdata['template']}", params[:hostname])
-
-          status 200
-          result['ok'] = true
-          metrics.increment('delete.success')
-          update_user_metrics('destroy', params[:hostname]) if Vmpooler::API.settings.config[:config]['usage_stats']
-        else
-          metrics.increment('delete.failed')
-        end
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    put "#{api_prefix}/vm/:hostname/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.put.vm.modify')
-
-      status 404
-      result = { 'ok' => false }
-
-      failure = []
-
-      params[:hostname] = hostname_shorten(params[:hostname], config['domain'])
-
-      if backend.exists?("vmpooler__vm__#{params[:hostname]}")
-        begin
-          jdata = JSON.parse(request.body.read)
-        rescue StandardError => e
-          span = OpenTelemetry::Trace.current_span
-          span.record_exception(e)
-          span.status = OpenTelemetry::Trace::Status.error(e.to_s)
-          halt 400, JSON.pretty_generate(result)
-        end
-
-        # Validate data payload
-        jdata.each do |param, arg|
-          case param
-            when 'lifetime'
-              need_token! if Vmpooler::API.settings.config[:auth]
-
-              # in hours, defaults to one week
-              max_lifetime_upper_limit = config['max_lifetime_upper_limit']
-              if max_lifetime_upper_limit
-                max_lifetime_upper_limit = max_lifetime_upper_limit.to_i
-                if arg.to_i >= max_lifetime_upper_limit
-                  failure.push("You provided a lifetime (#{arg}) that exceeds the configured maximum of #{max_lifetime_upper_limit}.")
-                end
-              end
-
-              # validate lifetime is within boundaries
-              unless arg.to_i > 0
-                failure.push("You provided a lifetime (#{arg}) but you must provide a positive number.")
-              end
-
-            when 'tags'
-              failure.push("You provided tags (#{arg}) as something other than a hash.") unless arg.is_a?(Hash)
-              failure.push("You provided unsuppored tags (#{arg}).") if config['allowed_tags'] && !(arg.keys - config['allowed_tags']).empty?
-            else
-              failure.push("Unknown argument #{arg}.")
-          end
-        end
-
-        if !failure.empty?
-          status 400
-          result['failure'] = failure
-        else
-          jdata.each do |param, arg|
-            case param
-              when 'lifetime'
-                need_token! if Vmpooler::API.settings.config[:auth]
-
-                arg = arg.to_i
-
-                backend.hset("vmpooler__vm__#{params[:hostname]}", param, arg)
-              when 'tags'
-                filter_tags(arg)
-                export_tags(backend, params[:hostname], arg)
-            end
-          end
-
-          status 200
-          result['ok'] = true
-        end
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/vm/:hostname/disk/:size/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.post.vm.disksize')
-
-      need_token! if Vmpooler::API.settings.config[:auth]
-
-      status 404
-      result = { 'ok' => false }
-
-      params[:hostname] = hostname_shorten(params[:hostname], config['domain'])
-
-      if ((params[:size].to_i > 0 )and (backend.exists?("vmpooler__vm__#{params[:hostname]}")))
-        result[params[:hostname]] = {}
-        result[params[:hostname]]['disk'] = "+#{params[:size]}gb"
-
-        backend.sadd('vmpooler__tasks__disk', "#{params[:hostname]}:#{params[:size]}")
-
-        status 202
-        result['ok'] = true
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/vm/:hostname/snapshot/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.post.vm.snapshot')
-
-      need_token! if Vmpooler::API.settings.config[:auth]
-
-      status 404
-      result = { 'ok' => false }
-
-      params[:hostname] = hostname_shorten(params[:hostname], config['domain'])
-
-      if backend.exists?("vmpooler__vm__#{params[:hostname]}")
-        result[params[:hostname]] = {}
-
-        o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten
-        result[params[:hostname]]['snapshot'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join
-
-        backend.sadd('vmpooler__tasks__snapshot', "#{params[:hostname]}:#{result[params[:hostname]]['snapshot']}")
-
-        status 202
-        result['ok'] = true
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/vm/:hostname/snapshot/:snapshot/?" do
-      content_type :json
-      metrics.increment('http_requests_vm_total.post.vm.snapshot')
-
-      need_token! if Vmpooler::API.settings.config[:auth]
-
-      status 404
-      result = { 'ok' => false }
-
-      params[:hostname] = hostname_shorten(params[:hostname], config['domain'])
-
-      unless backend.hget("vmpooler__vm__#{params[:hostname]}", "snapshot:#{params[:snapshot]}").to_i.zero?
-        backend.sadd('vmpooler__tasks__snapshot-revert', "#{params[:hostname]}:#{params[:snapshot]}")
-
-        status 202
-        result['ok'] = true
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    delete "#{api_prefix}/config/poolsize/:pool/?" do
-      content_type :json
-      result = { 'ok' => false }
-
-      if config['experimental_features']
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        if pool_exists?(params[:pool])
-          result = reset_pool_size(params[:pool])
-        else
-          metrics.increment('config.invalid.unknown')
-          status 404
-        end
-      else
-        status 405
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/config/poolsize/?" do
-      content_type :json
-      result = { 'ok' => false }
-
-      if config['experimental_features']
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        payload = JSON.parse(request.body.read)
-
-        if payload
-          invalid = invalid_template_or_size(payload)
-          if invalid.empty?
-            result = update_pool_size(payload)
-          else
-            invalid.each do |bad_template|
-              metrics.increment("config.invalid.#{bad_template}")
-            end
-            result[:not_configured] = invalid
-            status 400
-          end
-        else
-          metrics.increment('config.invalid.unknown')
-          status 404
-        end
-      else
-        status 405
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    delete "#{api_prefix}/config/pooltemplate/:pool/?" do
-      content_type :json
-      result = { 'ok' => false }
-
-      if config['experimental_features']
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        if pool_exists?(params[:pool])
-          result = reset_pool_template(params[:pool])
-        else
-          metrics.increment('config.invalid.unknown')
-          status 404
-        end
-      else
-        status 405
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/config/pooltemplate/?" do
-      content_type :json
-      result = { 'ok' => false }
-
-      if config['experimental_features']
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        payload = JSON.parse(request.body.read)
-
-        if payload
-          invalid = invalid_template_or_path(payload)
-          if invalid.empty?
-            result = update_pool_template(payload)
-          else
-            invalid.each do |bad_template|
-              metrics.increment("config.invalid.#{bad_template}")
-            end
-            result[:bad_templates] = invalid
-            status 400
-          end
-        else
-          metrics.increment('config.invalid.unknown')
-          status 404
-        end
-      else
-        status 405
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/poolreset/?" do
-      content_type :json
-      result = { 'ok' => false }
-
-      if config['experimental_features']
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        begin
-          payload = JSON.parse(request.body.read)
-          if payload
-            invalid = invalid_templates(payload)
-            if invalid.empty?
-              result = reset_pool(payload)
-            else
-              invalid.each do |bad_pool|
-                metrics.increment("poolreset.invalid.#{bad_pool}")
-              end
-              result[:bad_pools] = invalid
-              status 400
-            end
-          else
-            metrics.increment('poolreset.invalid.unknown')
-            status 404
-          end
-        rescue JSON::ParserError
-          span = OpenTelemetry::Trace.current_span
-          span.record_exception(e)
-          span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed')
-          status 400
-          result = {
-            'ok' => false,
-            'message' => 'JSON payload could not be parsed'
-          }
-        end
-      else
-        status 405
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    post "#{api_prefix}/config/clonetarget/?" do
-      content_type :json
-      result = { 'ok' => false }
-
-      if config['experimental_features']
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        payload = JSON.parse(request.body.read)
-
-        if payload
-          invalid = invalid_pool(payload)
-          if invalid.empty?
-            result = update_clone_target(payload)
-          else
-            invalid.each do |bad_template|
-              metrics.increment("config.invalid.#{bad_template}")
-            end
-            result[:bad_templates] = invalid
-            status 400
-          end
-        else
-          metrics.increment('config.invalid.unknown')
-          status 404
-        end
-      else
-        status 405
-      end
-
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/config/?" do
-      content_type :json
-      result = { 'ok' => false }
-      status 404
-
-      if pools
-        sync_pool_sizes
-        sync_pool_templates
-
-        pool_configuration = []
-        pools.each do |pool|
-          pool['template_ready'] = template_ready?(pool, backend)
-          pool_configuration << pool
-        end
-
-        result = {
-          pool_configuration: pool_configuration,
-          status: {
-            ok: true
-          }
-        }
-
-        status 200
-      end
-      JSON.pretty_generate(result)
-    end
-
-    get "#{api_prefix}/full_config/?" do
-      content_type :json
-
-      result = {
-        full_config: full_config,
-        status: {
-          ok: true
-        }
-      }
-
-      status 200
-      JSON.pretty_generate(result)
-    end
-  end
-  end
-end
diff --git a/lib/vmpooler/api/v2.rb b/lib/vmpooler/api/v3.rb
similarity index 74%
rename from lib/vmpooler/api/v2.rb
rename to lib/vmpooler/api/v3.rb
index a5987a0..4e8f6e9 100644
--- a/lib/vmpooler/api/v2.rb
+++ b/lib/vmpooler/api/v3.rb
@@ -5,8 +5,8 @@ require 'vmpooler/dns'
 
 module Vmpooler
   class API
-    class V2 < Vmpooler::API::V1
-      api_version = '2'
+    class V3 < Sinatra::Base
+      api_version = '3'
       api_prefix  = "/api/v#{api_version}"
 
       helpers do
@@ -54,7 +54,7 @@ module Vmpooler
       end
 
       def get_template_aliases(template)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result = []
           aliases = Vmpooler::API.settings.config[:alias]
           if aliases
@@ -125,7 +125,7 @@ module Vmpooler
       #   what template was used, if successful. Otherwise the tuple contains.
       #   nil values.
       def fetch_single_vm(template)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           template_backends = [template]
           aliases = Vmpooler::API.settings.config[:alias]
           if aliases
@@ -175,7 +175,7 @@ module Vmpooler
       end
 
       def return_vm_to_ready_state(template, vm)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           backend.srem("vmpooler__migrating__#{template}", vm)
           backend.hdel("vmpooler__active__#{template}", vm)
           backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user')
@@ -184,7 +184,7 @@ module Vmpooler
       end
 
       def account_for_starting_vm(template, vm)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
           user = backend.hget("vmpooler__token__#{request.env['HTTP_X_AUTH_TOKEN']}", 'user')
           span.set_attribute('enduser.id', user)
           has_token_result = has_token?
@@ -204,7 +204,7 @@ module Vmpooler
       end
 
       def update_result_hosts(result, template, vm)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result[template] ||= {}
           if result[template]['hostname']
             result[template]['hostname'] = Array(result[template]['hostname'])
@@ -215,13 +215,8 @@ module Vmpooler
         end
       end
 
-      # The domain in the result body will be set to the one associated with the
-      # last vm added. The part of the response is only being retained for
-      # backwards compatibility as the hostnames are now fqdn's instead of bare
-      # hostnames. This change is a result of now being able to specify a domain
-      # per pool.
       def atomically_allocate_vms(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
           result = { 'ok' => false }
           failed = false
           vms = [] # vmpool, vmname, vmtemplate
@@ -249,7 +244,7 @@ module Vmpooler
               return_vm_to_ready_state(vmpool, vmname)
             end
             span.add_event('error', attributes: {
-              'error.type' => 'Vmpooler::API::V2.atomically_allocate_vms',
+              'error.type' => 'Vmpooler::API::V3.atomically_allocate_vms',
               'error.message' => '503 due to failing to allocate one or more vms'
             })
             status 503
@@ -272,7 +267,7 @@ module Vmpooler
       end
 
       def component_to_test(match, labels_string)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           return if labels_string.nil?
 
           labels_string_parts = labels_string.split(',')
@@ -286,7 +281,7 @@ module Vmpooler
       end
 
       def update_user_metrics(operation, vmname)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
           begin
             backend.multi
             backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
@@ -336,7 +331,7 @@ module Vmpooler
       end
 
       def reset_pool_size(poolname)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result = { 'ok' => false }
 
           pool_index = pool_index(pools)
@@ -364,7 +359,7 @@ module Vmpooler
       end
 
       def update_pool_size(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result = { 'ok' => false }
 
           pool_index = pool_index(pools)
@@ -386,7 +381,7 @@ module Vmpooler
       end
 
       def reset_pool_template(poolname)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result = { 'ok' => false }
 
           pool_index_live = pool_index(pools)
@@ -415,7 +410,7 @@ module Vmpooler
       end
 
       def update_pool_template(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result = { 'ok' => false }
 
           pool_index = pool_index(pools)
@@ -437,7 +432,7 @@ module Vmpooler
       end
 
       def reset_pool(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result = { 'ok' => false }
 
           payload.each do |poolname, _count|
@@ -450,7 +445,7 @@ module Vmpooler
       end
 
       def update_clone_target(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           result = { 'ok' => false }
 
           pool_index = pool_index(pools)
@@ -472,7 +467,7 @@ module Vmpooler
       end
 
       def sync_pool_templates
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           pool_index = pool_index(pools)
           template_configs = backend.hgetall('vmpooler__config__template')
           template_configs&.each do |poolname, template|
@@ -484,7 +479,7 @@ module Vmpooler
       end
 
       def sync_pool_sizes
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           pool_index = pool_index(pools)
           poolsize_configs = backend.hgetall('vmpooler__config__poolsize')
           poolsize_configs&.each do |poolname, size|
@@ -496,7 +491,7 @@ module Vmpooler
       end
 
       def sync_clone_targets
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           pool_index = pool_index(pools)
           clone_target_configs = backend.hgetall('vmpooler__config__clone_target')
           clone_target_configs&.each do |poolname, clone_target|
@@ -508,7 +503,7 @@ module Vmpooler
       end
 
       def too_many_requested?(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           payload&.each do |poolname, count|
             next unless count.to_i > config['max_ondemand_instances_per_request']
 
@@ -520,7 +515,7 @@ module Vmpooler
       end
 
       def generate_ondemand_request(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
           result = { 'ok': false }
 
           requested_instances = payload.reject { |k, _v| k == 'request_id' }
@@ -529,7 +524,7 @@ module Vmpooler
             result['message'] = e_message
             status 403
             span.add_event('error', attributes: {
-              'error.type' => 'Vmpooler::API::V2.generate_ondemand_request',
+              'error.type' => 'Vmpooler::API::V3.generate_ondemand_request',
               'error.message' => "403 due to #{e_message}"
             })
             return result
@@ -546,7 +541,7 @@ module Vmpooler
             result['message'] = e_message
             status 409
             span.add_event('error', attributes: {
-              'error.type' => 'Vmpooler::API::V2.generate_ondemand_request',
+              'error.type' => 'Vmpooler::API::V3.generate_ondemand_request',
               'error.message' => "409 due to #{e_message}"
             })
             metrics.increment('ondemandrequest_generate.duplicaterequests')
@@ -588,6 +583,505 @@ module Vmpooler
         redirect to('/dashboard/')
       end
 
+      # Provide run-time statistics
+      #
+      # Example:
+      #
+      # {
+      #   "boot": {
+      #     "duration": {
+      #       "average": 163.6,
+      #       "min": 65.49,
+      #       "max": 830.07,
+      #       "total": 247744.71000000002
+      #     },
+      #     "count": {
+      #       "total": 1514
+      #     }
+      #   },
+      #   "capacity": {
+      #     "current": 968,
+      #     "total": 975,
+      #     "percent": 99.3
+      #   },
+      #   "clone": {
+      #     "duration": {
+      #       "average": 17.0,
+      #       "min": 4.66,
+      #       "max": 637.96,
+      #       "total": 25634.15
+      #     },
+      #     "count": {
+      #       "total": 1507
+      #     }
+      #   },
+      #   "queue": {
+      #     "pending": 12,
+      #     "cloning": 0,
+      #     "booting": 12,
+      #     "ready": 968,
+      #     "running": 367,
+      #     "completed": 0,
+      #     "total": 1347
+      #   },
+      #   "pools": {
+      #     "ready": 100,
+      #     "running": 120,
+      #     "pending": 5,
+      #     "max": 250,
+      #   }
+      #   "status": {
+      #     "ok": true,
+      #     "message": "Battle station fully armed and operational.",
+      #     "empty": [ # NOTE: would not have 'ok: true' w/ "empty" pools
+      #       "redhat-7-x86_64",
+      #       "ubuntu-1404-i386"
+      #     ],
+      #     "uptime": 179585.9
+      # }
+      #
+      # If the query parameter 'view' is provided, it will be used to select which top level
+      # element to compute and return. Select them by specifying them in a comma separated list.
+      # For example /status?view=capacity,boot
+      # would return only the "capacity" and "boot" statistics. "status" is always returned
+
+      get "#{api_prefix}/status/?" do
+        content_type :json
+
+        if params[:view]
+          views = params[:view].split(",")
+        end
+
+        result = {
+          status: {
+            ok: true,
+            message: 'Battle station fully armed and operational.'
+          }
+        }
+
+        sync_pool_sizes
+
+        result[:capacity] = get_capacity_metrics(pools, backend) unless views and not views.include?("capacity")
+        result[:queue] = get_queue_metrics(pools, backend) unless views and not views.include?("queue")
+        result[:clone] = get_task_metrics(backend, 'clone', Date.today.to_s) unless views and not views.include?("clone")
+        result[:boot] = get_task_metrics(backend, 'boot', Date.today.to_s) unless views and not views.include?("boot")
+
+        # Check for empty pools
+        result[:pools] = {} unless views and not views.include?("pools")
+        ready_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__ready__', backend)
+        running_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__running__', backend)
+        pending_hash = get_list_across_pools_redis_scard(pools, 'vmpooler__pending__', backend)
+        lastBoot_hash = get_list_across_pools_redis_hget(pools, 'vmpooler__lastboot', backend)
+
+        unless views and not views.include?("pools")
+          pools.each do |pool|
+            # REMIND: move this out of the API and into the back-end
+            ready    = ready_hash[pool['name']]
+            running  = running_hash[pool['name']]
+            pending  = pending_hash[pool['name']]
+            max      = pool['size']
+            lastBoot = lastBoot_hash[pool['name']]
+            aka      = pool['alias']
+
+            result[:pools][pool['name']] = {
+              ready: ready,
+              running: running,
+              pending: pending,
+              max: max,
+              lastBoot: lastBoot
+            }
+
+            if aka
+              result[:pools][pool['name']][:alias] = aka
+            end
+
+            # for backwards compatibility, include separate "empty" stats in "status" block
+            if ready == 0 && max != 0
+              result[:status][:empty] ||= []
+              result[:status][:empty].push(pool['name'])
+
+              result[:status][:ok] = false
+              result[:status][:message] = "Found #{result[:status][:empty].length} empty pools."
+            end
+          end
+        end
+
+        result[:status][:uptime] = (Time.now - Vmpooler::API.settings.config[:uptime]).round(1) if Vmpooler::API.settings.config[:uptime]
+
+        JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }])
+      end
+
+      # request statistics for specific pools by passing parameter 'pool'
+      # with a coma separated list of pools we want to query ?pool=ABC,DEF
+      # returns the ready, max numbers and the aliases (if set)
+      get "#{api_prefix}/poolstat/?" do
+        content_type :json
+
+        result = {}
+
+        poolscopy = []
+
+        if params[:pool]
+          subpool = params[:pool].split(",")
+          poolscopy = pools.select do |p|
+            if subpool.include?(p['name'])
+              true
+            elsif !p['alias'].nil?
+              if p['alias'].instance_of?(Array)
+                (p['alias'] & subpool).any?
+              elsif p['alias'].instance_of?(String)
+                subpool.include?(p['alias'])
+              end
+            end
+          end
+        end
+
+        result[:pools] = {}
+
+        poolscopy.each do |pool|
+          result[:pools][pool['name']] = {}
+
+          max      = pool['size']
+          aka      = pool['alias']
+
+          result[:pools][pool['name']][:max] = max
+
+          if aka
+            result[:pools][pool['name']][:alias] = aka
+          end
+        end
+
+        ready_hash = get_list_across_pools_redis_scard(poolscopy, 'vmpooler__ready__', backend)
+
+        ready_hash.each { |k, v| result[:pools][k][:ready] = v }
+
+        JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }])
+      end
+
+      # requests the total number of running VMs
+      get "#{api_prefix}/totalrunning/?" do
+        content_type :json
+        queue = {
+            running: 0
+        }
+
+        queue[:running] = get_total_across_pools_redis_scard(pools, 'vmpooler__running__', backend)
+
+        JSON.pretty_generate(queue)
+      end
+
+      get "#{api_prefix}/summary/?" do
+        content_type :json
+
+        result = {
+          daily: []
+        }
+
+        from_param = params[:from] || Date.today.to_s
+        to_param   = params[:to]   || Date.today.to_s
+
+        # Validate date formats
+        [from_param, to_param].each do |param|
+          if !validate_date_str(param.to_s)
+            halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD."
+          end
+        end
+
+        from_date, to_date = Date.parse(from_param), Date.parse(to_param)
+
+        if to_date < from_date
+          halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.'
+        elsif from_date > Date.today
+          halt 400, 'Date range is invalid, \'from\' must be in the past.'
+        end
+
+        boot = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true)
+        clone = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true)
+        tag = get_tag_summary(backend, from_date, to_date)
+
+        result[:boot] = boot[:boot]
+        result[:clone] = clone[:clone]
+        result[:tag] = tag[:tag]
+
+        daily = {}
+
+        boot[:daily].each do |day|
+          daily[day[:date]] ||= {}
+          daily[day[:date]][:boot] = day[:boot]
+        end
+
+        clone[:daily].each do |day|
+          daily[day[:date]] ||= {}
+          daily[day[:date]][:clone] = day[:clone]
+        end
+
+        tag[:daily].each do |day|
+          daily[day[:date]] ||= {}
+          daily[day[:date]][:tag] = day[:tag]
+        end
+
+        daily.each_key do |day|
+          result[:daily].push({
+            date: day,
+            boot: daily[day][:boot],
+            clone: daily[day][:clone],
+            tag: daily[day][:tag]
+          })
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      get "#{api_prefix}/summary/:route/?:key?/?" do
+        content_type :json
+
+        result = {}
+
+        from_param = params[:from] || Date.today.to_s
+        to_param   = params[:to]   || Date.today.to_s
+
+        # Validate date formats
+        [from_param, to_param].each do |param|
+          if !validate_date_str(param.to_s)
+            halt 400, "Invalid date format '#{param}', must match YYYY-MM-DD."
+          end
+        end
+
+        from_date, to_date = Date.parse(from_param), Date.parse(to_param)
+
+        if to_date < from_date
+          halt 400, 'Date range is invalid, \'to\' cannot come before \'from\'.'
+        elsif from_date > Date.today
+          halt 400, 'Date range is invalid, \'from\' must be in the past.'
+        end
+
+        case params[:route]
+          when 'boot'
+            result = get_task_summary(backend, 'boot', from_date, to_date, :bypool => true, :only => params[:key])
+          when 'clone'
+            result = get_task_summary(backend, 'clone', from_date, to_date, :bypool => true, :only => params[:key])
+          when 'tag'
+            result = get_tag_summary(backend, from_date, to_date, :only => params[:key])
+          else
+            halt 404, JSON.pretty_generate({ 'ok' => false })
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      get "#{api_prefix}/token/?" do
+        content_type :json
+
+        status 404
+        result = { 'ok' => false }
+
+        if Vmpooler::API.settings.config[:auth]
+          status 401
+
+          need_auth!
+
+          backend.keys('vmpooler__token__*').each do |key|
+            data = backend.hgetall(key)
+
+            if data['user'] == Rack::Auth::Basic::Request.new(request.env).username
+              span = OpenTelemetry::Trace.current_span
+              span.set_attribute('enduser.id', data['user'])
+              token = key.split('__').last
+
+              result[token] ||= {}
+
+              result[token]['created'] = data['created']
+              result[token]['last'] = data['last'] || 'never'
+
+              result['ok'] = true
+            end
+          end
+
+          if result['ok']
+            status 200
+          else
+            status 404
+          end
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      get "#{api_prefix}/token/:token/?" do
+        content_type :json
+
+        status 404
+        result = { 'ok' => false }
+
+        if Vmpooler::API.settings.config[:auth]
+          token = backend.hgetall("vmpooler__token__#{params[:token]}")
+
+          if not token.nil? and not token.empty?
+            status 200
+
+            pools.each do |pool|
+              backend.smembers("vmpooler__running__#{pool['name']}").each do |vm|
+                if backend.hget("vmpooler__vm__#{vm}", 'token:token') == params[:token]
+                  token['vms'] ||= {}
+                  token['vms']['running'] ||= []
+                  token['vms']['running'].push(vm)
+                end
+              end
+            end
+
+            result = { 'ok' => true, params[:token] => token }
+          end
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      delete "#{api_prefix}/token/:token/?" do
+        content_type :json
+
+        status 404
+        result = { 'ok' => false }
+
+        if Vmpooler::API.settings.config[:auth]
+          status 401
+
+          need_auth!
+
+          if backend.del("vmpooler__token__#{params[:token]}").to_i > 0
+            status 200
+            result['ok'] = true
+          end
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      post "#{api_prefix}/token" do
+        content_type :json
+
+        status 404
+        result = { 'ok' => false }
+
+        if Vmpooler::API.settings.config[:auth]
+          status 401
+
+          need_auth!
+
+          o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten
+          result['token'] = o[rand(25)] + (0...31).map { o[rand(o.length)] }.join
+
+          backend.hset("vmpooler__token__#{result['token']}", 'user', @auth.username)
+          backend.hset("vmpooler__token__#{result['token']}", 'created', Time.now)
+          span = OpenTelemetry::Trace.current_span
+          span.set_attribute('enduser.id', @auth.username)
+
+          status 200
+          result['ok'] = true
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      get "#{api_prefix}/vm/?" do
+        content_type :json
+
+        result = []
+
+        pools.each do |pool|
+          result.push(pool['name'])
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      post "#{api_prefix}/ondemandvm/?" do
+        content_type :json
+        metrics.increment('http_requests_vm_total.post.ondemand.requestid')
+
+        need_token! if Vmpooler::API.settings.config[:auth]
+
+        result = { 'ok' => false }
+
+        begin
+          payload = JSON.parse(request.body.read)
+
+          if payload
+            invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' })
+            if invalid.empty?
+              result = generate_ondemand_request(payload)
+            else
+              result[:bad_templates] = invalid
+              invalid.each do |bad_template|
+                metrics.increment("ondemandrequest_fail.invalid.#{bad_template}")
+              end
+              status 404
+            end
+          else
+            metrics.increment('ondemandrequest_fail.invalid.unknown')
+            status 404
+          end
+        rescue JSON::ParserError
+          span = OpenTelemetry::Trace.current_span
+          span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed')
+          status 400
+          result = {
+            'ok' => false,
+            'message' => 'JSON payload could not be parsed'
+          }
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      post "#{api_prefix}/ondemandvm/:template/?" do
+        content_type :json
+        result = { 'ok' => false }
+        metrics.increment('http_requests_vm_total.delete.ondemand.template')
+
+        need_token! if Vmpooler::API.settings.config[:auth]
+
+        payload = extract_templates_from_query_params(params[:template])
+
+        if payload
+          invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' })
+          if invalid.empty?
+            result = generate_ondemand_request(payload)
+          else
+            result[:bad_templates] = invalid
+            invalid.each do |bad_template|
+              metrics.increment("ondemandrequest_fail.invalid.#{bad_template}")
+            end
+            status 404
+          end
+        else
+          metrics.increment('ondemandrequest_fail.invalid.unknown')
+          status 404
+        end
+
+        JSON.pretty_generate(result)
+      end
+
+      get "#{api_prefix}/ondemandvm/:requestid/?" do
+        content_type :json
+        metrics.increment('http_requests_vm_total.get.ondemand.request')
+
+        status 404
+        result = check_ondemand_request(params[:requestid])
+
+        JSON.pretty_generate(result)
+      end
+
+      delete "#{api_prefix}/ondemandvm/:requestid/?" do
+        content_type :json
+        need_token! if Vmpooler::API.settings.config[:auth]
+        metrics.increment('http_requests_vm_total.delete.ondemand.request')
+
+        status 404
+        result = delete_ondemand_request(params[:requestid])
+
+        JSON.pretty_generate(result)
+      end
+
       post "#{api_prefix}/vm/?" do
         content_type :json
         result = { 'ok' => false }
@@ -614,7 +1108,7 @@ module Vmpooler
       end
 
       def extract_templates_from_query_params(params)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           payload = {}
 
           params.split('+').each do |template|
@@ -627,7 +1121,7 @@ module Vmpooler
       end
 
       def invalid_templates(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           invalid = []
           payload.keys.each do |template|
             invalid << template unless pool_exists?(template)
@@ -637,7 +1131,7 @@ module Vmpooler
       end
 
       def invalid_template_or_size(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           invalid = []
           payload.each do |pool, size|
             invalid << pool unless pool_exists?(pool)
@@ -652,7 +1146,7 @@ module Vmpooler
       end
 
       def invalid_template_or_path(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           invalid = []
           payload.each do |pool, template|
             invalid << pool unless pool_exists?(pool)
@@ -665,7 +1159,7 @@ module Vmpooler
       end
 
       def invalid_pool(payload)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do
           invalid = []
           payload.each do |pool, _clone_target|
             invalid << pool unless pool_exists?(pool)
@@ -675,7 +1169,7 @@ module Vmpooler
       end
 
       def delete_ondemand_request(request_id)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
           span.set_attribute('vmpooler.request_id', request_id)
           result = { 'ok' => false }
 
@@ -684,7 +1178,7 @@ module Vmpooler
             e_message = "no request found for request_id '#{request_id}'"
             result['message'] = e_message
             span.add_event('error', attributes: {
-              'error.type' => 'Vmpooler::API::V2.delete_ondemand_request',
+              'error.type' => 'Vmpooler::API::V3.delete_ondemand_request',
               'error.message' => e_message
             })
             return result
@@ -810,85 +1304,8 @@ module Vmpooler
         JSON.pretty_generate(result)
       end
 
-      post "#{api_prefix}/ondemandvm/?" do
-        content_type :json
-        metrics.increment('http_requests_vm_total.post.ondemand.requestid')
-
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        result = { 'ok' => false }
-
-        begin
-          payload = JSON.parse(request.body.read)
-
-          if payload
-            invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' })
-            if invalid.empty?
-              result = generate_ondemand_request(payload)
-            else
-              result[:bad_templates] = invalid
-              invalid.each do |bad_template|
-                metrics.increment("ondemandrequest_fail.invalid.#{bad_template}")
-              end
-              status 404
-            end
-          else
-            metrics.increment('ondemandrequest_fail.invalid.unknown')
-            status 404
-          end
-        rescue JSON::ParserError
-          span = OpenTelemetry::Trace.current_span
-          span.status = OpenTelemetry::Trace::Status.error('JSON payload could not be parsed')
-          status 400
-          result = {
-            'ok' => false,
-            'message' => 'JSON payload could not be parsed'
-          }
-        end
-
-        JSON.pretty_generate(result)
-      end
-
-      post "#{api_prefix}/ondemandvm/:template/?" do
-        content_type :json
-        result = { 'ok' => false }
-        metrics.increment('http_requests_vm_total.delete.ondemand.template')
-
-        need_token! if Vmpooler::API.settings.config[:auth]
-
-        payload = extract_templates_from_query_params(params[:template])
-
-        if payload
-          invalid = invalid_templates(payload.reject { |k, _v| k == 'request_id' })
-          if invalid.empty?
-            result = generate_ondemand_request(payload)
-          else
-            result[:bad_templates] = invalid
-            invalid.each do |bad_template|
-              metrics.increment("ondemandrequest_fail.invalid.#{bad_template}")
-            end
-            status 404
-          end
-        else
-          metrics.increment('ondemandrequest_fail.invalid.unknown')
-          status 404
-        end
-
-        JSON.pretty_generate(result)
-      end
-
-      get "#{api_prefix}/ondemandvm/:requestid/?" do
-        content_type :json
-        metrics.increment('http_requests_vm_total.get.ondemand.request')
-
-        status 404
-        result = check_ondemand_request(params[:requestid])
-
-        JSON.pretty_generate(result)
-      end
-
       def check_ondemand_request(request_id)
-        tracer.in_span("Vmpooler::API::V2.#{__method__}") do |span|
+        tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
           span.set_attribute('vmpooler.request_id', request_id)
           result = { 'ok' => false }
           request_hash = backend.hgetall("vmpooler__odrequest__#{request_id}")
@@ -896,7 +1313,7 @@ module Vmpooler
             e_message = "no request found for request_id '#{request_id}'"
             result['message'] = e_message
             span.add_event('error', attributes: {
-              'error.type' => 'Vmpooler::API::V2.check_ondemand_request',
+              'error.type' => 'Vmpooler::API::V3.check_ondemand_request',
               'error.message' => e_message
             })
             return result
diff --git a/spec/integration/api/v2/config_spec.rb b/spec/integration/api/v3/config_spec.rb
similarity index 99%
rename from spec/integration/api/v2/config_spec.rb
rename to spec/integration/api/v3/config_spec.rb
index 24543dd..301c4aa 100644
--- a/spec/integration/api/v2/config_spec.rb
+++ b/spec/integration/api/v3/config_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -37,7 +37,7 @@ describe Vmpooler::API::V2 do
   }
 
   describe '/config/pooltemplate' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
 
     let(:current_time) { Time.now }
@@ -388,7 +388,7 @@ describe Vmpooler::API::V2 do
     end
 
     describe 'GET /config' do
-      let(:prefix) { '/api/v2' }
+      let(:prefix) { '/api/v3' }
 
       it 'returns pool configuration when set' do
         get "#{prefix}/config"
diff --git a/spec/integration/api/v2/ondemandvm_spec.rb b/spec/integration/api/v3/ondemandvm_spec.rb
similarity index 94%
rename from spec/integration/api/v2/ondemandvm_spec.rb
rename to spec/integration/api/v3/ondemandvm_spec.rb
index 446b071..0a043bb 100644
--- a/spec/integration/api/v2/ondemandvm_spec.rb
+++ b/spec/integration/api/v3/ondemandvm_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -15,7 +15,7 @@ describe Vmpooler::API::V2 do
   end
 
   describe '/ondemandvm' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
     let(:config) {
       {
@@ -120,24 +120,6 @@ describe Vmpooler::API::V2 do
             expect(redis).to receive(:hset).with("vmpooler__odrequest__#{uuid}", 'requested', 'pool2:pool1:1')
             post "#{prefix}/ondemandvm", '{"pool2":"1"}'
           end
-
-        # Domain is always included in reply now
-        #   context 'with domain set in the config' do
-        #     let(:domain) { 'example.com' }
-        #     before(:each) do
-        #       config[:config]['domain'] = domain
-        #     end
-
-        #     it 'should include domain in the return reply' do
-        #       post "#{prefix}/ondemandvm", '{"poolone":"1"}'
-        #       expect_json(true, 201)
-        #       expected = {
-        #         "ok": true,
-        #         "request_id": uuid,
-        #       }
-        #       expect(last_response.body).to eq(JSON.pretty_generate(expected))
-        #     end
-        #   end
         end
 
         context 'with a resource request that exceeds the specified limit' do
diff --git a/spec/integration/api/v2/poolreset.rb b/spec/integration/api/v3/poolreset.rb
similarity index 98%
rename from spec/integration/api/v2/poolreset.rb
rename to spec/integration/api/v3/poolreset.rb
index 37457a3..74a11e3 100644
--- a/spec/integration/api/v2/poolreset.rb
+++ b/spec/integration/api/v3/poolreset.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -30,7 +30,7 @@ describe Vmpooler::API::V2 do
   }
 
   describe '/poolreset' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
 
     let(:current_time) { Time.now }
diff --git a/spec/integration/api/v2/status_spec.rb b/spec/integration/api/v3/status_spec.rb
similarity index 99%
rename from spec/integration/api/v2/status_spec.rb
rename to spec/integration/api/v3/status_spec.rb
index d412128..ff575ba 100644
--- a/spec/integration/api/v2/status_spec.rb
+++ b/spec/integration/api/v3/status_spec.rb
@@ -5,7 +5,7 @@ def has_set_tag?(vm, tag, value)
   value == redis.hget("vmpooler__vm__#{vm}", "tag:#{tag}")
 end
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -20,7 +20,7 @@ describe Vmpooler::API::V2 do
   end
 
   describe 'status and metrics endpoints' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
 
     let(:config) {
       {
diff --git a/spec/integration/api/v2/token_spec.rb b/spec/integration/api/v3/token_spec.rb
similarity index 98%
rename from spec/integration/api/v2/token_spec.rb
rename to spec/integration/api/v3/token_spec.rb
index 0dfee9e..2fd0dac 100644
--- a/spec/integration/api/v2/token_spec.rb
+++ b/spec/integration/api/v3/token_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -16,7 +16,7 @@ describe Vmpooler::API::V2 do
   end
 
   describe '/token' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:current_time) { Time.now }
     let(:config) { { 
       config: {}
@@ -111,7 +111,7 @@ describe Vmpooler::API::V2 do
   end
 
   describe '/token/:token' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:current_time) { Time.now }
 
     before(:each) do
diff --git a/spec/integration/api/v2/vm_hostname_spec.rb b/spec/integration/api/v3/vm_hostname_spec.rb
similarity index 99%
rename from spec/integration/api/v2/vm_hostname_spec.rb
rename to spec/integration/api/v3/vm_hostname_spec.rb
index b232cb2..b4c064d 100644
--- a/spec/integration/api/v2/vm_hostname_spec.rb
+++ b/spec/integration/api/v3/vm_hostname_spec.rb
@@ -5,7 +5,7 @@ def has_set_tag?(vm, tag, value)
   value == redis.hget("vmpooler__vm__#{vm}", "tag:#{tag}")
 end
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -20,7 +20,7 @@ describe Vmpooler::API::V2 do
   end
 
   describe '/vm/:hostname' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
 
     let(:config) {
diff --git a/spec/integration/api/v2/vm_spec.rb b/spec/integration/api/v3/vm_spec.rb
similarity index 93%
rename from spec/integration/api/v2/vm_spec.rb
rename to spec/integration/api/v3/vm_spec.rb
index 13f80d2..0800d7c 100644
--- a/spec/integration/api/v2/vm_spec.rb
+++ b/spec/integration/api/v3/vm_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -16,7 +16,7 @@ describe Vmpooler::API::V2 do
   end
 
   describe '/vm' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
     let(:config) {
       {
@@ -355,29 +355,27 @@ describe Vmpooler::API::V2 do
         expect(pool_has_ready_vm?('pool1', '2abcdefghijklmnop', redis)).to eq(true)
       end
 
-      # The helper create_ready_vm inherently means that the vm has already reached a
-      # ready state and that open_socket already returned sucessfully before being moved to ready.
-      # it 'returns the second VM when the first fails to respond' do
-      #   create_running_vm 'pool1', vmname, redis
-      #   create_ready_vm 'pool1', "2#{vmname}", redis
+      it 'returns the second VM when the first fails to respond' do
+        create_running_vm 'pool1', vmname, redis
+        create_ready_vm 'pool1', "2#{vmname}", redis
 
-      #   allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with(vmname, nil).and_raise('mockerror')
-      #   allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with("2#{vmname}", nil).and_return(socket)
+        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with(vmname, nil).and_raise('mockerror')
+        allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with("2#{vmname}", nil).and_return(socket)
 
-      #   post "#{prefix}/vm", '{"pool1":"1"}'
-      #   expect_json(ok = true, http = 200)
+        post "#{prefix}/vm", '{"pool1":"1"}'
+        expect_json(ok = true, http = 200)
 
-      #   expected = {
-      #     ok: true,
-      #     pool1: {
-      #       hostname: "2#{vmname}.one.example.com"
-      #     }
-      #   }
+        expected = {
+          ok: true,
+          pool1: {
+            hostname: "2#{vmname}.one.example.com"
+          }
+        }
 
-      #   expect(last_response.body).to eq(JSON.pretty_generate(expected))
+        expect(last_response.body).to eq(JSON.pretty_generate(expected))
 
-      #   expect(pool_has_ready_vm?('pool1', vmname, redis)).to be false
-      # end
+        expect(pool_has_ready_vm?('pool1', vmname, redis)).to be false
+      end
 
       context '(auth not configured)' do
         it 'does not extend VM lifetime if auth token is provided' do
diff --git a/spec/integration/api/v2/vm_template_spec.rb b/spec/integration/api/v3/vm_template_spec.rb
similarity index 99%
rename from spec/integration/api/v2/vm_template_spec.rb
rename to spec/integration/api/v3/vm_template_spec.rb
index 3c6d037..f809244 100644
--- a/spec/integration/api/v2/vm_template_spec.rb
+++ b/spec/integration/api/v3/vm_template_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-describe Vmpooler::API::V2 do
+describe Vmpooler::API::V3 do
   include Rack::Test::Methods
 
   def app()
@@ -16,7 +16,7 @@ describe Vmpooler::API::V2 do
   end
 
   describe '/vm/:template' do
-    let(:prefix) { '/api/v2' }
+    let(:prefix) { '/api/v3' }
     let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
     let(:config) {
       {

From 527f42cca9be042990819a36a28be11ac3601702 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 7 Mar 2023 14:26:14 -0500
Subject: [PATCH 17/19] Remove api reroute in favor of using versioned api
 directly

---
 lib/vmpooler/api.rb         |  3 +-
 lib/vmpooler/api/reroute.rb | 89 -------------------------------------
 2 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 lib/vmpooler/api/reroute.rb

diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb
index 1d0dce8..3b0d9de 100644
--- a/lib/vmpooler/api.rb
+++ b/lib/vmpooler/api.rb
@@ -3,7 +3,7 @@
 module Vmpooler
   class API < Sinatra::Base
     # Load API components
-    %w[helpers dashboard reroute v3 request_logger healthcheck].each do |lib|
+    %w[helpers dashboard v3 request_logger healthcheck].each do |lib|
       require "vmpooler/api/#{lib}"
     end
     # Load dashboard components
@@ -52,7 +52,6 @@ module Vmpooler
 
         use Vmpooler::Dashboard
         use Vmpooler::API::Dashboard
-        use Vmpooler::API::Reroute
         use Vmpooler::API::V3
       end
 
diff --git a/lib/vmpooler/api/reroute.rb b/lib/vmpooler/api/reroute.rb
deleted file mode 100644
index a8c66fa..0000000
--- a/lib/vmpooler/api/reroute.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-module Vmpooler
-  class API
-    class Reroute < Sinatra::Base
-      api_version = '1'
-
-      get '/status/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called /status/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/status")
-      end
-
-      get '/summary/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called /summary/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/summary")
-      end
-
-      get '/summary/:route/?:key?/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called /summary/:route/?:key?/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/summary/#{params[:route]}/#{params[:key]}")
-      end
-
-      get '/token/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called /token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/token")
-      end
-
-      post '/token/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/token")
-      end
-
-      get '/token/:token/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called /token/:token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/token/#{params[:token]}")
-      end
-
-      delete '/token/:token/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called delete /token/:token/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/token/#{params[:token]}")
-      end
-
-      get '/vm/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called /vm? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm")
-      end
-
-      post '/vm/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm")
-      end
-
-      post '/vm/:template/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm/:template/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:template]}")
-      end
-
-      get '/vm/:hostname/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called /vm/:hostname/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}")
-      end
-
-      delete '/vm/:hostname/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called delete /vm/:hostname/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}")
-      end
-
-      put '/vm/:hostname/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called put /vm/:hostname/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}")
-      end
-
-      post '/vm/:hostname/snapshot/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm/:hostname/snapshot/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}/snapshot")
-      end
-
-      post '/vm/:hostname/snapshot/:snapshot/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called post /vm/:hostname/snapshot/:snapshot/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}/snapshot/#{params[:snapshot]}")
-      end
-
-      put '/vm/:hostname/disk/:size/?' do
-        puts "DEPRECATION WARNING a client (#{request.user_agent}) called put /vm/:hostname/disk/:size/? and got redirected to api_version=1, this behavior will change in the next major version, please modify the client to use v2 in advance"
-        call env.merge('PATH_INFO' => "/api/v#{api_version}/vm/#{params[:hostname]}/disk/#{params[:size]}")
-      end
-    end
-  end
-end

From 528e9635d199d9a97ab1ccb9f8a363dba62f2482 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 14 Mar 2023 07:42:38 -0400
Subject: [PATCH 18/19] exit application if domain setting is used

---
 lib/vmpooler.rb                    |  4 +++
 spec/fixtures/vmpooler_domain.yaml | 45 ++++++++++++++++++++++++++++++
 spec/unit/vmpooler_spec.rb         | 25 +++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 spec/fixtures/vmpooler_domain.yaml

diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb
index cfb2e2c..54c4ffc 100644
--- a/lib/vmpooler.rb
+++ b/lib/vmpooler.rb
@@ -76,6 +76,10 @@ module Vmpooler
     parsed_config[:config]['prefix']                             = ENV['PREFIX'] || parsed_config[:config]['prefix'] || ''
     parsed_config[:config]['logfile']                            = ENV['LOGFILE'] if ENV['LOGFILE']
     parsed_config[:config]['site_name']                          = ENV['SITE_NAME'] if ENV['SITE_NAME']
+    if !parsed_config[:config]['domain'].nil? || !ENV['DOMAIN'].nil?
+      puts '[!] [error] The "domain" config setting has been removed in v3. Please see the docs for migrating the domain config to use a dns plugin at https://github.com/puppetlabs/vmpooler/blob/main/README.md#migrating-to-v3'
+      exit 1
+    end
     parsed_config[:config]['clone_target']                       = ENV['CLONE_TARGET'] if ENV['CLONE_TARGET']
     parsed_config[:config]['timeout']                            = string_to_int(ENV['TIMEOUT']) if ENV['TIMEOUT']
     parsed_config[:config]['vm_lifetime_auth']                   = string_to_int(ENV['VM_LIFETIME_AUTH']) if ENV['VM_LIFETIME_AUTH']
diff --git a/spec/fixtures/vmpooler_domain.yaml b/spec/fixtures/vmpooler_domain.yaml
new file mode 100644
index 0000000..9a79726
--- /dev/null
+++ b/spec/fixtures/vmpooler_domain.yaml
@@ -0,0 +1,45 @@
+---
+:providers:
+  :dummy:
+
+:redis:
+  server: 'localhost'
+
+:auth:
+   provider: dummy
+
+:tagfilter:
+  url: '(.*)\/'
+
+:config:
+  site_name: 'vmpooler'
+  # Need to change this on Windows
+  logfile: '/var/log/vmpooler.log'
+  task_limit: 10
+  timeout: 15
+  vm_checktime: 1
+  vm_lifetime: 12
+  vm_lifetime_auth: 24
+  allowed_tags:
+    - 'created_by'
+    - 'project'
+  domain: 'example.com'
+  prefix: 'poolvm-'
+
+# Uncomment the lines below to suppress metrics to STDOUT
+# :statsd:
+#   server: 'localhost'
+#   prefix: 'vmpooler'
+#   port: 8125
+
+:pools:
+  - name: 'pool01'
+    size: 5
+    provider: dummy
+    dns_plugin: 'example'
+    ready_ttl: 5
+  - name: 'pool02'
+    size: 5
+    provider: dummy
+    dns_plugin: 'example'
+    ready_ttl: 5
diff --git a/spec/unit/vmpooler_spec.rb b/spec/unit/vmpooler_spec.rb
index 2e9831f..8e6d39a 100644
--- a/spec/unit/vmpooler_spec.rb
+++ b/spec/unit/vmpooler_spec.rb
@@ -70,5 +70,30 @@ describe 'Vmpooler' do
         expect(Vmpooler.config[:config]).not_to be_nil #merge does not deleted existing keys
       end
     end
+
+    context 'when domain' do
+      context 'is set as a variable' do
+        before(:each) do
+          ENV['VMPOOLER_CONFIG_FILE'] = config_file
+          ENV['DOMAIN'] = 'example.com'
+        end
+
+        it 'should exit' do
+          expect { Vmpooler.config }.to raise_error(SystemExit)
+        end
+      end
+
+      context 'is set in a config file' do
+        let(:config_file) { File.join(fixtures_dir, 'vmpooler_domain.yaml') }
+
+        before(:each) do
+          ENV['VMPOOLER_CONFIG_FILE'] = config_file
+        end
+
+        it 'should exit' do
+          expect { Vmpooler.config }.to raise_error(SystemExit)
+        end
+      end
+    end
   end
 end

From 669ecaef483abb13ff33ab3eaaf738713af2f177 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Wed, 22 Mar 2023 16:15:08 -0400
Subject: [PATCH 19/19] Point dashboard to v3 api

---
 lib/vmpooler/public/lib/dashboard.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/vmpooler/public/lib/dashboard.js b/lib/vmpooler/public/lib/dashboard.js
index 11bc868..bd12074 100644
--- a/lib/vmpooler/public/lib/dashboard.js
+++ b/lib/vmpooler/public/lib/dashboard.js
@@ -29,10 +29,10 @@ Date.prototype.yyyymmdd = function() {
 
 var data_url = {
   'capacity': '/dashboard/stats/vmpooler/pool',
-  'pools'   : '/api/v2/vm',
+  'pools'   : '/api/v3/vm',
   'running' : '/dashboard/stats/vmpooler/running',
-  'status'  : '/api/v2/status',
-  'summary' : '/api/v2/summary'
+  'status'  : '/api/v3/status',
+  'summary' : '/api/v3/summary'
 };