staypuft 0.3.9 → 0.4.0

data/app/models/staypuft/deployment/nova_service.rb

@@ -41,6 +41,11 @@ module Staypuft
             end
           end
         end
+        unless record.private_fixed_range.empty?
+          if record.network_size < 4
+            record.errors[:private_fixed_range] << "Fixed range is too small. Specify CIDR for network size #{record.min_fixed_range_cidr} or larger"
+          end
+        end
       end
     end
 
@@ -119,6 +124,37 @@ module Staypuft
       end
     end
 
+    def fixed_range_size
+      fixed_range_str = private_fixed_range
+      if fixed_range_str.empty?
+        0
+      else
+        fixed_range = IPAddr.new(fixed_range_str).to_range
+        fixed_range.last.to_i - fixed_range.first.to_i + 1
+      end
+    end
+
+    # network size is equal to the number of IP addresses in
+    # the fixed range, divided by the number of networks,
+    # rounded *down* to the next power of two (or zero if <1)
+    def network_size
+      unrounded_size = fixed_range_size / num_networks
+      if unrounded_size < 1
+        0
+      else
+        2**Math.log(unrounded_size,2).floor
+      end
+    end
+
+    # for the current num_networks value (1 for non-vlan;
+    # based on the vlan range for VLAN, this calculates
+    # the smallest fixed range network cidr assuming the
+    # smallest useful network size of 4 (2 hosts+network
+    # address+broadcast address)
+    def min_fixed_range_cidr
+      "/#{32 - Math.log(4*num_networks,2).ceil}"
+    end
+
     def param_hash
       { 'network_manager'          => network_manager,
         'vlan_range'               => vlan_range,
@@ -128,7 +164,7 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :network_manager, :network_overrides, :private_fixed_range, :public_floating_range,
-        :num_networks
+        :num_networks, :network_size
     end
 
   end

data/app/overrides/foreman_hosts_edit.rb

@@ -7,7 +7,7 @@ end
 
 Deface::Override.new(:virtual_path => "hosts/_form",
                      :name => "include_custom_js_for_hosts_edit",
-                     :insert_after => "erb[loud]:contains('form_for')",
+                     :insert_after => "li > a[href='#network']",
                      :text => "<%= javascript 'staypuft/host_edit'%>"
                      )
 

data/app/views/staypuft/deployments/_assigned_hosts.html.erb

@@ -11,43 +11,7 @@
         <%= submit_tag _("Unassign Hosts"), :class => "btn btn-primary btn-sm", :disabled => true, :id => "unassign_hosts_button" %>
       </div>
     </div>
-    <table class="table table-bordered table-striped table-condensed">
-      <thead>
-        <tr>
-          <th class="ca">
-            <%= tag :input, type: 'checkbox', class: 'check_all' %>
-          </th>
-          <th><%= sort :name, :as => _('Name') %></th>
-          <th><%= _("Deployment Role") %></th>
-          <th><%= _("CPUs") %><br/><span class="text-muted small"><%= _("(cores)") %></span></th>
-          <th><%= _("Memory") %><br/><span class="text-muted small"><%= _("(GB)") %></span></th>
-          <th><%= _("NICs") %></th>
-          <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
-        </tr>
-      </thead>
-      <tbody class="searchable">
-        <% hosts.each do |host| %>
-          <tr class="checkbox_highlight">
-            <td class="ca">
-              <%= check_box_tag 'host_ids[]',
-                                host.id,
-                                false,
-                                id:       "host_ids_#{host.id}" %>
-            </td>
-            <td class="ellipsis">
-             <%= host_label(host) %>
-            </td>
-            <td class="ellipsis">
-              <%= link_to(host.hostgroup.role, hosts_path(:search => "os_description = #{host.hostgroup.role}")) if host.hostgroup %>
-            </td>
-            <td><%= host.cpus %></td>
-            <td><%= host.mem %></td>
-            <td><%= host_nics(host) %></td>
-            <td class="hidden-s hidden-xs"><%= host.ip %></td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+    <%= render partial: "hosts_table", locals: { hosts: hosts, deployment_role_col: true } %>
     <div class="modal fade" id="configure_networks_modal" tabindex="-1" role="dialog" aria-labelledby="<%= _("Configure Networks") %>" aria-hidden="true" data-path="<%= deployment_interface_assignments_path(@deployment.id) %>">
           <div class="modal-dialog modal-lg">
             <div class="modal-content">
@@ -63,7 +27,7 @@
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
-                <button type="button" class="btn btn-primarym" data-dismiss="modal"><%= _("Done") %></button>
+                <button type="button" class="btn btn-primary done" data-dismiss="modal"><%= _("Done") %></button>
               </div>
             </div>
           </div>

data/app/views/staypuft/deployments/_free_hosts.html.erb

@@ -11,43 +11,7 @@
                 data-target = "#role_modal" disabled="true"><%= _("Assign Hosts") %></button>
         </div>
     </div>
-    <table class="table table-bordered table-striped table-condensed">
-      <thead>
-        <tr>
-          <th class="ca">
-            <%= tag :input, type: 'checkbox', class: 'check_all' %>
-          </th>
-          <th><%= sort :name, :as => _('Name') %></th>
-          <th><%= _("Operating System") %></th>
-          <th><%= _("CPUs") %><br/><span class="text-muted small"><%= _("(cores)") %></span></th>
-          <th><%= _("Memory") %><br/><span class="text-muted small"><%= _("(GB)") %></span></th>
-          <th><%= _("NICs") %></th>
-          <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
-        </tr>
-      </thead>
-      <tbody class="searchable">
-        <% hosts.each do |host| %>
-          <tr class="checkbox_highlight">
-            <td class="ca">
-              <%= check_box_tag 'host_ids[]',
-                                host.id,
-                                false,
-                                id:       "host_ids_#{host.id}" %>
-            </td>
-            <td class="ellipsis">
-             <%= host_label(host) %>
-            </td>
-            <td class="ellipsis">
-              <%= link_to(host.os.to_label, hosts_path(:search => "os_description = #{host.os.description}")) if host.respond_to?(:os) && host.os %>
-            </td>
-            <td><%= host.cpus if host.respond_to?(:cpu) %></td>
-            <td><%= host.mem if host.respond_to?(:mem) %></td>
-            <td><%= host_nics(host) %></td>
-            <td class="hidden-s hidden-xs"><%= host.ip %></td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+    <%= render partial: "hosts_table", locals: { hosts: hosts, operating_system_col: true } %>
     <div class="modal fade" id="role_modal" tabindex="-1" role="dialog" aria-labelledby="Deployment Roles" aria-hidden="true">
       <div class="modal-dialog">
         <div class="modal-content">

data/app/views/staypuft/deployments/_host_head_row.html.erb

@@ -4,6 +4,7 @@
   </th>
   <th><%= sort :name, :as => _('Name') %></th>
   <th><%= _('NICs') %></th>
+  <th><%= _('Storage') %></th>
   <% if local_assigns[:deploying_col] %>
     <th class="hidden-s hidden-xs"><%= _('Deploying?') %></th>
   <% end %>

data/app/views/staypuft/deployments/_host_row.html.erb

@@ -16,6 +16,10 @@
     <%= host_nics(host) %>
   </td>
 
+  <td>
+    <%= host_disks(host) %>
+  </td>
+
   <% unless local_assigns[:disabled].nil? %>
     <td class="hidden-s hidden-xs">
       <% if disabled %>

data/app/views/staypuft/deployments/_hosts_table.html.erb

@@ -0,0 +1,51 @@
+    <table class="table table-bordered table-striped table-condensed">
+      <thead>
+        <tr>
+          <th class="ca">
+            <%= tag :input, type: 'checkbox', class: 'check_all' %>
+          </th>
+          <th><%= sort :name, :as => _('Name') %></th>
+          <% if local_assigns[:deployment_role_col] %>
+            <th><%= _("Deployment Role") %></th>
+          <% end %>
+          <% if local_assigns[:operating_system_col] %>
+            <th><%= _("Operating System") %></th>
+          <% end %>
+          <th><%= _("CPUs") %><br/><span class="text-muted small"><%= _("(cores)") %></span></th>
+          <th><%= _("Memory") %><br/><span class="text-muted small"><%= _("(GB)") %></span></th>
+          <th><%= _("Storage") %></th>
+          <th><%= _("NICs") %></th>
+          <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+        </tr>
+      </thead>
+      <tbody class="searchable">
+        <% hosts.each do |host| %>
+          <tr class="checkbox_highlight">
+            <td class="ca">
+              <%= check_box_tag 'host_ids[]',
+                                host.id,
+                                false,
+                                id:       "host_ids_#{host.id}" %>
+            </td>
+            <td class="ellipsis">
+             <%= host_label(host) %>
+            </td>
+            <% if local_assigns[:deployment_role_col] %>
+            <td class="ellipsis">
+              <%= link_to(host.hostgroup.role, hosts_path(:search => "os_description = #{host.hostgroup.role}")) if host.hostgroup %>
+            </td>
+            <% end %>
+            <% if local_assigns[:operating_system_col] %>
+            <td class="ellipsis">
+              <%= link_to(host.os.to_label, hosts_path(:search => "os_description = #{host.os.description}")) if host.respond_to?(:os) && host.os %>
+            </td>
+            <% end %>
+            <td><%= host.cpus if host.respond_to?(:cpus) %></td>
+            <td><%= host.mem if host.respond_to?(:mem) %></td>
+            <td><%= host_disks(host) %></td>
+            <td><%= host_nics(host) %></td>
+            <td class="hidden-s hidden-xs"><%= host.ip %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>

data/app/views/staypuft/interface_assignments/index.html.erb

@@ -2,6 +2,46 @@
 
 <% title _("Configure Interfaces (%s hosts)") % @hosts.size %>
 
+<div class="row">
+  <div class="col-md-12">
+    <h3><%= @hosts.count %> <%= "#{n_('Host', 'Hosts', @hosts.count)} #{_('to be configured')}" %></h3>
+    <table class="table table-striped table-condensed">
+      <thead>
+        <tr>
+          <th><%= sort :name, :as => _('Host Name') %></th>
+          <th><%= @host.primary_interface %></th>
+          <% @interfaces.each do |interface| %>
+            <th><%= interface.identifier %></th>
+          <% end %>
+        </tr>
+      </thead>
+      <tbody>
+        <% @hosts.each do |host| %>
+          <tr>
+            <td class="ellipsis">
+             <%= host_label(host) %>
+            </td>
+            <td>
+              <span class="glyphicon glyphicon-ok"></span> <%= _("ready") %> <br/>
+              <%= host.mac %><br/>
+              <%= host.ip %>
+            </td>
+            <% if host.interfaces.present? %>
+              <td>
+                <% host.interfaces.each do |interface| %>
+                  <span class="glyphicon glyphicon-ok"></span> <%= _("ready") %> <br/>
+                  <%= interface.mac %><br/>
+                  <%= interface.ip %>
+                <% end %>
+              </td>
+            <% end %>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
 <div class="row">
   <div class="col-md-12">
     <h3><%= _("Configured Networks") %></h3>

data/app/views/staypuft/steps/_neutron.html.erb

@@ -1,4 +1,6 @@
 <%= f.fields_for :neutron, @deployment.neutron do |p| %>
+  <%= base_errors_for @deployment.neutron %>
+  <div class="form-group <%= @deployment.neutron.errors.empty? ? "" : 'has-error' %> hide"></div>
   <%= change_label_width(4, field(p, :network_segmentation, :label => _(Staypuft::Deployment::NeutronService::NetworkSegmentation::HUMAN)) do
     Staypuft::Deployment::NeutronService::NetworkSegmentation::LABELS.map do |value, label|
       radio_button_f_non_inline(p, :network_segmentation,
@@ -14,4 +16,41 @@
                                      help_inline:                   _(Staypuft::Deployment::NeutronService::TenantVlanRanges::HUMAN_AFTER)) %>
   </div>
 
+  <div class="form-group">
+    <label class="col-md-4 control-label"><%= _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::HUMAN) %></label>
+    <div class="col-md-4">
+      <%= check_box_f_non_inline(p, :ml2_openvswitch,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :checked         => @deployment.neutron.openvswitch_mechanism?,
+                                 :text            => _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::LABELS['openvswitch']))
+      %>
+      <%= check_box_f_non_inline(p, :ml2_l2population,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :checked         => @deployment.neutron.l2population_mechanism?,
+                                 :text            => _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::LABELS['l2population']))
+      %>
+      <%= check_box_f_non_inline(p, :ml2_cisco_nexus,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :checked         => @deployment.neutron.cisco_nexus_mechanism?,
+                                 :text            => _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::LABELS['cisco_nexus']))
+      %>
+    </div>
+  </div>
+  <div class="neutron_cisco_nexus col-md-offset-1 hide">
+    <div id="nexuses" class="neutron_nexus_picker">
+      <% @deployment.neutron.nexuses.each_with_index do |nexus, index| %>
+        <%= p.fields_for "nexuses[]", nexus, index: index do |e| %>
+          <% render partial: 'neutron_cisco_nexus_form', locals: {e: e} %>
+        <% end %>
+      <% end %>
+    </div>
+    <script type='html/template' id='nexus_form_template'>
+      <%= p.fields_for 'nexuses[]', Staypuft::Deployment::NeutronService::Cisconexus.new, index: 'NEW_RECORD' do |e| render(partial: 'neutron_cisco_nexus_form', locals: {e: e}); end %>
+    </script>
+    <button type="button" class= "btn btn-primary btn-sm add_another_switch"><%= _("Add Another Switch") %></button> 
+  </div>
+
 <% end %>

data/app/views/staypuft/steps/_neutron_cisco_nexus_form.html.erb

@@ -0,0 +1,17 @@
+          <div class="nexus well">
+          <h5 class="muted"><a href="#" class="remove"><i class="glyphicon glyphicon-remove-sign ">&nbsp;</i></a>&nbsp;Switch #<span class="switch_number">1</span></h5>
+          <%= text_f e, :hostname, class: "neutron_cisco_nexus",
+                    label: _(Staypuft::Deployment::NeutronService::Cisconexus::Hostname::HUMAN) %>
+          <%= text_f e, :ip, class: "neutron_cisco_nexus",
+                    label: _(Staypuft::Deployment::NeutronService::Cisconexus::Ip::HUMAN) %>
+          <%= text_f e, :login, class: "neutron_cisco_nexus",
+                    label: _(Staypuft::Deployment::NeutronService::Cisconexus::Login::HUMAN) %>
+          <%= text_f e, :password, class: "neutron_cisco_nexus",
+                    label: _(Staypuft::Deployment::NeutronService::Cisconexus::Password::HUMAN) %>
+          <%= text_f e, :ssh_port, class: "neutron_cisco_nexus",
+                    label: _(Staypuft::Deployment::NeutronService::Cisconexus::SshPort::HUMAN) %>
+          <%= textarea_f e, :port_map, class: "neutron_cisco_nexus",
+                    label: _(Staypuft::Deployment::NeutronService::Cisconexus::PortMap::HUMAN),
+                    rows: 5,
+                    help_inline: _(Staypuft::Deployment::NeutronService::Cisconexus::PortMap::HELP_INLINE) %>
+          </div>

data/lib/staypuft/engine.rb

@@ -33,6 +33,7 @@ module Staypuft
       ::Host::Managed.send :include, Staypuft::Concerns::HostOpenStackAffiliation
       ::Host::Managed.send :include, Staypuft::Concerns::HostDetailsHelper
       ::Host::Discovered.send :include, Staypuft::Concerns::HostOpenStackAffiliation
+      ::Host::Discovered.send :include, Staypuft::Concerns::HostDetailsHelper
       ::Puppetclass.send :include, Staypuft::Concerns::PuppetclassExtensions
       ::Nic::Base.send :include, Staypuft::Concerns::SubnetIpManagement
       ::Nic::Base.send :include, Staypuft::Concerns::VipNicScopes

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.3.9'
+  VERSION = '0.4.0'
 end