Merge lp:~allenap/maas/ns-tags-commissioning--bug-1255479--port-to-1.4 into lp:maas/1.4

[Gavin Panella]

Backport trunk r1751: Don't recalculate tags in update_hardware_details(); only do it when commissioning finishes.

[Gavin Panella (allenap)]

Already reviewed into trunk:
  https://code.launchpad.net/~allenap/maas/ns-tags-commissioning--bug-1255479/+merge/197377

review: Approve

[Gavin Panella (allenap)]

Merged by hand; lander not operational.

=== modified file 'docs/development/tagging.rst'
--- docs/development/tagging.rst	2013-10-01 10:35:02 +0000
+++ docs/development/tagging.rst	2013-12-02 14:37:37 +0000
@@ -60,27 +60,15 @@
 New or updated commissioning result
 -----------------------------------
 
-When a new commissioning result comes in containing ``lshw`` XML
-output, every tag with an expression must be evaluated against the
+When a new commissioning result comes in containing ``lshw`` or ``lldp``
+XML output, every tag with an expression must be evaluated against the
 result so that the node is correctly tagged.
 
-To do this, ``maasserver.models.node.update_hardware_details`` is
-called. This happens in the **region**. While it's a computationally
-expensive operation, the overhead of spinning this work out to a
-cluster controller negates any benefit that might gained by doing so.
-
-This:
-
-#. Saves the raw ``lshw`` XML.
-
-#. Extracts CPU, memory, and storage numbers from the hardware
-   information, and saves these. This does not affect tag processing,
-   but it's worth knowing that the first-class constraint axes that
-   are exposed via the ``acquire()`` API call are derived from the
-   same source as tag expressions consume.
-
-#. Evaluates each tag expression and updates the node's tags as
-   appropriate.
+To do this, ``maasserver.api.VersionIndexHandler.signal`` calls
+``populate_tags_for_single_node`` just before saving all the changes.
+This happens in the **region**. While it's a computationally expensive
+operation, the overhead of spinning this work out to a cluster
+controller negates any benefit that might gained by doing so.
 
 
 Manual tags, or tags without expressions

=== modified file 'src/metadataserver/models/commissioningscript.py'
--- src/metadataserver/models/commissioningscript.py	2013-10-09 20:28:02 +0000
+++ src/metadataserver/models/commissioningscript.py	2013-12-02 14:37:37 +0000
@@ -167,14 +167,6 @@
         node.cpu_count = cpu_count or 0
         node.memory = memory
         node.storage = storage
-        for tag in Tag.objects.all():
-            if not tag.definition:
-                continue
-            has_tag = evaluator(tag.definition)
-            if has_tag:
-                node.tags.add(tag)
-            else:
-                node.tags.remove(tag)
         node.save()
 
 

=== modified file 'src/metadataserver/models/tests/test_commissioningscript.py'
--- src/metadataserver/models/tests/test_commissioningscript.py	2013-10-09 22:32:55 +0000
+++ src/metadataserver/models/tests/test_commissioningscript.py	2013-12-02 14:37:37 +0000
@@ -39,7 +39,6 @@
 from maasserver.testing import reload_object
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
-from maasserver.utils import ignore_unused
 from maastesting.matchers import ContainsAll
 from maastesting.utils import sample_binary_data
 from metadataserver.fields import Bin
@@ -512,27 +511,6 @@
         expected = (4294967296 + 3221225472 + 536879812) / mega
         self.assertEqual(expected, node.memory)
 
-    def test_hardware_updates_tags_match(self):
-        tag1 = factory.make_tag(factory.getRandomString(10), "/node")
-        tag2 = factory.make_tag(factory.getRandomString(10), "//node")
-        node = factory.make_node()
-        xmlbytes = '<node/>'.encode("utf-8")
-        update_hardware_details(node, xmlbytes, 0)
-        node = reload_object(node)
-        self.assertEqual([tag1, tag2], list(node.tags.all()))
-
-    def test_hardware_updates_tags_no_match(self):
-        tag1 = factory.make_tag(factory.getRandomString(10), "/missing")
-        ignore_unused(tag1)
-        tag2 = factory.make_tag(factory.getRandomString(10), "/nothing")
-        node = factory.make_node()
-        node.tags = [tag2]
-        node.save()
-        xmlbytes = '<node/>'.encode("utf-8")
-        update_hardware_details(node, xmlbytes, 0)
-        node = reload_object(node)
-        self.assertEqual([], list(node.tags.all()))
-
     def test_hardware_updates_ignores_empty_tags(self):
         # Tags with empty definitions are ignored when
         # update_hardware_details gets called.