staypuft 0.5.15 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393d259fe817948071494184f9fa3cd51ea8e654
-  data.tar.gz: 3641379f31897bed7e704f231b01b56254ea2656
+  metadata.gz: 74a5862bd668b6f98ac0a65f485cf5ae57ce4897
+  data.tar.gz: e7c7a890e4c73c74722626a4c0d0e90d9ab56332
 SHA512:
-  metadata.gz: 7ead581569132ae1531579d4ebe3b1b5808e2e7fba8e9166a34e1331ab3087227584e6eb827c68c83a1de46f75254bb065be3b5a45a45c2f77b7b01bfdf5213f
-  data.tar.gz: 378d4ba1e8647803e39665fe020fe22b57aeb7b308f206d179b6f6f53bb526761bc514c927f87f078b50b46907adbb3bef9a666b7200123de6bac51b72101072
+  metadata.gz: 633895bb0b6737544b067b7dbbfc7d248e2e5fe14a49efcbfaec36aa39fb54c3282aa652f14fd4c4efb6452ba726254c3986a52b5f253a2906ab524af63b0fc1
+  data.tar.gz: 626fae057c887bd398b803cfd521228dd9fae377823904ec1063c1b1dda86f4c88f9f9d39e7b38683443dbb396f67146492777f71875bbffc4589838e02ec754

data/app/assets/javascripts/staypuft/staypuft.js

@@ -221,6 +221,61 @@ $('.neutron_ml2_mechanisms').parent().parent().removeClass('col-md-6').addClass(
     }
   }
 
+  showCinderNetApp();
+  // trigger function whenever NetApp checkmark is changed
+  $("#staypuft_deployment_cinder_backend_netapp").change(showCinderNetApp);
+
+  /**
+   * Shows NetApp configuration options if it is selected as a backend
+   */
+  function showCinderNetApp() {
+    if ($('#staypuft_deployment_cinder_backend_netapp').is(":checked")) {
+      $('.cinder_netapp').show();
+      if($('#netapps').children().length == 0) {
+        $('.add_another_netapp').click();
+      }
+    }
+    else {
+      $('.cinder_netapp').hide();
+    }
+  }
+
+  /**
+   * The user first selects their NetApp storage family and protocol
+   * and then relevant options are presented to them.
+   */
+  function showHideNetAppOptions(){
+    $('#netapps').children().each(function(){
+      var family = $(this).find('.netapp-main select[name*=storage_family]').val()
+      var protocol = $(this).find('.netapp-main select[name*=storage_protocol]').val()
+
+      // Hide all NetApp options
+      $(this).find('.netapp-option').hide();
+      $(this).find('.netapp-main select[name*=storage_protocol]').removeAttr("disabled");
+
+      // Selectively show options based on storage family & protocol
+      if (family == 'eseries'){
+        protocol = 'iscsi';
+        $(this).find('.netapp-main select[name*=storage_protocol]').val(protocol).attr('disabled', 'disabled');
+        $(this).find('.netapp-eseries').show();
+      }
+
+      if (protocol == 'nfs'){
+        $(this).find('.netapp-nfs').show();
+      }
+
+      if (protocol == 'iscsi' && family == 'ontap_7mode'){
+        $(this).find('.netapp-7mode-iscsi').show();
+      }
+
+      if (family == 'ontap_cluster'){
+        $(this).find('.netapp-vserver').show();
+      }
+
+    })
+
+  }
+
   showNeutronMl2CiscoNexus();
   $("#staypuft_deployment_neutron_ml2_cisco_nexus").change(showNeutronMl2CiscoNexus);
   function showNeutronMl2CiscoNexus() {
@@ -413,6 +468,25 @@ $('.neutron_ml2_mechanisms').parent().parent().removeClass('col-md-6').addClass(
     }
   })
 
+  /**
+   * Adds another NetApp storage system configuration section
+   */
+  $("button.add_another_netapp").live("click", function() {
+    var netapp_form = function () {
+      return $('#netapp_form_template').text().replace(/NEW_RECORD/g, new Date().getTime());
+    }
+    $('#netapps').append(netapp_form());
+    if($('#netapps').children().length > 1) {
+      var added_form_span = $('#netapps').children().last().find('h5').find('.server_number');
+      var previous_span_number = $('#netapps').children().eq(-2).find('h5').find('.server_number');
+      added_form_span.html(parseInt(previous_span_number.html(), 10) + 1);
+    }
+
+    // Unbind existing handlers & add event handlers to all NetApp config sections
+    $(".netapp-main select[name*=storage_family]").unbind().change(showHideNetAppOptions);
+    $(".netapp-main select[name*=storage_protocol]").unbind().change(showHideNetAppOptions);
+  })
+
   $("button.add_another_switch").live("click", function() {
     var nexus_form = function() {
       return $('#nexus_form_template').text().replace(/NEW_RECORD/g, new Date().getTime());

data/app/lib/staypuft/seeder.rb

@@ -311,6 +311,23 @@ module Staypuft
       cinder_eqlx_chap_login        = { :array => '<%= @host.deployment.cinder.compute_eqlx_chap_logins %>' }
       cinder_eqlx_chap_password     = { :array => '<%= @host.deployment.cinder.compute_eqlx_chap_passwords %>' }
 
+      cinder_backend_netapp           = { :string => '<%= @host.deployment.cinder.netapp_backend? %>' }
+      cinder_netapp_hostname          = { :array => '<%= @host.deployment.cinder.compute_netapp_hostnames %>' }
+      cinder_netapp_login             = { :array => '<%= @host.deployment.cinder.compute_netapp_logins %>' }
+      cinder_netapp_password          = { :array => '<%= @host.deployment.cinder.compute_netapp_passwords %>' }
+      cinder_netapp_server_port       = { :array => '<%= @host.deployment.cinder.compute_netapp_server_ports %>' }
+      cinder_netapp_storage_family    = { :array => '<%= @host.deployment.cinder.compute_netapp_storage_families %>' }
+      cinder_netapp_transport_type    = { :array => '<%= @host.deployment.cinder.compute_netapp_transport_types %>' }
+      cinder_netapp_storage_protocol  = { :array => '<%= @host.deployment.cinder.compute_netapp_storage_protocols %>' }
+      cinder_netapp_nfs_shares        = { :array => '<%= @host.deployment.cinder.compute_netapp_nfs_shares %>' }
+      cinder_netapp_nfs_shares_config = { :array => '<%= @host.deployment.cinder.compute_netapp_nfs_shares_configs %>' }
+      cinder_netapp_volume_list       = { :array => '<%= @host.deployment.cinder.compute_netapp_volume_lists %>' }
+      cinder_netapp_vfiler            = { :array => '<%= @host.deployment.cinder.compute_netapp_vfilers %>' }
+      cinder_netapp_vserver           = { :array => '<%= @host.deployment.cinder.compute_netapp_vservers %>' }
+      cinder_netapp_controller_ips    = { :array => '<%= @host.deployment.cinder.compute_netapp_controller_ips %>' }
+      cinder_netapp_sa_password       = { :array => '<%= @host.deployment.cinder.compute_netapp_sa_passwords %>' }
+      cinder_netapp_storage_pools     = { :array => '<%= @host.deployment.cinder.compute_netapp_storage_pools %>' }
+
       # Keystone
       keystonerc = 'true'
 
@@ -527,6 +544,7 @@ module Staypuft
               'rbd_user'                         => cinder_rbd_user,
               'rbd_secret_uuid'                  => cinder_rbd_secret_uuid,
               'backend_eqlx'                     => cinder_backend_eqlx,
+              'backend_netapp'                   => cinder_backend_netapp,
               'san_ip'                           => cinder_san_ip,
               'san_login'                        => cinder_san_login,
               'san_password'                     => cinder_san_password,
@@ -535,7 +553,22 @@ module Staypuft
               'eqlx_pool'                        => cinder_eqlx_pool,
               'eqlx_use_chap'                    => cinder_eqlx_use_chap,
               'eqlx_chap_login'                  => cinder_eqlx_chap_login,
-              'eqlx_chap_password'               => cinder_eqlx_chap_password },
+              'eqlx_chap_password'               => cinder_eqlx_chap_password,
+              'netapp_hostname'                  => cinder_netapp_hostname,
+              'netapp_login'                     => cinder_netapp_login,
+              'netapp_password'                  => cinder_netapp_password,
+              'netapp_server_port'               => cinder_netapp_server_port,
+              'netapp_storage_family'            => cinder_netapp_storage_family,
+              'netapp_transport_type'            => cinder_netapp_transport_type,
+              'netapp_storage_protocol'          => cinder_netapp_storage_protocol,
+              'netapp_nfs_shares'                => cinder_netapp_nfs_shares,
+              'netapp_nfs_shares_config'         => cinder_netapp_nfs_shares_config,
+              'netapp_volume_list'               => cinder_netapp_volume_list,
+              'netapp_vfiler'                    => cinder_netapp_vfiler,
+              'netapp_vserver'                   => cinder_netapp_vserver,
+              'netapp_controller_ips'            => cinder_netapp_controller_ips,
+              'netapp_sa_password'               => cinder_netapp_sa_password,
+              'netapp_storage_pools'             => cinder_netapp_storage_pools },
           'quickstack::pacemaker::keystone'        => {
               'keystonerc'     => keystonerc,
               'admin_password' => admin_pw,

data/app/models/staypuft/deployment/cinder_service/netapp.rb

@@ -0,0 +1,59 @@
+#encoding: utf-8
+module Staypuft
+  class Deployment::CinderService::Netapp
+    include ActiveModel::Serializers::JSON
+    include ActiveModel::Validations
+    extend ActiveModel::Naming
+
+    attr_accessor :id, :hostname, :login, :password, :server_port,
+                  :storage_family, :transport_type, :storage_protocol,
+                  :nfs_shares, :nfs_shares_config, :volume_list, :vfiler,
+                  :vserver, :controller_ips, :sa_password, :storage_pools
+    attr_reader :errors
+
+    STORAGE_FAMILIES = { :ontap_cluster => 'Clustered Data ONTAP',
+                         :ontap_7mode => 'Data ONTAP 7-mode',
+                         :eseries => 'E-Series' }
+    STORAGE_PROTOCOLS = { :nfs => 'NFS', :iscsi => 'iSCSI' }
+    TRANSPORT_TYPES = { :http => 'http', :https => 'https' }
+
+    def initialize(attrs = {})
+      @errors = ActiveModel::Errors.new(self)
+      self.attributes = attrs
+      self.server_port = 80
+      self.storage_family = 'ontap_cluster'
+      self.transport_type = 'http'
+      self.storage_protocol = 'nfs'
+    end
+
+    def self.human_attribute_name(attr, options = {})
+      attr
+    end
+
+    def self.lookup_ancestors
+      [self]
+    end
+
+    def attributes
+      { 'hostname' => nil, 'login' => nil, 'password' => nil,
+        'server_port' => nil, 'storage_family' => nil, 'transport_type' => nil,
+        'storage_protocol' => nil, 'nfs_shares' => nil, 'nfs_shares_config' => nil,
+        'volume_list' => nil, 'vfiler' => nil, 'vserver' => nil,
+        'controller_ips' => nil, 'sa_password' => nil,
+        'storage_pools' => nil }
+    end
+
+    def attributes=(attrs)
+      attrs.each { |attr, value| send "#{attr}=", value } unless attrs.nil?
+    end
+
+    validates :login,
+              presence: true,
+              format: /\A[a-zA-Z\d][\w\.\-]*[\w\-]\z/,
+              length: { maximum: 16 }
+    validates :password,
+              presence: true,
+              format: /\A[!-~]+\z/,
+              length: { minimum:3, maximum: 16 }
+  end
+end

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

@@ -5,11 +5,12 @@ module Staypuft
       'cinder'
     end
 
-    BACKEND_TYPE_PARAMS = :backend_eqlx, :backend_nfs, :backend_lvm, :backend_ceph
+    BACKEND_TYPE_PARAMS = :backend_eqlx, :backend_nfs, :backend_lvm, :backend_ceph, :backend_netapp
     BACKEND_PARAMS = :nfs_uri, :rbd_secret_uuid
 
     param_attr *BACKEND_TYPE_PARAMS, *BACKEND_PARAMS
     param_attr_array :eqlxs => Equallogic
+    param_attr_array :netapps => Netapp
 
     after_save :set_lvm_ptable
 
@@ -18,10 +19,12 @@ module Staypuft
       NFS        = 'nfs'
       CEPH       = 'ceph'
       EQUALLOGIC = 'equallogic'
+      NETAPP     = 'netapp'
       LABELS     = { LVM        => N_('LVM'),
                      NFS        => N_('NFS'),
                      CEPH       => N_('Ceph'),
-                     EQUALLOGIC => N_('EqualLogic') }
+                     EQUALLOGIC => N_('EqualLogic'),
+                     NETAPP     => N_('NetApp') }
       TYPES      = LABELS.keys
       HUMAN      = N_('Choose Driver Backend')
     end
@@ -62,12 +65,70 @@ module Staypuft
     validate :equallogic_backends,
              :if          => :equallogic_backend?
 
+    module NetappHostname
+      HUMAN   = N_('Hostname:')
+    end
+    module NetappLogin
+      HUMAN   = N_('Login:')
+    end
+    module NetappPassword
+      HUMAN   = N_('Password:')
+    end
+    module NetappServerPort
+      HUMAN   = N_('Server Port:')
+    end
+    module NetappStorageFamily
+      HUMAN   = N_('Storage Family:')
+    end
+    module NetappTransportType
+      HUMAN   = N_('Transport Type:')
+    end
+    module NetappStorageProtocol
+      HUMAN   = N_('Storage Protocol:')
+    end
+    module NetappNfsShares
+      HUMAN   = N_('NFS Shares:')
+    end
+    module NetappNfsSharesConfig
+      HUMAN   = N_('NFS Shares Config:')
+    end
+    module NetappVolumeList
+      HUMAN   = N_('Volume List:')
+    end
+    module NetappVfiler
+      HUMAN   = N_('vFiler:')
+    end
+    module NetappVserver
+      HUMAN   = N_('Storage Virtual Machine (SVM):')
+    end
+    module NetappControllerIps
+      HUMAN   = N_('Controller IPs:')
+    end
+    module NetappSaPassword
+      HUMAN   = N_('SA Password:')
+    end
+    module NetappStoragePools
+      HUMAN   = N_('Storage Pools:')
+    end
+
+    validates :netapps,
+              :presence   => true,
+              :if         => :netapp_backend?
+    validate :netapp_backends,
+             :if          => :netapp_backend?
+
     class Jail < Safemode::Jail
-      allow :lvm_backend?, :nfs_backend?, :ceph_backend?, :equallogic_backend?,
+      allow :lvm_backend?, :nfs_backend?, :ceph_backend?, :equallogic_backend?, :netapp_backend?,
         :multiple_backends?, :rbd_secret_uuid, :nfs_uri, :eqlxs, :eqlxs_attributes=,
         :compute_eqlx_san_ips, :compute_eqlx_san_logins, :compute_eqlx_san_passwords,
         :compute_eqlx_group_names, :compute_eqlx_pools, :compute_eqlx_thin_provision,
-        :compute_eqlx_use_chap, :compute_eqlx_chap_logins, :compute_eqlx_chap_passwords
+        :compute_eqlx_use_chap, :compute_eqlx_chap_logins, :compute_eqlx_chap_passwords,
+        :netapps, :compute_netapp_hostnames, :compute_netapp_logins, :compute_netapp_passwords,
+        :compute_netapp_server_ports, :compute_netapp_storage_families,
+        :compute_netapp_transport_types, :compute_netapp_storage_protocolss,
+        :compute_netapp_nfs_shares, :compute_netapp_nfs_shares_configs, :compute_netapp_volume_list,
+        :compute_netapp_vfilers, :compute_netapp_vservers, :compute_netapp_controller_ips,
+        :compute_netapp_sa_passwords, :compute_netapp_storage_pools
     end
 
     def set_defaults
@@ -75,6 +136,7 @@ module Staypuft
       self.backend_ceph = "false"
       self.backend_nfs = "false"
       self.backend_eqlx = "false"
+      self.backend_netapp = "false"
       self.rbd_secret_uuid = SecureRandom.uuid
     end
 
@@ -99,8 +161,13 @@ module Staypuft
       self.backend_eqlx == "true"
     end
 
+    def netapp_backend?
+      self.backend_netapp == "true"
+    end
+
     def multiple_backends?
       (equallogic_backend? and self.eqlxs.length > 1) or
+        (netapp_backend? and self.netapps.length > 1) or
         BACKEND_TYPE_PARAMS.select { |type| send(type.to_s) == "true" }.length > 1
     end
 
@@ -115,7 +182,8 @@ module Staypuft
       { "backend_lvm" => backend_lvm, "backend_ceph" => backend_ceph,
         "backend_nfs" => backend_nfs, "backend_eqlx" => backend_eqlx,
         "nfs_uri" => nfs_uri, "rbd_secret_uuid" => rbd_secret_uuid,
-        "eqlxs" => self.eqlxs }
+        "eqlxs" => self.eqlxs, "backend_netapp" => backend_netapp,
+        "netapps" => self.netapps }
     end
 
     def lvm_ptable
@@ -162,5 +230,11 @@ module Staypuft
         errors.add :base, _("Please fix the problems in selected backends")
       end
     end
+
+    def netapp_backends
+      unless self.netapps.all? { |item| item.valid? }
+        errors.add :base, _("Please fix the problems in selected backends")
+      end
+    end
   end
 end

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

@@ -35,6 +35,13 @@
                                  :unchecked_value => 'false',
                                  :text            => _(Staypuft::Deployment::CinderService::DriverBackend::LABELS['equallogic']))
       %>
+
+      <%= check_box_f_non_inline(p, :backend_netapp,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :text            => _(Staypuft::Deployment::CinderService::DriverBackend::LABELS['netapp']))
+      %>
+
       <div class="cinder_equallogic col-md-offset-1 hide">
         <div id="eqlxs" class="cinder_equallogic_picker">
         <% @deployment.cinder.eqlxs.each_with_index do |eqlx, index| %>
@@ -48,6 +55,20 @@
         </script>
         <button type="button" class= "btn btn-primary btn-sm add_another_server"><%= _("Add Another Server") %></button>
     </div>
+
+      <div class="cinder_netapp col-md-offset-1 hide">
+        <div id="netapps" class="cinder_netapp_picker">
+        <% @deployment.cinder.netapps.each_with_index do |netapp, index| %>
+          <%= p.fields_for "netapps[]", netapp, index: index do |e| %>
+            <% render partial: 'cinder_netapp_form', locals: {e: e} %>
+          <% end %>
+        <% end %>
+        </div>
+        <script type='html/template' id='netapp_form_template'>
+          <%= p.fields_for 'netapps[]', Staypuft::Deployment::CinderService::Netapp.new, index: 'NEW_RECORD' do |e| render(partial: 'cinder_netapp_form', locals: {e: e}); end %>
+        </script>
+        <button type="button" class= "btn btn-primary btn-sm add_another_netapp"><%= _("Add Another NetApp Storage System") %></button>
+      </div>
     <%end%>
   </div>
 </div>

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

@@ -0,0 +1,55 @@
+          <div class="netapp well">
+            <h5 class="muted"><a href="#" class="remove"><i class="glyphicon glyphicon-remove-sign ">&nbsp;</i></a>&nbsp;Storage System #<span class="server_number">1</span></h5>
+            
+            <div class="netapp-main">
+              <%= select_f e, :storage_family, Staypuft::Deployment::CinderService::Netapp::STORAGE_FAMILIES,
+                         :first, :last, 
+                         {},
+                         { :label => _(Staypuft::Deployment::CinderService::NetappStorageFamily::HUMAN) } %>
+              <%= select_f e, :storage_protocol, Staypuft::Deployment::CinderService::Netapp::STORAGE_PROTOCOLS,
+                         :first, :last, 
+                         {},
+                         { :label => _(Staypuft::Deployment::CinderService::NetappStorageProtocol::HUMAN) } %>
+              <%= text_f e, :hostname, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappHostname::HUMAN) %>
+              <%= text_f e, :login, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappLogin::HUMAN) %>
+              <%= password_f e, :password, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappPassword::HUMAN) %>
+              <%= text_f e, :server_port, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappServerPort::HUMAN) %>
+              
+              <%= select_f e, :transport_type, Staypuft::Deployment::CinderService::Netapp::TRANSPORT_TYPES,
+                         :first, :last,
+                         {},
+                         { :label => _(Staypuft::Deployment::CinderService::NetappTransportType::HUMAN) } %>
+            </div>
+
+            <div class="netapp-nfs netapp-option">
+              <%= text_f e, :nfs_shares, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappNfsShares::HUMAN) %>
+              <%= text_f e, :nfs_shares_config, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappNfsSharesConfig::HUMAN) %>
+            </div>
+
+            <div class="netapp-7mode-iscsi netapp-option hide">
+              <%= text_f e, :volume_list, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappVolumeList::HUMAN) %>
+              <%= text_f e, :vfiler, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappVfiler::HUMAN) %>
+            </div>
+
+            <div class="netapp-vserver netapp-option">
+              <%= text_f e, :vserver, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappVserver::HUMAN) %>
+            </div>
+
+            <div class="netapp-eseries netapp-option hide">
+              <%= text_f e, :controller_ips, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappControllerIps::HUMAN) %>
+              <%= text_f e, :sa_password, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappSaPassword::HUMAN) %>
+              <%= text_f e, :storage_pools, class: "cinder_netapp",
+                         label:      _(Staypuft::Deployment::CinderService::NetappStoragePools::HUMAN) %>
+            </div>
+          </div>

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.15'
+  VERSION = '0.5.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors:
 - Staypuft team
@@ -131,6 +131,7 @@ files:
 - app/models/staypuft/deployment/abstract_param_scope.rb
 - app/models/staypuft/deployment/neutron_service/cisconexus.rb
 - app/models/staypuft/deployment/cinder_service/equallogic.rb
+- app/models/staypuft/deployment/cinder_service/netapp.rb
 - app/models/staypuft/deployment/neutron_service.rb
 - app/models/staypuft/deployment/ip_check.rb
 - app/models/staypuft/deployment/glance_service.rb
@@ -200,6 +201,7 @@ files:
 - app/views/staypuft/steps/_nova_ha.html.erb
 - app/views/staypuft/steps/_glance.html.erb
 - app/views/staypuft/steps/_neutron.html.erb
+- app/views/staypuft/steps/_cinder_netapp_form.html.erb
 - app/views/staypuft/steps/_wizard_form_buttons.html.erb
 - app/views/staypuft/subnet_types/_subnet_type_pull.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb