merge

Author: felippemr

dbaas/api/database.py

@@ -38,8 +38,9 @@ class Meta:
         fields = (
             'url', 'id', 'name', 'endpoint', 'plan', 'environment',
             'project', 'team', 'quarantine_dt', 'total_size_in_bytes',
-            'credentials', 'description', 'status', 'used_size_in_bytes',
-            'subscribe_to_email_events', 'created_at',
+            'credentials', 'description', 'contacts', 'status',
+            'used_size_in_bytes', 'subscribe_to_email_events',
+            'created_at',
         )
         read_only = ('credentials', 'status', 'used_size_in_bytes')
 
@@ -70,7 +71,8 @@ class DatabaseAPI(viewsets.ModelViewSet):
                 "project": "{api_url}/project/{project_id}/",
                 "team": "{api_url}/team/{team_id}/",
                 "description": "{description}",
-                "subscribe_to_email_events" "{subscribe_to_email_events}"
+                "subscribe_to_email_events" "{subscribe_to_email_events}",
+                "contacts": "{contacts}"
             }
     *   ### __Show details about a database__
         __GET__ /api/database/`database_id`/
@@ -82,6 +84,7 @@ class DatabaseAPI(viewsets.ModelViewSet):
                 "project": "{api_url}/project/{project_id}/",
                 "description": "{description}",
                 "subscribe_to_email_events" "{subscribe_to_email_events}"
+                "contacts": "{contacts}"
             }
     """
     serializer_class = DatabaseSerializer
@@ -106,7 +109,8 @@ def create(self, request):
                 environment=data['environment'], team=data['team'],
                 project=data['project'], description=data['description'],
                 subscribe_to_email_events=data['subscribe_to_email_events'],
-                task_history=task_history, user=request.user
+                contacts=data['contacts'], task_history=task_history,
+                user=request.user
             )
 
             headers = self.get_success_headers(data)

dbaas/api/tests/test_databaseapi.py

@@ -57,6 +57,7 @@ def test_post_create_new(self, mock_delay):
         self.assertEquals(test_obj.team, call_args['team'])
         self.assertEquals(test_obj.project, call_args['project'])
         self.assertEquals(test_obj.description, call_args['description'])
+        self.assertEquals(test_obj.contacts, call_args['contacts'])
 
     def payload(self, database, **kwargs):
         data = {
@@ -66,6 +67,7 @@ def payload(self, database, **kwargs):
             'team': reverse('team-detail', kwargs={'pk': database.team.pk}),
             'project': reverse('project-detail', kwargs={'pk': database.project.pk}),
             'description': database.description,
+            'contacts': database.contacts
         }
         return data
 

dbaas/logical/admin/database.py

@@ -418,6 +418,7 @@ def add_view(self, request, form_url='', extra_context=None):
                     project=form.cleaned_data['project'],
                     description=form.cleaned_data['description'],
                     subscribe_to_email_events=form.cleaned_data['subscribe_to_email_events'],
+                    contacts=form.cleaned_data['contacts'],
                     task_history=task_history,
                     user=request.user
                 )

dbaas/notification/tasks.py

@@ -41,7 +41,7 @@ def rollback_database(dest_database):
 
 @app.task(bind=True)
 def create_database(
-    self, name, plan, environment, team, project, description,
+    self, name, plan, environment, team, project, description, contacts,
     subscribe_to_email_events=True, task_history=None, user=None
 ):
     AuditRequest.new_request("create_database", user, "localhost")
@@ -66,6 +66,7 @@ def create_database(
             plan=plan, environment=environment, name=name, team=team,
             project=project, description=description,
             subscribe_to_email_events=subscribe_to_email_events, task=task_history,
+            contacts=contacts
         )
 
         if result['created'] is False:

dbaas/tsuru/views.py

@@ -436,6 +436,7 @@ def post(self, request, format=None):
         create_database.delay(
             name=name, plan=dbaas_plan, environment=dbaas_environment,
             team=dbaas_team, project=None, description=description,
+            contacts=None,
             task_history=task_history, user=dbaas_user
         )
 

dbaas/util/providers.py

@@ -14,7 +14,7 @@
 
 
 def make_infra(
-    plan, environment, name, team, project, description,
+    plan, environment, name, team, project, description, contacts,
     subscribe_to_email_events=True, task=None,
 ):
     if not plan.provider == plan.CLOUDSTACK:
@@ -28,6 +28,7 @@ def make_infra(
             database.description = description
             database.project = project
             database.subscribe_to_email_events = subscribe_to_email_events
+            database.contacts = contacts
             database.save()
 
             return build_dict(
@@ -41,7 +42,8 @@ def make_infra(
             plan.replication_topology.class_path
         ), qt=get_vm_qt(plan=plan, ), dbtype=str(plan.engine_type),
         team=team, project=project, description=description,
-        subscribe_to_email_events=subscribe_to_email_events
+        subscribe_to_email_events=subscribe_to_email_events,
+        contacts=contacts,
     )
 
     start_workflow(workflow_dict=workflow_dict, task=task)

dbaas/workflow/steps/util/deploy/build_database.py

@@ -43,6 +43,9 @@ def do(self, workflow_dict):
             LOG.info("Updating database subscribe_to_email_events")
             database.subscribe_to_email_events = workflow_dict['subscribe_to_email_events']
 
+            LOG.info("Updating database contacts")
+            database.contacts = workflow_dict['contacts']
+
             database.save()
             workflow_dict['database'] = database