MAAS

Merge lp:~blake-rouse/maas/fix-1512959 into lp:~maas-committers/maas/trunk

  1. fix-1512959
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4469
Proposed branch: lp:~blake-rouse/maas/fix-1512959
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 65 lines (+13/-8)
2 files modified
src/maasserver/api/tests/test_blockdevice.py (+4/-4)
src/maasserver/enum.py (+9/-4)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1512959
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Jeffrey C Jones (community) Approve
Review via email: mp+276694@code.launchpad.net

Commit message

Remove EXT3 and add EXT2 and VFAT.

To post a comment you must log in.
Revision history for this message
Jeffrey C Jones (trapnine) wrote :

looks good

review: Approve
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good to me.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1013.9 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1512959 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:3 http://security.ubuntu.com trusty-security/main Sources [98.0 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [242 kB]
Get:5 http://security.ubuntu.com trusty-security/universe Sources [31.0 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [361 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [143 kB]
Get:8 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [644 kB]
Get:9 http://security.ubuntu.com trusty-security/universe amd64 Packages [117 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [326 kB]
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 2,092 kB in 4s (510 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-te...

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1013.9 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1512959 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:3 http://security.ubuntu.com trusty-security/main Sources [98.0 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [242 kB]
Get:5 http://security.ubuntu.com trusty-security/universe Sources [31.0 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [361 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [143 kB]
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [117 kB]
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [644 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [326 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 2,092 kB in 4s (503 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-te...

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1013.7 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1512959 into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txtftp python-tz python-unittest2 python-virtualenv python-yaml python-zope.interface socat syslinux-common tgt ubuntu-...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api/tests/test_blockdevice.py'
2--- src/maasserver/api/tests/test_blockdevice.py 2015-10-27 20:53:16 +0000
3+++ src/maasserver/api/tests/test_blockdevice.py 2015-11-05 14:26:55 +0000
4@@ -353,10 +353,10 @@
5 # Use PartitionTable methods that auto-size and position partitions
6 partition1 = partition_table.add_partition(size=50000 * block_size)
7 partition2 = partition_table.add_partition()
8- filesystem1 = factory.make_Filesystem(partition=partition1,
9- fstype='ext4')
10- filesystem2 = factory.make_Filesystem(partition=partition2,
11- fstype='ext3')
12+ filesystem1 = factory.make_Filesystem(
13+ partition=partition1, fstype=FILESYSTEM_TYPE.EXT4)
14+ filesystem2 = factory.make_Filesystem(
15+ partition=partition2, fstype=FILESYSTEM_TYPE.EXT2)
16 uri = get_blockdevice_uri(block_device)
17 response = self.client.get(uri)
18 self.assertEqual(httplib.OK, response.status_code, response.content)
19
20=== modified file 'src/maasserver/enum.py'
21--- src/maasserver/enum.py 2015-10-27 20:19:30 +0000
22+++ src/maasserver/enum.py 2015-11-05 14:26:55 +0000
23@@ -393,8 +393,8 @@
24
25 class FILESYSTEM_TYPE:
26 """The vocabulary of possible partition types for `Filesystem`."""
27- #: Third extended filesystem.
28- EXT3 = 'ext3'
29+ #: Second extended filesystem.
30+ EXT2 = 'ext2'
31
32 #: Fourth extended filesystem.
33 EXT4 = 'ext4'
34@@ -402,6 +402,9 @@
35 #: FAT32
36 FAT32 = 'fat32'
37
38+ #: VFAT
39+ VFAT = 'vfat'
40+
41 #: LVM Physical Volume.
42 LVM_PV = 'lvm-pv'
43
44@@ -421,9 +424,10 @@
45 # Django choices for FILESYSTEM_TYPE: sequence of tuples (key, UI
46 # representation).
47 FILESYSTEM_TYPE_CHOICES = (
48- (FILESYSTEM_TYPE.EXT3, "ext3"),
49+ (FILESYSTEM_TYPE.EXT2, "ext2"),
50 (FILESYSTEM_TYPE.EXT4, "ext4"),
51 (FILESYSTEM_TYPE.FAT32, "fat32"),
52+ (FILESYSTEM_TYPE.VFAT, "vfat"),
53 (FILESYSTEM_TYPE.LVM_PV, "lvm"),
54 (FILESYSTEM_TYPE.RAID, "raid"),
55 (FILESYSTEM_TYPE.RAID_SPARE, "raid-spare"),
56@@ -436,9 +440,10 @@
57 # representation). When a user does a format operation only these values
58 # are allowed. The other values are reserved for internal use.
59 FILESYSTEM_FORMAT_TYPE_CHOICES = (
60- (FILESYSTEM_TYPE.EXT3, "ext3"),
61+ (FILESYSTEM_TYPE.EXT2, "ext2"),
62 (FILESYSTEM_TYPE.EXT4, "ext4"),
63 (FILESYSTEM_TYPE.FAT32, "fat32"),
64+ (FILESYSTEM_TYPE.VFAT, "vfat"),
65 )
66
67