foreman_datacenter 1.16.12 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b19a8ebbbfd9fb0447561147ffd64227a91b5ff08121c1fc0b56a06a3f5ee9
-  data.tar.gz: c3c6679a50f928e0895001f709f6e317479a51711b682cb60029f0ae4ae031cd
+  metadata.gz: b107cc41f1cd6e3e03d3eaa9c742dc6d437e206c50c4d5389a1e73251b9e8852
+  data.tar.gz: 2e0eb385586087cecd25ec166f12d7f45bd19a2cc4e9e761436a94ed0b50f00c
 SHA512:
-  metadata.gz: 2372432d548604b47861fddf088d865cedc6da89fe7e3fc1557f9d6fdf0a1a8e2705fcc602f76b071f64ffcc31427294db57db84461ab514ac0519ba838b628a
-  data.tar.gz: 0dbc2c1db3a3dc564cf62d49c200194cbbd7c6934c3ce9379ce098bc8ece36d54105f897feddf845b69b861800efe3eae543ceb8867695df6de69b2bfde095e4
+  metadata.gz: fb2948be60ff1b973fc6bc6d0bc72d108129478b47c082a12bc572957f905554db7e91f7f0b136b74b06da30e8f1f45757bdb7f2a1ad2bba7b199517dc4da693
+  data.tar.gz: 6efebfbac69d6ce1da94419d068573b5b31e1846d94a3d5b8a910f86b8cfc77482098c1ea0c722470de5b5fd1c896e1c68743f6f6d15aa41031dab5ae7257a92

data/app/assets/javascripts/foreman_datacenter/modal.js

@@ -8,10 +8,9 @@ $(window).click(function(event) {
     var pathname = window.location.pathname; // Returns path only
     var str = "/" + object_id;
     var patt = new RegExp(str);
-    var token = $('meta[name="csrf-token"]').attr('content');
+    console.log(object_type);
     if (object_type == 'device') {
-      // var checkbox_label = 'Delete associated host ONLY and keep current device as UNASSIGNED!'
-      var checkbox_label = ''
+      var checkbox_label = 'Delete associated host ONLY and keep current device as UNASSIGNED!'
     } else {
       var checkbox_label = 'Delete ' +  object_type + ' ONLY'
     }
@@ -19,19 +18,6 @@ $(window).click(function(event) {
     if (!(patt.test(pathname))) {
       pathname = pathname + str
     }
-    var move = "<p></p>"
-    var checkbox = ""
-    var text = "You will permanently delete the"
-    text_ao = ""
-    if (object_type == "site" || object_type == "rack" || object_type == "rack_group") {
-      move = '<p>You also can move associated object to another <strong>' + object_type + '</strong> before you destroy it.</p> \
-          <a class="btn btn-block btn-primary modal-btn modal-btn-primary marginbottomsixteen" href="/datacenter/' + object_type + 's/' + object_id + '/move">Move associated objects</a>'
-      checkbox = '<input type="checkbox" name="object_only" id="object_only" value="true" checked="checked">'
-      text = "By unselecting checkbox you will permanently delete the"
-      text_ao = 'with \
-            <strong>ALL</strong> \
-            associated objects' + ao
-    }
 
     var form = '<div id="myModal" class="modal"> \
       <div class="modal-content"> \
@@ -45,19 +31,20 @@ $(window).click(function(event) {
         <div class="modal-body"> \
           <p>This action \
             <strong>cannot</strong> \
-            be undone. \
-            ' + text + ' \
+            be undone. By unselecting checkbox you will permanently delete the \
             <strong>' + object_name + '</strong> \
-            ' + text_ao + ' \
+            with \
+            <strong>all</strong> \
+            associated objects' + ao + ' \
           </p> \
           <form class="modal-form nonpaddingbottom" action=' + pathname + ' accept-charset="UTF-8" method="post"> \
             <input type="hidden" name="_method" value="delete"> \
-            <input type="hidden" name="authenticity_token" value=' + token + '> \
-            ' + checkbox + ' \
+            <input type="checkbox" name="object_only" id="object_only" value="true" checked="checked"> \
             <label>' + checkbox_label + '</label> \
             <input type="submit" name="commit" value="I understand the consequences, delete this ' + object_type + '" class="btn btn-block btn-danger modal-btn modal-btn-danger"> \
 	  </form> \
-          '+ move +' \
+          <p>You also can move associated object to another <strong>' + object_type + '</strong> before you destroy it.</p> \
+          <a class="btn btn-block btn-primary modal-btn modal-btn-primary marginbottomsixteen" href="/datacenter/' + object_type + 's/' + object_id + '/move">Move associated objects</a> \
         </div> \
       </div> \
     </div>'

data/app/assets/stylesheets/foreman_datacenter/datacenter.css

@@ -9,6 +9,3 @@
 .nonbordercolor {
   border-color: transparent !important;
 }
-.nonmargintop {
-  margin-top: 0px !important;
-}

data/app/assets/stylesheets/foreman_datacenter/device_roles.css

@@ -28,35 +28,3 @@ span.mediumgray {
 span.darkgray {
   background-color: #171515;
 }
-
-
-.teal {
-  background-color: #06a79f;
-}
-.green {
-  background-color: #89A54E;
-}
-.blue {
-  background-color: #3D96AE;
-}
-.purple {
-  background-color: #D882d8;
-}
-.yellow {
-  background-color: #ecec61;
-}
-.orange {
-  background-color: #f37676;
-}
-.red {
-  background-color: #AA4643;
-}
-.lightgray {
-  background-color: gray;
-}
-.mediumgray {
-  background-color: #403e3e;
-}
-.darkgray {
-  background-color: #171515;
-}

data/app/controllers/api/v2/foreman_datacenter/console_port_templates_controller.rb

@@ -6,6 +6,7 @@ module Api
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{destroy show}
+        add_scoped_search_description_for(::ForemanDatacenter::ConsolePortTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/console_port_templates/", N_("List all ConsolePortTemplates")

data/app/controllers/api/v2/foreman_datacenter/console_ports_controller.rb

@@ -7,6 +7,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy connect connected planned disconnect}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::ConsolePort)
 
         api :GET, "/foreman_datacenter/console_ports/", N_("List all ConsolePorts")
 

data/app/controllers/api/v2/foreman_datacenter/console_server_port_templates_controller.rb

@@ -6,6 +6,7 @@ module Api
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{destroy show}
+        add_scoped_search_description_for(::ForemanDatacenter::ConsoleServerPortTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/console_server_port_templates/", N_("List all ConsoleServerPortTemplates")

data/app/controllers/api/v2/foreman_datacenter/console_server_ports_controller.rb

@@ -5,6 +5,7 @@ module Api
 	include ::ForemanDatacenter::Controller::Parameters::ConsoleServerPort
 
         before_action :find_resource, :only => %w{show update destroy connect connected planned disconnect}
+        add_scoped_search_description_for(::ForemanDatacenter::ConsoleServerPortTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/console_server_ports/", N_("List all ConsoleServerPorts")

data/app/controllers/api/v2/foreman_datacenter/device_bay_templates_controller.rb

@@ -7,6 +7,7 @@ module Api
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{destroy show}
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::ConsolePortTemplate)
         
         api :GET, "/foreman_datacenter/device_bay_templates/", N_("List all DeviceBayTemplate")
         

data/app/controllers/api/v2/foreman_datacenter/device_bays_controller.rb

@@ -2,11 +2,12 @@ module Api
   module V2
     module ForemanDatacenter
       class DeviceBaysController < ForemanDatacenter::BaseController
-	include ::ForemanDatacenter::Controller::Parameters::DeviceBay
+        include ::ForemanDatacenter::Controller::Parameters::DeviceBay
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{show update destroy populate depopulate}
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::ConsolePortTemplate)
         
         api :GET, "/foreman_datacenter/device_bays/", N_("List all DeviceBays")
         
@@ -20,35 +21,35 @@ module Api
         def show
         end
 
-	def_param_group :device_bay do
-	  param :device_bay, Hash, :required => true, :action_aware => true do
-	    param :name, String, :required => true
-	    param :device_id, :number, :desc => N_("Device ID")
-	  end
-	end
+        def_param_group :device_bay do
+          param :device_bay, Hash, :required => true, :action_aware => true do
+            param :name, String, :required => true
+            param :device_id, :number, :desc => N_("Device ID")
+          end
+        end
 
-	api :POST, "/foreman_datacenter/device_bays", N_("Create a DeviceBay")
-	param_group :device_bay, :as => :create
+        api :POST, "/foreman_datacenter/device_bays", N_("Create a DeviceBay")
+        param_group :device_bay, :as => :create
 
-	def create
-	  @device_bay = ::ForemanDatacenter::DeviceBay.new(device_bay_params)
-	  process_response @device_bay.save
-	end
+        def create
+          @device_bay = ::ForemanDatacenter::DeviceBay.new(device_bay_params)
+          process_response @device_bay.save
+        end
 
-	api :PUT, "/foreman_datacenter/device_bays/:id/", N_("Update a DeviceBay")
-	param :id, :identifier, :required => true
-	param_group :device_bay
+        api :PUT, "/foreman_datacenter/device_bays/:id/", N_("Update a DeviceBay")
+        param :id, :identifier, :required => true
+        param_group :device_bay
 
-	def update
-	  process_response @device_bay.update(device_bay_params)
-	end
+        def update
+          process_response @device_bay.update(device_bay_params)
+        end
 
-	api :DELETE, "/foreman_datacenter/device_bays/:id/", N_("Delete a DeviceBay")
-	param :id, :identifier, :required => true
+        api :DELETE, "/foreman_datacenter/device_bays/:id/", N_("Delete a DeviceBay")
+        param :id, :identifier, :required => true
 
-	def destroy
-	  process_response @device_bay.destroy
-	end
+        def destroy
+          process_response @device_bay.destroy
+        end
 
         api :PATCH, "/foreman_datacenter/device_bays/:id/populate", N_("Populate")
         param :id, :identifier, :required => true

data/app/controllers/api/v2/foreman_datacenter/device_interface_connections_controller.rb

@@ -2,7 +2,7 @@ module Api
   module V2
     module ForemanDatacenter
       class DeviceInterfaceConnectionsController < ForemanDatacenter::BaseController
-	include ::ForemanDatacenter::Controller::Parameters::DeviceInterfaceConnection
+        include ::ForemanDatacenter::Controller::Parameters::DeviceInterfaceConnection
 
         before_action :find_resource, :only => %w{show update destroy connected planned}
         param_group :search_and_pagination, ::Api::V2::BaseController
@@ -19,46 +19,46 @@ module Api
         def show
         end
 
-	def_param_group :device_interface_connection do
-	  param :device_interface_connection, Hash, :required => true, :action_aware => true do
-	    param :name, String, :required => true
-	    param :interface_a, :number, :desc => N_("Interface A")
-	    param :interface_b, :number, :desc => N_("Interface B")
-	    param :connection_status, :number, :desc => N_("Connectin status")
-	  end
-	end
+        def_param_group :device_interface_connection do
+          param :device_interface_connection, Hash, :required => true, :action_aware => true do
+            param :name, String, :required => true
+            param :interface_a, :number, :desc => N_("Interface A")
+            param :interface_b, :number, :desc => N_("Interface B")
+            param :connection_status, :number, :desc => N_("Connectin status")
+          end
+        end
 
-	api :POST, "/foreman_datacenter/device_interfaces/:device_interface_id/device_interface_connections", N_("Create a DeviceInterfaceConnection")
-	param_group :device_interface_connection, :as => :create
+        api :POST, "/foreman_datacenter/device_interfaces/:device_interface_id/device_interface_connections", N_("Create a DeviceInterfaceConnection")
+        param_group :device_interface_connection, :as => :create
 
-	def create
+        def create
           @device_interface_connection = ::ForemanDatacenter::DeviceInterfaceConnection.new(device_interface_connection_params.merge(interface_a: params[:device_interface_id]))
           @device_interface_connection.first_interface = get_device_interface
-	  process_response @device_interface_connection.save
-	end
+          @device_interface_connection.save
+        end
 
-	api :DELETE, "/foreman_datacenter/device_interface_connections/:id/", N_("Delete a DeviceInterfaceConnection")
-	param :id, :identifier, :required => true
+        api :DELETE, "/foreman_datacenter/device_interface_connections/:id/", N_("Delete a DeviceInterfaceConnection")
+        param :id, :identifier, :required => true
 
-	def destroy
-	  process_response @device_interface_connection.destroy
-	end
+        def destroy
+          process_response @device_interface_connection.destroy
+        end
 
         api :PATCH, "/foreman_datacenter/device_interface_connections/:id/planned", N_("Planned")
-	param :id, :identifier, :required => true
-	param_group :device_interface_connection
+        param :id, :identifier, :required => true
+        param_group :device_interface_connection
 
-	def planned
+        def planned
           process_response @device_interface_connection.planned!
-	end
+        end
 
         api :PATCH, "/foreman_datacenter/device_interface_connections/:id/connected", N_("Connected")
-	param :id, :identifier, :required => true
-	param_group :device_interface_connection
+        param :id, :identifier, :required => true
+        param_group :device_interface_connection
 
-	def connected
+        def connected
           process_response @device_interface_connection.connected!
-	end
+        end
 
         private
 

data/app/controllers/api/v2/foreman_datacenter/device_interfaces_controller.rb

@@ -7,6 +7,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy}
         before_action :find_optional_nested_object
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::DeviceInterface)
         
         api :GET, "/foreman_datacenter/device_interfaces/", N_("List all DeviceInterfaces")
         
@@ -37,7 +38,7 @@ module Api
 
 	def create
 	  @device_interface = ::ForemanDatacenter::DeviceInterface.new(device_interface_params)
-	  process_response @device_interface.save
+	  @device_interface.save
 	end
 
 	api :PUT, "/foreman_datacenter/device_interfaces/:id/", N_("Update a DeviceInterface")

data/app/controllers/api/v2/foreman_datacenter/device_modules_controller.rb

@@ -6,6 +6,7 @@ module Api
 
         before_action :find_resource, :only => %w{show update destroy}
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::ConsolePort)
 
         api :GET, "/foreman_datacenter/device_modules/", N_("List all DeviceModules")
 

data/app/controllers/api/v2/foreman_datacenter/device_roles_controller.rb

@@ -8,6 +8,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::DeviceRole)
 
         api :GET, "/foreman_datacenter/device_roles/", N_("List all device_roles")
 

data/app/controllers/api/v2/foreman_datacenter/device_types_controller.rb

@@ -8,6 +8,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::DeviceType)
 
         api :GET, "/foreman_datacenter/device_types/", N_("List all device_types")
 

data/app/controllers/api/v2/foreman_datacenter/devices_controller.rb

@@ -8,6 +8,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy destroy_interfaces sync_interfaces_with_host}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::Device)
 
         api :GET, "/foreman_datacenter/devices/", N_("List all Devices")
 
@@ -46,7 +47,7 @@ module Api
 	param_group :device, :as => :create
 
 	def create
-	  @device = ::ForemanDatacenter::Device.new(device_params.merge(host_id: params[:host_id]))
+	  @device = ::ForemanDatacenter::Device.new(device_params.merge(hosy_id: params[:host_id]))
 	  process_response @device.save
 	end
 

data/app/controllers/api/v2/foreman_datacenter/interface_templates_controller.rb

@@ -6,6 +6,7 @@ module Api
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{destroy show}
+        add_scoped_search_description_for(::ForemanDatacenter::InterfaceTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/interface_templates/", N_("List all InterfaceTemplates")

data/app/controllers/api/v2/foreman_datacenter/management_devices_controller.rb

@@ -34,7 +34,7 @@ module Api
 
 	def create
 	  @management_device = ::ForemanDatacenter::ManagementDevice.new(management_device_params)#.merge(device_id: params[]))
-	  process_response @management_device.save
+	  @management_device.save
 	end
 
 	api :PUT, "/foreman_datacenter/management_devices/:id/", N_("Update a management_device")

data/app/controllers/api/v2/foreman_datacenter/manufacturers_controller.rb

@@ -8,6 +8,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::Manufacturer)
 
         api :GET, "/foreman_datacenter/manufacturers/", N_("List all manufacturers")
 

data/app/controllers/api/v2/foreman_datacenter/platforms_controller.rb

@@ -8,6 +8,7 @@ module Api
         before_action :find_resource, :only => %w{show update destroy}
 
         param_group :search_and_pagination, ::Api::V2::BaseController
+        add_scoped_search_description_for(::ForemanDatacenter::Platform)
 
         api :GET, "/foreman_datacenter/platforms/", N_("List all platforms")
 

data/app/controllers/api/v2/foreman_datacenter/power_outlet_templates_controller.rb

@@ -6,6 +6,7 @@ module Api
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{destroy show}
+        add_scoped_search_description_for(::ForemanDatacenter::PowerOutletTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/power_outlet_templates/", N_("List all PowerOutletTemplates")

data/app/controllers/api/v2/foreman_datacenter/power_outlets_controller.rb

@@ -5,6 +5,7 @@ module Api
 	include ::ForemanDatacenter::Controller::Parameters::PowerOutlet
 
         before_action :find_resource, :only => %w{show update destroy connect disconnect}
+        add_scoped_search_description_for(::ForemanDatacenter::PowerOutletTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/power_outlets/", N_("List all PowerOutlets")
@@ -31,7 +32,7 @@ module Api
 
 	def create
 	  @power_outlet = ::ForemanDatacenter::PowerOutlet.new(power_outlet_params)
-	  process_response @power_outlet.save
+	  @power_outlet.save
 	end
 
 	api :PUT, "/foreman_datacenter/power_outlets/:id/", N_("Update a PowerOutlet")

data/app/controllers/api/v2/foreman_datacenter/power_port_templates_controller.rb

@@ -6,6 +6,7 @@ module Api
 
         before_action :find_optional_nested_object
         before_action :find_resource, :only => %w{destroy show}
+        add_scoped_search_description_for(::ForemanDatacenter::PowerPortTemplate)
         param_group :search_and_pagination, ::Api::V2::BaseController
 
         api :GET, "/foreman_datacenter/power_port_templates/", N_("List all PowerPortTemplates")