Fixed #170 -- "deis nodes:create" allows adding external instances.

Author: mboersma

api/models.py

@@ -107,6 +107,7 @@ class Provider(UuidAuditedModel):
     PROVIDERS = (
         ('ec2', 'Amazon Elastic Compute Cloud (EC2)'),
         ('mock', 'Mock Reference Provider'),
+        ('static', 'Static Node Provider'),
     )
 
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)
@@ -290,7 +291,7 @@ def destroy(self):
 @python_2_unicode_compatible
 class NodeManager(models.Manager):
 
-    def new(self, formation, layer):
+    def new(self, formation, layer, fqdn=None):
         existing_nodes = self.filter(formation=formation, layer=layer).order_by('-created')
         if existing_nodes:
             next_num = existing_nodes[0].num + 1
@@ -300,7 +301,8 @@ def new(self, formation, layer):
                            formation=formation,
                            layer=layer,
                            num=next_num,
-                           id="{0}-{1}-{2}".format(formation.id, layer.id, next_num))
+                           id="{0}-{1}-{2}".format(formation.id, layer.id, next_num),
+                           fqdn=fqdn)
         return node
 
     def scale(self, formation, structure, **kwargs):

api/tests/auth.py

@@ -9,6 +9,7 @@
 import json
 import urllib
 
+from django.conf import settings
 from django.test import TestCase
 
 
@@ -57,7 +58,7 @@ def test_auth(self):
         url = '/api/providers'
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(response.data['count'], len(settings.PROVIDER_MODULES))
         url = '/api/flavors'
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)

api/tests/node.py

@@ -194,3 +194,43 @@ def test_node_actions(self):
         url = '/api/nodes/{id}/converge'.format(**node)
         response = self.client.post(url)
         self.assertEqual(response.status_code, 200)
+
+    def test_node_create(self):
+        url = '/api/formations'
+        body = {'id': 'autotest'}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        formation_id = response.data['id']
+        url = '/api/formations/{formation_id}/layers'.format(**locals())
+        body = {'id': 'runtime', 'flavor': 'autotest', 'runtime': True}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        # create a node for an existing instance
+        url = '/api/formations/{formation_id}/nodes'.format(**locals())
+        body = {'fqdn': 'example.com', 'layer': 'runtime'}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        # create it again, expecting an error
+        url = '/api/formations/{formation_id}/nodes'.format(**locals())
+        body = {'fqdn': 'example.com', 'layer': 'runtime'}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 409)
+        # get our node
+        url = '/api/formations/{formation_id}/nodes'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 1)
+        node_id = response.data['results'][0]['id']
+        url = '/api/formations/{formation_id}/nodes/{node_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(node_id, response.data['id'])
+        node = response.data
+        # delete our node
+        response = self.client.delete(url)
+        self.assertEqual(response.status_code, 204)
+        # check the node is gone
+        url = '/api/formations/{formation_id}/nodes'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 0)

api/urls.py

@@ -129,6 +129,10 @@
 
   Retrieve a :class:`~api.models.Node` by its `id`.
 
+.. http:post:: /api/formations/(string:id)/nodes/
+
+  Create a new :class:`~api.models.Node` for an existing instance.
+
 .. http:delete:: /api/formations/(string:id)/nodes/(string:id)/
 
   Destroy a :class:`~api.models.Node` by its `id`.
@@ -344,7 +348,7 @@
         views.FormationNodeViewSet.as_view({
             'get': 'retrieve', 'delete': 'destroy'})),
     url(r'^formations/(?P<id>[-_\w]+)/nodes/?',
-        views.FormationNodeViewSet.as_view({'get': 'list'})),
+        views.FormationNodeViewSet.as_view({'get': 'list', 'post': 'add'})),
     # formation actions
     url(r'^formations/(?P<id>[-_\w]+)/scale/?',
         views.FormationViewSet.as_view({'post': 'scale'})),

api/views.py

@@ -16,8 +16,9 @@
 from rest_framework.response import Response
 from rest_framework.status import HTTP_400_BAD_REQUEST
 
-from api import models, tasks
+from api import models
 from api import serializers
+from api import tasks
 
 
 class AnonymousAuthentication(BaseAuthentication):
@@ -232,6 +233,19 @@ def get_object(self, *args, **kwargs):
         obj = get_object_or_404(qs, id=self.kwargs['node'])
         return obj
 
+    def add(self, request, **kwargs):
+        fqdn = request.DATA['fqdn']
+        formation = models.Formation.objects.get(
+            owner=self.request.user, id=self.kwargs['id'])
+        layer = models.Layer.objects.get(
+            owner=self.request.user, id=request.DATA['layer'])
+        if self.model.objects.filter(fqdn=fqdn, formation=formation, layer=layer).exists():
+            msg = "A node with fqdn={} already exists in the {} formation".format(fqdn, formation)
+            return Response(data=msg, status=status.HTTP_409_CONFLICT)
+        node = models.Node.objects.new(formation, layer, fqdn)
+        node.build()
+        return Response(status=status.HTTP_201_CREATED)
+
     def destroy(self, request, **kwargs):
         node = self.get_object()
         node.destroy()

client/deis.py

@@ -1336,6 +1336,31 @@ def nodes(self, args):
         args = docopt(self.nodes_list.__doc__)
         return self.nodes_list(args)
 
+    def nodes_create(self, args):
+        """
+        Add an existing node to a formation.
+
+        Usage: deis nodes:create <formation> <fqdn> --layer=<layer>
+        """
+        formation = args.get('<formation>')
+        fqdn, layer = args.get('<fqdn>'), args.get('--layer')
+        body = {'fqdn': fqdn, 'layer': layer}
+        sys.stdout.write("Creating node for {}... ".format(fqdn))
+        sys.stdout.flush()
+        try:
+            progress = TextProgress()
+            progress.start()
+            before = time.time()
+            response = self._dispatch('post', "/api/formations/{}/nodes".format(formation),
+                                      json.dumps(body))
+        finally:
+            progress.cancel()
+            progress.join()
+        if response.status_code == requests.codes.created:  # @UndefinedVariable
+            print('done in {}s'.format(int(time.time() - before)))
+        else:
+            raise ResponseError(response)
+
     def nodes_info(self, args):
         """
         Print info about a particular node

docs/server/index.rst

@@ -32,6 +32,7 @@ Server Reference
 
     provider.ec2
     provider.mock
+    provider.static
 
     web.urls
     web.views

docs/server/provider.static.rst

@@ -0,0 +1,14 @@
+:description: Python API Reference for the Deis provider.static module
+:keywords: deis, provider.static, python, celery, api
+
+===============
+provider.static
+===============
+
+.. contents::
+    :local:
+.. currentmodule:: provider.static
+
+.. automodule:: provider.static
+    :members:
+    :undoc-members:

provider/mock.py

@@ -49,7 +49,7 @@ def build_node(node):
     :rtype: a tuple of (provider_id, fully_qualified_domain_name, metadata)
     """
     provider_id = 'i-1234567'
-    fqdn = 'localhost.localdomain.local'
+    fqdn = node.get('fqdn') or 'localhost.localdomain.local'
     metadata = {'state': 'running'}
     return provider_id, fqdn, metadata
 

provider/static.py

@@ -0,0 +1,52 @@
+"""
+Deis cloud provider implementation for static nodes created outside Deis.
+"""
+
+
+def seed_flavors():
+    """Seed the database with default static flavor.
+
+    :rtype: list of dicts containing flavor data
+    """
+    return [{
+        'id': 'static',
+        'provider': 'static',
+        'params': {},
+    }]
+
+
+def build_layer(layer):
+    """
+    Build a layer.
+
+    :param layer: a dict containing formation, id, params, and creds info
+    """
+    pass
+
+
+def destroy_layer(layer):
+    """
+    Destroy a layer.
+
+    :param layer: a dict containing formation, id, params, and creds info
+    """
+    pass
+
+
+def build_node(node):
+    """
+    Build a node.
+
+    :param node: a dict containing formation, layer, params, and creds info.
+    :rtype: a tuple of (provider_id, fully_qualified_domain_name, metadata)
+    """
+    return ('static', node['fqdn'], {})
+
+
+def destroy_node(node):
+    """
+    Destroy a node.
+
+    :param node: a dict containing a node's provider_id, params, and creds
+    """
+    pass