From 14caeee4eb6209f22d85c4fff6921eac5d89594d Mon Sep 17 00:00:00 2001 From: Timur Nurlygayanov Date: Thu, 14 Mar 2013 16:59:29 +0400 Subject: [PATCH] Fixed small issues with UI. --- dashboard/api/windc.py | 8 +++--- dashboard/windc/tables.py | 50 ++++++++++++--------------------- dashboard/windc/views.py | 7 ++--- portas/etc/portas-api-paste.ini | 6 ++-- portas/etc/portas-api.conf | 6 ++-- 5 files changed, 30 insertions(+), 47 deletions(-) diff --git a/dashboard/api/windc.py b/dashboard/api/windc.py index adf60591..067f530e 100644 --- a/dashboard/api/windc.py +++ b/dashboard/api/windc.py @@ -61,10 +61,6 @@ def datacenters_deploy(request, datacenter_id): return windcclient(request).sessions.deploy(datacenter_id, session_id) -def datacenters_get_status(request, datacenter_id): - return datacenters_get(request, datacenter_id).status - - def services_create(request, datacenter, parameters): session_id = windcclient(request).sessions.list(datacenter)[0].id if parameters['service_type'] == 'Active Directory': @@ -92,6 +88,10 @@ def services_list(request, datacenter_id): services = windcclient(request).activeDirectories.list(datacenter_id, session_id) services += windcclient(request).webServers.list(datacenter_id, session_id) + + for i in range(len(services)): + LOG.critical(services[i].units[0]['id']) + services[i].id = services[i].units[0]['id'] return services diff --git a/dashboard/windc/tables.py b/dashboard/windc/tables.py index 8b7a0c98..10b518ad 100644 --- a/dashboard/windc/tables.py +++ b/dashboard/windc/tables.py @@ -133,9 +133,7 @@ class UpdateDCRow(tables.Row): ajax = True def get_data(self, request, datacenter_id): - datacenter = api.windc.datacenters_get(request, datacenter_id) - datacenter.status = api.windc.datacenters_get_status(request, datacenter_id) - return datacenter + return api.windc.datacenters_get(request, datacenter_id) class UpdateServiceRow(tables.Row): @@ -144,43 +142,31 @@ class UpdateServiceRow(tables.Row): def get_data(self, request, service_id): link = request.__dict__['META']['HTTP_REFERER'] datacenter_id = re.search('windc/(\S+)', link).group(0)[6:-1] - - service = api.windc.services_get(request, datacenter_id, service_id) - service.status = api.windc.services_get_status(request, datacenter_id, - service_id) - return service + + return api.windc.services_get(request, datacenter_id, service_id) -DC_STATUS_DISPLAY_CHOICES = ( +STATUS_DISPLAY_CHOICES = ( ('draft', 'Ready to deploy'), ('pending', 'Wait for configuration'), - ('finished', 'Active'), - ('inprogress', "Deploy in progress") + ('inprogress', 'Deploy in progress'), + ('finished', 'Active') ) -SERVICES_STATUS_DISPLAY_CHOICES = ( +STATUS_DISPLAY_CHOICES = ( ('draft', 'Ready to deploy'), ('pending', 'Wait for configuration'), - ('finished', 'Active'), - ('inprogress', "Deploy in progress") + ('inprogress', 'Deploy in progress'), + ('finished', 'Active') ) - - -def get_datacenter_status(datacenter): - return datacenter.status - -def get_service_status(service): - return service.status - - class WinDCTable(tables.DataTable): STATUS_CHOICES = ( (None, True), - ('draft', False), - ('finished', False) + ('Ready to deploy', True), + ('Active', True) ) @@ -188,10 +174,10 @@ class WinDCTable(tables.DataTable): link=('horizon:project:windc:services'), verbose_name=_('Name')) - status = tables.Column(get_datacenter_status, verbose_name=_('Status'), + status = tables.Column('status', verbose_name=_('Status'), status=True, status_choices=STATUS_CHOICES, - display_choices=DC_STATUS_DISPLAY_CHOICES) + display_choices=STATUS_DISPLAY_CHOICES) class Meta: name = 'windc' @@ -207,8 +193,8 @@ class WinServicesTable(tables.DataTable): STATUS_CHOICES = ( (None, True), - ('draft', False), - ('finished', False) + ('Ready to deploy', True), + ('Active', True) ) name = tables.Column('name', verbose_name=_('Name'), @@ -216,15 +202,15 @@ class WinServicesTable(tables.DataTable): _type = tables.Column('service_type', verbose_name=_('Type')) - status = tables.Column(get_service_status, verbose_name=_('Status'), + status = tables.Column('status', verbose_name=_('Status'), status=True, status_choices=STATUS_CHOICES, - display_choices=SERVICES_STATUS_DISPLAY_CHOICES) + display_choices=STATUS_DISPLAY_CHOICES) class Meta: name = 'services' verbose_name = _('Services') - status_columns = ['status'] row_class = UpdateServiceRow + status_columns = ['status'] table_actions = (CreateService,) row_actions = (DeleteService,) diff --git a/dashboard/windc/views.py b/dashboard/windc/views.py index 626e73f1..770abb76 100644 --- a/dashboard/windc/views.py +++ b/dashboard/windc/views.py @@ -66,6 +66,7 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView): parameters['configuration'] = 'standalone' parameters['name'] = str(form_list[1].data.get('1-dc_name', 'noname')) + parameters['domain'] = parameters['name'] # Fix Me in orchestrator parameters['adminPassword'] = \ str(form_list[1].data.get('1-adm_password', '')) dc_count = int(form_list[1].data.get('1-dc_count', 1)) @@ -138,9 +139,6 @@ class IndexView(tables.DataTableView): def get_data(self): try: data_centers = api.windc.datacenters_list(self.request) - for dc in data_centers: - dc.status = api.windc.datacenters_get_status(self.request, - dc.id) except: data_centers = [] exceptions.handle(self.request, @@ -154,7 +152,6 @@ class WinServices(tables.DataTableView): def get_context_data(self, **kwargs): context = super(WinServices, self).get_context_data(**kwargs) - data = self.get_data() context['dc_name'] = self.dc_name return context @@ -168,7 +165,7 @@ class WinServices(tables.DataTableView): services = [] exceptions.handle(self.request, _('Unable to retrieve list of services for ' - 'data center "%s".') % dc_id) + 'data center "%s".') % self.dc_name) return services diff --git a/portas/etc/portas-api-paste.ini b/portas/etc/portas-api-paste.ini index 3bb45916..3c4b22f9 100644 --- a/portas/etc/portas-api-paste.ini +++ b/portas/etc/portas-api-paste.ini @@ -9,10 +9,10 @@ paste.filter_factory = portas.api.middleware.context:ContextMiddleware.factory [filter:authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory -auth_host = 172.18.79.73 +auth_host = localhost auth_port = 35357 auth_protocol = http admin_tenant_name = admin admin_user = admin -admin_password = swordfish -signing_dir = /tmp/keystone-signing-portas \ No newline at end of file +admin_password = password +signing_dir = /tmp/keystone-signing-portas diff --git a/portas/etc/portas-api.conf b/portas/etc/portas-api.conf index b572829f..be932a26 100644 --- a/portas/etc/portas-api.conf +++ b/portas/etc/portas-api.conf @@ -28,6 +28,6 @@ reports_queue = task-reports host = localhost port = 5672 use_ssl = false -userid = guest -password = guest -virtual_host = / \ No newline at end of file +userid = keero +password = keero +virtual_host = keero