staypuft 0.4.1 → 0.4.2

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

@@ -4,11 +4,13 @@ module Staypuft
       'neutron'
     end
 
-    SEGMENTATION_LIST = ['vxlan', 'vlan', 'gre', 'flat']
-    VLAN_HELP         = N_('[1-4094] (e.g. 10:15)')
-    ML2MECHANISM_TYPES = :ml2_openvswitch, :ml2_l2population, :ml2_cisco_nexus
+    SEGMENTATION_LIST   = ['vxlan', 'vlan', 'gre', 'flat']
+    VLAN_HELP           = N_('[1-4094] (e.g. 10:15)')
+    ML2MECHANISM_TYPES  = :ml2_openvswitch, :ml2_l2population, :ml2_cisco_nexus
+    N1KV_PARAMS         = :n1kv_vsm_ip, :n1kv_vsm_password
 
-    param_attr :network_segmentation, :tenant_vlan_ranges, *ML2MECHANISM_TYPES
+    param_attr :network_segmentation, :tenant_vlan_ranges, :core_plugin,
+               *ML2MECHANISM_TYPES, *N1KV_PARAMS
     param_attr_array :nexuses => Cisconexus
 
     module NetworkSegmentation
@@ -26,6 +28,19 @@ module Staypuft
 
     validates :network_segmentation, presence: true, inclusion: { in: NetworkSegmentation::TYPES }
 
+    module CorePlugin
+      ML2    = 'ml2'
+      N1KV   = 'n1kv'
+      LABELS = { ML2 => N_("ML2 Core Plugin"),
+                 N1KV => N_("N1KV Core Plugin") }
+      MODULES = { ML2 => 'neutron.plugins.ml2.plugin.Ml2Plugin',
+                  N1KV => 'neutron.plugins.cisco.network_plugin.PluginV2'}
+      TYPES  = LABELS.keys
+      HUMAN  = N_('Core Plugin Type')
+    end
+
+    validates :core_plugin, presence: true, inclusion: { in: CorePlugin::TYPES }
+
     module TenantVlanRanges
       HUMAN       = N_('Tenant (VM Data) VLAN Ranges')
       HUMAN_AFTER = VLAN_HELP
@@ -40,6 +55,18 @@ module Staypuft
               :if                  => :vlan_segmentation?,
               :neutron_vlan_ranges => true
 
+    class N1kvIpAddressValidator < ActiveModel::EachValidator
+      include Staypuft::Deployment::IpAddressValidator
+    end
+
+    validates :n1kv_vsm_ip,
+              :presence        => true,
+              :if              => :n1kv_plugin?,
+              :n1kv_ip_address => true
+    validates :n1kv_vsm_password,
+              :presence        => true,
+              :if              => :n1kv_plugin?
+
     module Ml2Mechanisms
       OPENVSWITCH = 'openvswitch'
       L2POPULATION = 'l2population'
@@ -50,23 +77,27 @@ module Staypuft
       TYPES = LABELS.keys
       HUMAN = N_('ML2 Mechanism Drivers')
     end
-    validate  :at_least_one_mechanism_selected
+    validate  :at_least_one_mechanism_selected,
+              :if          => :ml2_plugin?
     validate  :cisco_nexuses,
-              :if          => :cisco_nexus_mechanism?
+              :if          => [:ml2_plugin?, :cisco_nexus_mechanism?]
     validates :nexuses,
               :presence   => true,
-              :if         => :cisco_nexus_mechanism?
+              :if         => [:ml2_plugin?, :cisco_nexus_mechanism?]
 
     class Jail < Safemode::Jail
       allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
         :tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
         :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks, :ovs_tunnel_types,
         :openvswitch_mechanism?, :l2population_mechanism?, :cisco_nexus_mechanism?,
-        :ml2_mechanisms, :nexuses, :active?, :compute_cisco_nexus_config
+        :ml2_mechanisms, :nexuses, :active?, :compute_cisco_nexus_config, :core_plugin,
+        :ml2_plugin?, :n1kv_plugin?, :n1kv_vsm_ip, :n1kv_vsm_password,
+        :core_plugin_module
     end
 
     def set_defaults
       self.network_segmentation   = NetworkSegmentation::VXLAN
+      self.core_plugin = CorePlugin::ML2
       self.ml2_openvswitch = "true"
       self.ml2_l2population = "true"
       self.ml2_cisco_nexus = "false"
@@ -145,6 +176,18 @@ module Staypuft
       self.ml2_cisco_nexus == "true"
     end
 
+    def ml2_plugin?
+      self.core_plugin == CorePlugin::ML2
+    end
+
+    def n1kv_plugin?
+      self.core_plugin == CorePlugin::N1KV
+    end
+
+    def core_plugin_module
+      CorePlugin::MODULES[self.core_plugin]
+    end
+
     def compute_cisco_nexus_config
       Hash[nexuses.map { |nexus| [nexus.hostname, nexus.config_hash] }]
     end
@@ -155,11 +198,14 @@ module Staypuft
 
     def param_hash
       { 'network_segmentation'       => network_segmentation,
+        'core_plugin'                => core_plugin,
         'tenant_vlan_ranges'         => tenant_vlan_ranges,
         'ml2_openvswitch'            => ml2_openvswitch,
         'ml2_l2population'           => ml2_l2population,
         'ml2_cisco_nexus'            => ml2_cisco_nexus,
-        'nexuses'                    => nexuses }
+        'nexuses'                    => nexuses,
+        'n1kv_vsm_ip'                => n1kv_vsm_ip,
+        'n1kv_vsm_password'          => n1kv_vsm_password }
     end
 
     private

data/app/models/staypuft/deployment/neutron_service/cisconexus.rb

@@ -29,18 +29,7 @@ module Staypuft
     end
 
     class IpValueValidator < ActiveModel::EachValidator
-      def validate_each(record, attribute, value)
-        return if value.empty?
-
-        ip_addr = IPAddr.new(value)
-        ip_range = ip_addr.to_range
-        if ip_range.begin == ip_range.end
-          true
-        else
-          record.errors.add attribute, "Specify single IP address, not range"
-          false
-        end
-      end
+      include Staypuft::Deployment::IpAddressValidator
     end
 
     class PortMapValueValidator < ActiveModel::EachValidator

data/app/models/staypuft/simple_subnet.rb

@@ -0,0 +1,115 @@
+require 'ipaddress'
+
+module Staypuft
+  class SimpleSubnet
+    extend ActiveModel::Naming
+    include ActiveModel::AttributeMethods
+    include ActiveModel::Validations
+
+    DHCP_SERVER_TYPE = {
+      'external' => 'External DHCP',
+      'none' => 'No existing DHCP'
+    }
+    ATTRS = [:name, :dhcp_server, :network_address, :vlan, :gateway,
+             :ip_range_from, :ip_range_to]
+    attr_accessor *ATTRS
+    attr_accessor :subnet, :deployment
+    delegate :to_key, :to => :subnet, :allow_nil => true
+
+    validates :name, :dhcp_server, :network_address, presence: true
+    validates :gateway, :presence => true,
+                        :if => Proc.new { |subnet| subnet.dhcp_server == 'none' }
+    validates_format_of :gateway, :with => Net::Validations::IP_REGEXP,
+                                  :if => Proc.new { |subnet| subnet.dhcp_server == 'none' }
+    validate :validate_network_address
+    validate :validate_ranges, :if => Proc.new { |subnet| subnet.dhcp_server == 'none' }
+
+    def initialize(attrs={})
+      self.dhcp_server = 'external'
+      if attrs.is_a?(::Subnet)
+        @subnet = Subnet.find_by_name(attrs.name)
+        convert_attributes_from
+      else
+        @subnet = Subnet.new
+        ATTRS.each do |attr|
+          self.send("#{attr}=", attrs.has_key?(attr) ? attrs[attr] : nil)
+        end
+      end
+    end
+
+    def save
+      if self.valid?
+        @subnet = Subnet.find_or_initialize_by_name(name)
+        convert_attributes_to
+        @subnet.save
+      else
+        false
+      end
+    end
+
+    private
+
+    def convert_attributes_to
+      @subnet.boot_mode = self.dhcp_server == 'external' ? ::Subnet::BOOT_MODES[:dhcp] : ::Subnet::BOOT_MODES[:static]
+      @subnet.ipam = self.dhcp_server == 'external' ? ::Subnet::IPAM_MODES[:none] : ::Subnet::IPAM_MODES[:db]
+      @subnet.network = get_network
+      @subnet.mask = get_mask
+      @subnet.vlanid = self.vlan
+      if self.dhcp_server == 'none'
+        @subnet.gateway = self.gateway
+        @subnet.from = self.ip_range_from
+        @subnet.to = self.ip_range_to
+      end
+    end
+
+    def convert_attributes_from
+      self.name = @subnet.name
+      if @subnet.boot_mode == ::Subnet::BOOT_MODES[:dhcp] && @subnet.ipam == ::Subnet::IPAM_MODES[:none]
+        self.dhcp_server = 'external'
+      elsif @subnet.boot_mode == ::Subnet::BOOT_MODES[:static] && @subnet.ipam == ::Subnet::IPAM_MODES[:db]
+        self.dhcp_server = 'none'
+      else
+        raise 'unknown simple subnet combination'
+      end
+
+      self.network_address = @subnet.network_address
+      self.gateway = @subnet.gateway
+      self.vlan = @subnet.vlanid
+      self.ip_range_from = @subnet.from
+      self.ip_range_to = @subnet.to
+    end
+
+    def get_network
+      IPAddress::IPv4.new(self.network_address).network.address
+    rescue Exception => ex
+      Rails.logger.warn("failed to parse network address: #{ex.message}")
+      nil
+    end
+
+    def get_mask
+      IPAddress::IPv4.new(self.network_address).netmask
+    rescue Exception => ex
+      Rails.logger.warn("failed to parse network mask: #{ex.message}")
+      nil
+    end
+
+    def validate_network_address
+      network = get_network
+      mask = get_mask
+      if !network || !mask || !(network =~ Net::Validations::IP_REGEXP) ||
+         !(mask =~ Net::Validations::MASK_REGEXP)
+        errors.add(:network_address, _("invalid Network Address"))
+      end
+    end
+
+    def validate_ranges
+      errors.add(:ip_range_from, _("invalid IP address")) if ip_range_from.present? && !(ip_range_from =~ Net::Validations::IP_REGEXP)
+      errors.add(:ip_range_to, _("invalid IP address")) if ip_range_to.present? && !(ip_range_to =~ Net::Validations::IP_REGEXP)
+      if ip_range_from.present? or ip_range_to.present?
+        errors.add(:ip_range_from, _("must be specified if 'IP Range End' is defined"))   if ip_range_from.blank?
+        errors.add(:ip_range_to,   _("must be specified if 'IP Range Start' is defined")) if ip_range_to.blank?
+      end
+    end
+
+  end
+end

data/app/overrides/foreman_hosts_edit.rb

@@ -22,3 +22,16 @@ Deface::Override.new(:virtual_path => "hosts/_unattended",
                      :insert_after => "#network",
                      :text => "<div class='tab-pane' id='fencing'><%= render 'hosts/fencing', :host => @host, :f => f %></div>"
                      )
+
+Deface::Override.new(:virtual_path => "hosts/_form",
+                     :name => "remove_openstack_hostgroups",
+                     :replace => "#{erb_tag}:contains(':hostgroup_id')",
+                     :original => '04903c858c6f96ed5c015cac5960e02708d8fea8'
+                     ) do
+"       <%=  select_f f, :hostgroup_id, accessible_hostgroups.reject { |hg| hg.to_label =~ /#{Setting[:base_hostgroup]}\\/.*/ }, :id, :to_label,
+          { :include_blank => true},
+          { :onchange => 'hostgroup_changed(this);', :'data-host-id' => @host.id,
+            :'data-url' => (@host.new_record? || @host.type_changed?) ? process_hostgroup_hosts_path : hostgroup_or_environment_selected_hosts_path,
+            :help_inline => :indicator } %>
+"
+end

data/app/overrides/select_multiple_systems_hostgroup.rb

@@ -0,0 +1,15 @@
+# older deface requires code prefix for erb tags
+if Gem.loaded_specs['deface'].version >= Gem::Version.new('1.0.0')
+  erb_tag = 'erb[loud]'
+else
+  erb_tag = 'code[erb-loud]'
+end
+
+Deface::Override.new(:virtual_path => "hosts/select_multiple_hostgroup",
+                     :name => "remove_openstack_hostgroups_multiple",
+                     :replace => "#{erb_tag}:contains(':id')",
+                     :original => '<%= selectable_f f, :id, [[_("Select host group"),"disabled"],[_("*Clear host group*"), "" ]] + Hostgroup.all.map{|h| [h.to_label, h.id]}.sort,{}, :onchange => "toggle_multiple_ok_button(this)" %>'
+                     ) do
+"  <%= selectable_f f, :id, [[_(\"Select host group\"),\"disabled\"],[_(\"*Clear host group*\"), \"\" ]] + Hostgroup.all.reject{ |hg| hg.to_label =~ /#{Setting[:base_hostgroup]}\\/.*/ }.map{|h| [h.to_label, h.id]}.sort,{},
+        :onchange => \"toggle_multiple_ok_button(this)\" %>"
+end

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

@@ -16,29 +16,42 @@
                                      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>
+  <%= change_label_width(4, field(p, :core_plugin, :label => _(Staypuft::Deployment::NeutronService::CorePlugin::HUMAN)) do
+    Staypuft::Deployment::NeutronService::CorePlugin::LABELS.map do |value, label|
+      radio_button_f_non_inline(p, :core_plugin,
+                                :checked => @deployment.neutron.core_plugin == value,
+                                :value   => value,
+                                :text    => label)
+    end.join
+  end) %>
+
+  <div class="neutron_ml2_mechanisms inset_form hide">
+    <%= _(Staypuft::Deployment::NeutronService::Ml2Mechanisms::HUMAN) %>
+    <%= 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 class="neutron_n1kv_parameters inset_form hide">
+    <%= change_label_width 4, text_f(p, :n1kv_vsm_ip, class: "neutron_n1kv_vsm_ip", label: _('VSM IP')) %>
+    <%= change_label_width 4, text_f(p, :n1kv_vsm_password, class: "neutron_n1kv_vsm_password", label: _('VSM Password')) %>
   </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| %>

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

@@ -55,6 +55,8 @@
                                 :step => Staypuft::Deployment::STEP_SETTINGS } %>
   
       <% end %>
+
+      <%= textarea_f f, :custom_repos, :rows => 3, :help_inline => _('If you need to add custom repositories on provisioned hosts you can specify base urls here, one per line. These repositories will have highest priority (50)') %>
     <% end %>
   </div>
 

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

@@ -1,4 +1,5 @@
 <%= javascript 'staypuft/subnets_assignment' %>
+<%= javascript 'staypuft/new_subnet' %>
 
 <%= render :layout => 'title' do %>
   <%= alert_if_deployed %>
@@ -25,7 +26,11 @@
     <div class="row">
       <div id="title_action" class="col-md-12">
         <div class="btn-toolbar pull-right">
-          <%= display_link_if_authorized(_("New Subnet"), hash_for_new_subnet_path(:redirect => request.url + '#new')) %>
+          <button type="button" class= "btn btn-success"
+                  id="new_subnet_button" data-toggle = "modal"
+                  data-target = "#new_subnet_modal">
+            <%= _("New Subnet") %>
+          </button>
         </div>
       </div>
     </div>
@@ -57,4 +62,26 @@
       </div>
     </div>
   </div>
+
+  <div class="modal fade" id="new_subnet_modal" tabindex="-1" role="dialog" aria-labelledby="<%= _("New Subnet") %>" aria-hidden="true" data-path="<%= new_staypuft_subnet_path(:deployment_id => @deployment) %>">
+      <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h2 class="modal-title">
+              <%= _("New Subnet") %>
+            </h2>
+          </div>
+          <div id="new_subnet_ajax_content">
+            <div class="modal-body">
+              <div id="new_subnet_form"><%= image_tag '/assets/spinner.gif', style: "display: block; margin-left: auto; margin-right: auto" %></div>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
+              <button id="create_subnet_btn" type="button" class="btn btn-primary done" data-dismiss="modal"><%= _("Done") %></button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
 <% end %>

data/app/views/staypuft/subnets/_form.html.erb

@@ -0,0 +1,24 @@
+<%= form_for(subnet, :url => staypuft_subnets_path(:deployment_id => deployment), :remote => true, :html => {:id => "new_subnet_form", :class => ""}) do |f| %>
+  <div class="modal-body">
+    <%= change_label_width(4, text_f(f, :name, :label => _("Name"))) %>
+    <%= change_label_width(4, select_f(f, :dhcp_server,
+                                       ::Staypuft::SimpleSubnet::DHCP_SERVER_TYPE,
+                                       :first, :last,
+                                       { include_blank: false },
+                                       { label: _("DHCP server") })) %>
+    <%= change_label_width(4, text_f(f, :network_address, :label => _("Network Address"),
+                                        :help_inline => _("Network Address using CIDR notation (eg. 1.2.3.4/24)"))) %>
+    <%= change_label_width(4, text_f(f, :vlan, :label => _("VLAN"))) %>
+    <div id="no_existing_dhcp_fields" style="display: <%= subnet.dhcp_server == 'none' ? 'block' : 'none' %>">
+      <%= change_label_width(4, text_f(f, :gateway, :label => _("Gateway"))) %>
+      <%= change_label_width(4, text_f(f, :ip_range_from, :label => _("IP Range Start"))) %>
+      <%= change_label_width(4, text_f(f, :ip_range_to, :label => _("IP Range End"))) %>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
+    <%= submit_tag _("Create Subnet"),
+                :id => "create_subnet_btn",
+                :class => "btn btn-primary done" %>
+  </div>
+<% end %>

data/app/views/staypuft/subnets/create.js.erb

@@ -0,0 +1,14 @@
+<% if @result %>
+  $("#subnets").append(
+    '<%=j render 'staypuft/subnets/drop_zone',
+                 :subnet => @simple_subnet.subnet,
+                 :deployment => @deployment %>');
+  $('#new_subnet_modal').modal('toggle');
+  subnets_assigments();
+<% else %>
+  $("#new_subnet_ajax_content").html(
+    '<%=j render 'staypuft/subnets/form',
+                 :deployment => @deployment,
+                 :subnet => @simple_subnet %>');
+  new_subnet();
+<% end %>