staypuft 0.3.0 → 0.3.1

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

@@ -1,51 +1,30 @@
 <div class="tab-pane" id="<%= child_hostgroup.name.parameterize.underscore %>_deployed_hosts">
-  <% if child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(deployment, nil) && h.open_stack_deployed? }.present? %>
+  <% if hosts.present? %>
     <%= form_tag(unassign_host_deployment_path(id: deployment), class: 'form-horizontal well association') do |f| %>
       <%= submit_tag _("Unassign Hosts"),
           :class => "btn btn-danger btn-sm pull-left",
           :'data-toggle' => "tooltip",
           :'data-placement' => "right",
           :title => _("Unassigning deployed hosts may lead to unexpected problems.") %>
-      <h4 class="pull-left"><%= _("Deployed Hosts") %></h4>
-      <button type="button" class="close" aria-hidden="true">×</button>
-      <p class="clearfix"></p>
-      <%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>
+
+      <%= render 'hosts_header', :header => _("Deployed Hosts"), :child_hostgroup => child_hostgroup, :assign_text => false %>
+
       <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 class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
-          </tr>
+          <%= render 'host_head_row' %>
         </thead>
         <tbody>
-          <% child_hostgroup.hosts.select{ |h| !ForemanTasks::Lock.locked?(deployment, nil) && h.open_stack_deployed? }.each do |host| %>
-            <tr class="checkbox_highlight deployed">
-              <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="hidden-s hidden-xs"><%= host.ip %></td>
-            </tr>
+          <% hosts.each do |host| %>
+            <%= render 'host_row',
+                       :custom_css_class => 'deployed',
+                       :host => host,
+                       :checkbox_value => false %>
           <% end %>
         </tbody>
       </table>
+
     <% end %>
   <% else %>
-    <div class="well association">
-      <button type="button" class="close pull-right" aria-hidden="true">×</button>
-      <h4><%= _("Deployed Hosts") %></h4>
-      <div class="alert alert-warning">
-        <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
-        <%= _("No hosts from this group have been deployed yet.") %>
-      </div>
-    </div>
+    <%= render 'empty_hosts', :header => _("Deployed Hosts"), :message => _("No hosts from this group have been deployed yet.") %>
   <% end %>
 </div>

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

@@ -44,15 +44,18 @@
 
   <div class="tab-content col-md-8">
     <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
-      <%= render :partial => "free_hosts_table", :locals => { :deployment      => @deployment,
-                                                              :hostgroup       => @hostgroup,
-                                                              :child_hostgroup => child_hostgroup } %>
-      <%= render :partial => "assigned_hosts_table", :locals => { :deployment      => @deployment,
-                                                                  :hostgroup       => @hostgroup,
-                                                                  :child_hostgroup => child_hostgroup } %>
-      <%= render :partial => "deployed_hosts_table", :locals => { :deployment      => @deployment,
-                                                                  :hostgroup       => @hostgroup,
-                                                                  :child_hostgroup => child_hostgroup } %>
+      <%= render 'free_hosts_table', :deployment => @deployment,
+                 :hostgroup => @hostgroup,
+                 :child_hostgroup => child_hostgroup,
+                 :hosts => child_hostgroup.free_hosts %>
+      <%= render 'assigned_hosts_table', :deployment => @deployment,
+                 :hostgroup => @hostgroup,
+                 :child_hostgroup => child_hostgroup,
+                 :hosts => child_hostgroup.hosts %>
+      <%= render 'deployed_hosts_table', :deployment => @deployment,
+                 :hostgroup => @hostgroup,
+                 :child_hostgroup => child_hostgroup,
+                 :hosts => child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? } %>
     <% end %>
     <%= render :partial => "deployment_summary", :locals => { :deployment => @deployment } %>
   </div>

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

@@ -6,6 +6,24 @@
     <div class="row">
       <div class="col-sm-12 text-center"><h3 class="text-muted"><%= _("Deployed") %></h3></div>
     </div>
+    <div class="row ceph_notification <% if @deployment.hide_ceph_notification? %>hide<% end %>">
+      <div class="col-sm-8 col-sm-offset-1">
+        <div class="row">
+          <div class="col-sm-1 col-sm-offset-2"><h3 class="glyphicon glyphicon-info-sign text-muted"></h3></div>
+          <div class="col-sm-8"><h3 class="text-muted"><%= _("Information")%></h3></div>
+        </div>
+        <div class="row">
+          <div class="col-sm-8 col-sm-offset-2">
+            <%= _("Ceph Hosts need to be configured manually. Please follow instructions in Ceph Installation documentation.") %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-10 col-sm-offset-2">
+            <a href="" id="ceph_notification_dismissal"><span class="glyphicon glyphicon-remove"></span><%= _("Dismiss this notification") %></a>
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="row">
       <div class="col-sm-8 col-sm-offset-2">
         <form class="form-horizontal">

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

@@ -0,0 +1,8 @@
+<div class="well association">
+  <button type="button" class="close pull-right" aria-hidden="true">×</button>
+  <h4><%= header %></h4>
+  <div class="alert alert-warning">
+    <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
+    <%= message %>
+  </div>
+</div>

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

@@ -42,7 +42,7 @@
             </td>
             <td><%= host.cpus %></td>
             <td><%= host.mem %></td>
-            <td><%= host.network_interfaces.join('<br/>') if host.network_interfaces %></td>
+            <td><%= host_nics(host) %></td>
             <td class="hidden-s hidden-xs"><%= host.ip %></td>
           </tr>
         <% end %>

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

@@ -1,47 +1,24 @@
 <div class="tab-pane" id="<%= child_hostgroup.name.parameterize.underscore %>_free_hosts">
-  <% if child_hostgroup.free_hosts.present? %>
+  <% if hosts.present? %>
     <%= form_tag(associate_host_deployment_path(id: deployment), class: 'form-horizontal well association') do |f| %>
-      <h4 class="pull-left"><%= _("Free Hosts") %></h4>
-      <button type="button" class="close pull-right" aria-hidden="true">&nbsp;&nbsp;×</button>
-      <%= submit_tag _("Assign Hosts"), :class => "btn btn-primary btn-sm pull-right" %>
-      <p class="clearfix"></p>
-      <%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>
+
+      <%= render 'hosts_header', :header => _("Free Hosts"), :child_hostgroup => child_hostgroup, :assign_text => _("Assign Hosts") %>
+
       <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 class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
-          </tr>
+          <%= render 'host_head_row' %>
         </thead>
         <tbody>
-          <% child_hostgroup.free_hosts.each do |host| %>
-            <tr class="checkbox_highlight">
-              <td class="ca">
-                <%= check_box_tag 'host_ids[]',
-                                  host.id,
-                                  child_hostgroup.host_ids.include?(host.id),
-                                  id:       "host_ids_#{host.id}" %>
-              </td>
-              <td class="ellipsis">
-               <%= host_label(host) %>
-              </td>
-              <td class="hidden-s hidden-xs"><%= host.ip %></td>
-            </tr>
+          <% hosts.each do |host| %>
+            <%= render 'host_row',
+                       :host => host,
+                       :checkbox_value => child_hostgroup.host_ids.include?(host.id) %>
           <% end %>
         </tbody>
       </table>
+
     <% end %>
   <% else %>
-    <div class="well association">
-      <button type="button" class="close pull-right" aria-hidden="true">×</button>
-      <h4><%= _("Free Hosts") %></h4>
-      <div class="alert alert-warning">
-        <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
-        <%= _("All available hosts have been already assigned.") %>
-      </div>
-    </div>
+    <%= render 'empty_hosts', :header => _("Free Hosts"), :message => _("All available hosts have been already assigned.") %>
   <% end %>
 </div>

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

@@ -0,0 +1,11 @@
+<tr>
+  <th class="ca">
+    <%= tag :input, type: 'checkbox', class: 'check_all' %>
+  </th>
+  <th><%= sort :name, :as => _('Name') %></th>
+  <th><%= _('NICs') %></th>
+  <% if local_assigns[:deploying_col] %>
+    <th class="hidden-s hidden-xs"><%= _('Deploying?') %></th>
+  <% end %>
+  <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+</tr>

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

@@ -0,0 +1,30 @@
+<tr class="checkbox_highlight <%= local_assigns[:custom_css_class] %>">
+  <td class="ca">
+    <%= check_box_tag 'host_ids[]',
+                      host.id,
+                      checkbox_value,
+                      id:       "host_ids_#{host.id}",
+                      disabled: local_assigns[:disabled]%>
+    <%= hidden_field_tag 'host_ids[]', host.id if local_assigns[:disabled] %>
+  </td>
+
+  <td class="ellipsis">
+    <%= host_label(host) %>
+  </td>
+
+  <td>
+    <%= host_nics(host) %>
+  </td>
+
+  <% unless local_assigns[:disabled].nil? %>
+    <td class="hidden-s hidden-xs">
+      <% if disabled %>
+        <span class="glyphicon glyphicon-cloud-upload"></span>
+      <% else %>
+        <span class="glyphicon glyphicon-minus"></span>
+      <% end %>
+    </td>
+  <% end %>
+
+  <td class="hidden-s hidden-xs"><%= host.ip %></td>
+</tr>

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

@@ -0,0 +1,7 @@
+<h4 class="pull-left"><%= header %></h4>
+<button type="button" class="close pull-right" aria-hidden="true">&nbsp;&nbsp;×</button>
+<% if assign_text %>
+  <%= submit_tag assign_text, :class => "btn btn-primary btn-sm pull-right" %>
+<% end %>
+<p class="clearfix"></p>
+<%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>

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

@@ -1,6 +1,6 @@
 <% title _("OpenStack Deployments") %>
 
-<% title_actions display_link_if_authorized(_("New Deployment"), hash_for_new_deployment_path, :class => 'btn-success'), help_path %>
+<% title_actions display_link_if_authorized(_("New Deployment"), hash_for_new_deployment_path, :class => 'btn btn-success'), help_path %>
 
 <% if @deployments.present? %>
 

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

@@ -3,7 +3,7 @@
 <% sub_nav = [ {:title => _("Overview"), :target_id => '#overview', :active => true},
                {:title => _("Hosts"), :target_id => '#hosts'},
                # {:title => _("Networking"), :target_id => '#networking'},
-             {:title => _("Advanced Configuration"), :target_id => '#advanced_configuration'} ] %>
+               {:title => _("Advanced Configuration"), :target_id => '#advanced_configuration'} ] %>
 <%= tabbed_nav_menu(sub_nav, 'sub-navigation', 'nav nav-tabs') %>
 
 <div id="sub-navigation-tabs"  class="tab-content">
@@ -14,7 +14,7 @@
     <%= render :partial => "deployment_hosts", :locals => { :deployment => @deployment } %>
   </div>
   <!--<div class="tab-pane" id="networking">-->
-    <!--<%= render :partial => "deployment_networking", :locals => { :deployment => @deployment } %>-->
+  <!--<%= render :partial => "deployment_networking", :locals => { :deployment => @deployment } %>-->
   <!--</div>-->
   <div class="tab-pane" id="advanced_configuration">
     <%= render :partial => "advanced_configuration", :locals => { :deployment => @deployment } %>

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

@@ -0,0 +1,12 @@
+<% if @saved %>
+$("#<%= dom_id(@subnet) %>").remove();
+$("#<%= params[:interface] %>-<%= @assigner.virtual_assignment? ? 'virtuals' : 'physicals' %>").prepend(
+        '<%=j render :partial => 'staypuft/subnets/subnet_pull',
+                     :object => @subnet,
+                     :as => 'subnet',
+                     :locals => { :active => !is_pxe?(@deployment, @subnet), :deployment => @deployment, :existing => true } %>');
+$("#<%= dom_id(@subnet) %>").draggable({revert: 'invalid'});
+<% else %>
+  error = '<%=j @errors.map { |k, v| "#{h(k)}: #{v.join(', ')}" }.join('<br />').html_safe %>';
+  $.jnotify(error, { type: "error", sticky: true });
+<% end %>

data/app/views/staypuft/interface_assignments/destroy.js.erb

@@ -0,0 +1,12 @@
+<% if @destroyed %>
+$("#<%= dom_id(@subnet) %>").remove();
+$("#subnets").append(
+        '<%=j render :partial => 'staypuft/subnets/subnet_pull',
+                     :object => @subnet,
+                     :as => 'subnet',
+                     :locals => { :active => !is_pxe?(@deployment, @subnet), :deployment => @deployment, :existing => false } %>');
+$("#<%= dom_id(@subnet) %>").draggable({revert: 'invalid'});
+<% else %>
+  error = '<%=j @errors.map { |k, v| "#{k}: #{v.join(', ')}" }.join('<br />') %>';
+  $.jnotify(error, { type: "error", sticky: true });
+<% end %>

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

@@ -0,0 +1,38 @@
+<%= javascript 'staypuft/nics_assignment' %>
+
+<% title _("Configure Interfaces (%s hosts)") % @hosts.size %>
+
+<div id="subnets">
+  <h2><%= _("Configured Networks") %></h2>
+  <% @subnets.each do |subnet| %>
+  <% next if is_pxe?(@deployment, subnet) # we skip PXE network which is always on primary interface %>
+  <% next if @host.interfaces.where(:subnet_id => subnet.id).present? # we skip assigned subnets %>
+    <%= render 'staypuft/subnets/subnet_pull',
+               :subnet => subnet,
+               :deployment => @deployment,
+               :active => true,
+               :existing => false %>
+  <% end %>
+</div>
+
+<div class="cleared"></div>
+<br />
+<h2><%= _("Network Interfaces") %></h2>
+
+<% if (subnet = @host.subnet) %>
+  <%= render 'staypuft/interfaces/drop_zone',
+             :identifier => @host.primary_interface,
+             :subnet => subnet,
+             :deployment => @deployment,
+             :host => @host %>
+<% end %>
+
+<% @interfaces.each do |interface| %>
+  <%= render 'staypuft/interfaces/drop_zone',
+             :identifier => interface.identifier,
+             :subnet => interface.subnet,
+             :deployment => @deployment,
+             :host => @host %>
+<% end %>
+
+<%= link_to _('Back to deployment'), deployment_path(@deployment) %>

data/app/views/staypuft/interfaces/_drop_zone.html.erb

@@ -0,0 +1,30 @@
+<div class="interface" id="<%= identifier %>-interface" data-interface="<%= identifier %>">
+  <div class="identifier">
+    <%= identifier %>
+  </div>
+
+  <!-- physical interface assignment (can be only one at most) -->
+  <div id="<%= identifier %>-physicals">
+    <%= render 'staypuft/subnets/subnet_pull',
+               :subnet => subnet,
+               :deployment => deployment,
+               :active => !is_pxe?(deployment, subnet),
+               :existing => true if subnet %>
+  </div>
+
+  <!-- all virtual devices attached to this physical interface assignments -->
+  <div id="<%= identifier %>-virtuals">
+    <% host.interfaces.where(:physical_device => identifier).where("subnet_id IS NOT NULL").each do |virtual| %>
+      <%= render 'staypuft/subnets/subnet_pull',
+                 :subnet => virtual.subnet,
+                 :deployment => deployment,
+                 :active => true,
+                 :existing => true if virtual.subnet %>
+    <% end %>
+  </div>
+
+  <div class="subnet-drop-zones">
+    <div class="empty-zone">
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,52 @@
+<%= javascript 'staypuft/subnets_assignment' %>
+
+<%= render :layout => 'title' do %>
+  <%= alert_if_deployed %>
+
+  <div class="well">
+    <div class="wizard-container">
+      <%= deployment_wizard 2 %>
+    </div>
+
+    <div class="row">
+      <div id="subnet_types" class="col-md-12">
+        <%= base_errors_for @deployment %>
+        <h4><%= _("Available Roles") %></h4>
+        <% @deployment.unassigned_subnet_types.each do |subnet_type| %>
+          <%= render 'staypuft/subnet_types/subnet_type_pull', :subnet_type => subnet_type, :deployment => @deployment %>
+        <% end %>
+      </div>
+    </div>
+
+    <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')) %>
+        </div>
+      </div>
+
+      <div id="subnets" class="col-md-12">
+        <h4><%= _("Networks") %></h4>
+        <% @subnets.each do |subnet| %>
+          <%= render 'staypuft/subnets/drop_zone', :subnet => subnet, :deployment => @deployment %>
+        <% end %>
+      </div>
+    </div>
+
+    <br />
+
+    <%= form_for(@deployment, :url => wizard_path, :method => 'PUT', :html => {:class => ''}) do |f| %>
+      <div class="form_actions">
+        <a class="btn btn-default" href="<%= previous_wizard_path %>">
+          <span class="glyphicon glyphicon-chevron-left"></span>
+          <%= _("Back") %>
+        </a>
+        <%= link_to _("Cancel"), deployment_path(@deployment),
+                    :class => "btn btn-danger" %>
+        <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
+          <%= _("Next") %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,44 +1,50 @@
 <%= render :layout => 'title' do %>
   <%= alert_if_deployed %>
 
-  <div class="deployment-wizard">
-    <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
-      <%= base_errors_for @deployment %>
-  
-      <%= deployment_wizard 3 %>
-      <div class="form-group tabbed_side_nav_form row">
-        <ul class="nav nav-pills nav-stacked col-md-3 configuration" data-tabs="pills">
-          <h3><%= _("Services") %></h3>
-          <% @services_map.each_with_index do |service_name, i| %>
-            <% service = @deployment.send(service_name)
-               if service.active?
-            %>
-              <li class="">
-                <a href="#<%= service_name  %>" data-toggle="tab">
-                  <%= service_name.capitalize %>
-                </a>
-              </li>
-              <% end %>
-          <% end %>
-        </ul>
-  
-        <div class="tab-content col-md-9">
-          <% @services_map.each_with_index do |service_name, i| %>
-            <% service = @deployment.send(service_name)
-               if service.active?
-            %>
-              <div class="tab-pane" id="<%= service_name %>">
-                <h3><%= _("%s Service Configuration") % service_name.to_s.capitalize %></h3>
-                <%= render partial: service_name.to_s, locals: {f: f}%>
-              </div>
-              <% end %>
-          <% end %>
-        </div>
+  <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
+    <%= base_errors_for @deployment %>
+
+    <%= deployment_wizard 4 %>
+    <div class="form-group tabbed_side_nav_form row">
+      <ul class="nav nav-pills nav-stacked col-md-3 configuration" data-tabs="pills">
+        <h3><%= _("Services") %></h3>
+        <% @services_map.each_with_index do |service_name, i| %>
+          <% service = @deployment.send(service_name)
+             if service.active?
+          %>
+            <li class="">
+              <a href="#<%= service_name  %>" data-toggle="tab">
+                <%= service_name.capitalize %>
+              </a>
+            </li>
+            <% end %>
+        <% end %>
+      </ul>
+
+      <div class="tab-content col-md-9">
+        <% @services_map.each_with_index do |service_name, i| %>
+          <% service = @deployment.send(service_name)
+             if service.active?
+          %>
+            <div class="tab-pane" id="<%= service_name %>">
+              <h3><%= _("%s Service Configuration") % service_name.to_s.capitalize %></h3>
+              <%= render partial: service_name.to_s, locals: {f: f}%>
+            </div>
+            <% end %>
+        <% end %>
       </div>
-  
-      <%= render :partial => "wizard_form_buttons", 
-                 :locals => { :deployment => @deployment,
-                              :step => Staypuft::Deployment::STEP_CONFIGURATION } %>
-    <% end %>
-  </div>
+    </div>
+
+    <div class="form_actions">
+      <a class="btn btn-default" href="<%= previous_wizard_path %>">
+        <span class="glyphicon glyphicon-chevron-left"></span>
+        <%= _("Back") %>
+      </a>
+      <%= link_to _("Cancel"), deployment_path(@deployment),
+                  :class => "btn btn-danger" %>
+      <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
+        <%= _("Next") %>
+      <% end %>
+    </div>
+  <% end %>
 <% end %>

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

@@ -5,7 +5,7 @@
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>
 
-    <%= deployment_wizard 2 %>
+    <%= deployment_wizard 3 %>
     <h3><%= _("Deployment Roles & Available Services") %></h3>
     <h4><%= "#{@deployment.layout.name} - #{@deployment.layout.networking.capitalize} " + _("Networking") %></h4>
 

data/app/views/staypuft/subnet_types/_subnet_type_pull.html.erb

@@ -0,0 +1,9 @@
+<% typing = local_assigns[:subnet_typing] %>
+
+<div class="subnet-type-pull <%= typing.nil? ? 'new' : 'existing' %>" id="<%= dom_id(subnet_type) %>"
+     data-subnet-type-id="<%= subnet_type.id %>"
+     data-delete-url="<%= url_for subnet_typing_path(typing) if typing %>"
+     data-update-url="<%= url_for subnet_typing_path(typing) if typing %>"
+     data-create-url="<%= url_for subnet_typings_path(:deployment_id => deployment) %>">
+  <%= subnet_type.name %>
+</div>

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

@@ -0,0 +1,12 @@
+<% if @saved %>
+  $("#<%= dom_id(@subnet_type) %>").remove();
+  $("#<%= dom_id(@subnet) %>_drop_zone div.subnet-types").prepend('<%=j render :partial => 'staypuft/subnet_types/subnet_type_pull',
+    :object => @subnet_type,
+    :as => 'subnet_type',
+    :locals => { :subnet_typing => @subnet_typing, :deployment => @deployment } %>');
+  $("#<%= dom_id(@subnet_type) %>").draggable({revert: 'invalid'});
+<% end %>
+
+<% if @warn.present? %>
+  $.jnotify('<%=j @warn.html_safe %>', { type: "warning", sticky: true });
+<% end %>

data/app/views/staypuft/subnet_typings/destroy.js.erb

@@ -0,0 +1,12 @@
+<% if @destroyed %>
+  $('#<%= dom_id(@subnet_type) %>').remove();
+  $("#subnet_types").append('<%=j render :partial => 'staypuft/subnet_types/subnet_type_pull',
+      :object => @subnet_type,
+      :locals => { :deployment => @deployment },
+      :as => 'subnet_type' %>');
+  $("#<%= dom_id(@subnet_type) %>").draggable({revert: 'invalid'});
+<% end %>
+
+<% if @warn.present? %>
+  $.jnotify('<%=j @warn.html_safe %>', { type: "warning", sticky: true });
+<% end %>

data/app/views/staypuft/subnet_typings/update.js.erb

@@ -0,0 +1,14 @@
+<% if @saved %>
+  $("#<%= dom_id(@subnet_type) %>").remove()
+  $("#<%= dom_id(@subnet) %>_drop_zone div.subnet-types").prepend('<%=j render :partial => 'staypuft/subnet_types/subnet_type_pull',
+    :object => @subnet_type,
+    :as => 'subnet_type',
+    :locals => { :subnet_typing => @subnet_typing, :deployment => @deployment } %>');
+  $("#<%= dom_id(@subnet_type) %>").draggable({
+    revert: 'invalid'
+  });
+<% end %>
+
+<% if @warn.present? %>
+  $.jnotify('<%=j @warn.html_safe %>', { type: "warning", sticky: true });
+<% end %>

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

@@ -0,0 +1,16 @@
+<div class="subnet-drop-zone" id="<%= dom_id(subnet) %>_drop_zone" data-subnet-id="<%= subnet.id %>">
+  <div class="name">
+    <%= subnet.name %> - <%= subnet.network_address %>
+  </div>
+
+  <div class="subnet-types">
+    <% deployment.subnet_typings.where(["#{Staypuft::SubnetTyping.table_name}.subnet_id = ?", subnet.id]).each do |typing| %>
+    <%= render :partial => 'staypuft/subnet_types/subnet_type_pull',
+               :object => typing.subnet_type,
+               :locals => { :subnet_typing => typing, :deployment => deployment },
+               :as => :subnet_type %>
+    <% end %>
+
+    <div class="empty-zone"></div>
+  </div>
+</div>

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

@@ -0,0 +1,9 @@
+<div class="subnet-pull <%= 'active' if active %> <%= 'existing' if existing %> <%= 'virtual' if subnet.vlanid.present? %>"
+     id="<%= dom_id(subnet) %>"
+     data-create-url="<%= deployment_interface_assignments_path(deployment, :host_ids => params[:host_ids], :subnet_id => subnet) %>"
+     data-delete-url="<%= deployment_interface_assignment_path(deployment, 0, :host_ids => params[:host_ids], :subnet_id => subnet) %>">
+  <div class="content">
+    <div class="name"><%= subnet.name %> <%= '(vlan: ' + subnet.vlanid + ')' if subnet.vlanid.present? %></div>
+    <div class="subnet-types"><%= subnet_types(deployment, subnet) %></div>
+  </div>
+</div>

data/config/routes.rb

@@ -16,7 +16,10 @@ Rails.application.routes.draw do
       end
 
       resources :steps
+
+      resources :interface_assignments, :only => [:index, :create, :destroy]
     end
 
+    resources :subnet_typings, :only => [:create, :destroy, :update]
   end
 end