Merge lp:~lamont/maas/domain-detail into lp:maas

Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: 4668
Merged at revision: 4670
Proposed branch: lp:~lamont/maas/domain-detail
Merge into: lp:maas
Diff against target: 1965 lines (+914/-228)
31 files modified
services/rackd/run (+1/-1)
src/maasserver/api/dnsresourcerecords.py (+4/-0)
src/maasserver/api/ip_addresses.py (+9/-4)
src/maasserver/api/tests/test_dnsresourcerecords.py (+24/-0)
src/maasserver/api/tests/test_ipaddresses.py (+59/-0)
src/maasserver/dns/config.py (+13/-2)
src/maasserver/dns/tests/test_config.py (+64/-4)
src/maasserver/dns/tests/test_zonegenerator.py (+30/-22)
src/maasserver/dns/zonegenerator.py (+17/-11)
src/maasserver/models/dnsdata.py (+18/-8)
src/maasserver/models/domain.py (+33/-35)
src/maasserver/models/staticipaddress.py (+28/-12)
src/maasserver/models/tests/test_dnsdata.py (+23/-2)
src/maasserver/models/tests/test_domain.py (+31/-52)
src/maasserver/models/tests/test_node.py (+2/-1)
src/maasserver/models/tests/test_staticipaddress.py (+118/-28)
src/maasserver/static/js/angular/controllers/domain_details.js (+61/-0)
src/maasserver/static/js/angular/controllers/domains_list.js (+1/-1)
src/maasserver/static/js/angular/controllers/tests/test_domain_details.js (+158/-0)
src/maasserver/static/js/angular/controllers/tests/test_domains_list.js (+95/-0)
src/maasserver/static/js/angular/controllers/tests/test_networks_list.js (+2/-2)
src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js (+2/-2)
src/maasserver/static/js/angular/maas.js (+8/-0)
src/maasserver/static/partials/domain-details.html (+56/-0)
src/maasserver/static/partials/domains-list.html (+10/-12)
src/maasserver/static/partials/subnet-details.html (+7/-2)
src/maasserver/testing/factory.py (+9/-3)
src/maasserver/views/combo.py (+1/-0)
src/maasserver/websockets/handlers/domain.py (+4/-4)
src/maasserver/websockets/handlers/tests/test_domain.py (+22/-18)
src/provisioningserver/dns/tests/test_zoneconfig.py (+4/-2)
To merge this branch: bzr merge lp:~lamont/maas/domain-detail
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Blake Rouse (community) Needs Fixing
Review via email: mp+285794@code.launchpad.net

Commit message

Add domain-details page, read only.

Description of the change

Add domain-details page, read only.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

I basically approve, but please check my comments below regarding some mostly-minor nits.

Also, after staring at your HTML and JavaScript long enough, I convinced myself that it was good, but that was after the text morphed into a minotaur and said "ENOUGH! SHIP IT!". And I said "BACK, VILE BEAST! SHOW ME YOUR UNIT TESTS!" ... and it screamed a horrible scream and turned into a pile of dust.

So yeah. Please add a unit test for the new controller. =)

Also, what I think I'm trying to say is, I'd feel more comfortable Blake reviews lines 874 through 1093. ;-)

review: Needs Fixing
Revision history for this message
LaMont Jones (lamont) wrote :

Addressed the various.

Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks almost there. Couple of issues to fix.

review: Approve
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Sorry that was wrong.

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

Thanks for adding the tests.

My only (minor) nit was that when I read the test case, it wasn't immediately obvious why you expected it to fail. (because the Domain object didn't exist, I think) Adding a comment might help future readers.

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

The attempt to merge lp:~lamont/maas/domain-detail into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [95.8 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 95.8 kB in 0s (216 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb 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 postgresql pxelinux python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-seamicroclient python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu1).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.9.5.dfsg-12.1ubuntu1).
bind9utils is already the newest version (1:9.9.5.dfsg-12.1ubuntu1).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu1).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.28ubuntu2).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.9.5.dfsg-12.1ubuntu1).
firefox is already the newest version (44.0.2+build1-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.0-1).
isc-dhcp-common is already the newest version (4.3.3-5ubuntu4).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-jquery-hotkeys is already the newest version (0~20130707+git2d51e3a9+dfsg-2ubuntu1).
libjs-yui3-full is already the n...