foreman_virt_who_configure 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee4227e4992392c6e28c5c78d67767da1b848d8f
-  data.tar.gz: 979259473442e7970dd08a06749b444eedde82cd
+  metadata.gz: 2008ae4faa3e226b92f38e622d36336c9c41ab6d
+  data.tar.gz: 19a345a6b897f6316d4246ac3d27d062e8e11064
 SHA512:
-  metadata.gz: a99643747882bac9738c17cfabc6aab51e7e61e32e4c318f7942cb64009151bb4e0be21b4cef3f354c1e558c34f26be93e1901bc706bba72500656ce80194878
-  data.tar.gz: 18481a8b5857bdf33cc67b3f43d5af1607ff79d38d810db32d0936b24ff992dd9ff96264e69788a880fbf528064767fbae050fb24032988b14da6ba930c74716
+  metadata.gz: fba16d9169161c00450b0d3247552e68a5b103192c1eef0be6a36c77e6d9658b942646e8edc1b6225a737c1fa5a6c54c7780d9857d5d35a8ef5f69f3b3600acd
+  data.tar.gz: dfa23ba31cc18e7a0eeba914cca88fff1e7ab42d8620279848c933037fd7986cfbbf88ade145aa61e8ee2b7531d1b48857c62d52ac329cb20de4d3f11bf8bbdf

data/app/assets/stylesheets/foreman_virt_who_configure/config.css.scss

@@ -2,6 +2,7 @@ pre.terminal {
   display: block;
   padding: 9.5px;
   margin: 0 0 10px;
+  max-height: 300px;
   font-size: 12px;
   word-break: break-all;
   word-wrap: break-word;
@@ -11,3 +12,6 @@ pre.terminal {
   border-radius: 0px;
   font-family: Menlo, Monaco, Consolas, monospace;
 }
+ .terminal-buttons {
+  margin-bottom: 10px;
+}

data/app/models/foreman_virt_who_configure/config.rb

@@ -88,9 +88,10 @@ module ForemanVirtWhoConfigure
     after_create :create_service_user
     after_destroy :destroy_service_user
 
-    validates :interval, :hypervisor_type, :hypervisor_server, :hypervisor_username, :hypervisor_password,
+    validates :interval, :hypervisor_type, :hypervisor_server, :hypervisor_username,
               :satellite_url, :hypervisor_id, :organization_id, :name,
               :presence => true
+    validates :hypervisor_password, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'libvirt' }
     validates :hypervisor_type, :inclusion => HYPERVISOR_TYPES.keys
     validates :hypervisor_id, :inclusion => HYPERVISOR_IDS
     validates :interval, :inclusion => AVAILABLE_INTERVALS.keys.map(&:to_i)
@@ -182,6 +183,10 @@ module ForemanVirtWhoConfigure
       end
     end
 
+    def virt_who_config_command
+      "hammer virt-who-config deploy --id #{self.id}"
+    end
+
     def virt_who_touch!
       self.last_report_at = DateTime.now.utc
       self.out_of_date_at = self.last_report_at + self.interval.minutes

data/app/views/foreman_virt_who_configure/configs/show.html.erb

@@ -5,7 +5,41 @@
   <div class="form-group">
     <div class="row">
       <div class="col-md-12">
-        <label><%= _("To deploy this configuration. run this script on the target host which has access to Red Hat Satellite Tools repository and will run virt-who reporting, preferably Satellite host:") %></label>
+        <h1><%= _("Virt-who Configuration %s") % @config.name %></h1>
+      </div>
+      <div class="col-md-6">
+        <%= _("Use either hammer command or the script below to deploy this configuration. Run one of them on the target host which has access to Red Hat Satellite Tools repository and will run virt-who reporting, preferably Satellite host:") %>
+      </div>
+      <div class="col-md-2">
+        <div class="pull-right">
+          <p>
+            <%= link_to _('Edit this configuration'), edit_foreman_virt_who_configure_config_path(@config), :class => 'btn btn-default' %>
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-md-12">
+        <h2><%= 'a) ' + _('Hammer command: ') %></h2>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-8">
+        <pre class="terminal" id="config_command"><%= @config.virt_who_config_command %></pre>
+      </div>
+      <div class="col-md-8">
+        <div class="terminal-buttons">
+          <%= link_to _('Copy to clipboard'), nil, :class => 'btn btn-default', :onclick => 'virt_who_copy_configuration_to_clipboard($("#config_command").html())' %>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-md-12">
+        <h2><%= 'b) ' + _('Configuration script: ') %></h2>
+      </div>
+      <div class="col-md-8">
         <p>
           <%= _("On the target virt-who host:") %></br>
           <%= _("1. Copy this configuration script to a safe directory.") %></br>
@@ -14,17 +48,15 @@
         </p>
       </div>
     </div>
-
     <div class="row">
       <div class="col-md-8">
-        <div class="pull-right">
-          <%= link_to _('Edit this configuration'), edit_foreman_virt_who_configure_config_path(@config), :class => 'btn btn-default' %>
+        <pre class="terminal" id="config_script"><%= @config.virt_who_config_script %></pre>
+      </div>
+      <div class="col-md-8">
+        <div class="terminal-buttons">
+          <%= link_to _('Copy to clipboard'), nil, :class => 'btn btn-default', :onclick => 'virt_who_copy_configuration_to_clipboard($("#config_script").html())' %>
           <%= link_to _('Download the script'), deploy_script_foreman_virt_who_configure_config_path(@config), :class => 'btn btn-default' %>
-          <%= link_to _('Copy to clipboard'), nil, :class => 'btn btn-default', :onclick => 'virt_who_copy_configuration_to_clipboard($("pre.terminal").html())' %>
         </div>
-
-        <h3><%= _('Configuration script: ') %></h3>
-        <pre class="terminal"><%= @config.virt_who_config_script %></pre>
       </div>
     </div>
   </div>

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Foreman virt-who-configure team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello