Merge branch 'master' into remove_td_agent

Author: ricardosdias

dbaas/logical/models.py

@@ -175,6 +175,7 @@ def delete(self, *args, **kwargs):
         else:
             LOG.warning("Putting database {} in quarantine".format(self.name))
             self.is_in_quarantine = True
+            self.is_protected = False
             self.save()
             if self.credentials.exists():
                 for credential in self.credentials.all():
@@ -554,7 +555,7 @@ def can_be_cloned(self):
 
     def can_be_deleted(self):
         error = None
-        if self.is_protected:
+        if self.is_protected and not self.is_in_quarantine:
             error = "Database {} is protected and cannot be deleted"
         elif self.is_dead:
             error = "Database {} is not alive and cannot be deleted"

dbaas/logical/tests/test_database.py

@@ -17,6 +17,8 @@
     "Database does not have persistence cannot be cloned"
 ERROR_CLONE_IN_QUARANTINE = "Database in quarantine cannot be cloned"
 ERROR_CLONE_NOT_ALIVE = "Database is not alive and cannot be cloned"
+ERROR_DELETE_PROTECTED = "Database {} is protected and cannot be deleted"
+ERROR_DELETE_DEAD = "Database {} is not alive and cannot be deleted"
 
 
 class FakeDriver(base.BaseDriver):
@@ -174,6 +176,50 @@ def test_cannot_clone_dead(self):
         self.assertFalse(can_be_cloned)
         self.assertEqual(error, ERROR_CLONE_NOT_ALIVE)
 
+    def test_can_delete(self):
+        database = factory.DatabaseFactory()
+        database.status = database.ALIVE
+
+        can_be_deleted, error = database.can_be_deleted()
+        self.assertTrue(can_be_deleted)
+        self.assertIsNone(error)
+
+    def test_cannot_delete_protected(self):
+        database = factory.DatabaseFactory()
+        database.status = database.ALIVE
+        database.is_protected = True
+
+        can_be_deleted, error = database.can_be_deleted()
+        self.assertFalse(can_be_deleted)
+        self.assertEqual(error, ERROR_DELETE_PROTECTED.format(database.name))
+
+    def test_can_delete_protected_in_quarantine(self):
+        database = factory.DatabaseFactory()
+        database.status = database.ALIVE
+        database.is_protected = True
+        database.is_in_quarantine = True
+
+        can_be_deleted, error = database.can_be_deleted()
+        self.assertTrue(can_be_deleted)
+        self.assertIsNone(error)
+
+    def test_can_delete_in_quarantine(self):
+        database = factory.DatabaseFactory()
+        database.status = database.ALIVE
+        database.is_in_quarantine = True
+
+        can_be_deleted, error = database.can_be_deleted()
+        self.assertTrue(can_be_deleted)
+        self.assertIsNone(error)
+
+    def test_cannot_delete_dead(self):
+        database = factory.DatabaseFactory()
+        database.status = database.DEAD
+
+        can_be_deleted, error = database.can_be_deleted()
+        self.assertFalse(can_be_deleted)
+        self.assertEqual(error, ERROR_DELETE_DEAD.format(database.name))
+
     '''
 
     @mock.patch.object(clone_database, 'delay')

dbaas/workflow/settings.py

@@ -39,6 +39,7 @@
     'workflow.steps.mysql.flipperfox_migration.check_pupet.CheckPuppetIsRunning',
     'workflow.steps.mysql.flipperfox_migration.config_vms_foreman.ConfigVMsForeman',
     'workflow.steps.mysql.flipperfox_migration.run_pupet_setup.RunPuppetSetup',
+    'workflow.steps.mysql.flipperfox_migration.config_log.ConfigLog',
     'workflow.steps.mysql.flipperfox_migration.config_fox.ConfigFox',
     'workflow.steps.mysql.flipperfox_migration.create_foxha_mysql_users.CreateFoxHAMySQLUser',
     'workflow.steps.mysql.flipperfox_migration.config_backup_log.ConfigBackupLog',

dbaas/workflow/steps/mysql/flipperfox_migration/config_log.py

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+import logging
+from util import full_stack
+from util import exec_remote_command
+from dbaas_cloudstack.models import HostAttr as CS_HostAttr
+from workflow.steps.util.base import BaseStep
+from workflow.exceptions.error_codes import DBAAS_0020
+
+LOG = logging.getLogger(__name__)
+
+
+class ConfigLog(BaseStep):
+
+    def __unicode__(self):
+        return "Configuring rsyslog..."
+
+    def do(self, workflow_dict):
+        try:
+            for source_host in workflow_dict['source_hosts']:
+                future_host = source_host.future_host
+                cs_host_attr = CS_HostAttr.objects.get(host=future_host)
+
+                LOG.info("Configuring rsyslog {}".format(future_host))
+
+                script = self.rsyslog_create_config(workflow_dict['database'])
+                LOG.info(script)
+
+                output = {}
+                return_code = exec_remote_command(
+                    server=future_host.address,
+                    username=cs_host_attr.vm_user,
+                    password=cs_host_attr.vm_password,
+                    command=script,
+                    output=output
+                )
+                LOG.info(output)
+                if return_code != 0:
+                    error_msg = "Error configuring rsyslog: {}".format(str(output))
+                    LOG.error(error_msg)
+                    raise EnvironmentError(error_msg)
+
+            return True
+        except Exception:
+            traceback = full_stack()
+
+            workflow_dict['exceptions']['error_codes'].append(DBAAS_0020)
+            workflow_dict['exceptions']['traceback'].append(traceback)
+
+            return False
+
+    def undo(self, workflow_dict):
+        LOG.info("Running undo...")
+        try:
+            for source_host in workflow_dict['source_hosts']:
+                future_host = source_host.future_host
+                cs_host_attr = CS_HostAttr.objects.get(host=future_host)
+
+                LOG.info("Removing rsyslog config in {}".format(future_host))
+
+                script = self.rsyslog_remove_config()
+                LOG.info(script)
+
+                output = {}
+                return_code = exec_remote_command(
+                    server=future_host.address,
+                    username=cs_host_attr.vm_user,
+                    password=cs_host_attr.vm_password,
+                    command=script,
+                    output=output
+                )
+                LOG.info(output)
+                if return_code != 0:
+                    error_msg = "Error removing configuring rsyslog: {}".format(str(output))
+                    LOG.error(error_msg)
+                    raise EnvironmentError(error_msg)
+
+            return True
+        except Exception:
+            traceback = full_stack()
+
+            workflow_dict['exceptions']['error_codes'].append(DBAAS_0020)
+            workflow_dict['exceptions']['traceback'].append(traceback)
+
+            return False
+
+    def rsyslog_create_config(self, database):
+        return \
+            ' echo "\$EscapeControlCharactersOnReceive off" >> /etc/rsyslog.d/globologging.conf &&' \
+            ' sed -i "\$a \$template db-log, \\\"<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg%   tags: dbaas,{}\\\"" /etc/rsyslog.d/globologging.conf &&' \
+            ' sed -i "\$a*.*                    @logging.udp.globoi.com:5140; db-log" /etc/rsyslog.d/globologging.conf &&' \
+            ' /etc/init.d/rsyslog restart'.format(database.name)
+
+    def rsyslog_remove_config(self):
+        return 'rm -f /etc/rsyslog.d/globologging.conf'