Hot fix: Fixed pep8 for Dashboard.

dashboard/windc/forms.py

@@ -38,10 +38,9 @@ LOG = logging.getLogger(__name__)
 class WizardFormServiceType(forms.Form):
     service = forms.ChoiceField(label=_("Service Type"),
                                 choices=[
-                                       ('active directory', 'Active Directory'),
+                                ('active directory', 'Active Directory'),
-                                       ('iis', 'Internet Information Services')
+                                ('iis', 'Internet Information Services')
-                                        ],
+                                ])
-                                initial = 'Please, select the type of service...')
 
 
 class WizardFormConfiguration(forms.Form):
@@ -60,15 +59,12 @@ class WizardFormADConfiguration(forms.Form):
                                   initial=1)
 
     adm_password = forms.CharField(widget=forms.PasswordInput,
-                                   label=_("Administrator password"), required=False)
+                                   label=_("Administrator password"),
+                                   required=False)
 
     recovery_password = forms.CharField(widget=forms.PasswordInput,
-                                   label=_("Recovery password"), required=False)
+                                   label=_("Recovery password"),
-    
+                                   required=False)
-    def handle(self, request, data):
-        message = "Test"
-        messages.success(request, message)
-        LOG.critical('^^^^^^^^^^^^^^^^^^^^^')
 
 
 class WizardFormIISConfiguration(forms.Form):
@@ -76,7 +72,8 @@ class WizardFormIISConfiguration(forms.Form):
                                required=False)
 
     adm_password = forms.CharField(widget=forms.PasswordInput,
-                                   label=_("Administrator password"), required=False)
+                                   label=_("Administrator password"),
+                                   required=False)
 
     iis_count = forms.IntegerField(label=_("IIS Servers Count"),
                                    required=True,
@@ -88,10 +85,11 @@ class WizardFormIISConfiguration(forms.Form):
                                  required=False)
 
     domain_user_name = forms.CharField(label=_("Domain User Name"),
-                               required=False)
+                                       required=False)
 
     domain_user_password = forms.CharField(widget=forms.PasswordInput,
-                                   label=_("Domain User Password"), required=False)
+                                      label=_("Domain User Password"),
+                                      required=False)
 
 
 class UpdateWinDC(forms.SelfHandlingForm):

dashboard/windc/tables.py

@@ -114,16 +114,6 @@ class EditService(tables.LinkAction):
         return True
 
 
-class Wizard(tables.LinkAction):
-    name = "wizard"
-    verbose_name = _("Wizard")
-    url = "horizon:project:windc:update"
-    classes = ("ajax-modal", "btn-edit")
-
-    def allowed(self, request, instance):
-        return True
-
-
 class ShowDataCenterServices(tables.LinkAction):
     name = "edit"
     verbose_name = _("Services")
@@ -152,7 +142,7 @@ class WinDCTable(tables.DataTable):
         name = "windc"
         verbose_name = _("Windows Data Centers")
         row_class = UpdateRow
-        table_actions = (CreateDataCenter, Wizard)
+        table_actions = (CreateDataCenter,)
         row_actions = (ShowDataCenterServices, DeleteDataCenter)
 
 

dashboard/windc/urls.py

@@ -20,8 +20,7 @@
 
 from django.conf.urls.defaults import patterns, url
 
-from .views import IndexView, WinServices, \
+from .views import IndexView, WinServices, CreateWinDCView
-                   CreateWinDCView, CreateWinServiceView
 from .views import Wizard
 from .forms import WizardFormServiceType, WizardFormConfiguration
 

dashboard/windc/views.py

@@ -41,7 +41,7 @@ from horizon.forms.views import ModalFormMixin
 
 from openstack_dashboard import api
 from .tables import WinDCTable, WinServicesTable
-from .workflows import CreateWinService, CreateWinDC
+from .workflows import CreateWinDC
 from .forms import (WizardFormServiceType, WizardFormConfiguration,
                     WizardFormADConfiguration, WizardFormIISConfiguration)
 
@@ -61,19 +61,24 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
 
         service_type = form_list[0].data.get('0-service', '')
         parameters = {}
+        if form_list[1].data:
+            data = form_list[1].data
 
         if service_type == 'active directory':
-            parameters['dc_name'] = str(form_list[1].data.get('1-dc_name', 'noname'))
+            parameters['dc_name'] = str(data.get('1-dc_name', 'noname'))
-            parameters['adm_password'] = str(form_list[1].data.get('1-adm_password', ''))
+            parameters['adm_password'] = str(data.get('1-adm_password', ''))
-            parameters['dc_count'] = int(form_list[1].data.get('1-dc_count', 1))
+            parameters['dc_count'] = int(data.get('1-dc_count', 1))
-            parameters['recovery_password'] = str(form_list[1].data.get('1-recovery_password', ''))
+            parameters['recovery_password'] = \
+                        str(data.get('1-recovery_password', ''))
         elif service_type == 'iis':
-            parameters['iis_name'] = str(form_list[1].data.get('1-iis_name', 'noname'))
+            parameters['iis_name'] = str(data.get('1-iis_name', 'noname'))
-            parameters['adm_password'] = str(form_list[1].data.get('1-adm_password', ''))
+            parameters['adm_password'] = str(data.get('1-adm_password', ''))
-            parameters['iis_count'] = int(form_list[1].data.get('1-iis_count', 1))
+            parameters['iis_count'] = int(data.get('1-iis_count', 1))
-            parameters['iis_domain'] = str(form_list[1].data.get('1-iis_domain', ''))
+            parameters['iis_domain'] = str(data.get('1-iis_domain', ''))
-            parameters['domain_user_name'] = str(form_list[1].data.get('1-domain_user_name', ''))
+            parameters['domain_user_name'] = \
-            parameters['domain_user_password'] = str(form_list[1].data.get('1-domain_user_password', ''))
+                        str(data.get('1-domain_user_name', ''))
+            parameters['domain_user_password'] = \
+                        str(data.get('1-domain_user_password', ''))
 
         service = api.windc.services_create(self.request,
                                             datacenter_id,
@@ -96,10 +101,6 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
 
         return form
 
-    def get_form_step_data(self, form):
-        LOG.debug(form.data)
-        return form.data
-
 
 class IndexView(tables.DataTableView):
     table_class = WinDCTable
@@ -149,14 +150,3 @@ class CreateWinDCView(workflows.WorkflowView):
         initial['project_id'] = self.request.user.tenant_id
         initial['user_id'] = self.request.user.id
         return initial
-
-
-class CreateWinServiceView(workflows.WorkflowView):
-    workflow_class = CreateWinService
-    template_name = "project/windc/create.html"
-
-    def get_initial(self):
-        initial = super(CreateWinServiceView, self).get_initial()
-        initial['project_id'] = self.request.user.tenant_id
-        initial['user_id'] = self.request.user.id
-        return initial

dashboard/windc/workflows.py

@@ -80,112 +80,6 @@ class ConfigureDC(workflows.Step):
         return context
 
 
-class ConfigureWinDCAction(workflows.Action):
-    dc_name = forms.CharField(label=_("Domain Name"),
-                              required=False)
-
-    dc_count = forms.IntegerField(label=_("Instances Count"),
-                                  required=True,
-                                  min_value=1,
-                                  max_value=100,
-                                  initial=1)
-
-    adm_password = forms.CharField(widget=forms.PasswordInput,
-                                   label=_("Administrator password"),
-                                   required=False,
-                                   help_text=_("Password for "
-                                               "administrator account."))
-
-    recovery_password = forms.CharField(widget=forms.PasswordInput,
-                                   label=_("Recovery password"),
-                                   required=False,
-                                   help_text=_("Password for "
-                                               "Active Directory "
-                                               "Recovery Mode."))
-
-    class Meta:
-        name = _("Active Directory")
-        help_text_template = ("project/windc/_dc_help.html")
-
-
-class ConfigureWinDC(workflows.Step):
-    action_class = ConfigureWinDCAction
-    contibutes = ('dc_name', 'dc_count', 'adm_password', 'recovery_password')
-
-    def contribute(self, data, context):
-        if data:
-            context['dc_name'] = data.get('dc_name', '')
-            context['dc_count'] = data.get('dc_count', 1)
-            context['adm_password'] = data.get('adm_password', '')
-            context['recovery_password'] = data.get('recovery_password', '')
-            context['type'] = 'active_directory_service'
-        return context
-
-
-class ConfigureWinIISAction(workflows.Action):
-    iis_name = forms.CharField(label=_("IIS Server Name"),
-                               required=False)
-
-    iis_count = forms.IntegerField(label=_("IIS Servers Count"),
-                                   required=True,
-                                   min_value=1,
-                                   max_value=100,
-                                   initial=1)
-
-    iis_domain = forms.CharField(label=_("Member of the Domain"),
-                                 required=False,
-                                 help_text=_("A name of domain for"
-                                             " IIS Server."))
-
-    class Meta:
-        name = _("Internet Information Services")
-        help_text_template = ("project/windc/_iis_help.html")
-
-
-class ConfigureWinIIS(workflows.Step):
-    action_class = ConfigureWinIISAction
-
-    contibutes = ('iis_name', 'iis_count', 'iis_domain')
-
-    def contribute(self, data, context):
-        if data:
-            context['iis_name'] = data.get('iis_name', '')
-            context['iis_count'] = data.get('iis_count', 1)
-            context['iis_domain'] = data.get('iis_domain', '')
-        return context
-
-
-class CreateWinService(workflows.Workflow):
-    slug = "create"
-    name = _("Create Service")
-    finalize_button_name = _("Deploy")
-    success_message = _('Created service "%s".')
-    failure_message = _('Unable to create service "%s".')
-    success_url = "/project/windc/%s/"
-    default_steps = (SelectProjectUser,
-                     ConfigureWinDC,
-                     ConfigureWinIIS)
-
-    def format_status_message(self, message):
-        dc_name = self.context.get('dc_name', 'noname')
-        return message % dc_name
-
-    def handle(self, request, context):
-        try:
-            link = request.__dict__['META']['HTTP_REFERER']
-            datacenter_id = re.search('windc/(\S+)', link).group(0)[6:-1]
-
-            self.success_url = "/project/windc/%s/" % datacenter_id
-
-            service = api.windc.services_create(request,
-                                                datacenter_id,
-                                                context)
-            return True
-        except:
-            exceptions.handle(request)
-            return False
-
-
 class CreateWinDC(workflows.Workflow):
     slug = "create"
     name = _("Create Windows Data Center")