Fixes #38266 - Remove oVirt & RHV code

Author: stejskalleos

.github/workflows/foreman.yml

@@ -12,7 +12,7 @@ env:
   RAILS_ENV: test
   DATABASE_URL: postgresql://postgres:password@localhost/test
   DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
-  BUNDLE_WITHOUT: "console:development:journald"
+  BUNDLE_WITHOUT: 'console:development:journald'
 
 concurrency:
   group: ${{ github.ref_name }}-${{ github.workflow }}
@@ -34,7 +34,7 @@ jobs:
     needs: setup_matrix
     runs-on: ubuntu-24.04
     env:
-      BUNDLE_WITHOUT: assets:console:development:dynflow_sidekiq:ec2:journald:jsonp:libvirt:openid:openstack:ovirt:redis:service:telemetry:vmware
+      BUNDLE_WITHOUT: assets:console:development:dynflow_sidekiq:ec2:journald:jsonp:libvirt:openid:openstack:redis:service:telemetry:vmware
     steps:
       - uses: actions/checkout@v4
       - name: Setup Ruby
@@ -46,7 +46,7 @@ jobs:
         run: bundle exec rubocop -P
 
   tests:
-    name: "${{ matrix.task }} - Ruby ${{ matrix.ruby }} and Node ${{ matrix.node }} on PostgreSQL ${{ matrix.postgresql }}"
+    name: '${{ matrix.task }} - Ruby ${{ matrix.ruby }} and Node ${{ matrix.node }} on PostgreSQL ${{ matrix.postgresql }}'
     runs-on: ubuntu-24.04
     needs:
       - setup_matrix
@@ -77,9 +77,9 @@ jobs:
       - run: sudo apt-get -qq -y install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev libvirt-dev
       - name: generate artifact suffix
         run: echo "ARTIFACT_SUFFIX=$(echo 'ruby-${{ matrix.ruby }}-node-${{ matrix.node }}-pg-${{ matrix.postgresql }}-${{ matrix.task }}' | tr -cd '[:alnum:]-.')" >> "${GITHUB_ENV}"
-      - name: "Check out Foreman"
+      - name: 'Check out Foreman'
         uses: actions/checkout@v4
-      - name: "Set up Ruby ${{ matrix.ruby }}"
+      - name: 'Set up Ruby ${{ matrix.ruby }}'
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -89,7 +89,7 @@ jobs:
         with:
           name: Gemfile-${{ env.ARTIFACT_SUFFIX }}.lock
           path: Gemfile.lock
-      - name: "Set up Node ${{ matrix.node }}"
+      - name: 'Set up Node ${{ matrix.node }}'
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}

.rubocop_todo.yml

@@ -59,7 +59,6 @@ Layout/MultilineOperationIndentation:
 Layout/SpaceAroundMethodCallOperator:
   Exclude:
     - 'test/controllers/api/v2/hosts_controller_test.rb'
-    - 'test/models/compute_resources/ovirt_test.rb'
 
 # Offense count: 3321
 # Cop supports --auto-correct.

app/assets/config/manifest.js

@@ -10,8 +10,6 @@
 
 // link compute_resource.js
 //= link compute_resources/libvirt/nic_info.js
-//= link compute_resources/ovirt/nic_info.js
-//= link compute_resources/ovirt/display.js
 //= link compute_resources/vmware/nic_info.js
 //= link host_edit.js
 //= link host_edit_interfaces.js

app/assets/javascripts/compute_resources/ovirt/display.js

@@ -3,9 +3,11 @@ var compute_resource_id = null;
 
 $(document).on('ContentLoad', function() {
   var searchParams = new URLSearchParams(window.location.search);
-  if(searchParams.has('hostgroup_id')) {
+  if (searchParams.has('hostgroup_id')) {
     var param = searchParams.get('hostgroup_id');
-    $('#host_hostgroup_id').val(param).trigger('change');
+    $('#host_hostgroup_id')
+      .val(param)
+      .trigger('change');
   }
   onHostEditLoad();
   const overrideButtons = document.querySelectorAll('[name=is_overridden_btn]');
@@ -39,17 +41,41 @@ $(document).on('ContentLoad', function() {
 $(document)
   .on('select2:select select2:unselecting', '.hostgroup-select', function(evt) {
     hostgroup_changed(evt.target);
-  }).on('select2:select select2:unselecting', '.host-form-compute-resource-handle', function(evt) {
-    computeResourceSelected(evt.target);
-  }).on('select2:select select2:unselecting', '.host-taxonomy-select', function(evt) {
+  })
+  .on(
+    'select2:select select2:unselecting',
+    '.host-form-compute-resource-handle',
+    function(evt) {
+      computeResourceSelected(evt.target);
+    }
+  )
+  .on('select2:select select2:unselecting', '.host-taxonomy-select', function(
+    evt
+  ) {
     update_form(evt.target);
-  }).on('select2:select select2:unselecting', '#host_architecture_id', function(evt) {
-    architecture_selected(evt.target);
-  }).on('select2:select select2:unselecting', '#hostgroup_architecture_id', function(evt) {
+  })
+  .on('select2:select select2:unselecting', '#host_architecture_id', function(
+    evt
+  ) {
     architecture_selected(evt.target);
-  }).on('select2:select select2:unselecting', '.host-architecture-os-select', function(evt) {
-    os_selected(evt.target);
-  }).on('select2:select select2:unselecting', '.host-os-media-select', function(evt) {
+  })
+  .on(
+    'select2:select select2:unselecting',
+    '#hostgroup_architecture_id',
+    function(evt) {
+      architecture_selected(evt.target);
+    }
+  )
+  .on(
+    'select2:select select2:unselecting',
+    '.host-architecture-os-select',
+    function(evt) {
+      os_selected(evt.target);
+    }
+  )
+  .on('select2:select select2:unselecting', '.host-os-media-select', function(
+    evt
+  ) {
     medium_selected(evt.target);
   });
 
@@ -207,14 +233,20 @@ function submit_with_all_params() {
     success: function(response, _responseStatus, jqXHR) {
       // workaround for redirecting to the new host details page
       if (!response.includes('id="main"')) {
-        return tfm.nav.pushUrl(tfm.tools.foremanUrl(jqXHR.getResponseHeader('X-Request-Path')));
+        return tfm.nav.pushUrl(
+          tfm.tools.foremanUrl(jqXHR.getResponseHeader('X-Request-Path'))
+        );
       }
 
       $('#host-progress').hide();
       $('#content').replaceWith($('#content', response));
       $(document.body).trigger('ContentLoad');
-      if ($("[data-history-url]").exists()) {
-        history.pushState({}, 'Host show', $("[data-history-url]").data('history-url'));
+      if ($('[data-history-url]').exists()) {
+        history.pushState(
+          {},
+          'Host show',
+          $('[data-history-url]').data('history-url')
+        );
       }
     },
     error: function(response) {
@@ -275,7 +307,7 @@ function update_progress(data) {
 }
 
 function update_default_compute_resource(hostgroup_id) {
-  if(hostgroup_id) {
+  if (hostgroup_id) {
     tfm.tools.showSpinner();
     $.ajax({
       type: 'get',
@@ -285,10 +317,10 @@ function update_default_compute_resource(hostgroup_id) {
       },
       success: function(response) {
         compute_resource_id = response['compute_resource_id'];
-      }});
-  }
-  else {
-    compute_resource_id = null
+      },
+    });
+  } else {
+    compute_resource_id = null;
   }
 }
 
@@ -303,7 +335,6 @@ function hostgroup_changed(element) {
   }
   const hostgroup_id = element.value;
   update_default_compute_resource(hostgroup_id);
-
 }
 
 function handleHostgroupChangeEdit(element, host_id, host_changed) {
@@ -482,12 +513,6 @@ function update_provisioning_image() {
         if ($('#host_provision_method_image')[0].checked) {
           if ($('#provider').val() == 'Libvirt') {
             tfm.computeResource.libvirt.imageSelected(image_options);
-          } else if ($('#provider').val() == 'Ovirt') {
-            var template_select = $('#host_compute_attributes_template');
-            if (template_select.length > 0) {
-              template_select.val(image_options.val());
-              tfm.computeResource.ovirt.templateSelected(image_options);
-            }
           }
         }
       }
@@ -579,8 +604,8 @@ function onHostEditLoad() {
   $('#params-tab').on('shown', function() {
     mark_params_override();
   });
-  $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-    $('a[rel="popover"]').popover("destroy");
+  $('a[data-toggle="tab"]').on('shown.bs.tab', function(e) {
+    $('a[rel="popover"]').popover('destroy');
   });
   if ($('#supports_update') && !$('#supports_update').data('supports-update'))
     disable_vm_form_fields();
@@ -598,8 +623,6 @@ function build_provision_method_selected() {
   $('div[id*=_provisioning]').hide();
   $('#network_provisioning').show();
   $('#image_selection select').attr('disabled', true);
-  if ($('#provider').val() == 'Ovirt')
-    $('#host_compute_attributes_template').select2('readonly',false);
 }
 $(document).on(
   'select2:select select2:unselecting',
@@ -615,13 +638,6 @@ function image_provision_method_selected() {
   image_options.attr('disabled', false);
   if ($('#provider').val() == 'Libvirt') {
     tfm.computeResource.libvirt.imageSelected(image_options);
-  } else if ($('#provider').val() == 'Ovirt') {
-    var template_options = $('#host_compute_attributes_template');
-    if (template_options.length > 0) {
-      template_options.select2('readonly',true);
-      template_options.val(image_options.val());
-      tfm.computeResource.ovirt.templateSelected(image_options);
-    }
   }
 }
 $(document).on(
@@ -630,12 +646,16 @@ $(document).on(
   image_provision_method_selected
 );
 
-$(document).on('select2:select select2:unselecting', '.interface_domain', function() {
+$(document).on(
+  'select2:select select2:unselecting',
+  '.interface_domain',
+  function() {
     interface_domain_selected(this);
     clearIpField(this, '.interface_ip');
     clearIpField(this, '.interface_ip6');
     reload_host_params();
-});
+  }
+);
 
 function clearIpField(parent, childclass) {
   var ip_field = $(parent)
@@ -883,7 +903,7 @@ function selectRelatedNetwork(subnetElement) {
   var vlanId = subnet_select.find(':selected').attr('data-vlan_id');
   var network_select = subnet_select
     .closest('fieldset')
-    .find('.vmware_network,.ovirt_network');
+    .find('.vmware_network');
   var isVisible = subnet_select.closest('#interfaceModal').length > 0;
   var isPreSelected = network_select.find('option[selected]').length > 0;
 
@@ -894,13 +914,10 @@ function selectRelatedNetwork(subnetElement) {
   var selected = null;
   // prefer a match of the vlanid bounded by non digits
   // this prevent vlanId=1 from matching "vlan100"
-  var vlanidregex = new RegExp("(^|\\D)" + vlanId + "($|\\D)")
+  var vlanidregex = new RegExp('(^|\\D)' + vlanId + '($|\\D)');
 
   network_select.find('option').each(function(index, option) {
-    if (
-      selected === null &&
-      vlanidregex.test($(option).text())
-    ) {
+    if (selected === null && vlanidregex.test($(option).text())) {
       selected = option.value;
     }
   });

app/assets/javascripts/compute_resources/ovirt/nic_info.js

@@ -8,7 +8,7 @@ class ComputeResourcesController < V2::BaseController
 
       before_action :find_resource, :only => [:show, :update, :destroy, :available_images, :associate,
                                               :available_virtual_machines, :available_clusters, :available_flavors, :available_folders,
-                                              :available_networks, :available_vnic_profiles, :available_resource_pools, :available_security_groups, :available_storage_domains,
+                                              :available_networks, :available_resource_pools, :available_security_groups, :available_storage_domains,
                                               :available_zones, :available_storage_pods, :storage_domain, :storage_pod, :refresh_cache, :power_vm, :show_vm, :destroy_vm]
 
       api :GET, "/compute_resources/", N_("List all compute resources")
@@ -32,42 +32,27 @@ def show
           param :provider, String, :desc => N_("Providers include %{providers}") # values are defined in apipie initializer
           param :url, String, :desc => N_("URL for %{providers_requiring_url}")
           param :description, String
-          param :user, String, :desc => N_("Username for oVirt, EC2, VMware, OpenStack. Access Key for EC2.")
-          param :password, String, :desc => N_("Password for oVirt, EC2, VMware, OpenStack. Secret key for EC2")
-          param :datacenter, String, :desc => N_("for oVirt, VMware Datacenter")
-          param :ovirt_quota, String, :desc => N_("for oVirt only, ID or Name of quota to use")
-          param :public_key, String, :desc => N_("for oVirt only")
+          param :user, String, :desc => N_("Username for EC2, VMware, OpenStack. Access Key for EC2.")
+          param :password, String, :desc => N_("Password for EC2, VMware, OpenStack. Secret key for EC2")
+          param :datacenter, String, :desc => N_("for VMware Datacenter")
           param :region, String, :desc => N_("for AzureRm eg. 'eastus' and for EC2 only. Use '%s' for EC2 GovCloud region") % Foreman::Model::EC2::GOV_CLOUD_REGION
           param :tenant, String, :desc => N_("for OpenStack and AzureRm only")
           param :domain, String, :desc => N_("for OpenStack (v3) only")
           param :project_domain_name, String, :desc => N_("for OpenStack (v3) only")
           param :project_domain_id, String, :desc => N_("for OpenStack (v3) only")
           param :server, String, :desc => N_("for VMware")
           param :set_console_password, :bool, :desc => N_("for Libvirt and VMware only")
-          param :display_type, %w(VNC SPICE), :desc => N_('for Libvirt and oVirt only')
-          param :keyboard_layout, ComputeResource::ALLOWED_KEYBOARD_LAYOUTS, :desc => N_('for oVirt only')
+          param :display_type, %w(VNC SPICE), :desc => N_('for Libvirt only')
           param :caching_enabled, :bool, :desc => N_('enable caching, for VMware only')
           param_group :taxonomies, ::Api::V2::BaseController
         end
       end
 
-      def change_datacenter_to_uuid(datacenter)
-        if @compute_resource.respond_to?(:get_datacenter_uuid) && datacenter.present?
-          @compute_resource.test_connection
-          @compute_resource.get_datacenter_uuid(datacenter)
-        end
-      end
-
       api :POST, "/compute_resources/", N_("Create a compute resource")
       param_group :compute_resource, :as => :create
 
       def create
         begin
-          if compute_resource_params["provider"].downcase == "ovirt" && !Foreman.is_uuid?(compute_resource_params[:datacenter])
-            @compute_resource = ComputeResource.new_provider(compute_resource_params.except(:datacenter))
-            params[:compute_resource][:datacenter] = change_datacenter_to_uuid(params[:compute_resource][:datacenter])
-          end
-
           @compute_resource = ComputeResource.new_provider(compute_resource_params)
         rescue Foreman::Exception => e
           render_exception(e, :status => :unprocessable_entity)
@@ -82,13 +67,10 @@ def create
       param_group :compute_resource
 
       def update
-        datacenter = change_datacenter_to_uuid(compute_resource_params[:datacenter])
-        update_parameters = datacenter.present? ? compute_resource_params.merge(:datacenter => datacenter) : compute_resource_params
-        # update compute attributes as well when datacenter is changed
         if @compute_resource.provider == 'Vmware' && compute_resource_params[:datacenter].present?
           @compute_resource.compute_attributes.map { |ca| ca.vm_attrs['path'].gsub!(@compute_resource.datacenter, compute_resource_params[:datacenter]) }
         end
-        process_response @compute_resource.update(update_parameters)
+        process_response @compute_resource.update(compute_resource_params)
       end
 
       api :DELETE, "/compute_resources/:id/", N_("Delete a compute resource")
@@ -146,13 +128,6 @@ def available_networks
         render :available_networks, :layout => 'api/v2/layouts/index_layout'
       end
 
-      api :GET, "/compute_resources/:id/available_vnic_profiles", N_("List available vnic profiles for a compute resource, for oVirt only")
-      param :id, :identifier, :required => true
-      def available_vnic_profiles
-        @available_vnic_profiles = @compute_resource.vnic_profiles
-        render :available_vnic_profiles, :layout => 'api/v2/layouts/index_layout'
-      end
-
       api :GET, "/compute_resources/:id/available_clusters/:cluster_id/available_resource_pools", N_("List resource pools for a compute resource cluster")
       param :id, :identifier, :required => true
       param :cluster_id, String, :required => true
@@ -302,7 +277,7 @@ def cluster_id
 
       def action_permission
         case params[:action]
-          when 'available_images', 'available_virtual_machines', 'available_clusters', 'available_flavors', 'available_folders', 'available_networks', 'available_vnic_profiles', 'available_resource_pools', 'available_security_groups', 'available_storage_domains', 'storage_domain', 'available_zones', 'associate', 'available_storage_pods', 'storage_pod', 'refresh_cache', 'show_vm', 'power_vm', 'destroy_vm'
+          when 'available_images', 'available_virtual_machines', 'available_clusters', 'available_flavors', 'available_folders', 'available_networks', 'available_resource_pools', 'available_security_groups', 'available_storage_domains', 'storage_domain', 'available_zones', 'associate', 'available_storage_pods', 'storage_pod', 'refresh_cache', 'show_vm', 'power_vm', 'destroy_vm'
             :view
           else
             super