Merge lp:~allenap/maas/add-remove-tag-using-post--bug-1611711--2.0 into lp:maas/2.0

[Gavin Panella]

Backport r5236 from lp:maas: Switch BlockDevice.add_tag and remove_tag to be POST operations rather than GET.

[Gavin Panella (allenap)]

Self-review.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~allenap/maas/add-remove-tag-using-post--bug-1611711--2.0 into lp:maas/2.0 failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [314 kB]
Fetched 409 kB in 0s (876 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr 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-all python3-apt python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools 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-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netad...

[Gavin Panella (allenap)]

Spurious failure in maasserver.tests.test_dhcp.TestValidateDHCPConfig.test__calls_validate_for_both_ipv4_and_ipv6.

=== modified file 'src/maasserver/api/blockdevices.py'
--- src/maasserver/api/blockdevices.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/api/blockdevices.py	2016-08-15 08:43:51 +0000
@@ -267,7 +267,7 @@
         else:
             raise MAASAPIValidationError(form.errors)
 
-    @operation(idempotent=True)
+    @operation(idempotent=False)
     def add_tag(self, request, system_id, device_id):
         """Add a tag to block device on a machine.
 
@@ -283,11 +283,11 @@
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
                 "Cannot update block device because the machine is not Ready.")
-        device.add_tag(get_mandatory_param(request.GET, 'tag'))
+        device.add_tag(get_mandatory_param(request.POST, 'tag'))
         device.save()
         return device
 
-    @operation(idempotent=True)
+    @operation(idempotent=False)
     def remove_tag(self, request, system_id, device_id):
         """Remove a tag from block device on a machine.
 
@@ -303,7 +303,7 @@
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
                 "Cannot update block device because the machine is not Ready.")
-        device.remove_tag(get_mandatory_param(request.GET, 'tag'))
+        device.remove_tag(get_mandatory_param(request.POST, 'tag'))
         device.save()
         return device
 

=== modified file 'src/maasserver/api/tests/test_blockdevice.py'
--- src/maasserver/api/tests/test_blockdevice.py	2016-05-24 22:05:45 +0000
+++ src/maasserver/api/tests/test_blockdevice.py	2016-08-15 08:43:51 +0000
@@ -422,7 +422,7 @@
     def test_add_tag_returns_403_when_not_admin(self):
         block_device = factory.make_PhysicalBlockDevice()
         uri = get_blockdevice_uri(block_device)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'add_tag', 'tag': factory.make_name('tag')})
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
@@ -432,7 +432,7 @@
         block_device = factory.make_PhysicalBlockDevice()
         other_node = factory.make_Node()
         uri = get_blockdevice_uri(block_device, node=other_node)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'add_tag', 'tag': factory.make_name('tag')})
         self.assertEqual(
             http.client.NOT_FOUND, response.status_code, response.content)
@@ -443,7 +443,7 @@
             status=factory.pick_enum(NODE_STATUS, but_not=[NODE_STATUS.READY]))
         block_device = factory.make_VirtualBlockDevice(node=node)
         uri = get_blockdevice_uri(block_device)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'add_tag', 'tag': factory.make_name('tag')})
         self.assertEqual(
             http.client.CONFLICT, response.status_code, response.content)
@@ -454,7 +454,7 @@
         block_device = factory.make_PhysicalBlockDevice(node=node)
         tag_to_be_added = factory.make_name('tag')
         uri = get_blockdevice_uri(block_device)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'add_tag', 'tag': tag_to_be_added})
 
         self.assertEqual(
@@ -467,7 +467,7 @@
     def test_remove_tag_returns_403_when_not_admin(self):
         block_device = factory.make_PhysicalBlockDevice()
         uri = get_blockdevice_uri(block_device)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'remove_tag', 'tag': factory.make_name('tag')})
 
         self.assertEqual(
@@ -478,7 +478,7 @@
         block_device = factory.make_PhysicalBlockDevice()
         other_node = factory.make_Node()
         uri = get_blockdevice_uri(block_device, node=other_node)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'remove_tag', 'tag': factory.make_name('tag')})
 
         self.assertEqual(
@@ -490,7 +490,7 @@
             status=factory.pick_enum(NODE_STATUS, but_not=[NODE_STATUS.READY]))
         block_device = factory.make_PhysicalBlockDevice(node=node)
         uri = get_blockdevice_uri(block_device)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'remove_tag', 'tag': factory.make_name('tag')})
 
         self.assertEqual(
@@ -502,7 +502,7 @@
         block_device = factory.make_PhysicalBlockDevice(node=node)
         tag_to_be_removed = block_device.tags[0]
         uri = get_blockdevice_uri(block_device)
-        response = self.client.get(
+        response = self.client.post(
             uri, {'op': 'remove_tag', 'tag': tag_to_be_removed})
 
         self.assertEqual(