PEP8 compliance
This commit is contained in:
Serg Melikyan
parent
37249ee7fa
commit
a70b44e30b
@ -74,9 +74,11 @@ def services_create(request, datacenter, parameters):
|
||||
|
||||
return res
|
||||
|
||||
|
||||
def get_time(obj):
|
||||
return obj.updated
|
||||
|
||||
|
||||
def services_list(request, datacenter_id):
|
||||
session_id = None
|
||||
sessions = windcclient(request).sessions.list(datacenter_id)
|
||||
@ -93,7 +95,6 @@ def services_list(request, datacenter_id):
|
||||
session_id)
|
||||
services += windcclient(request).webServers.list(datacenter_id, session_id)
|
||||
|
||||
|
||||
for i in range(len(services)):
|
||||
reports = windcclient(request).sessions. \
|
||||
reports(datacenter_id, session_id,
|
||||
@ -104,6 +105,7 @@ def services_list(request, datacenter_id):
|
||||
|
||||
return services
|
||||
|
||||
|
||||
def get_active_directories(request, datacenter_id):
|
||||
session_id = None
|
||||
sessions = windcclient(request).sessions.list(datacenter_id)
|
||||
@ -121,14 +123,17 @@ def get_active_directories(request, datacenter_id):
|
||||
session_id)
|
||||
return services
|
||||
|
||||
|
||||
def services_get(request, datacenter_id, service_id):
|
||||
services = services_list(request, datacenter_id)
|
||||
|
||||
for service in services:
|
||||
if service.id is service_id:
|
||||
service['operation'] = get_status_message_for_service(request, service_id)
|
||||
service['operation'] = get_status_message_for_service(request,
|
||||
service_id)
|
||||
return service
|
||||
|
||||
|
||||
def get_data_center_id_for_service(request, service_id):
|
||||
datacenters = datacenters_list(request)
|
||||
|
||||
@ -138,6 +143,7 @@ def get_data_center_id_for_service(request, service_id):
|
||||
if service.id == service_id:
|
||||
return dc.id
|
||||
|
||||
|
||||
def get_service_datails(request, service_id):
|
||||
datacenters = datacenters_list(request)
|
||||
services = []
|
||||
@ -148,6 +154,7 @@ def get_service_datails(request, service_id):
|
||||
if service.id == service_id:
|
||||
return service
|
||||
|
||||
|
||||
def get_status_message_for_service(request, service_id):
|
||||
environment_id = get_data_center_id_for_service(request, service_id)
|
||||
session_id = None
|
||||
@ -171,6 +178,7 @@ def get_status_message_for_service(request, service_id):
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def services_delete(request, datacenter_id, service_id):
|
||||
services = services_list(request, datacenter_id)
|
||||
|
||||
|
||||
@ -30,12 +30,12 @@ LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class PasswordField(forms.CharField):
|
||||
|
||||
# Setup the Field
|
||||
def __init__(self, label, *args, **kwargs):
|
||||
super(PasswordField, self).__init__(min_length=7, required=True,
|
||||
label=label,
|
||||
widget=forms.PasswordInput(render_value=False),
|
||||
widget=forms.PasswordInput(
|
||||
render_value=False),
|
||||
*args, **kwargs)
|
||||
|
||||
def clean(self, value):
|
||||
@ -86,8 +86,6 @@ class WizardFormConfiguration(forms.Form):
|
||||
|
||||
|
||||
class WizardFormADConfiguration(forms.Form):
|
||||
|
||||
|
||||
dc_name = forms.CharField(label=_('Domain Name'),
|
||||
required=True)
|
||||
|
||||
@ -105,7 +103,6 @@ class WizardFormADConfiguration(forms.Form):
|
||||
super(WizardFormADConfiguration, self).__init__(*args, **kwargs)
|
||||
|
||||
|
||||
|
||||
class WizardFormIISConfiguration(forms.Form):
|
||||
iis_name = forms.CharField(label=_('IIS Server Name'),
|
||||
required=True)
|
||||
@ -126,4 +123,3 @@ class WizardFormIISConfiguration(forms.Form):
|
||||
self.fields['iis_domain'].choices = [("", "")] + \
|
||||
[(domain.name, domain.name)
|
||||
for domain in domains]
|
||||
|
||||
@ -17,28 +17,14 @@
|
||||
|
||||
# TO DO: clear extra modules
|
||||
|
||||
import re
|
||||
import logging
|
||||
|
||||
from django import shortcuts
|
||||
from django import template
|
||||
from django.core import urlresolvers
|
||||
from django.template.defaultfilters import title
|
||||
from django.utils.http import urlencode
|
||||
from django.utils.translation import string_concat, ugettext_lazy as _
|
||||
|
||||
from horizon.conf import HORIZON_CONFIG
|
||||
from horizon import exceptions
|
||||
import re
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from horizon import messages
|
||||
from horizon import tables
|
||||
from horizon.templatetags import sizeformat
|
||||
from horizon.utils.filters import replace_underscores
|
||||
|
||||
from tabula.windc import api
|
||||
|
||||
from openstack_dashboard.dashboards.project.access_and_security \
|
||||
.floating_ips.workflows import IPAssociationWorkflow
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -102,8 +88,8 @@ class DeleteService(tables.BatchAction):
|
||||
try:
|
||||
api.services_delete(request, datacenter_id, service_id)
|
||||
except:
|
||||
messages.error(request,
|
||||
_('Sorry, you can not delete this service right now.'))
|
||||
messages.error(request, _('Sorry, you can not delete this '
|
||||
'service right now.'))
|
||||
|
||||
|
||||
class DeployDataCenter(tables.BatchAction):
|
||||
@ -112,7 +98,7 @@ class DeployDataCenter(tables.BatchAction):
|
||||
action_past = _('Deploy')
|
||||
data_type_singular = _('Data Center')
|
||||
data_type_plural = _('Data Center')
|
||||
classes = ('btn-launch')
|
||||
classes = 'btn-launch'
|
||||
|
||||
def allowed(self, request, datum):
|
||||
return True
|
||||
@ -161,14 +147,12 @@ STATUS_DISPLAY_CHOICES = (
|
||||
|
||||
|
||||
class WinDCTable(tables.DataTable):
|
||||
|
||||
STATUS_CHOICES = (
|
||||
(None, True),
|
||||
('Ready to deploy', True),
|
||||
('Active', True)
|
||||
)
|
||||
|
||||
|
||||
name = tables.Column('name',
|
||||
link=('horizon:project:windc:services'),
|
||||
verbose_name=_('Name'))
|
||||
@ -189,7 +173,6 @@ class WinDCTable(tables.DataTable):
|
||||
|
||||
|
||||
class WinServicesTable(tables.DataTable):
|
||||
|
||||
STATUS_CHOICES = (
|
||||
(None, True),
|
||||
('Ready to deploy', True),
|
||||
|
||||
@ -25,6 +25,7 @@ from tabula.windc import api
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class OverviewTab(tabs.Tab):
|
||||
name = _("Service")
|
||||
slug = "_service"
|
||||
@ -38,6 +39,7 @@ class OverviewTab(tabs.Tab):
|
||||
"service_type": data.service_type,
|
||||
"service_domain": data.domain}
|
||||
|
||||
|
||||
class LogsTab(tabs.Tab):
|
||||
name = _("Logs")
|
||||
slug = "_logs"
|
||||
|
||||
@ -29,11 +29,13 @@ VIEW_MOD = 'openstack_dashboard.dashboards.project.windc.views'
|
||||
urlpatterns = patterns(VIEW_MOD,
|
||||
url(r'^$', IndexView.as_view(), name='index'),
|
||||
url(r'^create$',
|
||||
Wizard.as_view([WizardFormServiceType, WizardFormConfiguration]),
|
||||
Wizard.as_view([WizardFormServiceType,
|
||||
WizardFormConfiguration]),
|
||||
name='create'),
|
||||
url(r'^create_dc$', CreateWinDCView.as_view(), name='create_dc'),
|
||||
url(r'^(?P<data_center_id>[^/]+)/$', WinServices.as_view(),
|
||||
name='services'),
|
||||
url(r'^(?P<service_id>[^/]+)/details$', DetailServiceView.as_view(),
|
||||
name='service_details')
|
||||
)
|
||||
url(r'^create_dc$', CreateWinDCView.as_view(),
|
||||
name='create_dc'),
|
||||
url(r'^(?P<data_center_id>[^/]+)/$',
|
||||
WinServices.as_view(), name='services'),
|
||||
url(r'^(?P<service_id>[^/]+)/details$',
|
||||
DetailServiceView.as_view(),
|
||||
name='service_details'))
|
||||
|
||||
@ -24,16 +24,12 @@ Views for managing instances.
|
||||
import logging
|
||||
import re
|
||||
|
||||
from django import http
|
||||
from django import shortcuts
|
||||
from django.views import generic
|
||||
from django.core.urlresolvers import reverse, reverse_lazy
|
||||
from django.utils.datastructures import SortedDict
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.contrib.formtools.wizard.views import SessionWizardView
|
||||
|
||||
from horizon import exceptions
|
||||
from horizon import forms
|
||||
from horizon import tabs
|
||||
from horizon import tables
|
||||
from horizon import workflows
|
||||
@ -44,12 +40,12 @@ from tabula.windc import api
|
||||
from .tables import WinDCTable, WinServicesTable
|
||||
from .workflows import CreateWinDC
|
||||
from .tabs import WinServicesTabs
|
||||
from .forms import (WizardFormServiceType, WizardFormConfiguration,
|
||||
WizardFormADConfiguration, WizardFormIISConfiguration)
|
||||
from .forms import (WizardFormADConfiguration, WizardFormIISConfiguration)
|
||||
|
||||
from horizon import messages
|
||||
|
||||
from django.http import HttpResponseRedirect
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@ -60,11 +56,6 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
|
||||
link = self.request.__dict__['META']['HTTP_REFERER']
|
||||
datacenter_id = re.search('windc/(\S+)', link).group(0)[6:-1]
|
||||
|
||||
LOG.critical("/////////////////////////////")
|
||||
LOG.critical(link)
|
||||
LOG.critical(datacenter_id)
|
||||
LOG.critical("/////////////////////////////")
|
||||
|
||||
url = "/project/windc/%s/" % datacenter_id
|
||||
|
||||
service_type = form_list[0].data.get('0-service', '')
|
||||
@ -82,9 +73,11 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
|
||||
'recoveryPassword': recovery_password,
|
||||
'location': 'west-dc'})
|
||||
for dc in range(dc_count - 1):
|
||||
parameters['units'].append({'isMaster': False,
|
||||
parameters['units'].append({
|
||||
'isMaster': False,
|
||||
'recoveryPassword': recovery_password,
|
||||
'location': 'west-dc'})
|
||||
'location': 'west-dc'
|
||||
})
|
||||
|
||||
elif service_type == 'IIS':
|
||||
password = data.get('1-adm_password', '')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user