Merge ~steverydz/maas:dhcp-snippets-for-machines into maas:master

[Steve Rydz]

only show dhcp snippets that apply to machines and devices

Done:
- add link to all snippets on the dhcp snippets table
- removed commented out code
- for devices and machine details interfaces tab, only show snippets that apply to that machine/device

QA:
- go to a machine that has DHCP snippets (you should be able to see which machine by looking at all snippets in settings)
- see that the snippets only apply to that machine
- see that there is a link to all snippets in the settings section
- go to a device that has DHCP snippets (you should be able to see which device by looking at all snippets in settings)
- see that the snippets only apply to that machine
- see that there is a link to all snippets in the settings section
- see that there is no link to all settings on the settings dhcp snippets table

[Lilyana Videnova (lilyanavidenova)]

LGTM! :)

review: Approve (ux)

[LukeWH (0-luke)]

Code looks good +1

review: Approve (code)

diff --git a/src/maasserver/static/js/angular/controllers/node_details_networking.js b/src/maasserver/static/js/angular/controllers/node_details_networking.js
index e70405c..d0a80ec 100644
--- a/src/maasserver/static/js/angular/controllers/node_details_networking.js
+++ b/src/maasserver/static/js/angular/controllers/node_details_networking.js
@@ -310,6 +310,7 @@ export function NodeNetworkingController(
   $scope.editInterfaceLinkMonitoring = null;
   $scope.isSaving = false;
   $scope.snippets = DHCPSnippetsManager.getItems();
+  $scope.filteredSnippets = [];
   $scope.modes = [
     {
       mode: LINK_MODE.AUTO,
@@ -508,10 +509,9 @@ export function NodeNetworkingController(
       }
     });
 
-    $scope.filteredSnippets = DHCPSnippetsManager.getFilteredSnippets(
-      $scope.snippets,
-      subnetIPs
-    );
+    $scope.filteredSnippets = $scope.snippets.filter(snippet => {
+      return snippet.node === $scope.node.system_id;
+    });
 
     // Update the scope interface links mapping.
     $scope.interfaceLinksMap = {};
diff --git a/src/maasserver/static/js/angular/directives/dhcp_snippets_table.js b/src/maasserver/static/js/angular/directives/dhcp_snippets_table.js
index e2d5f97..86df4ea 100644
--- a/src/maasserver/static/js/angular/directives/dhcp_snippets_table.js
+++ b/src/maasserver/static/js/angular/directives/dhcp_snippets_table.js
@@ -11,7 +11,8 @@ function maasDhcpSnippetsTable($window) {
     scope: {
       snippets: "=",
       allowAddNew: "=",
-      allowDelete: "="
+      allowDelete: "=",
+      hideAllSnippetsLink: "="
     },
     templateUrl:
       "static/partials/dhcp-snippets-table.html?v=" +
diff --git a/src/maasserver/static/partials/dhcp-snippets-table.html b/src/maasserver/static/partials/dhcp-snippets-table.html
index 56f36a5..c99b5a4 100644
--- a/src/maasserver/static/partials/dhcp-snippets-table.html
+++ b/src/maasserver/static/partials/dhcp-snippets-table.html
@@ -190,4 +190,13 @@
     <button class="p-button--neutral" data-ng-disabled="editing" data-ng-if="!newSnippet" data-ng-click="editing || snippetAdd()">Add custom snippet</button>
   </div>
 </div>
-<p><a class="p-link--external" href="https://maas.io/docs/{$ MAAS_VERSION_NUMBER $}/en/installconfig-network-dhcp#dhcp-snippets" target="_blank">About DHCP snippets</a></p>
\ No newline at end of file
+<ul class="p-inline-list--middot">
+  <li class="p-inline-list__item" data-ng-if="!hideAllSnippetsLink">
+    <a href="/#/settings/dhcp">All snippets: Settings > DHCP snippets</a>
+  </li>
+  <li class="p-inline-list__item">
+    <a class="p-link--external"
+      href="https://maas.io/docs/{$ MAAS_VERSION_NUMBER $}/en/installconfig-network-dhcp#dhcp-snippets"
+      target="_blank">About DHCP snippets</a>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/src/maasserver/static/partials/settings.html b/src/maasserver/static/partials/settings.html
index a53aff1..28a81fb 100644
--- a/src/maasserver/static/partials/settings.html
+++ b/src/maasserver/static/partials/settings.html
@@ -43,56 +43,8 @@
 <div data-ng-show="!loading && currentpage === 'dhcp'" width-width>
     <section class="p-strip">
         <div class="row" data-ng-if="snippets.length">
-            <!-- XXX 04-01-2016 blake_r: Need to add the ability to show the compiled DHCP configuration.
-            <div class="twelve-col">
-                <div class="four-col last-col align-right">
-                    <a href="" class=" u-float--right">View compiled configuration</a>
-                </div>
-            </div>
-            -->
-            <maas-dhcp-snippets-table snippets="snippets" allow-add-new="true" allow-delete="true"></maas-dhcp-snippets-table>
+            <maas-dhcp-snippets-table snippets="snippets" allow-add-new="true" allow-delete="true" hide-all-snippets-link="true"></maas-dhcp-snippets-table>
         </div>
-
-        <!--
-        XXX 04-01-2016 blake_r: Need to add the ability to show the compiled DHCP configuration.
-        <div class="ng-hide">
-            <div class="twelve-col">
-                <div class="equal-height">
-                    <div class="eight-col">
-                        <h2 class="u-margin--none">Compiled configuration</h2>
-                    </div>
-                    <div class="four-col last-col align-right">
-                        <a href="" class="right margin-top">Download as text</a>
-                    </div>
-                </div>
-                <div class="twelve-col">
-                    <form class="form form--inline">
-                        <div class="form__group">
-                            <label for="" class="u-margin--right-small">Compiled DHCP configuration for</label>
-                            <select name="rack" id="rack">
-                                <option value="">rack-controller-1</option>
-                                <option value="">rack-controller-2</option>
-                                <option value="" selected="selected">rack-controller-3</option>
-                            </select>
-                        </div>
-                        <div class="form__group">
-                            <label for="" class="u-margin--right-small">For</label>
-                            <select name="dhcp" id="dhcp">
-                                <option value="" selected="selected">DHCP v4</option>
-                                <option value="">DHCP v4</option>
-                                <option value="">DHCP v4</option>
-                            </select>
-                        </div>
-                    </form>
-                </div>
-                <div class="twelve-col">
-                    <pre>
-                        <code data-maas-code-lines="getConfigurationData()"></code>
-                    </pre>
-                </div>
-            </div>
-        </div>
-        -->
     </section>
 </div>
 <div data-ng-show="!loading && currentpage === 'repositories'" window-width>