Changed Action of load swift policies

JosepSampe · JosepSampe · commit 38ac239a2689 · 2017-11-03T19:15:44.000+01:00
diff --git a/crystal_dashboard/dashboards/crystal/filters/urls.py b/crystal_dashboard/dashboards/crystal/filters/urls.py
@@ -2,11 +2,9 @@
 from crystal_dashboard.dashboards.crystal.filters import views
 from crystal_dashboard.dashboards.crystal.filters.dependencies import urls as dependencies_urls
 from crystal_dashboard.dashboards.crystal.filters.filters import urls as filter_urls
-from crystal_dashboard.dashboards.crystal.filters.registry_dsl import urls as registry_urls
 
 urlpatterns = [
     url(r'^$', views.IndexView.as_view(), name='index'),
     url(r'filters/', include(filter_urls, namespace="filters")),
     url(r'dependencies/', include(dependencies_urls, namespace="dependencies")),
-    url(r'', include(registry_urls, namespace="registry_dsl")),
 ]
diff --git a/crystal_dashboard/dashboards/crystal/rings/storage_policies/forms.py b/crystal_dashboard/dashboards/crystal/rings/storage_policies/forms.py
@@ -4,7 +4,6 @@
 from horizon import exceptions
 from horizon import forms
 from horizon import messages
-import json
 
 from crystal_dashboard.dashboards.crystal import exceptions as sdsexception
 from crystal_dashboard.api import swift as api
@@ -22,32 +21,30 @@ class CreateStoragePolicy(forms.SelfHandlingForm):
                                label=_("Num. Replicas"),
                                help_text=_("Number of replicas"),
                                initial=3)
- 
+
     partition_power = forms.CharField(max_length=255,
                                       label=_("Partiton Power"),
                                       help_text=_("If the value is x the num of partitions will be 2^x"),
                                       initial=10)
- 
+
     time = forms.CharField(max_length=255,
                            label=_("Time"),
                            help_text=_("Time between moving a partition more than once. In hours"),
                            initial=1)
-    
-    
+
     policy_type = forms.CharField(widget=forms.HiddenInput(), initial='replication')
- 
+
     deprecated = forms.CharField(widget=forms.HiddenInput(), initial='False')
-  
+
     deployed = forms.CharField(widget=forms.HiddenInput(), initial='False')
-    
+
     default = forms.CharField(widget=forms.HiddenInput(), initial='False')
-      
+
     devices = forms.CharField(widget=forms.HiddenInput(), initial='[]')
 
     def __init__(self, request, *args, **kwargs):
         super(CreateStoragePolicy, self).__init__(request, *args, **kwargs)
 
-
     def handle(self, request, data):
         try:
             response = api.swift_new_storage_policy(request, data)
@@ -60,7 +57,6 @@ def handle(self, request, data):
             redirect = reverse("horizon:crystal:rings:index")
             error_message = "Unable to create storage policy.\t %s" % ex.message
             exceptions.handle(request, _(error_message), redirect=redirect)
-        
 
 
 class UpdateStoragePolicy(forms.SelfHandlingForm):
@@ -71,8 +67,6 @@ class UpdateStoragePolicy(forms.SelfHandlingForm):
     default = forms.BooleanField(required=False, label="Default")
     deprecated = forms.BooleanField(required=False, label="Deprecated")
 
-
-
     def __init__(self, request, *args, **kwargs):
         super(UpdateStoragePolicy, self).__init__(request, *args, **kwargs)
 
@@ -137,17 +131,16 @@ class CreateECStoragePolicy(forms.SelfHandlingForm):
                                             required=True,
                                             help_text=_("EC Duplication enables Swift to make duplicated copies of fragments of erasure coded objects."),
                                             initial=1)
-    
+
     policy_type = forms.CharField(widget=forms.HiddenInput(), initial='EC')
 
     deprecated = forms.CharField(widget=forms.HiddenInput(), initial='False')
-  
+
     deployed = forms.CharField(widget=forms.HiddenInput(), initial='False')
-    
+
     devices = forms.CharField(widget=forms.HiddenInput(), initial='[]')
-    
-    default = forms.CharField(widget=forms.HiddenInput(), initial='False')
 
+    default = forms.CharField(widget=forms.HiddenInput(), initial='False')
 
     def __init__(self, request, *args, **kwargs):
         super(CreateECStoragePolicy, self).__init__(request, *args, **kwargs)
@@ -164,25 +157,3 @@ def handle(self, request, data):
             redirect = reverse("horizon:crystal:rings:index")
             error_message = "Unable to create storage policy.\t %s" % ex.message
             exceptions.handle(request, _(error_message), redirect=redirect)
-
-
-class LoadSwiftPolicies(forms.SelfHandlingForm):
-    name = forms.CharField(max_length=255,
-                           label=_("Name"),
-                           help_text=_("The name assigned to new storage node."),
-                           widget=forms.TextInput(
-                               attrs={"ng-model": "name", "not-blank": ""}
-                           ))
-    type = forms.CharField(max_length=255,
-                           label=_("Type"),
-                           help_text=_("SSD or HDD"),
-                           widget=forms.TextInput(
-                               attrs={"ng-model": "type", "not-blank": ""}
-                           ))
-
-    def __init__(self, request, *args, **kwargs):
-        super(LoadSwiftPolicies, self).__init__(request, *args, **kwargs)
-
-    def handle(self, request, data):
-        api.load_swift_policies(request, data)
-        return data
diff --git a/crystal_dashboard/dashboards/crystal/rings/storage_policies/tables.py b/crystal_dashboard/dashboards/crystal/rings/storage_policies/tables.py
@@ -2,6 +2,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 from django.core.urlresolvers import reverse_lazy
+from django import shortcuts
 from horizon import exceptions
 from horizon import messages
 from horizon import tables
@@ -38,23 +39,24 @@ class LoadSwiftPolicies(tables.Action):
     name = "load_swift_policies"
     verbose_name = _("Load Swift Policies")
     requires_input = False
-    success_url = "horizon:crystal:rings:index"
-    
+    icon = "upload"
+
     def allowed(self, request, policies):
-        return len(self.table.get_rows()) == 0;
-    
-    def handle(self, data_table, request, object_ids):
+        return len(self.table.get_rows()) == 0
+
+    def single(self, data_table, request, object_id):
         try:
             response = api.load_swift_policies(request)
             if 200 <= response.status_code < 300:
-                messages.success(request, _("Policies loaded successfully"))
+                messages.success(request, _("Storage Policies loaded successfully"))
+                return shortcuts.redirect('horizon:crystal:rings:index')
             else:
                 raise sdsexception.SdsException(response.text)
         except Exception as ex:
             redirect = reverse("horizon:crystal:rings:index")
             error_message = "Unable to load policies.\t %s" % ex.message
             exceptions.handle(request, _(error_message), redirect=redirect)
-    
+
 
 class ManageDisksLink(tables.LinkAction):
     name = "users"
@@ -87,11 +89,11 @@ def get_data(self, request, obj_id):
         response = api.swift_storage_policy_detail(request, obj_id)
         inst = json.loads(response.text)
         parameters = ', '.join([key.replace('_', ' ').title()+':'+inst[key] for key in inst.keys() if key not in ['id', 'name', 'policy_type', 'default', 'devices', 'deprecated', 'deployed']])
-        policy = storage_policies_models.StoragePolicy(inst['storage_policy_id'], inst['name'], inst['policy_type'], 
+        policy = storage_policies_models.StoragePolicy(inst['storage_policy_id'], inst['name'], inst['policy_type'],
                                                        inst['default'], parameters, inst['deprecated'], inst['deployed'], inst['devices'])
 
         return policy
-    
+
 
 class UpdateStoragePolicy(tables.LinkAction):
     name = "update"
@@ -141,7 +143,7 @@ def delete(self, request, obj_id):
 class DeleteMultipleStoragePolicies(DeleteStoragePolicy):
     name = "delete_multiple_storage_policies"
 
-    
+
 class DeployChanges(tables.BatchAction):
     @staticmethod
     def action_present(count):
@@ -163,7 +165,7 @@ def action_past(count):
     icon = "plus"
     requires_input = True
     success_url = "horizon:crystal:rings:index"
-    
+
     def allowed(self, request, storage_policy):
         return not storage_policy.deployed
 
@@ -176,7 +178,7 @@ def action(self, request, obj_id):
             redirect = reverse("horizon:crystal:rings:index")
             error_message = "Unable to deploy storage policy.\t %s" % ex.message
             exceptions.handle(request, _(error_message), redirect=redirect)
-    
+
 
 class StoragePolicyTable(tables.DataTable):
 
@@ -187,14 +189,14 @@ class StoragePolicyTable(tables.DataTable):
                             form_field=forms.ChoiceField(choices=[('True', _('True')), ('False', _('False'))]), update_action=UpdateCell)
     parameters = tables.Column('parameters', verbose_name=_("Parameters"))
     deprecated = tables.Column('deprecated', verbose_name=_("Deprecated"),
-                            form_field=forms.ChoiceField(choices=[('True', _('True')), ('False', _('False'))]), update_action=UpdateCell)
+                               form_field=forms.ChoiceField(choices=[('True', _('True')), ('False', _('False'))]), update_action=UpdateCell)
     devices = tables.Column('devices', verbose_name=_("Devices"))
     deployed = tables.Column('deployed', verbose_name=_("Deployed"))
 
     class Meta:
         name = "storagepolicies"
         verbose_name = _("Storage Policies")
-        table_actions = (MyFilterAction, CreateStoragePolicy, CreateECStoragePolicy, LoadSwiftPolicies,DeleteMultipleStoragePolicies,)
+        table_actions = (MyFilterAction, CreateStoragePolicy, CreateECStoragePolicy, LoadSwiftPolicies, DeleteMultipleStoragePolicies,)
         row_actions = (DeployChanges, ManageDisksLink, UpdateStoragePolicy, DeleteStoragePolicy)
         row_class = UpdateRow
 
@@ -240,8 +242,7 @@ def delete(self, request, obj_id):
             redirect = reverse("horizon:crystal:rings:storage_policies:devices")
             error_message = "Unable to remove disk.\t %s" % ex.message
             exceptions.handle(request, _(error_message), redirect=redirect)
-        
-        
+
     def get_success_url(self, request=None):
         policy_id = self.table.kwargs.get('policy_id', None)
         return reverse(self.success_url, args=[policy_id])
@@ -297,7 +298,7 @@ def action(self, request, obj_id):
     def get_success_url(self, request=None):
         policy_id = self.table.kwargs.get('policy_id', None)
         return reverse(self.success_url, args=[policy_id])
-    
+
 
 class AddDisksTable(ManageDisksTable):
 
diff --git a/crystal_dashboard/dashboards/crystal/rings/templates/rings/storage_policies/_load_swift_policies.html b/crystal_dashboard/dashboards/crystal/rings/templates/rings/storage_policies/_load_swift_policies.html
diff --git a/crystal_dashboard/dashboards/crystal/rings/templates/rings/storage_policies/load_swift_policies.html b/crystal_dashboard/dashboards/crystal/rings/templates/rings/storage_policies/load_swift_policies.html
diff --git a/setup.cfg b/setup.cfg
@@ -2,7 +2,7 @@
 name = crystal-dashboard
 summary = Horizon Plugin for Crystal
 version = 0.8.6
-description-file = README.rst
+description-file = README.md
 author = AST Team
 author-email = gerard.paris@urv.cat, josep.sampe@urv.cat
 home-page = http://ast-deim.urv.cat/
