Merge into trunk : check_valid_inter

Status:

Merged

Approved by:

Raphaël Badin on 2014-06-23

Approved revision:

no longer in the source branch.

Merged at revision:

2454

Proposed branch:

lp:~rvb/maas/check_valid_inter_network

Merge into:

lp:~maas-committers/maas/trunk

Diff against target:

51 lines (+25/-1)

2 files modified

src/maasserver/api.py (+7/-1)
src/maasserver/tests/test_api_nodegroup.py (+18/-0)

To merge this branch:

bzr merge lp:~rvb/maas/check_valid_inter_network

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)		2014-06-23	Approve on 2014-06-23
Review via email: mp+224082@code.launchpad.net

Commit message

Skip unconfigured interfaces in update_mac_cluster_interfaces.

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2014-06-23:

#

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

review: approve

On 23/06/14 19:47, Raphaël Badin wrote:
> for interface in cluster.nodegroupinterface_set.all(): + #
> Skip unconfigured interfaces. + if interface.network is
> None: + break

Looks good. Is it worth putting this in a query to do it all in one
go? The conditional break is kinda ugly.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlOn/8cACgkQWhGlTF8G/Hf0wgCfTNTPAmcesJiCAQDoS3JX6tZ8
UYUAnA3y7jw4WhjWBxbXjHM/70e7FBgc
=RqOV
-----END PGP SIGNATURE-----

review: Approve

Revision history for this message

Raphaël Badin (rvb) wrote on 2014-06-23:

#

> Looks good. Is it worth putting this in a query to do it all in one
> go? The conditional break is kinda ugly.

Good point, done.

Thanks for the review.

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-06-23:

#

Download full text (17.5 KiB)

The attempt to merge lp:~rvb/maas/check_valid_inter_network into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [58.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [58.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [25.3 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [4,727 B]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [87.2 kB]
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
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [28.0 kB]
Get:9 http://security.ubuntu.com trusty-security/main Translation-en [39.0 kB]
Get:10 http://security.ubuntu.com trusty-security/universe Translation-en [15.1 kB]
Ign http://security.ubuntu.com trusty-security/main Translation-en_US
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [67.1 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [51.1 kB]
Get:13 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [165 kB]
Get:14 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [125 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
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 727 kB in 0s (1,661 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy 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-formencode python-hi...

The attempt to merge lp:~rvb/maas/check_valid_inter_network into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [58.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [58.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [25.3 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [4,727 B]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [87.2 kB]
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
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [28.0 kB]
Get:9 http://security.ubuntu.com trusty-security/main Translation-en [39.0 kB]
Get:10 http://security.ubuntu.com trusty-security/universe Translation-en [15.1 kB]
Ign http://security.ubuntu.com trusty-security/main Translation-en_US
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [67.1 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [51.1 kB]
Get:13 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [165 kB]
Get:14 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [125 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
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 727 kB in 0s (1,661 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy 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-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplestreams python-sphinx python-tempita python-twisted python-txamqp python-txlongpoll python-txtftp python-virtualenv python-yaml rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
freeipmi-tools is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
libpq-dev is already the newest version.
make is already the newest version.
postgresql is already the newest version.
python-amqplib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-curtin is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplestreams is already the newest version.
python-tempita is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-txtftp is already the newest version.
python-yaml is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
dh-apport is already the newest version.
firefox is already the newest version.
python-bzrlib is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-sphinx is already the newest version.
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 3 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge python-librabbitmq
Reading package lists...
Building dependency tree...
Reading state information...
Package 'python-librabbitmq' is not installed, so not removed
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 3 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.KCCceo/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.KCCceo/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.KCCceo
New python executable in /tmp/tarmac/branch.KCCceo/bin/python2.7
Also creating executable in /tmp/tarmac/branch.KCCceo/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/tmp/tarmac/branch.KCCceo/parts'.
Creating directory '/tmp/tarmac/branch.KCCceo/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.KCCceo/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.KCCceo/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.KCCceo/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.KCCceo/bin/celeryd.region'.
Generated script '/tmp/tarmac/branch.KCCceo/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.KCCceo/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.KCCceo/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.KCCceo/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.KCCceo/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.KCCceo/bin/celeryd.cluster'.
Generated script '/tmp/tarmac/branch.KCCceo/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.KCCceo/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.KCCceo/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.KCCceo/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.KCCceo/bin/maas-probe-dhcp'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/tmp/tarmac/branch.KCCceo/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.KCCceo/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.KCCceo/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
bin/buildout install maas
Updating maas.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.599s

OK
..S...............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................F.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
======================================================================
FAIL: maasserver.tests.test_api_nodegroup.TestUpdateMacClusterInterfaces.test_updates_mac_cluster_interfaces
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.KCCceo/src/maasserver/tests/test_api_nodegroup.py", line 829, in test_updates_mac_cluster_interfaces
    self.assertEqual(mac_addresses, results)
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 324, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 414, in assertThat
    raise MismatchError(matchee, matcher, mismatch, verbose)
MismatchError: !=:
reference = {<MACAddress: 13:dd:5c:e1:6e:26>: <NodeGroupInterface 6d108a5a-fad6-11e3-9bef-fa163e4ecfce,interface-fqvylH>,
 <MACAddress: b2:f6:88:1a:e6:11>: <NodeGroupInterface 6d108a5a-fad6-11e3-9bef-fa163e4ecfce,interface-fqvylH>,
 <MACAddress: ed:b2:64:6f:ea:a2>: <NodeGroupInterface 6d108a5a-fad6-11e3-9bef-fa163e4ecfce,interface-yHp5Pa>,
 <MACAddress: 9e:d4:df:83:97:e1>: <NodeGroupInterface 6d108a5a-fad6-11e3-9bef-fa163e4ecfce,interface-yHp5Pa>}
actual    = {<MACAddress: ed:b2:64:6f:ea:a2>: None,
 <MACAddress: b2:f6:88:1a:e6:11>: None,
 <MACAddress: 9e:d4:df:83:97:e1>: None,
 <MACAddress: 13:dd:5c:e1:6e:26>: None}

----------------------------------------------------------------------
Ran 2641 tests in 1630.380s

FAILED (SKIP=2, failures=1)
...........................................................................................................
----------------------------------------------------------------------
Ran 107 tests in 1.572s

OK
..............................................................S..S.....................................................................
----------------------------------------------------------------------
Ran 135 tests in 2.475s

OK (SKIP=2)
..........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................SSSS........................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1046 tests in 39.405s

OK (SKIP=4)
make: *** [test] Error 123

 === modified file 'src/maasserver/api.py'
 --- src/maasserver/api.py	2014-06-20 13:38:39 +0000
 +++ src/maasserver/api.py	2014-06-23 14:36:15 +0000
@@ -1522,7 +1522,13 @@
  def update_mac_cluster_interfaces(leases, cluster):
      """Calculate and store which interface a MAC is attached to."""
      interface_ranges = {}
--    for interface in cluster.nodegroupinterface_set.all():
++    # Only consider configured interfaces.
++    interfaces = (
++        cluster.nodegroupinterface_set
++        .exclude(ip_range_low__isnull=True)
++        .exclude(ip_range_high__isnull=True)
++    )
++    for interface in interfaces:
          ip_range = netaddr.IPRange(
              interface.ip_range_low, interface.ip_range_high)
          interface_ranges[interface] = ip_range
 === modified file 'src/maasserver/tests/test_api_nodegroup.py'
 --- src/maasserver/tests/test_api_nodegroup.py	2014-06-18 20:43:23 +0000
 +++ src/maasserver/tests/test_api_nodegroup.py	2014-06-23 14:36:15 +0000
@@ -30,6 +30,7 @@
  from maasserver.enum import (
      NODEGROUP_STATUS,
      NODEGROUP_STATUS_CHOICES,
++    NODEGROUPINTERFACE_MANAGEMENT,
+     )
  from maasserver.models import (
      Config,
@@ -850,3 +851,20 @@
          update_mac_cluster_interfaces(leases, cluster)
          self.assertFalse(
              MACAddress.objects.filter(mac_address=mac_address).exists())
++
++    def test_ignores_unconfigured_interfaces(self):
++        cluster = factory.make_node_group()
++        factory.make_node_group_interface(
++            nodegroup=cluster, subnet_mask='', broadcast_ip='',
++            static_ip_range_low='', static_ip_range_high='',
++            ip_range_low='', ip_range_high='', router_ip='',
++            ip=factory.getRandomIPAddress(),
++            management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
++        mac_address = factory.getRandomMACAddress()
++        leases = {
++            factory.getRandomIPAddress(): mac_address
++            }
++        self.assertIsNone(update_mac_cluster_interfaces(leases, cluster))
++        # The real test is that update_mac_cluster_interfaces() doesn't
++        # stacktrace because of the unconfigured interface (see bug
++        # 1332596).

MAAS

Merge lp:~rvb/maas/check_valid_inter_network into lp:~maas-committers/maas/trunk

Commit message

Description of the change

Preview Diff

Subscribers