Merge ~ltrager/maas:network_testing_models into maas:master

[Lee Trager]

Add database columns for network testing

[Newell Jensen (newell-jensen)]

Follows the spec. Looks good.

review: Approve

[Blake Rouse (blake-rouse)]

Looks good to me.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b network_testing_models lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5836/consoleText

e807550... by Lee Trager on 2019-06-07

Fix failing test

diff --git a/src/maasserver/forms/tests/test_pods.py b/src/maasserver/forms/tests/test_pods.py
index 948d4ce..03d332a 100644
--- a/src/maasserver/forms/tests/test_pods.py
+++ b/src/maasserver/forms/tests/test_pods.py
@@ -1869,9 +1869,9 @@ class TestGetKnownHostInterfaces(MAASServerTestCase):
         node = factory.make_Machine_with_Interface_on_Subnet()
         node.interface_set.all().delete()
         bridge = factory.make_Interface(
-            iftype=INTERFACE_TYPE.BRIDGE, node=node, disconnected=True)
+            iftype=INTERFACE_TYPE.BRIDGE, node=node, link_connected=False)
         physical = factory.make_Interface(
-            iftype=INTERFACE_TYPE.PHYSICAL, node=node, disconnected=True)
+            iftype=INTERFACE_TYPE.PHYSICAL, node=node, link_connected=False)
         interfaces = get_known_host_interfaces(node)
         self.assertItemsEqual(
             interfaces, [
diff --git a/src/maasserver/migrations/maasserver/0188_network_testing.py b/src/maasserver/migrations/maasserver/0188_network_testing.py
 new file mode 100644
index 0000000..bb9e267
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0188_network_testing.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2019-06-07 19:40
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0187_status_messages_change_event_logging_levels'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='interface',
+            name='interface_speed',
+            field=models.PositiveIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='link_connected',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='link_speed',
+            field=models.PositiveIntegerField(default=0),
+        ),
+    ]
diff --git a/src/maasserver/models/interface.py b/src/maasserver/models/interface.py
index 842e0e8..6b5932e 100644
--- a/src/maasserver/models/interface.py
+++ b/src/maasserver/models/interface.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Model for interfaces."""
@@ -28,6 +28,7 @@ from django.db.models import (
     ForeignKey,
     Manager,
     ManyToManyField,
+    PositiveIntegerField,
     PROTECT,
     Q,
     TextField,
@@ -571,6 +572,15 @@ class Interface(CleanSave, TimestampedModel):
         max_length=255, blank=True, null=True,
         help_text="Firmware version of the interface.")
 
+    # Whether or not the Interface is physically connected to an uplink.
+    link_connected = BooleanField(default=True)
+
+    # The speed of the interface in Mbit/s
+    interface_speed = PositiveIntegerField(default=0)
+
+    # The speed of the link in Mbit/s
+    link_speed = PositiveIntegerField(default=0)
+
     def __init__(self, *args, **kwargs):
         type = kwargs.get('type', self.get_type())
         kwargs['type'] = type
@@ -1475,6 +1485,14 @@ class Interface(CleanSave, TimestampedModel):
             'mdns': self.mdns_discovery_state,
         }
 
+    def save(self, *args, **kwargs):
+        if (self.link_speed > self.interface_speed and
+                self.interface_speed != 0):
+            raise ValidationError('link_speed may not exceed interface_speed')
+        if not self.link_connected:
+            self.link_speed = 0
+        return super().save(*args, **kwargs)
+
 
 class InterfaceRelationship(CleanSave, TimestampedModel):
     child = ForeignKey(
diff --git a/src/maasserver/models/tests/test_interface.py b/src/maasserver/models/tests/test_interface.py
index 36cd455..934705d 100644
--- a/src/maasserver/models/tests/test_interface.py
+++ b/src/maasserver/models/tests/test_interface.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the Interface model."""
@@ -873,7 +873,7 @@ class InterfaceTest(MAASServerTestCase):
         mac = factory.make_MAC()
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL,
-            name=name, node=node, mac_address=mac, disconnected=True)
+            name=name, node=node, mac_address=mac, link_connected=False)
         self.assertThat(interface, MatchesStructure.byEquality(
             name=name, node=node, mac_address=mac,
             type=INTERFACE_TYPE.PHYSICAL, vlan=None))
@@ -884,7 +884,7 @@ class InterfaceTest(MAASServerTestCase):
         mac = factory.make_MAC()
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL,
-            name=name, node=node, mac_address=mac, disconnected=True)
+            name=name, node=node, mac_address=mac, link_connected=False)
         interface.acquired = True
         self.assertRaises(ValueError, interface.save)
 
@@ -1103,6 +1103,27 @@ class InterfaceTest(MAASServerTestCase):
         #: Test is this doesn't raise an exception
         interface.remove_tag(tag)
 
+    def test_save_link_speed_may_not_exceed_interface_speed(self):
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        interface.interface_speed = 100
+        interface.link_speed = 1000
+        self.assertRaises(ValidationError, interface.save)
+
+    def test_save_link_speed_may_exceed_unknown_interface_speed(self):
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        interface.interface_speed = 0
+        interface.link_speed = 1000
+        interface.save()
+        interface = reload_object(interface)
+        self.assertEquals(0, interface.interface_speed)
+        self.assertEquals(1000, interface.link_speed)
+
+    def test_save_if_link_disconnected_set_link_speed_to_zero(self):
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        interface.link_connected = False
+        interface.save()
+        self.assertEquals(0, interface.link_speed)
+
 
 class InterfaceUpdateNeighbourTest(MAASServerTestCase):
     """Tests for `Interface.update_neighbour`."""
@@ -1378,7 +1399,7 @@ class InterfaceMTUTest(MAASServerTestCase):
 
     def test_get_effective_mtu_returns_default_mtu(self):
         nic1 = factory.make_Interface(
-            INTERFACE_TYPE.PHYSICAL, disconnected=True)
+            INTERFACE_TYPE.PHYSICAL, link_connected=False)
         self.assertEqual(DEFAULT_MTU, nic1.get_effective_mtu())
 
     def test_get_effective_mtu_returns_interface_mtu(self):
@@ -2380,7 +2401,7 @@ class TestForceAutoOrDHCPLink(MAASServerTestCase):
 
     def test__does_nothing_when_disconnected(self):
         interface = factory.make_Interface(
-            INTERFACE_TYPE.PHYSICAL, disconnected=True)
+            INTERFACE_TYPE.PHYSICAL, link_connected=False)
         self.assertIsNone(interface.force_auto_or_dhcp_link())
 
     def test__sets_to_AUTO_on_subnet(self):
@@ -2412,7 +2433,7 @@ class TestEnsureLinkUp(MAASServerTestCase):
 
     def test__does_nothing_if_no_vlan(self):
         interface = factory.make_Interface(
-            INTERFACE_TYPE.PHYSICAL, disconnected=True)
+            INTERFACE_TYPE.PHYSICAL, link_connected=False)
         interface.ensure_link_up()
         interface = reload_object(interface)
         self.assertEqual(
diff --git a/src/maasserver/testing/factory.py b/src/maasserver/testing/factory.py
index ec327a4..7ce4b7a 100644
--- a/src/maasserver/testing/factory.py
+++ b/src/maasserver/testing/factory.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test object factories."""
@@ -1323,7 +1323,8 @@ class Factory(maastesting.factory.Factory):
             self, iftype=INTERFACE_TYPE.PHYSICAL, node=None, mac_address=None,
             vlan=None, parents=None, name=None, cluster_interface=None,
             ip=None, subnet=None, enabled=True, fabric=None, tags=None,
-            disconnected=False, params=""):
+            link_connected=True, interface_speed=None, link_speed=None,
+            params=""):
         if subnet is None and cluster_interface is not None:
             subnet = cluster_interface.subnet
         if subnet is not None and vlan is None:
@@ -1344,7 +1345,7 @@ class Factory(maastesting.factory.Factory):
             elif iftype == INTERFACE_TYPE.VLAN:
                 # Need to calculate this later based on the VID.
                 name = None
-        if not disconnected:
+        if link_connected:
             if vlan is None:
                 if fabric is not None:
                     if iftype == INTERFACE_TYPE.VLAN:
@@ -1375,9 +1376,21 @@ class Factory(maastesting.factory.Factory):
             node = parents[0].get_node()
         if tags is None:
             tags = [self.make_name('tag') for _ in range(3)]
+        link_speeds = [10, 100, 1000, 10000, 20000, 40000, 50000, 100000]
+        if interface_speed is None:
+            interface_speed = random.choice(link_speeds)
+        if link_speed is None:
+            if not link_connected:
+                link_speed = 0
+            else:
+                link_speed = random.choice([
+                    speed for speed in link_speeds
+                    if speed <= interface_speed])
         interface = Interface(
             node=node, mac_address=mac_address, type=iftype,
-            name=name, vlan=vlan, enabled=enabled, tags=tags, params=params)
+            name=name, vlan=vlan, enabled=enabled, tags=tags,
+            link_connected=link_connected, interface_speed=interface_speed,
+            link_speed=link_speed, params=params)
         interface.save()
         if subnet is None and ip is not None:
             subnet = Subnet.objects.get_best_subnet_for_ip(ip)
diff --git a/src/maasserver/tests/test_routablepairs.py b/src/maasserver/tests/test_routablepairs.py
index 7ba6fe8..45ca34c 100644
--- a/src/maasserver/tests/test_routablepairs.py
+++ b/src/maasserver/tests/test_routablepairs.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `maasserver.routablepairs`."""
@@ -136,7 +136,7 @@ class TestFindAddressesBetweenNodes(MAASServerTestCase):
         # null space, one in a non-null space.
         origin = factory.make_Node(hostname="origin")
         origin_iface = factory.make_Interface(
-            node=origin, disconnected=True)
+            node=origin, link_connected=False)
         origin_subnet = factory.make_Subnet(
             space=space, cidr=next(networks))
         origin_subnet_null_space = factory.make_Subnet(
@@ -150,14 +150,14 @@ class TestFindAddressesBetweenNodes(MAASServerTestCase):
         node_same_subnet = factory.make_Node(hostname="same-subnet")
         sip_same_subnet = factory.make_StaticIPAddress(
             interface=factory.make_Interface(
-                node=node_same_subnet, disconnected=True),
+                node=node_same_subnet, link_connected=False),
             subnet=origin_subnet)
 
         # Same VLAN, different subnet, different node.
         node_same_vlan = factory.make_Node(hostname="same-vlan")
         sip_same_vlan = factory.make_StaticIPAddress(
             interface=factory.make_Interface(
-                node=node_same_vlan, disconnected=True),
+                node=node_same_vlan, link_connected=False),
             subnet=factory.make_Subnet(
                 space=space, vlan=origin_subnet.vlan,
                 cidr=next(networks)))
@@ -166,7 +166,7 @@ class TestFindAddressesBetweenNodes(MAASServerTestCase):
         node_same_space = factory.make_Node(hostname="same-space")
         sip_same_space = factory.make_StaticIPAddress(
             interface=factory.make_Interface(
-                node=node_same_space, disconnected=True),
+                node=node_same_space, link_connected=False),
             subnet=factory.make_Subnet(
                 space=space, cidr=next(networks)))
 
@@ -174,7 +174,7 @@ class TestFindAddressesBetweenNodes(MAASServerTestCase):
         node_null_space = factory.make_Node(hostname="null-space")
         factory.make_StaticIPAddress(
             interface=factory.make_Interface(
-                node=node_null_space, disconnected=True),
+                node=node_null_space, link_connected=False),
             subnet=factory.make_Subnet(
                 space=None, cidr=next(networks)))
 
@@ -208,7 +208,7 @@ class TestFindAddressesBetweenNodes(MAASServerTestCase):
         # would have obscured the test.
         origin_sip_2 = factory.make_StaticIPAddress(
             interface=factory.make_Interface(
-                node=origin, disconnected=True),
+                node=origin, link_connected=False),
             subnet=factory.make_Subnet(
                 space=space, cidr=next(networks)))
 
@@ -239,7 +239,7 @@ class TestFindAddressesBetweenNodes(MAASServerTestCase):
         # null space, one in a non-null space.
         origin = factory.make_Node(hostname="origin")
         origin_iface = factory.make_Interface(
-            node=origin, disconnected=True)
+            node=origin, link_connected=False)
         origin_subnet_null_space = factory.make_Subnet(
             space=None, cidr=network1)
         factory.make_StaticIPAddress(
@@ -248,7 +248,7 @@ class TestFindAddressesBetweenNodes(MAASServerTestCase):
         # Same subnet, different node.
         node_no_match = factory.make_Node(hostname="no-match")
         no_match_iface = factory.make_Interface(
-            node=node_no_match, disconnected=True)
+            node=node_no_match, link_connected=False)
         no_match_subnet_null_space = factory.make_Subnet(
             space=None, cidr=network2)
         factory.make_StaticIPAddress(
diff --git a/src/maasserver/websockets/handlers/tests/test_script.py b/src/maasserver/websockets/handlers/tests/test_script.py
index 7d498d2..1108d6d 100644
--- a/src/maasserver/websockets/handlers/tests/test_script.py
+++ b/src/maasserver/websockets/handlers/tests/test_script.py
@@ -1,4 +1,4 @@
-# Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `maasserver.websockets.handlers.script`"""
@@ -35,6 +35,7 @@ class TestScriptHandler(MAASServerTestCase):
             'for_hardware': script.for_hardware,
             'may_reboot': script.may_reboot,
             'recommission': script.recommission,
+            'apply_configured_networking': script.apply_configured_networking,
             'created': dehydrate_datetime(script.created),
             'updated': dehydrate_datetime(script.updated),
             }
diff --git a/src/metadataserver/enum.py b/src/metadataserver/enum.py
index 25222bc..983a5b3 100644
--- a/src/metadataserver/enum.py
+++ b/src/metadataserver/enum.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Enumerations meaningful to the metadataserver application."""
@@ -101,6 +101,7 @@ class HARDWARE_TYPE:
     CPU = 1
     MEMORY = 2
     STORAGE = 3
+    NETWORK = 4
 
 
 # Labels are also used for autotagging scripts.
@@ -109,6 +110,7 @@ HARDWARE_TYPE_CHOICES = (
     (HARDWARE_TYPE.CPU, "CPU"),
     (HARDWARE_TYPE.MEMORY, "Memory"),
     (HARDWARE_TYPE.STORAGE, "Storage"),
+    (HARDWARE_TYPE.NETWORK, "Network"),
 )
 
 
diff --git a/src/metadataserver/migrations/0020_network_testing.py b/src/metadataserver/migrations/0020_network_testing.py
 new file mode 100644
index 0000000..2ea2ecb
--- /dev/null
+++ b/src/metadataserver/migrations/0020_network_testing.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2019-06-07 19:40
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0188_network_testing'),
+        ('metadataserver', '0019_add_script_result_suppressed'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='script',
+            name='apply_configured_networking',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='scriptresult',
+            name='interface',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='maasserver.Interface'),
+        ),
+        migrations.AlterField(
+            model_name='script',
+            name='hardware_type',
+            field=models.IntegerField(choices=[(0, 'Node'), (1, 'CPU'), (2, 'Memory'), (3, 'Storage'), (4, 'Network')], default=0),
+        ),
+    ]
diff --git a/src/metadataserver/models/script.py b/src/metadataserver/models/script.py
index ffa4e69..3bfda14 100644
--- a/src/metadataserver/models/script.py
+++ b/src/metadataserver/models/script.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [
@@ -75,6 +75,8 @@ def translate_hardware_type(hardware_type):
         return HARDWARE_TYPE.MEMORY
     elif hardware_type in ['storage', 'disk', 'ssd']:
         return HARDWARE_TYPE.STORAGE
+    elif hardware_type in ['network', 'net', 'interface']:
+        return HARDWARE_TYPE.NETWORK
     else:
         raise ValidationError(
             'Hardware type must be node, cpu, memory, or storage')
@@ -182,6 +184,10 @@ class Script(CleanSave, TimestampedModel):
     # scripts after receiving the result.
     recommission = BooleanField(default=False)
 
+    # Whether or not maas-run-remote-scripts should apply user configured
+    # network settings before running the Script.
+    apply_configured_networking = BooleanField(default=False)
+
     @property
     def ForHardware(self):
         """Parses the for_hardware field and returns a ForHardware tuple."""
diff --git a/src/metadataserver/models/scriptresult.py b/src/metadataserver/models/scriptresult.py
index e3b80ff..5ec3c98 100644
--- a/src/metadataserver/models/scriptresult.py
+++ b/src/metadataserver/models/scriptresult.py
@@ -24,6 +24,7 @@ from django.db.models import (
 from maasserver.fields import JSONObjectField
 from maasserver.models.cleansave import CleanSave
 from maasserver.models.event import Event
+from maasserver.models.interface import Interface
 from maasserver.models.physicalblockdevice import PhysicalBlockDevice
 from maasserver.models.timestampedmodel import (
     now,
@@ -73,6 +74,10 @@ class ScriptResult(CleanSave, TimestampedModel):
         PhysicalBlockDevice, editable=False, blank=True, null=True,
         on_delete=CASCADE)
 
+    # If the result is in reference to a particular Interface link it.
+    interface = ForeignKey(
+        Interface, editable=False, blank=True, null=True, on_delete=CASCADE)
+
     script_version = ForeignKey(
         VersionedTextFile, blank=True, null=True, editable=False,
         on_delete=SET_NULL)
diff --git a/src/metadataserver/models/tests/test_script.py b/src/metadataserver/models/tests/test_script.py
index ebf12d9..9c10e16 100644
--- a/src/metadataserver/models/tests/test_script.py
+++ b/src/metadataserver/models/tests/test_script.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = []
@@ -162,6 +162,18 @@ class TestTranslateHardwareType(MAASServerTestCase):
             'value': 'ssd',
             'return_value': HARDWARE_TYPE.STORAGE,
         }),
+        ('network', {
+            'value': 'network',
+            'return_value': HARDWARE_TYPE.NETWORK,
+        }),
+        ('net', {
+            'value': 'net',
+            'return_value': HARDWARE_TYPE.NETWORK,
+        }),
+        ('interface', {
+            'value': 'interface',
+            'return_value': HARDWARE_TYPE.NETWORK,
+        }),
         ('invalid value', {
             'value': factory.make_name('value'),
             'exception': 'Hardware type must be node, cpu, memory, or storage',