Merge lp:~allenap/maas/remove-get-interfaces-definition--bug-1587864 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Remove p.networks; it's no longer necessary.

[Blake Rouse (blake-rouse)]

Looks good. I am going to approve this only because I assume that previous code landed that I did not review, where this is no longer needed? This used to be used in the interface updating service on the rack controller.

review: Approve

[Gavin Panella (allenap)]

> Looks good. I am going to approve this only because I assume that
> previous code landed that I did not review, where this is no longer
> needed? This used to be used in the interface updating service on the
> rack controller.

Yep, r5074 on lp:maas changed that.

Thanks!

[MAAS Lander (maas-lander)]

Attempt to merge into lp:maas failed due to conflicts:

text conflict in src/provisioningserver/rpc/clusterservice.py

=== removed file 'src/provisioningserver/networks.py'
--- src/provisioningserver/networks.py	2016-02-29 22:14:24 +0000
+++ src/provisioningserver/networks.py	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Get /etc/network/interface definition for the rack controller."""
-
-__all__ = [
-    "get_interfaces_definition",
-    "clear_current_interfaces_definition",
-]
-
-from provisioningserver.utils.network import get_all_interfaces_definition
-
-# Holds the current interfaces definition that the rack controller has
-# processed.
-_current_definition = None
-
-
-def get_interfaces_definition():
-    """Return tuple containing the /etc/network/interfaces definition and a
-    boolean for it the definition has changed since the last time this method
-    was called.
-    """
-    global _current_definition
-    if _current_definition is None:
-        _current_definition = get_all_interfaces_definition()
-        return _current_definition, True
-    else:
-        new_definition = get_all_interfaces_definition()
-        if _current_definition != new_definition:
-            _current_definition = new_definition
-            return _current_definition, True
-        else:
-            return _current_definition, False
-
-
-def clear_current_interfaces_definition():
-    """Clear the current cached interfaces definition."""
-    global _current_definition
-    _current_definition = None

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2016-06-02 18:23:20 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2016-06-07 09:08:18 +0000
@@ -33,7 +33,6 @@
 from provisioningserver.drivers.power.mscm import probe_and_enlist_mscm
 from provisioningserver.drivers.power.msftocs import probe_and_enlist_msftocs
 from provisioningserver.logger.log import get_maas_logger
-from provisioningserver.networks import get_interfaces_definition
 from provisioningserver.power.change import maybe_change_power_state
 from provisioningserver.power.query import get_power_state
 from provisioningserver.refresh import (
@@ -71,6 +70,7 @@
     get_maas_id,
     set_maas_id,
 )
+from provisioningserver.utils.network import get_all_interfaces_definition
 from provisioningserver.utils.shell import (
     call_and_check,
     ExternalProcessError,
@@ -384,7 +384,7 @@
         def perform_refresh():
             architecture = get_architecture()
             os_release = get_os_release()
-            interfaces, _ = get_interfaces_definition()
+            interfaces = get_all_interfaces_definition()
             return architecture, os_release, interfaces
 
         def cb_result(result):
@@ -555,7 +555,7 @@
             system_id = ''
 
         # Gather the interface definition and hostname.
-        interfaces, _ = get_interfaces_definition()
+        interfaces = get_all_interfaces_definition()
         hostname = gethostname().split('.')[0]
 
         def cb_register(data):

=== modified file 'src/provisioningserver/support_dump.py'
--- src/provisioningserver/support_dump.py	2016-03-18 21:11:49 +0000
+++ src/provisioningserver/support_dump.py	2016-06-07 09:08:18 +0000
@@ -19,9 +19,9 @@
     list_boot_images,
 )
 from provisioningserver.config import ClusterConfiguration
-from provisioningserver.networks import get_interfaces_definition
 from provisioningserver.utils.ipaddr import get_ip_addr
 from provisioningserver.utils.iproute import get_ip_route
+from provisioningserver.utils.network import get_all_interfaces_definition
 
 
 all_arguments = (
@@ -73,8 +73,7 @@
         "function": get_ip_route
     },
     {
-        "title": "get_interfaces_definition()",
-        "function": lambda: get_interfaces_definition()[0]
+        "function": get_all_interfaces_definition,
     },
 ]
 

=== removed file 'src/provisioningserver/tests/test_networks.py'
--- src/provisioningserver/tests/test_networks.py	2016-05-12 19:07:37 +0000
+++ src/provisioningserver/tests/test_networks.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Test networks module."""
-
-__all__ = [
-    ]
-
-from unittest.mock import sentinel
-
-from maastesting.testcase import MAASTestCase
-from provisioningserver import networks
-
-
-class TestGetInterfacesDefinition(MAASTestCase):
-    """Tests for `get_interfaces_definition`."""
-
-    def test__sets_global_when_None(self):
-        networks._current_definition = None
-        patched_getter = self.patch(networks, "get_all_interfaces_definition")
-        patched_getter.return_value = sentinel.definition
-        expected_value, updated = networks.get_interfaces_definition()
-        self.assertEquals(sentinel.definition, expected_value)
-        self.assertEquals(sentinel.definition, networks._current_definition)
-        self.assertTrue(updated)
-
-    def test__sets_global_when_different(self):
-        networks._current_definition = sentinel.old_definition
-        patched_getter = self.patch(networks, "get_all_interfaces_definition")
-        patched_getter.return_value = sentinel.definition
-        expected_value, updated = networks.get_interfaces_definition()
-        self.assertEquals(sentinel.definition, expected_value)
-        self.assertEquals(sentinel.definition, networks._current_definition)
-        self.assertTrue(updated)
-
-    def test__returns_not_changed_if_same(self):
-        networks._current_definition = sentinel.definition
-        patched_getter = self.patch(networks, "get_all_interfaces_definition")
-        patched_getter.return_value = sentinel.definition
-        expected_value, updated = networks.get_interfaces_definition()
-        self.assertEquals(sentinel.definition, expected_value)
-        self.assertEquals(sentinel.definition, networks._current_definition)
-        self.assertFalse(updated)
-
-
-class TestClearCurrentInterfacesDefinition(MAASTestCase):
-    """Tests for `clear_current_interfaces_definition`."""
-
-    def test__sets_global_to_None(self):
-        networks._current_definition = sentinel.old_definition
-        networks.clear_current_interfaces_definition()
-        self.assertIsNone(networks._current_definition)