Merge lp:~blake-rouse/maas/images-ajax-view into lp:~maas-committers/maas/trunk

[Blake Rouse]

Use the ImagesView on the images page. Status of importing is updated every 15 seconds, new Ubuntu resources will appear and disappear along with its current status.

[Newell Jensen (newell-jensen)]

review: Approve

=== modified file 'src/maasserver/context_processors.py'
--- src/maasserver/context_processors.py	2014-09-29 15:26:08 +0000
+++ src/maasserver/context_processors.py	2014-10-02 18:55:55 +0000
@@ -56,6 +56,8 @@
             'css/multiselect_widget.css',
         ],
         'JS_LIST': [
+            'js/image.js',
+            'js/image_views.js',
             'js/license_key.js',
             'js/morph.js',
             'js/user_panel.js',

=== modified file 'src/maasserver/static/js/image_views.js'
--- src/maasserver/static/js/image_views.js	2014-10-02 18:55:55 +0000
+++ src/maasserver/static/js/image_views.js	2014-10-02 18:55:55 +0000
@@ -254,9 +254,11 @@
         if(ubuntuImages.length == 0) {
             this.ubuntuMissingImages.removeClass('hidden');
             this.ubuntuTable.addClass('hidden');
+            this.updateUbuntuButton(false);
         } else {
             this.ubuntuMissingImages.addClass('hidden');
             this.ubuntuTable.removeClass('hidden');
+            this.updateUbuntuButton(true);
         }
         var self = this;
         var innerTable = "";
@@ -273,6 +275,25 @@
     },
 
    /**
+    * Update the value of the ubuntuButton.
+    *
+    * The value of the button can be locked meaning it should not change, this
+    * is done using the data attribute lock-value. data-lock-value="true"
+    *
+    * @method updateUbuntuButton
+    */
+    updateUbuntuButton: function(showApply) {
+        if(!Y.Lang.isValue(this.ubuntuButton))
+            return;
+        if(this.ubuntuButton.getData('lock-value') === "true")
+            return;
+        if(showApply)
+            this.ubuntuButton.set('value', 'Apply changes');
+        else
+            this.ubuntuButton.set('value', 'Import images');
+    },
+
+   /**
     * Return the HTML for the downloading spinner for the given model.
     *
     * @method getSpinner

=== modified file 'src/maasserver/static/js/tests/test_image_views.js'
--- src/maasserver/static/js/tests/test_image_views.js	2014-10-02 18:55:55 +0000
+++ src/maasserver/static/js/tests/test_image_views.js	2014-10-02 18:55:55 +0000
@@ -369,6 +369,29 @@
         });
     },
 
+    testUpdateUbuntuButtonSetValueForApply: function() {
+        var view = this.makeImagesView();
+        var ubuntuButton = view.srcNode.one('#ubuntu-apply');
+        view.updateUbuntuButton(true);
+        Y.Assert.areSame('Apply changes', ubuntuButton.get('value'));
+    },
+
+    testUpdateUbuntuButtonSetValueForImport: function() {
+        var view = this.makeImagesView();
+        var ubuntuButton = view.srcNode.one('#ubuntu-apply');
+        view.updateUbuntuButton(false);
+        Y.Assert.areSame('Import images', ubuntuButton.get('value'));
+    },
+
+    testUpdateUbuntuButtonDoesNothingIfLockValueExists: function() {
+        var view = this.makeImagesView();
+        var ubuntuButton = view.srcNode.one('#ubuntu-apply');
+        ubuntuButton.set('value', 'testing');
+        ubuntuButton.setData('lock-value', 'true');
+        view.updateUbuntuButton(true);
+        Y.Assert.areSame('testing', ubuntuButton.get('value'));
+    },
+
     testGetSpinnerReturnsEmptyForComplete: function() {
         var view = this.makeImagesView();
         var model = new Y.maas.image.Image({complete: true});

=== modified file 'src/maasserver/templates/maasserver/images.html'
--- src/maasserver/templates/maasserver/images.html	2014-09-30 18:59:13 +0000
+++ src/maasserver/templates/maasserver/images.html	2014-10-02 18:55:55 +0000
@@ -42,7 +42,11 @@
       -webkit-border-radius: 5px;
       background-color: rgba(221, 72, 20, 0.3);
     }
-    .importing {
+    #loader {
+      width: 10px;
+      margin: 16px auto 0 auto;
+    }
+    #importing {
       margin: -20px auto -19px auto;
       width: 230px;
       font-weight: bold;
@@ -85,82 +89,212 @@
         }
     }
   </style>
+  <script type="text/javascript">
+    <!--
+    YUI().use('maas.image_views', 'maas.shortpoll', function (Y) {
+      Y.on('load', function() {
+        var view = new Y.maas.image_views.ImagesView({
+            srcNode: '#content',
+            loader: '#loader',
+            content: '#images-content',
+            importer: '#importing',
+            ubuntuOptions: '#ubuntu-options',
+            ubuntuTable: '#ubuntu-resources',
+            ubuntuMissingImages: '#missing-ubuntu-images',
+            ubuntuButton: '#ubuntu-apply'});
+
+        var poller = new Y.maas.shortpoll.ShortPollManager({
+            uri: MAAS_config.uris.images_handler
+        });
+        view.addLoader(poller.get("io"));
+        poller.poll();
+      });
+    });
+    // -->
+  </script>
 {% endblock %}
 
 {% block content %}
-    {% if region_import_running or cluster_import_running %}
-    <div class="importing">
+    <div id="loader">
       <div class="spinner spin"></div>
-      {% if region_import_running %}
-      Step 1/2: Region importing
-      {% elif cluster_import_running %}
-      Step 2/2: Clusters importing
+    </div>
+    <div id="images-content" class="hidden">
+      <div id="importing" class="hidden">
+        <div class="spinner spin"></div>
+        <span class="importing-text"></span>
+        <span class="importing-dot">.</span>
+        <span class="importing-dot" style="-webkit-animation-delay: 0.2s; animation-delay: 0.2s;">.</span>
+        <span class="importing-dot" style="-webkit-animation-delay: 0.3s; animation-delay: 0.3s;">.</span>​
+      </div>
+      <div id="ubuntu-images" class="section">
+        <h2>Ubuntu</h2>
+        <div class="content">
+          <form id="ubuntu_images"
+            method="POST"
+            action="{% url 'images' %}">
+            {% csrf_token %}
+            <input type="hidden" name="ubuntu_images" value="1" />
+            {% if user.is_superuser %}
+            <div id="ubuntu-options" class="row hidden">
+              {% if connection_error %}
+              <div id="connection-error" class="images-warning">
+                Connection Error: Unable to retrieve image information from
+                boot sources.
+              </div>
+              {% else %}
+              {% if ubuntu_streams_count == 0 %}
+              <div id="no-ubuntu-sources" class="images-warning">
+                Error: No boot sources provide Ubuntu images.
+              </div>
+              {% elif ubuntu_streams_count == 1 %}
+              <div class="col2">
+                <div class="space-bottom-small">Release:</div>
+                <ul id="ubuntu-releases" class="data-list">
+                  {% for release in ubuntu_releases %}
+                  <li><input type="checkbox" name="release"
+                    value="{{release.name}}"
+                    {% if release.checked %}checked="checked"{% endif %}>
+                    {{release.title}}</li>
+                  {% endfor %}
+                </ul>
+              </div>
+              <div class="col10 last">
+                <div class="space-bottom-small">Architecture:</div>
+                <ul id="ubuntu-arches" class="data-list">
+                  {% for arch in ubuntu_arches %}
+                  <li><input type="checkbox" name="arch"
+                    value="{{arch.name}}"
+                    {% if arch.checked %}checked="checked"{% endif %}>
+                    {{arch.title}}</li>
+                  {% endfor %}
+                </ul>
+              </div>
+              {% else %}
+              <div id="too-many-ubuntu-sources" class="images-warning">
+                More than one boot source is providing Ubuntu images. Image
+                selection cannot be performed using the WebUI.
+              </div>
+              {% endif %}
+              {% endif %}
+            </div>
+            <div class="clear"></div>
+            {% endif %}
+            <div class="row space-top">
+              <table id="ubuntu-resources" class="space-top list hidden">
+                <thead>
+                  <tr>
+                    <th class="spinner-col"></th>
+                    <th>Release</th>
+                    <th>Architecture</th>
+                    <th>Size</th>
+                    <th>Nodes deployed</th>
+                    <th>Last update</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {# maas.image_view.ImageView will render this part #}
+                </tbody>
+              </table>
+              <div id="missing-ubuntu-images" class="images-warning hidden">
+                No Ubuntu images have been imported. Ubuntu images are required
+                to allow nodes to enlist, commission, and install.</div>
+            </div>
+            <div class="clear"></div>
+            <div class="row space-top end-row">
+              {% if user.is_superuser %}
+              <div class="col12 last align-right">
+                {% if ubuntu_streams_count == 1 %}
+                <input id="ubuntu-apply" type="submit" class="button hidden" value="Import images">
+                {% elif ubuntu_streams_count > 1 %}
+                <input id="ubuntu-apply" type="submit" class="button hidden" data-lock-value="true" value="Import images">
+                {% endif %}
+              </div>
+              {% endif %}
+            </div>
+            <div class="clear"></div>
+          </form>
+        </div>
+      </div>
+      {% if other_resources %}
+      <div id="other-sync-images" class="section">
+        <h2>Other Images</h2>
+        <div class="content">
+          <form id="other_images"
+            method="POST"
+            action="{% url 'images' %}">
+            {% csrf_token %}
+            <input type="hidden" name="other_images" value="1" />
+            <div class="row space-top">
+              <table id="other-resources" class="space-top list">
+                <thead>
+                  <tr>
+                    <th class="spinner-col"></th>
+                    <th>Name</th>
+                    <th>Architecture</th>
+                    <th>Size</th>
+                    <th>Nodes deployed</th>
+                    <th>Last update</th>
+                  </tr>
+                </thead>
+                <tbody>
+                {% for resource in other_resources %}
+                  <tr
+                    class="{% cycle 'even' 'odd' %}"
+                    data-id="{% if resource.id %}{{ resource.id }}{% endif %}">
+                    <td>
+                      {% if region_import_running and resource.exists %}
+                      {% if not resource.complete %}
+                      <div
+                        title="{{ resource.status }}"
+                        class="
+                          spinner
+                          {% if resource.downloading %}spin{% endif %}">
+                      </div>
+                      {% endif %}
+                      {% elif not region_import_running and user.is_superuser %}
+                      <input
+                        type="checkbox"
+                        name="image"
+                        value="{{ resource.os }}/{{ resource.arch }}/{{ resource.subarch }}/{{ resource.release }}"
+                        {% if resource.exists %}
+                        checked="checked"
+                        {% endif %}
+                        >
+                      {% endif %}
+                    </td>
+                    <td>{{ resource.title }}</td>
+                    <td>{{ resource.arch }}</td>
+                    <td>{{ resource.size }}</td>
+                    <td>{{ resource.number_of_nodes }}</td>
+                    <td>{{ resource.last_update }}</td>
+                  </tr>
+                {% endfor %}
+                </tbody>
+              </table>
+            </div>
+            <div class="clear"></div>
+            <div class="row space-top end-row">
+              {% if user.is_superuser and not region_import_running %}
+              <div class="col12 last align-right">
+                <input type="submit" class="button" value="Apply changes">
+              </div>
+              {% endif %}
+            </div>
+            <div class="clear"></div>
+          </form>
+        </div>
+      </div>
       {% endif %}
-      <span class="importing-dot">.</span>
-      <span class="importing-dot" style="-webkit-animation-delay: 0.2s; animation-delay: 0.2s;">.</span>
-      <span class="importing-dot" style="-webkit-animation-delay: 0.3s; animation-delay: 0.3s;">.</span>​
-    </div>
-    {% endif %}
-    <div id="ubuntu-images" class="section">
-      <h2>Ubuntu</h2>
-      <div class="content">
-        <form id="ubuntu_images"
-          method="POST"
-          action="{% url 'images' %}">
-          {% csrf_token %}
-          <input type="hidden" name="ubuntu_images" value="1" />
-          {% if user.is_superuser and not region_import_running %}
-          <div class="row">
-            {% if connection_error %}
-            <div id="connection-error" class="images-warning">
-              Connection Error: Unable to retrieve image information from
-              boot sources.
-            </div>
-            {% else %}
-            {% if ubuntu_streams_count == 0 %}
-            <div id="no-ubuntu-sources" class="images-warning">
-              Error: No boot sources provide Ubuntu images.
-            </div>
-            {% elif ubuntu_streams_count == 1 %}
-            <div class="col2">
-              <div class="space-bottom-small">Release:</div>
-              <ul id="ubuntu-releases" class="data-list">
-                {% for release in ubuntu_releases %}
-                <li><input type="checkbox" name="release"
-                  value="{{release.name}}"
-                  {% if release.checked %}checked="checked"{% endif %}>
-                  {{release.title}}</li>
-                {% endfor %}
-              </ul>
-            </div>
-            <div class="col10 last">
-              <div class="space-bottom-small">Architecture:</div>
-              <ul id="ubuntu-arches" class="data-list">
-                {% for arch in ubuntu_arches %}
-                <li><input type="checkbox" name="arch"
-                  value="{{arch.name}}"
-                  {% if arch.checked %}checked="checked"{% endif %}>
-                  {{arch.title}}</li>
-                {% endfor %}
-              </ul>
-            </div>
-            {% else %}
-            <div id="too-many-ubuntu-sources" class="images-warning">
-              More than one boot source is providing Ubuntu images. Image
-              selection cannot be performed using the WebUI.
-            </div>
-            {% endif %}
-            {% endif %}
-          </div>
-          <div class="clear"></div>
-          {% endif %}
+      {% if generated_resources %}
+      <div id="generated-images" class="section">
+        <h2>Generated Images</h2>
+        <div class="content">
           <div class="row space-top">
-            {% if ubuntu_resources|length %}
-            <table id="ubuntu-resources" class="space-top list">
+            <table id="generated-resources" class="space-top list">
               <thead>
                 <tr>
                   <th class="spinner-col"></th>
-                  <th>Release</th>
+                  <th>Name</th>
                   <th>Architecture</th>
                   <th>Size</th>
                   <th>Nodes deployed</th>
@@ -168,7 +302,7 @@
                 </tr>
               </thead>
               <tbody>
-                {% for resource in ubuntu_resources %}
+                {% for resource in generated_resources %}
                 <tr
                   class="{% cycle 'even' 'odd' %}"
                   data-id="{{ resource.id }}">
@@ -182,7 +316,18 @@
                     </div>
                     {% endif %}
                   </td>
-                  <td>{{ resource.title }}</td>
+                  <td>{{ resource.title }}
+                    {% if user.is_superuser %}
+                    <a
+                      title="Delete image"
+                      href="{% url 'image-delete' resource.id %}">
+                      <img
+                        class="small-icon"
+                        src="{{ STATIC_URL }}img/delete.png"
+                        alt="delete" />
+                    </a>
+                    {% endif %}
+                  </td>
                   <td>{{ resource.arch }}</td>
                   <td>{{ resource.size }}</td>
                   <td>{{ resource.number_of_nodes }}</td>
@@ -191,46 +336,22 @@
                 {% endfor %}
               </tbody>
             </table>
-            {% else %}
-            <div id="missing-ubuntu-images" class="images-warning">
-              No Ubuntu images have been imported. Ubuntu images are required
-              to allow nodes to enlist, commission, and install.</div>
-            {% endif %}
-          </div>
-          <div class="clear"></div>
-          <div class="row space-top end-row">
-            {% if user.is_superuser and not region_import_running %}
-            <div class="col12 last align-right">
-              {% if ubuntu_streams_count == 1 %}
-              {% if ubuntu_resources|length %}
-              <input type="submit" class="button" value="Apply changes">
-              {% else %}
-              <input type="submit" class="button" value="Import images">
-              {% endif %}
-              {% elif ubuntu_streams_count > 1 %}
-              <input type="submit" class="button" value="Import images">
-              {% endif %}
-            </div>
-            {% endif %}
-          </div>
-          <div class="clear"></div>
-        </form>
+          </div>
+          <div class="clear"></div>
+          <div class="row space-top end-row"></div>
+          <div class="clear"></div>
+        </div>
       </div>
-    </div>
-    {% if other_resources %}
-    <div id="other-sync-images" class="section">
-      <h2>Other Images</h2>
-      <div class="content">
-        <form id="other_images"
-          method="POST"
-          action="{% url 'images' %}">
-          {% csrf_token %}
-          <input type="hidden" name="other_images" value="1" />
+      {% endif %}
+      <div id="custom-images" class="section">
+        <h2>Custom Images</h2>
+        <div class="content">
           <div class="row space-top">
-            <table id="other-resources" class="space-top list">
+            {% if uploaded_resources|length %}
+            <table id="uploaded-resources" class="space-top list">
               <thead>
                 <tr>
-                  <th class="spinner-col"></th>
+                  <th></th>
                   <th>Name</th>
                   <th>Architecture</th>
                   <th>Size</th>
@@ -239,12 +360,9 @@
                 </tr>
               </thead>
               <tbody>
-              {% for resource in other_resources %}
-                <tr
-                  class="{% cycle 'even' 'odd' %}"
-                  data-id="{% if resource.id %}{{ resource.id }}{% endif %}">
+                {% for resource in uploaded_resources %}
+                <tr class="{% cycle 'even' 'odd' %}">
                   <td>
-                    {% if region_import_running and resource.exists %}
                     {% if not resource.complete %}
                     <div
                       title="{{ resource.status }}"
@@ -253,154 +371,35 @@
                         {% if resource.downloading %}spin{% endif %}">
                     </div>
                     {% endif %}
-                    {% elif not region_import_running and user.is_superuser %}
-                    <input
-                      type="checkbox"
-                      name="image"
-                      value="{{ resource.os }}/{{ resource.arch }}/{{ resource.subarch }}/{{ resource.release }}"
-                      {% if resource.exists %}
-                      checked="checked"
-                      {% endif %}
-                      >
+                  </td>
+                  <td>{{ resource.title }}
+                    {% if user.is_superuser %}
+                    <a
+                      title="Delete image"
+                      href="{% url 'image-delete' resource.id %}">
+                      <img
+                        class="small-icon"
+                        src="{{ STATIC_URL }}img/delete.png"
+                        alt="delete" />
+                    </a>
                     {% endif %}
                   </td>
-                  <td>{{ resource.title }}</td>
                   <td>{{ resource.arch }}</td>
                   <td>{{ resource.size }}</td>
                   <td>{{ resource.number_of_nodes }}</td>
                   <td>{{ resource.last_update }}</td>
                 </tr>
-              {% endfor %}
+                {% endfor %}
               </tbody>
             </table>
-          </div>
-          <div class="clear"></div>
-          <div class="row space-top end-row">
-            {% if user.is_superuser and not region_import_running %}
-            <div class="col12 last align-right">
-              <input type="submit" class="button" value="Apply changes">
+            {% else %}
+            <div id="no-custom-images" class="images-info">
+              No custom images have been uploaded.
             </div>
             {% endif %}
           </div>
           <div class="clear"></div>
-        </form>
-      </div>
-    </div>
-    {% endif %}
-    {% if generated_resources %}
-    <div id="generated-images" class="section">
-      <h2>Generated Images</h2>
-      <div class="content">
-        <div class="row space-top">
-          <table id="generated-resources" class="space-top list">
-            <thead>
-              <tr>
-                <th class="spinner-col"></th>
-                <th>Name</th>
-                <th>Architecture</th>
-                <th>Size</th>
-                <th>Nodes deployed</th>
-                <th>Last update</th>
-              </tr>
-            </thead>
-            <tbody>
-              {% for resource in generated_resources %}
-              <tr
-                class="{% cycle 'even' 'odd' %}"
-                data-id="{{ resource.id }}">
-                <td>
-                  {% if not resource.complete %}
-                  <div
-                    title="{{ resource.status }}"
-                    class="
-                      spinner
-                      {% if resource.downloading %}spin{% endif %}">
-                  </div>
-                  {% endif %}
-                </td>
-                <td>{{ resource.title }}
-                  {% if user.is_superuser %}
-                  <a
-                    title="Delete image"
-                    href="{% url 'image-delete' resource.id %}">
-                    <img
-                      class="small-icon"
-                      src="{{ STATIC_URL }}img/delete.png"
-                      alt="delete" />
-                  </a>
-                  {% endif %}
-                </td>
-                <td>{{ resource.arch }}</td>
-                <td>{{ resource.size }}</td>
-                <td>{{ resource.number_of_nodes }}</td>
-                <td>{{ resource.last_update }}</td>
-              </tr>
-              {% endfor %}
-            </tbody>
-          </table>
-        </div>
-        <div class="clear"></div>
-        <div class="row space-top end-row"></div>
-        <div class="clear"></div>
-      </div>
-    </div>
-    {% endif %}
-    <div id="custom-images" class="section">
-      <h2>Custom Images</h2>
-      <div class="content">
-        <div class="row space-top">
-          {% if uploaded_resources|length %}
-          <table id="uploaded-resources" class="space-top list">
-            <thead>
-              <tr>
-                <th></th>
-                <th>Name</th>
-                <th>Architecture</th>
-                <th>Size</th>
-                <th>Nodes deployed</th>
-                <th>Last update</th>
-              </tr>
-            </thead>
-            <tbody>
-              {% for resource in uploaded_resources %}
-              <tr class="{% cycle 'even' 'odd' %}">
-                <td>
-                  {% if not resource.complete %}
-                  <div
-                    title="{{ resource.status }}"
-                    class="
-                      spinner
-                      {% if resource.downloading %}spin{% endif %}">
-                  </div>
-                  {% endif %}
-                </td>
-                <td>{{ resource.title }}
-                  {% if user.is_superuser %}
-                  <a
-                    title="Delete image"
-                    href="{% url 'image-delete' resource.id %}">
-                    <img
-                      class="small-icon"
-                      src="{{ STATIC_URL }}img/delete.png"
-                      alt="delete" />
-                  </a>
-                  {% endif %}
-                </td>
-                <td>{{ resource.arch }}</td>
-                <td>{{ resource.size }}</td>
-                <td>{{ resource.number_of_nodes }}</td>
-                <td>{{ resource.last_update }}</td>
-              </tr>
-              {% endfor %}
-            </tbody>
-          </table>
-          {% else %}
-          <div id="no-custom-images" class="images-info">
-            No custom images have been uploaded.
-          </div>
-          {% endif %}
-        </div>
-        <div class="clear"></div>
+        </div>
       </div>
     </div>
 {% endblock %}

=== modified file 'src/maasserver/templates/maasserver/js-conf.html'
--- src/maasserver/templates/maasserver/js-conf.html	2012-06-26 09:47:31 +0000
+++ src/maasserver/templates/maasserver/js-conf.html	2014-10-02 18:55:55 +0000
@@ -14,7 +14,8 @@
         statics: '{{ STATIC_URL }}',
         maas_handler: '{% url "maas_handler" %}',
         nodes_handler: '{% url "nodes_handler" %}',
-        account_handler: '{% url "account_handler" %}'
+        account_handler: '{% url "account_handler" %}',
+        images_handler: '{% url "images" %}'
         },
     debug: {% if YUI_DEBUG %}true{% else %}false{% endif %}
 };

=== modified file 'src/maasserver/views/images.py'
--- src/maasserver/views/images.py	2014-10-02 18:55:55 +0000
+++ src/maasserver/views/images.py	2014-10-02 18:55:55 +0000
@@ -140,7 +140,6 @@
         context['ubuntu_streams_count'] = len(self.ubuntu_sources)
         context['ubuntu_releases'] = self.format_ubuntu_releases()
         context['ubuntu_arches'] = self.format_ubuntu_arches()
-        context['ubuntu_resources'] = self.get_ubuntu_resources()
         context['other_resources'] = self.get_other_resources()
         context['generated_resources'] = self.get_generated_resources()
         context['uploaded_resources'] = self.get_uploaded_resources()
@@ -247,15 +246,6 @@
             else:
                 return resource.name
 
-    def get_ubuntu_resources(self):
-        """Return all Ubuntu resources, for usage in the template."""
-        resources = list(BootResource.objects.filter(
-            rtype=BOOT_RESOURCE_TYPE.SYNCED,
-            name__startswith='ubuntu/').order_by('-name', 'architecture'))
-        for resource in resources:
-            self.add_resource_template_attributes(resource)
-        return resources
-
     def add_resource_template_attributes(self, resource):
         """Adds helper attributes to the resource."""
         resource.title = self.get_resource_title(resource)

=== modified file 'src/maasserver/views/tests/test_images.py'
--- src/maasserver/views/tests/test_images.py	2014-10-02 18:55:55 +0000
+++ src/maasserver/views/tests/test_images.py	2014-10-02 18:55:55 +0000
@@ -43,7 +43,6 @@
     )
 from requests import ConnectionError
 from testtools.matchers import (
-    Contains,
     ContainsAll,
     HasLength,
     )
@@ -62,17 +61,6 @@
         mock_get_os_info.return_value = (sources, releases, arches)
         return mock_get_os_info
 
-    def make_ubuntu_resource(self, release=None):
-        if release is None:
-            release = factory.make_name('release')
-        name = 'ubuntu/%s' % release
-        arch = factory.make_name('arch')
-        subarch = factory.make_name('subarch')
-        architecture = '%s/%s' % (arch, subarch)
-        return factory.make_usable_boot_resource(
-            rtype=BOOT_RESOURCE_TYPE.SYNCED,
-            name=name, architecture=architecture)
-
     def test_shows_connection_error(self):
         self.client_log_in(as_admin=True)
         mock_get_os_info = self.patch(
@@ -128,83 +116,6 @@
         warnings = doc.cssselect('div#missing-ubuntu-images')
         self.assertEqual(1, len(warnings))
 
-    def test_shows_ubuntu_resources(self):
-        self.client_log_in()
-        releases = [factory.make_name('release') for _ in range(3)]
-        [self.make_ubuntu_resource(release) for release in releases]
-        response = self.client.get(reverse('images'))
-        doc = fromstring(response.content)
-        table_content = doc.cssselect(
-            'table#ubuntu-resources')[0].text_content()
-        self.assertThat(table_content, ContainsAll(releases))
-
-    def test_shows_ubuntu_release_version_name(self):
-        self.client_log_in()
-        # Use trusty as known to map to "14.04 LTS"
-        release = 'trusty'
-        version = '14.04 LTS'
-        self.make_ubuntu_resource(release)
-        response = self.client.get(reverse('images'))
-        doc = fromstring(response.content)
-        table_content = doc.cssselect(
-            'table#ubuntu-resources')[0].text_content()
-        self.assertThat(table_content, Contains(version))
-
-    def test_shows_number_of_nodes_deployed_for_ubuntu_resource(self):
-        self.client_log_in()
-        resource = self.make_ubuntu_resource()
-        os_name, series = resource.name.split('/')
-        number_of_nodes = random.randint(1, 4)
-        for _ in range(number_of_nodes):
-            factory.make_Node(
-                status=NODE_STATUS.DEPLOYED,
-                osystem=os_name, distro_series=series,
-                architecture=resource.architecture)
-        response = self.client.get(reverse('images'))
-        doc = fromstring(response.content)
-        count = int(doc.cssselect(
-            'table#ubuntu-resources > tbody > tr > td')[4].text_content())
-        self.assertEqual(number_of_nodes, count)
-
-    def test_shows_number_of_default_nodes_deployed_for_ubuntu_resource(self):
-        self.client_log_in()
-        resource = self.make_ubuntu_resource()
-        os_name, series = resource.name.split('/')
-        Config.objects.set_config('default_osystem', os_name)
-        Config.objects.set_config('default_distro_series', series)
-        number_of_nodes = random.randint(1, 4)
-        for _ in range(number_of_nodes):
-            factory.make_Node(
-                status=NODE_STATUS.DEPLOYED,
-                architecture=resource.architecture)
-        response = self.client.get(reverse('images'))
-        doc = fromstring(response.content)
-        count = int(doc.cssselect(
-            'table#ubuntu-resources > tbody > tr > td')[4].text_content())
-        self.assertEqual(number_of_nodes, count)
-
-    def test_shows_number_of_nodes_deployed_for_ubuntu_subarch_resource(self):
-        self.client_log_in()
-        resource = self.make_ubuntu_resource()
-        arch, subarch = resource.split_arch()
-        extra_subarch = factory.make_name('subarch')
-        resource.extra['subarches'] = ','.join([subarch, extra_subarch])
-        resource.save()
-
-        os_name, series = resource.name.split('/')
-        node_architecture = '%s/%s' % (arch, extra_subarch)
-        number_of_nodes = random.randint(1, 4)
-        for _ in range(number_of_nodes):
-            factory.make_Node(
-                status=NODE_STATUS.DEPLOYED,
-                osystem=os_name, distro_series=series,
-                architecture=node_architecture)
-        response = self.client.get(reverse('images'))
-        doc = fromstring(response.content)
-        count = int(doc.cssselect(
-            'table#ubuntu-resources > tbody > tr > td')[4].text_content())
-        self.assertEqual(number_of_nodes, count)
-
     def test_hides_import_button_if_not_admin(self):
         self.client_log_in()
         sources = [factory.make_BootSource()]
@@ -225,18 +136,6 @@
             '#ubuntu-images')[0].cssselect('input[type="submit"]')
         self.assertEqual(1, len(import_button))
 
-    def test_hides_import_button_if_import_running(self):
-        self.client_log_in()
-        sources = [factory.make_BootSource()]
-        self.patch_get_os_info_from_boot_sources(sources)
-        self.patch(
-            images_view, 'is_import_resources_running').return_value = True
-        response = self.client.get(reverse('images'))
-        doc = fromstring(response.content)
-        import_button = doc.cssselect(
-            '#ubuntu-images')[0].cssselect('input[type="submit"]')
-        self.assertEqual(0, len(import_button))
-
     def test_post_returns_forbidden_if_not_admin(self):
         self.client_log_in()
         response = self.client.post(