Merge pull request #30 from jay7x/features

New features

Author: jay7x

plans/cluster/create.pp

@@ -1,12 +1,18 @@
 # @summary Create the cluster of Lima VMs
 # @param name
 #   Cluster name
+# @param start
+#   Start the cluster after creation
+# @param start_jobs
+#   Amount of jobs to start VMs in parallel when $start is true
 # @param clusters
 #   Hash of all defined clusters. Populated from Hiera usually.
 # @param target
 #   The host to run the limactl on
 plan lima::cluster::create (
   String[1] $name,
+  Boolean $start = false,
+  Integer[0] $start_jobs = 0,
   Optional[Hash] $clusters = undef,
   TargetSpec $target = 'localhost',
 ) {
@@ -66,5 +72,9 @@
     })
   }
 
-  return $create_res
+  if $start {
+    return run_plan('lima::cluster::start', name => $name, jobs => $start_jobs, clusters => $clusters, target => $target)
+  } else {
+    return $create_res
+  }
 }

plans/cluster/delete.pp

@@ -1,6 +1,8 @@
 # @summary Delete the cluster of Lima VMs
 # @param name
 #   Cluster name
+# @param stop
+#   Stop the cluster before deleting
 # @param force
 #   Forcibly stop the processes
 # @param clusters
@@ -9,6 +11,7 @@
 #   The host to run the limactl on
 plan lima::cluster::delete (
   String[1] $name,
+  Boolean $stop = false,
   Boolean $force = false,
   Optional[Hash] $clusters = undef,
   TargetSpec $target = 'localhost',
@@ -26,6 +29,10 @@
   }
   out::verbose("Nodes to delete: ${defined_nodes}")
 
+  if $stop {
+    run_plan('lima::cluster::stop', name => $name, force => $force, clusters => $clusters, target => $target)
+  }
+
   return run_task('lima::delete', $target, {
       names => $defined_nodes,
       force => $force,

plans/cluster/stop.pp

@@ -1,6 +1,10 @@
 # @summary Stop the cluster of Lima VMs
 # @param name
 #   Cluster name
+# @param start
+#   Start the cluster after stopping it
+# @param start_jobs
+#   Amount of jobs to start VMs in parallel when $restart is true
 # @param force
 #   Forcibly stop the processes
 # @param clusters
@@ -9,6 +13,8 @@
 #   The host to run the limactl on
 plan lima::cluster::stop (
   String[1] $name,
+  Boolean $start = false,
+  Integer[0] $start_jobs = 0,
   Boolean $force = false,
   Optional[Hash] $clusters = undef,
   TargetSpec $target = 'localhost',
@@ -48,5 +54,9 @@
     })
   }
 
-  return $stop_res
+  if $start {
+    return run_plan('lima::cluster::start', name => $name, jobs => $start_jobs, clusters => $clusters, target => $target)
+  } else {
+    return $stop_res
+  }
 }

spec/plans/cluster/create_spec.rb

@@ -53,7 +53,9 @@
     }
   end
   let(:nodes_to_create) { [nodes[2], nodes[3], nodes[4]] }
-  let(:plan_params) { { 'name' => cluster_name, 'clusters' => clusters } }
+  let(:start) { nil }
+  let(:start_jobs) { nil }
+  let(:plan_params) { { 'name' => cluster_name, 'clusters' => clusters, 'start' => start, 'start_jobs' => start_jobs } }
 
   context 'with non-existent cluster' do
     let(:cluster_name) { 'nonexistent' }
@@ -111,11 +113,29 @@
       expect_out_verbose.with_params("Nodes to create: [#{nodes_to_create.join(', ')}]")
     end
 
-    it 'creates the cluster' do
-      result = run_plan(plan, plan_params)
+    context 'with default params' do
+      it 'creates the cluster' do
+        expect_plan('lima::cluster::start').not_be_called
+
+        result = run_plan(plan, plan_params)
+
+        expect(result.ok?).to be(true)
+        expect(result.value.count).to eq(3)
+      end
+    end
 
-      expect(result.ok?).to be(true)
-      expect(result.value.count).to eq(3)
+    context 'with start=>true' do
+      let(:start) { true }
+      let(:start_jobs) { 2 }
+      let(:start_params) { { 'name' => cluster_name, 'clusters' => clusters, 'jobs' => start_jobs, 'target' => 'localhost' } }
+
+      it 'creates and starts the cluster' do
+        expect_plan('lima::cluster::start').be_called_times(1).with_params(start_params)
+
+        result = run_plan(plan, plan_params)
+
+        expect(result.ok?).to be(true)
+      end
     end
   end
 end

spec/plans/cluster/delete_spec.rb

@@ -29,8 +29,9 @@
     }
   end
   let(:cluster_name) { 'example' }
-  let(:plan_params) { { 'name' => cluster_name, 'clusters' => clusters } }
-  let(:force) { false }
+  let(:force) { nil }
+  let(:stop) { nil }
+  let(:plan_params) { { 'name' => cluster_name, 'clusters' => clusters, 'stop' => stop, 'force' => force } }
 
   context 'with non-existent cluster' do
     let(:cluster_name) { 'nonexistent' }
@@ -46,11 +47,12 @@
   context 'with existing cluster' do
     before :each do
       expect_plan('lima::clusters').always_return(clusters[cluster_name])
-      expect_task('lima::delete').be_called_times(1).with_params('names' => nodes, 'force' => force).always_return(delete: true)
+      expect_task('lima::delete').be_called_times(1).with_params('names' => nodes, 'force' => force ? true : false).always_return(delete: true)
       expect_out_verbose.with_params("Nodes to delete: [#{nodes.join(', ')}]")
+      expect_plan('lima::cluster::stop').be_called_times(0)
     end
 
-    context 'with force unset' do
+    context 'with default params' do
       it 'deletes all nodes in the cluster' do
         result = run_plan(plan, plan_params)
 
@@ -62,7 +64,6 @@
 
     context 'with force => true' do
       let(:force) { true }
-      let(:plan_params) { super().merge('force' => force) }
 
       it 'deletes all nodes in the cluster' do
         result = run_plan(plan, plan_params)
@@ -72,5 +73,19 @@
         expect(result.value[0].value).to eq('delete' => true)
       end
     end
+
+    context 'with stop => true' do
+      let(:stop) { true }
+
+      it 'deletes all nodes in the cluster' do
+        expect_plan('lima::cluster::stop').be_called_times(1)
+
+        result = run_plan(plan, plan_params)
+
+        expect(result.ok?).to be(true)
+        expect(result.value.count).to eq(1)
+        expect(result.value[0].value).to eq('delete' => true)
+      end
+    end
   end
 end

spec/plans/cluster/stop_spec.rb

@@ -39,8 +39,10 @@
     }
   end
   let(:nodes_to_stop) { [nodes[0], nodes[2]] }
-  let(:plan_params) { { 'name' => cluster_name, 'clusters' => clusters } }
-  let(:force) { false }
+  let(:force) { nil }
+  let(:start) { nil }
+  let(:start_jobs) { nil }
+  let(:plan_params) { { 'name' => cluster_name, 'clusters' => clusters, 'start' => start, 'start_jobs' => start_jobs, 'force' => force } }
 
   context 'with non-existent cluster' do
     let(:cluster_name) { 'nonexistent' }
@@ -58,13 +60,14 @@
       expect_plan('lima::clusters').always_return(clusters[cluster_name])
       expect_task('lima::list').be_called_times(1).always_return(lima_list_res)
       nodes_to_stop.each do |node|
-        expect_task('lima::stop').be_called_times(1).with_params('name' => node, 'force' => force).always_return(stop: true)
+        expect_task('lima::stop').be_called_times(1).with_params('name' => node, 'force' => force ? true : false).always_return(stop: true)
       end
       expect_out_verbose.with_params("Defined nodes: [#{nodes.join(', ')}]")
       expect_out_verbose.with_params("Nodes to stop: [#{nodes_to_stop.join(', ')}]")
+      expect_plan('lima::cluster::start').be_called_times(0)
     end
 
-    context 'with force unset' do
+    context 'with default params' do
       it 'stops all non-running nodes in the cluster' do
         result = run_plan(plan, plan_params)
 
@@ -78,7 +81,6 @@
 
     context 'with force => true' do
       let(:force) { true }
-      let(:plan_params) { super().merge('force' => force) }
       let(:nodes_to_stop) { [nodes[0], nodes[1], nodes[2]] }
 
       it 'stops all non-running nodes in the cluster' do
@@ -91,5 +93,19 @@
         end
       end
     end
+
+    context 'with start => true' do
+      let(:start) { true }
+      let(:start_jobs) { 2 }
+      let(:start_params) { { 'name' => cluster_name, 'jobs' => start_jobs, 'clusters' => clusters, 'target' => 'localhost' } }
+
+      it 'stops the cluster and starts it again' do
+        expect_plan('lima::cluster::start').be_called_times(1).with_params(start_params)
+
+        result = run_plan(plan, plan_params)
+
+        expect(result.ok?).to be(true)
+      end
+    end
   end
 end