From 93044d53f65815b74822a71759bed3b92ea1628b Mon Sep 17 00:00:00 2001
From: Timur Nurlygayanov <tnurlygayanov@mirantis.com>
Date: Mon, 4 Mar 2013 18:24:27 +0400
Subject: [PATCH] Fixed small issues with parameters. It is required fix.

---
 dashboard/windc/forms.py                | 4 ++--
 dashboard/windc/tables.py               | 6 ++----
 dashboard/windc/urls.py                 | 5 +++--
 dashboard/windc/views.py                | 3 +--
 dashboard/windcclient/v1/datacenters.py | 8 ++++----
 dashboard/windcclient/v1/services.py    | 5 ++---
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dashboard/windc/forms.py b/dashboard/windc/forms.py
index d2ce98a0b..80ba3275b 100644
--- a/dashboard/windc/forms.py
+++ b/dashboard/windc/forms.py
@@ -35,11 +35,11 @@ import pdb
 LOG = logging.getLogger(__name__)
 
 
-class WizardForm1(forms.Form):
+class WizardFormServiceType(forms.Form):
     _type = forms.ChoiceField(label=_("Service Type"))
 
 
-class WizardForm2(forms.Form):
+class WizardFormConfiguration(forms.Form):
     subject = forms.CharField(max_length=100)
     sender = forms.CharField(max_length=1)
 
diff --git a/dashboard/windc/tables.py b/dashboard/windc/tables.py
index ead8c21b7..b18d1a352 100644
--- a/dashboard/windc/tables.py
+++ b/dashboard/windc/tables.py
@@ -81,8 +81,7 @@ class DeleteDataCenter(tables.BatchAction):
         return True
 
     def action(self, request, datacenter_id):
-        datacenter = api.windc.datacenters_get(request, datacenter_id)
-        api.windc.datacenters_delete(request, datacenter)
+        api.windc.datacenters_delete(request, datacenter_id)
 
 
 class DeleteService(tables.BatchAction):
@@ -101,9 +100,8 @@ class DeleteService(tables.BatchAction):
         link = request.__dict__['META']['HTTP_REFERER']
         datacenter_id = re.search('windc/(\S+)', link).group(0)[6:-1]
         ##############
-        datacenter = api.windc.datacenters_get(request, datacenter_id)
         
-        api.windc.services_delete(request, datacenter, service_id)
+        api.windc.services_delete(request, datacenter_id, service_id)
 
 
 class EditService(tables.LinkAction):
diff --git a/dashboard/windc/urls.py b/dashboard/windc/urls.py
index a62393e30..e8baa60eb 100644
--- a/dashboard/windc/urls.py
+++ b/dashboard/windc/urls.py
@@ -22,7 +22,7 @@ from django.conf.urls.defaults import patterns, url
 
 from .views import IndexView, CreateWinDCView, WinServices, CreateWinServiceView
 from .views import Wizard
-from .forms import WizardForm1, WizardForm2
+from .forms import WizardFormServiceType, WizardFormConfiguration
 
 VIEW_MOD = 'openstack_dashboard.dashboards.project.windc.views'
 
@@ -32,7 +32,8 @@ urlpatterns = patterns(VIEW_MOD,
     url(r'^create_dc$', CreateWinDCView.as_view(), name='create_dc'),
     url(r'^(?P<data_center_id>[^/]+)/$', WinServices.as_view(),
         name='services'),
-    url(r'^update$', Wizard.as_view([WizardForm2, WizardForm2]),
+    url(r'^update$',
+        Wizard.as_view([WizardFormServiceType, WizardFormConfiguration]),
         name='update'),
     url(r'^(?P<service_id>[^/]+)/$', WinServices.as_view(),
         name='service_details')
diff --git a/dashboard/windc/views.py b/dashboard/windc/views.py
index 92dc898cf..533b65a4a 100644
--- a/dashboard/windc/views.py
+++ b/dashboard/windc/views.py
@@ -40,7 +40,7 @@ from horizon.forms.views import ModalFormMixin
 from openstack_dashboard import api
 from .tables import WinDCTable, WinServicesTable
 from .workflows import CreateWinService, CreateWinDC
-from .forms import WizardForm1, WizardForm2
+from .forms import WizardFormServiceType, WizardFormConfiguration
 
 import pdb
 LOG = logging.getLogger(__name__)
@@ -57,7 +57,6 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
         form = super(Wizard, self).get_form(step, data, files)
         print step
         print data
-        print files
         return form
 
 class IndexView(tables.DataTableView):
diff --git a/dashboard/windcclient/v1/datacenters.py b/dashboard/windcclient/v1/datacenters.py
index 636021d55..3d184f1a8 100644
--- a/dashboard/windcclient/v1/datacenters.py
+++ b/dashboard/windcclient/v1/datacenters.py
@@ -35,9 +35,9 @@ class DCManager(base.Manager):
         body.update(extra)
         return self._create('/datacenters', body, 'datacenter')
 
-    def delete(self, datacenter):
-        return self._delete("/datacenters/%s" % base.getid(datacenter))
+    def delete(self, datacenter_id):
+        return self._delete("/datacenters/%s" % datacenter_id)
 
-    def get(self, datacenter):
-        return self._get("/datacenters/%s" % base.getid(datacenter),
+    def get(self, datacenter_id):
+        return self._get("/datacenters/%s" % datacenter_id,
                          'datacenter')
diff --git a/dashboard/windcclient/v1/services.py b/dashboard/windcclient/v1/services.py
index 8309338f8..809a30c9d 100644
--- a/dashboard/windcclient/v1/services.py
+++ b/dashboard/windcclient/v1/services.py
@@ -37,10 +37,9 @@ class DCServiceManager(base.Manager):
         return self._create("/datacenters/%s/services" % base.getid(datacenter),
                             body, 'service')
 
-    def delete(self, datacenter, service):
+    def delete(self, datacenter_id, service_id):
         return self._delete("/datacenters/%s/services/%s" % \
-                            (base.getid(datacenter),
-                             base.getid(service)))
+                            (datacenter_id, service_id))
 
     def get(self, datacenter, service):
         return self._get("/datacenters/%s/services/%s" % \