Fixes #27684 - Add validation for PVC (#117)

Author: shiramax

app/models/foreman_kubevirt/kubevirt.rb

@@ -106,11 +106,13 @@ def storage_classes_for_select
       storage_classes.map { |sc| OpenStruct.new(id: sc.name, description: "#{sc.name} (#{sc.provisioner})") }
     end
 
-    def new_volume(attr = {})
-      return unless new_volume_errors.empty?
 
-      vol = Fog::Kubevirt::Compute::Volume.new(attr)
-      vol.boot_order = 1 if attr[:bootable] == "on" || attr[:bootable] == "true"
+    def new_volume(attrs = {})
+      return unless new_volume_errors.empty?
+      capacity = attrs.delete(:capacity)
+      args = {capacity: capacity}.merge(attrs)
+      vol = Fog::Kubevirt::Compute::Volume.new(args)
+      vol.boot_order = 1 if args[:bootable] == "on" || args[:bootable] == "true"
       vol
     end
 
@@ -376,7 +378,11 @@ def add_volume_for_image_provision(options)
     end
 
     def validate_volume_capacity(volumes_attributes)
-      volumes_attributes.each { |_, v| raise ::Foreman::Exception.new N_('Capacity was not found') if v[:capacity].empty? }
+      volumes_attributes.each do |_, vol|
+        if vol[:capacity].to_s.empty? || /\A\d+G?\Z/.match(vol[:capacity].to_s).nil?
+          raise Foreman::Exception.new(N_("Volume size #{vol[:capacity]} is not valid"))
+        end
+      end
     end
 
     def validate_only_single_bootable_volume(volumes_attributes)

test/unit/foreman_kubevirt_test.rb

@@ -126,9 +126,22 @@ def new_kubevirt_vcr
     exception = assert_raise(Foreman::Exception) do
       compute_resource.create_vm(vm_args)
     end
-    assert_match(/Capacity was not found/, exception.message)
+    assert_match(/Volume size  is not valid/, exception.message)
   end
 
+
+  test "should fail when creating a VM with not valid capacity" do
+    vm_args = NETWORK_BASED_VM_ARGS.deep_dup
+    vm_args["volumes_attributes"]["0"]["capacity"] = "TG"
+    Fog.mock!
+    compute_resource = new_kubevirt_vcr
+    exception = assert_raise(Foreman::Exception) do
+      compute_resource.create_vm(vm_args)
+    end
+    assert_match(/Volume size TG is not valid/, exception.message)
+  end
+
+
   test "should fail when creating a VM with two bootable PVCs" do
     vm_args = NETWORK_BASED_VM_ARGS.deep_dup
     vm_args["volumes_attributes"]["0"]["bootable"] = "true"