Merge lp:~mpontillo/maas/bug-1537257-triage-1.10 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Add unit test for problem described by bug #1537257.

=== modified file 'required-packages/base'
--- required-packages/base	2016-01-19 22:36:17 +0000
+++ required-packages/base	2016-01-26 01:18:12 +0000
@@ -11,6 +11,7 @@
 libjs-jquery
 libjs-yui3-min
 libpq-dev
+<<<<<<< TREE
 postgresql-9.4
 python-bson
 python-crochet
@@ -25,6 +26,22 @@
 python-tempita
 python-twisted
 python-yaml
+=======
+postgresql
+python-bson
+python-crochet
+python-django
+python-django-piston
+python-djorm-ext-pgarray
+python-formencode
+python-lxml
+python-netaddr
+python-netifaces
+python-psycopg2
+python-tempita
+python-twisted
+python-yaml
+>>>>>>> MERGE-SOURCE
 python3-apt
 python3-bson
 python3-convoy

=== modified file 'src/maasserver/tests/test_forms_nodegroup.py'
--- src/maasserver/tests/test_forms_nodegroup.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/tests/test_forms_nodegroup.py	2016-01-26 01:18:12 +0000
@@ -26,7 +26,7 @@
 from maasserver.models import (
     NodeGroup,
     NodeGroupInterface,
-)
+    Fabric)
 from maasserver.testing.factory import factory
 from maasserver.testing.orm import reload_object
 from maasserver.testing.testcase import MAASServerTestCase
@@ -36,7 +36,7 @@
     HasLength,
     MatchesStructure,
     StartsWith,
-)
+    Equals)
 
 
 class TestNodeGroupDefineForm(MAASServerTestCase):
@@ -348,6 +348,70 @@
             ipv4_network,
             interfaces_by_name[network_interface].network)
 
+    def test_creates_appropriate_fabric_layout(self):
+        name = factory.make_name('name')
+        uuid = factory.make_UUID()
+        interfaces = [
+            {'interface': 'bond0',
+             'ip': '92.140.99.3',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond0.100',
+             'ip': '92.140.100.3',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond0.101',
+             'ip': '92.140.101.3',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond0.102',
+             'ip': '92.140.102.3',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond0.103',
+             'ip': '92.140.103.3',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond1',
+             'ip': '78.146.99.12',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond1.200',
+             'ip': '78.146.200.12',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond1.201',
+             'ip': '78.146.201.12',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond1.202',
+             'ip': '78.146.202.12',
+             'subnet_mask': '255.255.255.0'},
+            {'interface': 'bond1.203',
+             'ip': '78.146.203.12',
+             'subnet_mask': '255.255.255.0'},
+        ]
+        input_json = {
+            "bond0": {"type": "ethernet.bond"},
+            "bond0.100": {"type": "ethernet.vlan", "parent": "bond0"},
+            "bond0.101": {"type": "ethernet.vlan", "parent": "bond0"},
+            "bond0.102": {"type": "ethernet.vlan", "parent": "bond0"},
+            "bond0.103": {"type": "ethernet.vlan", "parent": "bond0"},
+            "bond1": {"type": "ethernet.bond"},
+            "bond1.200": {"type": "ethernet.vlan", "parent": "bond1"},
+            "bond1.201": {"type": "ethernet.vlan", "parent": "bond1"},
+            "bond1.202": {"type": "ethernet.vlan", "parent": "bond1"},
+            "bond1.203": {"type": "ethernet.vlan", "parent": "bond1"},
+        }
+        form = NodeGroupDefineForm(
+            data={
+                'name': name,
+                'uuid': uuid,
+                'interfaces': json.dumps(interfaces),
+                'ip_addr_json': json.dumps(input_json),
+                })
+        self.assertTrue(form.is_valid(), form._errors)
+        self.assertThat(Fabric.objects.count(), Equals(1))
+        form.save()
+        # After saving the form, there should be two Fabric objects, with
+        # five VLANs each.
+        self.assertThat(Fabric.objects.count(), Equals(2))
+        for fabric in Fabric.objects.all():
+            self.assertThat(fabric.vlan_set.count(), Equals(5))
+
+
 
 class TestNodeGroupEdit(MAASServerTestCase):