Sync

dashboard/api/windc.py

@@ -78,8 +78,10 @@ def services_create(request, datacenter, parameters):
 def services_list(request, datacenter_id):
     session_id = None
     sessions = windcclient(request).sessions.list(datacenter_id)
+    LOG.critical('DC ID: ' + str(datacenter_id))
+    
     for s in sessions:
-        if s.state in ['open', 'deployed', 'deploying']:
+        if s.state in ['open', 'deploying']:
             session_id = s.id
 
     if session_id is None:

dashboard/windc/tables.py

@@ -143,6 +143,10 @@ class UpdateServiceRow(tables.Row):
         link = request.__dict__['META']['HTTP_REFERER']
         datacenter_id = re.search('windc/(\S+)', link).group(0)[6:-1]
         
+        LOG.critical('////////////////')
+        LOG.critical(datacenter_id)
+        LOG.critical('////////////////')
+ 
         return api.windc.services_get(request, datacenter_id, service_id)
 
 
@@ -153,6 +157,13 @@ STATUS_DISPLAY_CHOICES = (
     ('finished', 'Active')
 )
 
+STATUS_DISPLAY_CHOICES = (
+    ('draft', 'Ready to deploy'),
+    ('pending', 'Wait for configuration'),
+    ('inprogress', 'Deploy in progress'),
+    ('finished', 'Active')
+)
+
 
 class WinDCTable(tables.DataTable):
 
@@ -162,6 +173,7 @@ class WinDCTable(tables.DataTable):
         ('Active', True)
     )
 
+
     name = tables.Column('name',
                          link=('horizon:project:windc:services'),
                          verbose_name=_('Name'))
@@ -204,18 +216,5 @@ class WinServicesTable(tables.DataTable):
         verbose_name = _('Services')
         row_class = UpdateServiceRow
         status_columns = ['status']
-        row_actions = (ShowDataCenterServices, DeleteDataCenter,
-                       DeployDataCenter)
-
-
-class WinServicesTable(tables.DataTable):
-
-    name = tables.Column('name', verbose_name=_('Name'),
-                         link=('horizon:project:windc:service_details'),)
-    _type = tables.Column('service_type', verbose_name=_('Type'))
-
-    class Meta:
-        name = 'services'
-        verbose_name = _('Services')
         table_actions = (CreateService,)
         row_actions = (DeleteService,)

dashboard/windc/templates/windc/_services_tabs.html

@@ -51,6 +51,7 @@
 {% block modal-footer %}
 {% if wizard.steps.prev %}
 <input type="submit" class="btn btn-primary pull-right"  value="{% trans 'Create' %}"/>
+<button name="wizard_goto_step" class="btn btn-small" type="submit" value="{{ wizard.steps.prev }}">{% trans "< Back" %}</button>
 {% else %}
 <button name="wizard_goto_step" class="btn btn-small" type="submit" value="{{ wizard.steps.next }}">{% trans "Next >" %}</button>
 {% endif %}

dashboard/windc/views.py

@@ -66,10 +66,7 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
             parameters['configuration'] = 'standalone'
             parameters['name'] = str(form_list[1].data.get('1-dc_name',
                                                            'noname'))
-
-            # Fix Me in orchestrator
-            parameters['domain'] = parameters['name']
-
+            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))
@@ -91,10 +88,12 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
             dc_pass = form_list[1].data.get('1-domain_user_password', '')
             parameters['name'] = str(form_list[1].data.get('1-iis_name',
                                                            'noname'))
-
+            parameters['domain'] = parameters['name']
             parameters['credentials'] = {'username': 'Administrator',
                                          'password': password}
             parameters['domain'] = str(domain)
+                                   # 'username': str(dc_user),
+                                   # 'password': str(dc_pass)}
             parameters['location'] = 'west-dc'
 
             parameters['units'] = []
@@ -140,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,
@@ -162,6 +158,7 @@ class WinServices(tables.DataTableView):
     def get_data(self):
         try:
             dc_id = self.kwargs['data_center_id']
+            self.datacenter_id = dc_id
             datacenter = api.windc.datacenters_get(self.request, dc_id)
             self.dc_name = datacenter.name
             services = api.windc.services_list(self.request, dc_id)