Solved an issue when the user tries to create a policy and the contai…

…ner contains a dash in the name.

api/filters/urls.py

@@ -1,4 +1,5 @@
 from django.conf.urls import url
+
 import views
 
 urlpatterns = [
@@ -9,13 +10,13 @@
 
     # Deploy to tenant container or object
     url(r'^/(?P<account>\w+)/deploy/(?P<filter_id>[0-9]+)/?$', views.filter_deploy),
-    url(r'^/(?P<account>\w+)/(?P<container>\w+)/deploy/(?P<filter_id>[0-9]+)/?$', views.filter_deploy),
-    url(r'^/(?P<account>\w+)/(?P<container>\w+)/(?P<swift_object>\w+)/deploy/(?P<filter_id>[0-9]+)/?$', views.filter_deploy),
+    url(r'^/(?P<account>\w+)/(?P<container>[-\w]+)/deploy/(?P<filter_id>[0-9]+)/?$', views.filter_deploy),
+    url(r'^/(?P<account>\w+)/(?P<container>[-\w]+)/(?P<swift_object>[-\w]+)/deploy/(?P<filter_id>[0-9]+)/?$', views.filter_deploy),
 
     # Undeploy to tenant container or object
     # url(r'^/(?P<account>\w+)/undeploy/(?P<filter_id>[0-9]+)/?$', views.filter_undeploy),
-    # url(r'^/(?P<account>\w+)/(?P<container>\w+)/undeploy/(?P<filter_id>[0-9]+)/?$', views.filter_undeploy),
-    # url(r'^/(?P<account>\w+)/(?P<container>\w+)/(?P<swift_object>\w+)/undeploy/(?P<filter_id>[0-9]+)/?$', views.filter_undeploy),
+    # url(r'^/(?P<account>\w+)/(?P<container>[-\w]+)/undeploy/(?P<filter_id>[0-9]+)/?$', views.filter_undeploy),
+    # url(r'^/(?P<account>\w+)/(?P<container>[-\w]+)/(?P<swift_object>[-\w]+)/undeploy/(?P<filter_id>[0-9]+)/?$', views.filter_undeploy),
 
     url(r'^/dependencies/?$', views.dependency_list),
     url(r'^/dependencies/(?P<dependency_id>\w+)/?$', views.dependency_detail),

api/swift/urls.py

@@ -6,7 +6,7 @@
     url(r'^/tenants/?$', views.tenants_list),
     url(r'^/storage_policies/?$', views.storage_policy_list),
     url(r'^/spolicies/?$', views.storage_policies),
-    url(r'^/locality/(?P<account>\w+)(?:/(?P<container>\w+))(?:/(?P<swift_object>\w+))?/$', views.locality_list),
+    url(r'^/locality/(?P<account>\w+)(?:/(?P<container>[-\w]+))(?:/(?P<swift_object>[-\w]+))?/$', views.locality_list),
     url(r'^/sort_nodes/?$', views.sort_list),
     url(r'^/sort_nodes/(?P<id>[0-9]+)/?$', views.sort_detail),
 ]