Merge lp:~gz/juju-ci-tools/maas_substrate_interfaces into lp:juju-ci-tools

[Martin Packman]

Add interfaces management methods to maas substrate

Just the subset of commands we need at present, interfaces can apply to more than just machines but we only care about the machine/vlan case at present.

[Aaron Bentley (abentley)]

The interfaces method needs slightly more testing.

review: Needs Fixing

[Martin Packman (gz)]

Replied to comments, not making more changes at this point in the chain but suggestions will be done later.

[Aaron Bentley (abentley)]

review: Needs Fixing

=== modified file 'substrate.py'
--- substrate.py	2016-09-27 14:01:01 +0000
+++ substrate.py	2016-09-27 14:01:01 +0000
@@ -529,6 +529,24 @@
         return self._maas(
             self.profile, 'vlan', 'delete', str(fabric_id), str(vid))
 
+    def interfaces(self, system_id):
+        """Return list of interfaces belonging to node with given system_id."""
+        return self._maas(self.profile, 'interfaces', 'read', system_id)
+
+    def interface_create_vlan(self, system_id, parent, vlan_id):
+        """Create a vlan interface on machine with given system_id."""
+        args = [
+            self.profile, 'interfaces', 'create-vlan', system_id,
+            'parent=' + str(parent), 'vlan=' + str(vlan_id),
+        ]
+        # TODO(gz): Add support for optional parameters as needed.
+        return self._maas(*args)
+
+    def delete_interface(self, system_id, interface_id):
+        """Delete interface on node with given system_id with interface_id."""
+        return self._maas(
+            self.profile, 'interface', 'delete', system_id, str(interface_id))
+
 
 class MAAS1Account(MAASAccount):
     """Represent a MAAS 1.X account."""
 
=== modified file 'tests/test_substrate.py'
--- tests/test_substrate.py	2016-09-27 14:01:01 +0000
+++ tests/test_substrate.py	2016-09-27 14:01:01 +0000
@@ -947,6 +947,40 @@
             ('maas', 'mas', 'vlan', 'delete', '0', '4096'))
         self.assertEqual(None, result)
 
+    def test_interfaces(self):
+        config = get_maas_env().config
+        account = MAASAccount(
+            config['name'], config['maas-server'], config['maas-oauth'])
+        with patch('subprocess.check_output', autospec=True,
+                   return_value='[]') as co_mock:
+            interfaces = account.interfaces('node-xyz')
+        co_mock.assert_called_once_with((
+            'maas', 'mas', 'interfaces', 'read', 'node-xyz'))
+        self.assertEqual([], interfaces)
+
+    def test_interface_create_vlan(self):
+        config = get_maas_env().config
+        account = MAASAccount(
+            config['name'], config['maas-server'], config['maas-oauth'])
+        with patch('subprocess.check_output', autospec=True,
+                   return_value='{"id": 10}') as co_mock:
+            interface = account.interface_create_vlan('node-xyz', 1, 5000)
+        co_mock.assert_called_once_with((
+            'maas', 'mas', 'interfaces', 'create-vlan', 'node-xyz', 'parent=1',
+            'vlan=5000'))
+        self.assertEqual({'id': 10}, interface)
+
+    def test_delete_interface(self):
+        config = get_maas_env().config
+        account = MAASAccount(
+            config['name'], config['maas-server'], config['maas-oauth'])
+        with patch('subprocess.check_output', autospec=True,
+                   return_value='') as co_mock:
+            result = account.delete_interface('node-xyz', 10)
+        co_mock.assert_called_once_with(
+            ('maas', 'mas', 'interface', 'delete', 'node-xyz', '10'))
+        self.assertEqual(None, result)
+
 
 class TestMAAS1Account(TestCase):