firewall_gui: detach urls

cloud/urls.py

@@ -4,7 +4,7 @@ from django.contrib import admin
 admin.autodiscover()
 admin.autodiscover()
 
 
 import one.views
 import one.views
-import firewall.views
+import firewall_gui.urls
 # import store.views
 # import store.views
 
 
 js_info_dict = {
 js_info_dict = {
@@ -93,39 +93,5 @@ urlpatterns = patterns('',
     url(r'^sites/(?P<site>[a-zA-Z0-9]+)/$', 'one.views.sites'),
     url(r'^sites/(?P<site>[a-zA-Z0-9]+)/$', 'one.views.sites'),
     url(r'^accounts/(?P<site>profile)/$', 'one.views.sites'),
     url(r'^accounts/(?P<site>profile)/$', 'one.views.sites'),
 
 
-    url(r'^firewall/$', 'firewall_gui.views.index'),
-
-    url(r'^firewall/rules/(?P<id>\d+)/$', 'firewall_gui.views.show_rule'),
-    url(r'^firewall/hosts/(?P<id>\d+)/$', 'firewall_gui.views.show_host'),
-    url(r'^firewall/vlans/(?P<id>\d+)/$', 'firewall_gui.views.show_vlan'),
-    url(r'^firewall/vlangroups/(?P<id>\d+)/$', 'firewall_gui.views.show_vlangroup'),
-    url(r'^firewall/hostgroups/(?P<id>\d+)/$', 'firewall_gui.views.show_hostgroup'),
-    url(r'^firewall/records/(?P<id>\d+)/$', 'firewall_gui.views.show_record'),
-    url(r'^firewall/domains/(?P<id>\d+)/$', 'firewall_gui.views.show_domain'),
-
-    url(r'^firewall/(?P<name>\w+)/$', 'firewall_gui.views.list_entities'),
-
-    url(r'^firewall/autocomplete/(?P<entity>\w+)/$', 'firewall_gui.views.autocomplete'),
-
-    url(r'^firewall/rules/save/$', 'firewall_gui.views.save_rule'),
-    url(r'^firewall/hosts/save/$', 'firewall_gui.views.save_host'),
-    url(r'^firewall/vlans/save/$', 'firewall_gui.views.save_vlan'),
-    url(r'^firewall/vlangroups/save/$', 'firewall_gui.views.save_vlangroup'),
-    url(r'^firewall/hostgroups/save/$', 'firewall_gui.views.save_hostgroup'),
-    url(r'^firewall/domains/save/$', 'firewall_gui.views.save_domain'),
-    url(r'^firewall/records/save/$', 'firewall_gui.views.save_record'),
-
-    url(r'^firewall/(?P<name>\w+)/(?P<id>\d+)/delete/', 'firewall_gui.views.delete_entity'),
-
-    url(r'^firewall/rules/new/$', 'firewall_gui.views.show_rule'),
-    url(r'^firewall/hosts/new/$', 'firewall_gui.views.show_host'),
-    url(r'^firewall/vlans/new/$', 'firewall_gui.views.show_vlan'),
-    url(r'^firewall/vlangroups/new/$', 'firewall_gui.views.show_vlangroup'),
-    url(r'^firewall/hostgroups/new/$', 'firewall_gui.views.show_hostgroup'),
-    url(r'^firewall/domains/new/$', 'firewall_gui.views.show_domain'),
-    url(r'^firewall/records/new/$', 'firewall_gui.views.show_record'),
-    # url(r'^firewall/vlangroups/save/$', 'firewall_gui.views.save_vlangroup'),
-    # url(r'^firewall/hostgroups/save/$', 'firewall_gui.views.save_hostgroup'),
-    # url(r'^firewall/domains/save/$', 'firewall_gui.views.save_domain'),
-    # url(r'^firewall/records/save/$', 'firewall_gui.views.save_record'),
+    url(r'^firewall/', include(firewall_gui.urls), ),
 )
 )

firewall_gui/urls.py

+from django.conf.urls import patterns, url
+
+urlpatterns = patterns(
+    '',
+    url(r'rules/(?P<id>\d+)/$', 'firewall_gui.views.show_rule'),
+    url(r'hosts/(?P<id>\d+)/$', 'firewall_gui.views.show_host'),
+    url(r'vlans/(?P<id>\d+)/$', 'firewall_gui.views.show_vlan'),
+    url(r'vlangroups/(?P<id>\d+)/$', 'firewall_gui.views.show_vlangroup'),
+    url(r'hostgroups/(?P<id>\d+)/$', 'firewall_gui.views.show_hostgroup'),
+    url(r'records/(?P<id>\d+)/$', 'firewall_gui.views.show_record'),
+    url(r'domains/(?P<id>\d+)/$', 'firewall_gui.views.show_domain'),
+
+    url(r'(?P<name>\w+)/$', 'firewall_gui.views.list_entities'),
+
+    url(r'autocomplete/(?P<entity>\w+)/$', 'firewall_gui.views.autocomplete'),
+
+    url(r'rules/save/$', 'firewall_gui.views.save_rule'),
+    url(r'hosts/save/$', 'firewall_gui.views.save_host'),
+    url(r'vlans/save/$', 'firewall_gui.views.save_vlan'),
+    url(r'vlangroups/save/$', 'firewall_gui.views.save_vlangroup'),
+    url(r'hostgroups/save/$', 'firewall_gui.views.save_hostgroup'),
+    url(r'domains/save/$', 'firewall_gui.views.save_domain'),
+    url(r'records/save/$', 'firewall_gui.views.save_record'),
+
+    url(r'(?P<name>\w+)/(?P<id>\d+)/delete/',
+        'firewall_gui.views.delete_entity'),
+
+    url(r'rules/new/$', 'firewall_gui.views.show_rule'),
+    url(r'hosts/new/$', 'firewall_gui.views.show_host'),
+    url(r'vlans/new/$', 'firewall_gui.views.show_vlan'),
+    url(r'vlangroups/new/$', 'firewall_gui.views.show_vlangroup'),
+    url(r'hostgroups/new/$', 'firewall_gui.views.show_hostgroup'),
+    url(r'domains/new/$', 'firewall_gui.views.show_domain'),
+    url(r'records/new/$', 'firewall_gui.views.show_record'),
+    # url(r'vlangroups/save/$', 'firewall_gui.views.save_vlangroup'),
+    # url(r'hostgroups/save/$', 'firewall_gui.views.save_hostgroup'),
+    # url(r'domains/save/$', 'firewall_gui.views.save_domain'),
+    # url(r'records/save/$', 'firewall_gui.views.save_record'),
+
+    url(r'$', 'firewall_gui.views.index'),
+)