Merge lp:~hopem/maas-deployer/lp1479023 into lp:~maas-deployers/maas-deployer/next

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

LGTM

review: Approve

=== modified file 'examples/deployment.yaml'
--- examples/deployment.yaml	2015-09-11 08:06:40 +0000
+++ examples/deployment.yaml	2015-09-22 21:06:04 +0000
@@ -83,6 +83,15 @@
               gateway 192.168.122.1
               dns-nameservers 192.168.122.1 127.0.0.1
 
+        # See https://maas.ubuntu.com/docs/maascli.html#node-groups for
+        # description and full list of supported options.
+        # NOTE: interfaces are added using the node_group_interfaces section
+        #       and only one node_group can be created by this bundle.
+        #       Additional node groups can be added post deployment.
+        #node_group:
+        #    # This is the cluster DNS name.
+        #    name: maas
+
         # The node-group-interfaces section is used to configure the MAAS
         # network interfaces. Basic configuration is supported, such as which
         # device should be bound, the range of IP addresses, etc.

=== modified file 'maas_deployer/tests/test_engine.py'
--- maas_deployer/tests/test_engine.py	2015-08-21 17:12:13 +0000
+++ maas_deployer/tests/test_engine.py	2015-09-22 21:06:04 +0000
@@ -14,7 +14,10 @@
 )
 
 sys.modules['apiclient'] = MagicMock()
-from maas_deployer.vmaas import engine
+from maas_deployer.vmaas import (
+    engine,
+    exception,
+)
 
 
 class TestEngine(unittest.TestCase):
@@ -80,3 +83,16 @@
         e._create_maas_tags(mock_client, nodes)
         self.assertTrue(mock_client.create_tag.called)
         self.assertTrue(mock_client.get_tags.called)
+
+    @patch.object(engine, 'MAASClient')
+    def test_update_nodegroup(self, mock_client):
+        e = engine.DeploymentEngine({}, 'test-env')
+        nodegroup = {'uuid': 'fd623c43-6f5b-44fa-bc16-0f58a531063f'}
+        maas_config = {'node_group': {'name': 'maas.demo'}}
+        e.update_nodegroup(mock_client, nodegroup, maas_config)
+        self.assertTrue(mock_client.update_nodegroup.called)
+
+        maas_config = {'node_group': {'name': 'maas.demo', 'blah': 123}}
+        self.assertRaises(exception.MAASDeployerConfigError,
+                          e.update_nodegroup, mock_client, nodegroup,
+                          maas_config)

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2015-09-11 08:07:58 +0000
+++ maas_deployer/vmaas/engine.py	2015-09-22 21:06:04 +0000
@@ -21,6 +21,7 @@
 )
 from maas_deployer.vmaas.exception import (
     MAASDeployerClientError,
+    MAASDeployerConfigError,
 )
 from maas_deployer.vmaas.maasclient import (
     bootimages,
@@ -422,17 +423,27 @@
             if not succ:
                 log.error("Unable to set %s to %s", key, value)
 
+    def update_nodegroup(self, client, nodegroup, maas_config):
+        node_group_config = maas_config.get('node_group')
+        if not node_group_config:
+            return
+
+        supported_keys = ['name', 'cluster_name']
+        if not set(node_group_config.keys()).issubset(supported_keys):
+            msg = ("node_group config contains unsupported settings: %s" %
+                   node_group_config.keys())
+            raise MAASDeployerConfigError(msg)
+
+        client.update_nodegroup(nodegroup, **node_group_config)
+
     def configure_maas(self, client, maas_config):
-        """
-        Configures the MAAS instance.
-        """
+        """Configures the MAAS instance."""
+        # FIXME: we currently pick the first node group out of the default
+        #        list which will cause problems if new node groups are added
+        #        and the order changes.
         nodegroup = client.get_nodegroups()[0]
-        log.debug("Creating the nodegroup interfaces...")
-        node_group_interfaces = copy.deepcopy(maas_config['node_group_ifaces'])
-        for iface in node_group_interfaces:
-            if not self.create_nodegroup_interface(client, nodegroup, iface):
-                msg = "Unable to create nodegroup interface: %s" % iface
-                raise MAASDeployerClientError(msg)
+        self.update_nodegroup(client, nodegroup, maas_config)
+        self.create_nodegroup_interfaces(client, nodegroup, maas_config)
 
         nodes = maas_config.get('nodes', [])
         self._create_maas_nodes(client, nodes)
@@ -577,10 +588,7 @@
         return json.dumps(power_parameters)
 
     def create_nodegroup_interface(self, client, nodegroup, properties):
-        """
-        Creates a NodegroupInterface object from the dictionary of attributes
-        passed in.
-        """
+        """Add/update node group interface."""
         # Note: for compatibility with current revisions of the deployment.yaml
         # file we'll need to flatten the resulting dict from the yaml and then
         # remap some of the resulting keys to meet what the MAAS API is looking
@@ -599,10 +607,13 @@
                 properties[name_map[key]] = properties[key]
                 del properties[key]
 
-        if not properties.get('name', None):
+        if not properties.get('name'):
             properties['name'] = properties['interface']
 
-        if not properties.get('management', None):
+        log.debug("Creating interface '%s' in node group '%s'",
+                  properties['name'], nodegroup.name)
+
+        if not properties.get('management'):
             properties['management'] = '2'  # Default to dhcp and dns
 
         existing_iface = client.get_nodegroup_interface(nodegroup,
@@ -614,3 +625,15 @@
             success = client.create_nodegroup_interface(nodegroup, properties)
 
         return success
+
+    def create_nodegroup_interfaces(self, client, nodegroup, maas_config):
+        """
+        Creates a NodegroupInterface object from the dictionary of attributes
+        passed in.
+        """
+        log.debug("Creating node group '%s' interfaces" % (nodegroup.name))
+        node_group_interfaces = copy.deepcopy(maas_config['node_group_ifaces'])
+        for iface in node_group_interfaces:
+            if not self.create_nodegroup_interface(client, nodegroup, iface):
+                msg = "Unable to create nodegroup interface: %s" % iface
+                raise MAASDeployerClientError(msg)

=== modified file 'maas_deployer/vmaas/maasclient/__init__.py'
--- maas_deployer/vmaas/maasclient/__init__.py	2015-08-11 08:55:09 +0000
+++ maas_deployer/vmaas/maasclient/__init__.py	2015-09-22 21:06:04 +0000
@@ -94,6 +94,16 @@
     ###########################################################################
     # Nodegroup API - http://maas.ubuntu.com/docs/api.html#nodegroups
     ###########################################################################
+    def update_nodegroup(self, nodegroup, **settings):
+        """
+        Update nodegroup.
+        http://maas.ubuntu.com/docs/api.html#nodegroups
+        """
+        resp = self.driver.update_nodegroup(nodegroup, **settings)
+        if resp.ok:
+            return True
+        return False
+
     def get_nodegroups(self):
         """
         Returns the nodegroups.

=== modified file 'maas_deployer/vmaas/maasclient/clidriver.py'
--- maas_deployer/vmaas/maasclient/clidriver.py	2015-09-10 15:52:50 +0000
+++ maas_deployer/vmaas/maasclient/clidriver.py	2015-09-22 21:06:04 +0000
@@ -139,6 +139,14 @@
     ###########################################################################
     # Nodegroup API - http://maas.ubuntu.com/docs/api.html#nodegroups
     ###########################################################################
+    def update_nodegroup(self, nodegroup, **settings):
+        """
+        Returns the nodegroups.
+        http://maas.ubuntu.com/docs/api.html#nodegroups
+        """
+        return self._maas_execute('node-group', 'update', nodegroup.uuid,
+                                  **settings)
+
     def get_nodegroups(self):
         """
         Returns the nodegroups.