Update URLs to Django 1.8 style

django.conf.urls.patterns() is deprecated since 1.8.
We should not use patterns(), so this patch updates URLs to
1.8 style.

Change-Id: I4098cacd4150b80a0f06982b31dbff9de8433cc4
Closes-Bug: #1539354

muranodashboard/catalog/urls.py

@@ -17,30 +17,24 @@ from django.conf import urls
 from muranodashboard.catalog import views
 from muranodashboard.dynamic_ui import services
 
-VIEW_MOD = 'muranodashboard.catalog.views'
-
 wizard_view = views.Wizard.as_view(
     services.get_app_forms, condition_dict=services.condition_getter)
 
-urlpatterns = urls.patterns(
-    VIEW_MOD,
+urlpatterns = [
     urls.url(r'^$', views.IndexView.as_view(), name='index'),
     urls.url(r'^switch_environment/(?P<environment_id>[^/]+)$',
-             'switch',
-             name='switch_env'),
+             views.switch, name='switch_env'),
     urls.url(r'^add/(?P<app_id>[^/]+)/(?P<environment_id>[^/]+)/'
              r'(?P<do_redirect>[^/]+)/(?P<drop_wm_form>[^/]+)$',
-             wizard_view,
-             name='add'),
+             wizard_view, name='add'),
     urls.url(r'^add/(?P<app_id>[^/]+)/(?P<environment_id>[^/]+)$',
-             'deploy',
-             name='deploy'),
+             views.deploy, name='deploy'),
     urls.url(r'^quick-add/(?P<app_id>[^/]+)$',
-             'quick_deploy',
-             name='quick_deploy'),
+             views.quick_deploy, name='quick_deploy'),
     urls.url(r'^details/(?P<application_id>[^/]+)$',
              views.AppDetailsView.as_view(), name='application_details'),
-    urls.url(r'^images/(?P<app_id>[^/]*)', 'get_image', name="images"),
-    urls.url(r'^supplier-images/(?P<app_id>[^/]*)', 'get_supplier_image',
-             name="supplier_images")
-)
+    urls.url(r'^images/(?P<app_id>[^/]*)',
+             views.get_image, name="images"),
+    urls.url(r'^supplier-images/(?P<app_id>[^/]*)',
+             views.get_supplier_image, name="supplier_images")
+]

muranodashboard/categories/urls.py

@@ -13,18 +13,12 @@
 #    under the License.
 
 from django.conf import urls
+
 from muranodashboard.categories import views
 
 
-urlpatterns = urls.patterns(
-    '',
-    urls.url(r'^$', views.CategoriesView.as_view(),
-             name='index'),
-
-    urls.url(r'^add$', views.AddCategoryView.as_view(),
-             name='add'),
-
-    urls.url(r'^delete$', views.CategoriesView.as_view(),
-             name='delete'),
-
-)
+urlpatterns = [
+    urls.url(r'^$', views.CategoriesView.as_view(), name='index'),
+    urls.url(r'^add$', views.AddCategoryView.as_view(), name='add'),
+    urls.url(r'^delete$', views.CategoriesView.as_view(), name='delete'),
+]

muranodashboard/environments/urls.py

@@ -13,46 +13,30 @@
 #    under the License.
 
 from django.conf import urls
+
 from openstack_dashboard.dashboards.project.instances import views as inst_view
 
 from muranodashboard.environments import views
 
-VIEW_MOD = 'muranodashboard.environments.views'
 ENVIRONMENT_ID = r'^(?P<environment_id>[^/]+)'
 
-
-urlpatterns = urls.patterns(
-    VIEW_MOD,
+urlpatterns = [
     urls.url(r'^environments/$', views.IndexView.as_view(), name='index'),
-
     urls.url(r'^create_environment$', views.CreateEnvironmentView.as_view(),
              name='create_environment'),
-
     urls.url(ENVIRONMENT_ID + r'/services$',
-             views.EnvironmentDetails.as_view(),
-             name='services'),
-
+             views.EnvironmentDetails.as_view(), name='services'),
     urls.url(ENVIRONMENT_ID + r'/services/get_d3_data$',
              views.JSONView.as_view(), name='d3_data'),
-
     urls.url(ENVIRONMENT_ID + r'/(?P<service_id>[^/]+)/$',
-             views.DetailServiceView.as_view(),
-             name='service_details'),
-
+             views.DetailServiceView.as_view(), name='service_details'),
     urls.url(ENVIRONMENT_ID + r'/start_action/(?P<action_id>[^/]+)/$',
-             views.StartActionView.as_view(),
-             name='start_action'),
-
+             views.StartActionView.as_view(), name='start_action'),
     urls.url(ENVIRONMENT_ID +
              r'/actions/(?P<task_id>[^/]+)(?:/(?P<optional>[^/]+))?/$',
-             views.ActionResultView.as_view(),
-             name='action_result'),
-
+             views.ActionResultView.as_view(), name='action_result'),
     urls.url(r'^(?P<instance_id>[^/]+)/$',
-             inst_view.DetailView.as_view(),
-             name='detail'),
-
+             inst_view.DetailView.as_view(), name='detail'),
     urls.url(ENVIRONMENT_ID + r'/deployments/(?P<deployment_id>[^/]+)$',
-             views.DeploymentDetailsView.as_view(),
-             name='deployment_details'),
-)
+             views.DeploymentDetailsView.as_view(), name='deployment_details'),
+]

muranodashboard/images/urls.py

@@ -13,18 +13,14 @@
 #    under the License.
 
 from django.conf import urls
+
 from muranodashboard.images import views
 
 
-urlpatterns = urls.patterns(
-    '',
-    urls.url(r'^$', views.MarkedImagesView.as_view(),
-             name='index'),
-
+urlpatterns = [
+    urls.url(r'^$', views.MarkedImagesView.as_view(), name='index'),
     urls.url(r'^mark_image$', views.MarkImageView.as_view(),
              name='mark_image'),
-
     urls.url(r'^remove_metadata$', views.MarkedImagesView.as_view(),
              name='remove_metadata'),
-
-)
+]

muranodashboard/packages/urls.py

@@ -17,19 +17,12 @@ from django.conf import urls
 from muranodashboard.packages import views
 
 
-urlpatterns = urls.patterns(
-    '',
-    urls.url(r'^$', views.PackageDefinitionsView.as_view(),
-             name='index'),
-
+urlpatterns = [
+    urls.url(r'^$', views.PackageDefinitionsView.as_view(), name='index'),
     urls.url(r'^upload$', views.ImportPackageWizard.as_view(
-        views.FORMS), name='upload'),
-
+             views.FORMS), name='upload'),
     urls.url(r'^import_bundle$', views.ImportBundleWizard.as_view(
-        views.BUNDLE_FORMS), name='import_bundle'),
-
+             views.BUNDLE_FORMS), name='import_bundle'),
     urls.url(r'^modify/(?P<app_id>[^/]+)?$',
-             views.ModifyPackageView.as_view(),
-             name='modify'),
-
-)
+             views.ModifyPackageView.as_view(), name='modify'),
+]