Merge pull request #851 from globocom/dev

Dev > Master

Author: akira-miyazato

dbaas/drivers/replication_topologies/mysql.py

@@ -1065,22 +1065,30 @@ def get_update_ssl_steps(self):
             'Disable monitoring and alarms': (
                 'workflow.steps.util.zabbix.DisableAlarms',
                 'workflow.steps.util.db_monitor.DisableMonitoring',
-                'workflow.steps.util.ssl.UpdateExpireAtDateRollback',
-                'workflow.steps.util.ssl.BackupSSLFolder',
             ),
         }] + [{
             'Disable SSL': (
                 'workflow.steps.util.ssl.UnSetReplicationUserRequireSSL',
             ),
         }] + [{
             'Configure SSL': (
-                'workflow.steps.util.ssl.UpdateSSLForInfra',
-                'workflow.steps.util.ssl.UpdateSSLForInstance',
+                'workflow.steps.util.ssl.UpdateExpireAtDateRollback',
+                'workflow.steps.util.ssl.MoveSSLFolder',
+                'workflow.steps.util.ssl.UpdateOpenSSlLib',
+                'workflow.steps.util.ssl.CreateSSLFolder',
+                'workflow.steps.util.ssl.CreateSSLConfForInfraEndPoint',
+                'workflow.steps.util.ssl.CreateSSLConfForInstanceIP',
+                'workflow.steps.util.ssl.RequestSSLForInfra',
+                'workflow.steps.util.ssl.RequestSSLForInstance',
                 'workflow.steps.util.ssl.CreateJsonRequestFileInfra',
                 'workflow.steps.util.ssl.CreateJsonRequestFileInstance',
                 'workflow.steps.util.ssl.CreateCertificateInfra',
                 'workflow.steps.util.ssl.CreateCertificateInstance',
                 'workflow.steps.util.ssl.SetSSLFilesAccessMySQL',
+                'workflow.steps.util.ssl.SetInfraConfiguredSSL',
+                'workflow.steps.util.plan.Configure',
+                'workflow.steps.util.plan.ConfigureLog',
+                'workflow.steps.util.metric_collector.ConfigureTelegraf',
                 'workflow.steps.util.ssl.UpdateExpireAtDate',
             ),
         }] + [{
@@ -1089,7 +1097,7 @@ def get_update_ssl_steps(self):
                 'workflow.steps.util.vm.ChangeMaster',
                 'workflow.steps.util.database.CheckIfSwitchMaster',
                 'workflow.steps.util.database.Stop',
-                'workflow.steps.util.ssl.RestoreSSLFolder4Rollback',
+                # 'workflow.steps.util.ssl.RestoreSSLFolder4Rollback',
                 'workflow.steps.util.database.Start',
                 'workflow.steps.util.metric_collector.RestartTelegraf',
                 'workflow.steps.util.database.CheckIfSwitchMasterRollback',
@@ -1103,6 +1111,7 @@ def get_update_ssl_steps(self):
             ),
         }] + [{
             'Enabling monitoring and alarms': (
+                'workflow.steps.util.db_monitor.UpdateInfraSSLMonitor',
                 'workflow.steps.util.db_monitor.EnableMonitoring',
                 'workflow.steps.util.zabbix.EnableAlarms',
             ),

dbaas/logical/models.py

@@ -17,7 +17,7 @@
 
 from util import slugify, make_db_random_password
 from util.models import BaseModel
-from physical.models import DatabaseInfra, Environment
+from physical.models import DatabaseInfra, Environment, Offering
 from drivers import factory_for
 from system.models import Configuration
 from account.models import Team
@@ -1373,6 +1373,67 @@ def update_team_labels(self):
             LOG.error(msg)
             status = False
         return status, msg
+    
+    def get_future_offering(self, resize_target):
+        LOG.info('Buscando Future Offering de %s para database %s -> Offer atual: %s', resize_target, self.name, self.infra.offering.name)
+        current_offer = self.infra.offering
+        environment = self.environment
+
+        future_offer = None
+
+        # Busca ofertas disponíveis para o environment
+        possible_offerings_environment = self.get_possible_future_offerings_for_environment(environment)
+
+        if resize_target == 'cpu':
+            # Busca por offer > de CPU e >= de RAM
+            future_offer = self.get_next_offer_for_cpu(environment, current_offer, possible_offerings_environment)
+
+        elif resize_target == 'ram':
+            # Busca por offer >= de CPU e > de RAM
+            future_offer = self.get_next_offer_for_ram(environment, current_offer, possible_offerings_environment)
+            
+        elif resize_target == 'cpu_ram':
+            # Busca por offer > de CPU e > de RAM
+            future_offer = self.get_next_offer_for_cpu_ram(environment, current_offer, possible_offerings_environment)
+            
+        LOG.info('Future Offering selecionada: %s', future_offer.name)
+
+        return future_offer
+    
+    def get_possible_future_offerings_for_environment(self, environment):
+        # Busca na Configuration os nomes resumidos (ex: c2m2) das offerings disponíveis no DBaaS para auto upgrade
+        possible_offerings_names = Configuration.get_by_name_as_list(
+            'allowed_future_offerings_names_auto_upgrade_vm'
+            )
+        LOG.info('Possiveis offerings no DBaaS: %s', possible_offerings_names)
+        
+        possible_offerings_environment = []
+
+        # traz o nome real das Offerings, ja filtrando pelo environment
+        for possible_offer in possible_offerings_names:
+            offer_with_name = environment.offerings.filter(name__icontains=possible_offer).first()
+            if offer_with_name:
+                possible_offerings_environment.append(offer_with_name.name)
+
+        return possible_offerings_environment
+    
+    def get_next_offer_for_cpu(self, environment, current_offer, possible_offerings_environment):
+        return environment.offerings.filter(
+                cpus__gt=current_offer.cpus, 
+                memory_size_mb__gte=current_offer.memory_size_mb,
+                name__in=possible_offerings_environment).order_by('cpus', 'memory_size_mb').first()
+
+    def get_next_offer_for_ram(self, environment, current_offer, possible_offerings_environment):
+        return environment.offerings.filter(
+            cpus__gte=current_offer.cpus, 
+            memory_size_mb__gt=current_offer.memory_size_mb,
+            name__in=possible_offerings_environment).order_by('cpus', 'memory_size_mb').first()
+
+    def get_next_offer_for_cpu_ram(self, environment, current_offer, possible_offerings_environment):
+        return environment.offerings.filter(
+            cpus__gt=current_offer.cpus, 
+            memory_size_mb__gt=current_offer.memory_size_mb,
+            name__in=possible_offerings_environment).order_by('cpus', 'memory_size_mb').first()
 
 
 class DatabaseLock(BaseModel):

dbaas/logical/templates/logical/database/details/resizes_tab.html

@@ -41,6 +41,16 @@
             {% endif %}
         </div>
       </div>
+      {% if show_resize_btns %}
+      <div class="control-group">
+        <div class="control-label"><label>AutoResize:</label></div>
+        <div class="controls">
+          <a href="{% url 'resize_vm_from_btn' database.id 'cpu_ram' %}" target="_blank" class="btn btn-success">Resize CPU & RAM</a>
+          <a href="{% url 'resize_vm_from_btn' database.id 'cpu' %}" target="_blank" class="btn btn-primary">Resize CPU</a>
+          <a href="{% url 'resize_vm_from_btn' database.id 'ram' %}" target="_blank" class="btn btn-info">Resize RAM</a>
+        </div>
+      </div>
+      {% endif %}
   {% endif %}
 <!--  <div class="control-group">-->
 <!--    <div class="control-label"><label>Disk offering:</label></div>-->

dbaas/logical/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, url
 from .views import refresh_status, toggle_monitoring, start_database_vm, stop_database_vm, set_attention, funct_send_all_chg
 from .views import (CredentialView, CredentialSSLView,
-                    credential_parameter_by_name, check_offering_sizes)
+                    credential_parameter_by_name, check_offering_sizes, resize_vm_from_btn)
 
 
 urlpatterns = patterns(
@@ -36,4 +36,7 @@
     url(r"^check_offering_sizes/",
         check_offering_sizes,
         name="check_offering_sizes"),
+    url(r"^resize_vm/(?P<database_id>\d*)/(?P<resize_target>[\w\-\_]+)",
+        resize_vm_from_btn,
+        name="resize_vm_from_btn")
 )

dbaas/logical/views.py

@@ -15,6 +15,7 @@
 from django.utils.decorators import method_decorator
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template import RequestContext
+from django.core import serializers
 from workflow.steps.util.base import HostProviderClient
 
 from dbaas_credentials.models import CredentialType
@@ -1117,6 +1118,17 @@ def database_resizes(request, context, database):
     else:
         context['vm_offerings'].append(context['current_vm_offering'])
 
+    user_teams = request.user.team_set.all()
+    teams_names = []
+    for team in user_teams:
+        teams_names.append(team.name)
+
+    show_resize_btns = False
+    if request.user.is_superuser or 'dbaas' in teams_names:
+        show_resize_btns = True
+
+    context['show_resize_btns'] = show_resize_btns
+
     return render_to_response(
         "logical/database/details/resizes_tab.html",
         context, RequestContext(request)
@@ -2723,3 +2735,12 @@ def check_offering_sizes(request):
                                 'cpus': cpus,
                                 'memory': memory})
     return HttpResponse(response_json, content_type="application/json")
+
+
+@login_required()
+@method_decorator(csrf_exempt)
+def resize_vm_from_btn(request, database_id, resize_target):    
+    database = get_object_or_404(Database, pk=database_id)
+
+    future_offering = database.get_future_offering(resize_target)
+    return HttpResponse(json.dumps({'future_offering': future_offering.name}), content_type="application/json")

dbaas/workflow/steps/util/ssl.py

@@ -820,6 +820,31 @@ def undo(self):
         return self.run_script(script)
 
 
+class MoveSSLFolder(SSL):
+    source_ssl_dir = '/data/ssl'
+    backup_ssl_dir = '/data/ssl-BKP'
+
+    def __unicode__(self):
+        return "Moving backup of SSL folder..."
+
+    def remove_created_folder(self, folder):
+        script = 'rm -rf {}'.format(folder)
+        return self.run_script(script)
+
+    def move_folder(self, source, dest):
+        script = 'rm -rf {};mv {} {}'.format(
+            dest, source, dest
+        )
+        return self.run_script(script)
+
+    def do(self):
+        return self.move_folder(source=self.source_ssl_dir, dest=self.backup_ssl_dir)
+
+    def undo(self):
+        if self.remove_created_folder(self.source_ssl_dir):
+            return self.move_folder(source=self.backup_ssl_dir, dest=self.source_ssl_dir)
+
+
 class RestoreSSLFolder4Rollback(BackupSSLFolder):
     def __unicode__(self):
         return "Restore SSL folder if doing rollback..."