Merge "Remove patterns call from urls"
This commit is contained in:
commit
f14de1c22a
|
@ -11,13 +11,11 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
from django.conf.urls import patterns # noqa
|
|
||||||
from django.conf.urls import url # noqa
|
from django.conf.urls import url # noqa
|
||||||
|
|
||||||
import views
|
import views
|
||||||
|
|
||||||
urlpatterns = patterns(
|
urlpatterns = [
|
||||||
'',
|
|
||||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||||
url(r'^addpolicy_rule_set$', views.AddPolicyRuleSetView.as_view(),
|
url(r'^addpolicy_rule_set$', views.AddPolicyRuleSetView.as_view(),
|
||||||
name='addpolicy_rule_set'),
|
name='addpolicy_rule_set'),
|
||||||
|
@ -48,4 +46,4 @@ urlpatterns = patterns(
|
||||||
url(r'^policy_rule_set/(?P<policy_rule_set_id>[^/]+)/$',
|
url(r'^policy_rule_set/(?P<policy_rule_set_id>[^/]+)/$',
|
||||||
views.PolicyRuleSetDetailsView.as_view(),
|
views.PolicyRuleSetDetailsView.as_view(),
|
||||||
name='policy_rule_set_details'),
|
name='policy_rule_set_details'),
|
||||||
)
|
]
|
||||||
|
|
|
@ -11,16 +11,13 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
from django.conf.urls import patterns # noqa
|
|
||||||
from django.conf.urls import url # noqa
|
from django.conf.urls import url # noqa
|
||||||
|
|
||||||
import views
|
import views
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = [
|
||||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||||
url(r'^addl3policy$',
|
url(r'^addl3policy$', views.AddL3policyView.as_view(), name='addl3policy'),
|
||||||
views.AddL3policyView.as_view(),
|
|
||||||
name='addl3policy'),
|
|
||||||
url(r'^addservicepolicy$',
|
url(r'^addservicepolicy$',
|
||||||
views.CreateServicePolicyView.as_view(),
|
views.CreateServicePolicyView.as_view(),
|
||||||
name='create_servicepolicy'),
|
name='create_servicepolicy'),
|
||||||
|
@ -42,28 +39,22 @@ urlpatterns = patterns('',
|
||||||
url(r'^update_servicepolicy/(?P<service_policy_id>[^/]+)/$',
|
url(r'^update_servicepolicy/(?P<service_policy_id>[^/]+)/$',
|
||||||
views.UpdateServicePolicyView.as_view(),
|
views.UpdateServicePolicyView.as_view(),
|
||||||
name='update_service_policy'),
|
name='update_service_policy'),
|
||||||
url(r'^update_externalconnectivity/'
|
url(r'^update_externalconnectivity/(?P<external_connectivity_id>[^/]+)/$',
|
||||||
'(?P<external_connectivity_id>[^/]+)/$',
|
|
||||||
views.UpdateExternalConnectivityView.as_view(),
|
views.UpdateExternalConnectivityView.as_view(),
|
||||||
name='update_externalconnectivity'),
|
name='update_externalconnectivity'),
|
||||||
url(r'^update_natpool/'
|
url(r'^update_natpool/(?P<nat_pool_id>[^/]+)/$',
|
||||||
'(?P<nat_pool_id>[^/]+)/$',
|
|
||||||
views.UpdateNATPoolView.as_view(),
|
views.UpdateNATPoolView.as_view(),
|
||||||
name='update_natpool'),
|
name='update_natpool'),
|
||||||
url(r'^natpool/'
|
url(r'^natpool/(?P<nat_pool_id>[^/]+)/$',
|
||||||
'(?P<nat_pool_id>[^/]+)/$',
|
|
||||||
views.NATPoolDetailsView.as_view(),
|
views.NATPoolDetailsView.as_view(),
|
||||||
name='nat_pool_details'),
|
name='nat_pool_details'),
|
||||||
url(r'^servicepolicy/(?P<service_policy_id>[^/]+)/$',
|
url(r'^servicepolicy/(?P<service_policy_id>[^/]+)/$',
|
||||||
views.ServicePolicyDetailsView.as_view(),
|
views.ServicePolicyDetailsView.as_view(),
|
||||||
name='service_policy_details'),
|
name='service_policy_details'),
|
||||||
url(r'^externalconnectivity/'
|
url(r'^externalconnectivity/(?P<external_connectivity_id>[^/]+)/$',
|
||||||
'(?P<external_connectivity_id>[^/]+)/$',
|
|
||||||
views.ExternalConnectivityDetailsView.as_view(),
|
views.ExternalConnectivityDetailsView.as_view(),
|
||||||
name='external_connectivity_details'),
|
name='external_connectivity_details'),
|
||||||
url(r'^addl2policy$',
|
url(r'^addl2policy$', views.AddL2policyView.as_view(), name='addl2policy'),
|
||||||
views.AddL2policyView.as_view(),
|
|
||||||
name='addl2policy'),
|
|
||||||
url(r'^l3policy_details/(?P<l3policy_id>[^/]+)/$',
|
url(r'^l3policy_details/(?P<l3policy_id>[^/]+)/$',
|
||||||
views.L3PolicyDetailsView.as_view(),
|
views.L3PolicyDetailsView.as_view(),
|
||||||
name='l3policy_details'),
|
name='l3policy_details'),
|
||||||
|
@ -76,4 +67,4 @@ urlpatterns = patterns('',
|
||||||
url(r'^l2policy_update/(?P<l2policy_id>[^/]+)/$',
|
url(r'^l2policy_update/(?P<l2policy_id>[^/]+)/$',
|
||||||
views.L2PolicyUpdateView.as_view(),
|
views.L2PolicyUpdateView.as_view(),
|
||||||
name='update_l2policy'),
|
name='update_l2policy'),
|
||||||
)
|
]
|
||||||
|
|
|
@ -11,12 +11,11 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
from django.conf.urls import patterns # noqa
|
|
||||||
from django.conf.urls import url # noqa
|
from django.conf.urls import url # noqa
|
||||||
|
|
||||||
import views
|
import views
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = [
|
||||||
url(r'^$', views.IndexView.as_view(), name='index'),
|
url(r'^$', views.IndexView.as_view(), name='index'),
|
||||||
url(r'^create_service_profile$',
|
url(r'^create_service_profile$',
|
||||||
views.CreateServiceProfileView.as_view(),
|
views.CreateServiceProfileView.as_view(),
|
||||||
|
@ -51,4 +50,4 @@ urlpatterns = patterns('',
|
||||||
url(r'^sc_instance/(?P<scinstance_id>[^/]+)/$',
|
url(r'^sc_instance/(?P<scinstance_id>[^/]+)/$',
|
||||||
views.ServiceChainInstanceDetailsView.as_view(),
|
views.ServiceChainInstanceDetailsView.as_view(),
|
||||||
name='sc_instance_details'),
|
name='sc_instance_details'),
|
||||||
)
|
]
|
||||||
|
|
|
@ -11,12 +11,11 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
from django.conf.urls import patterns # noqa
|
|
||||||
from django.conf.urls import url # noqa
|
from django.conf.urls import url # noqa
|
||||||
|
|
||||||
import views
|
import views
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = [
|
||||||
url(r'^$',
|
url(r'^$',
|
||||||
views.IndexView.as_view(),
|
views.IndexView.as_view(),
|
||||||
name='index'),
|
name='index'),
|
||||||
|
@ -26,54 +25,45 @@ urlpatterns = patterns('',
|
||||||
url(r'^addexternal_policy_target$',
|
url(r'^addexternal_policy_target$',
|
||||||
views.AddExternalPTGView.as_view(),
|
views.AddExternalPTGView.as_view(),
|
||||||
name='addexternal_policy_target'),
|
name='addexternal_policy_target'),
|
||||||
url(r'^updatepolicy_target/'
|
url(r'^updatepolicy_target/(?P<policy_target_id>[^/]+)/$',
|
||||||
'(?P<policy_target_id>[^/]+)/$',
|
|
||||||
views.UpdatePTGView.as_view(),
|
views.UpdatePTGView.as_view(),
|
||||||
name='updatepolicy_target'),
|
name='updatepolicy_target'),
|
||||||
url(r'^update_ext_policy_target/'
|
url(r'^update_ext_policy_target/(?P<ext_policy_target_id>[^/]+)/$',
|
||||||
'(?P<ext_policy_target_id>[^/]+)/$',
|
|
||||||
views.UpdateExternalPTGView.as_view(),
|
views.UpdateExternalPTGView.as_view(),
|
||||||
name='update_ext_policy_target'),
|
name='update_ext_policy_target'),
|
||||||
url(r'^policy_target/(?P<policy_target_id>[^/]+)/$',
|
url(r'^policy_target/(?P<policy_target_id>[^/]+)/$',
|
||||||
views.PTGDetailsView.as_view(),
|
views.PTGDetailsView.as_view(),
|
||||||
name='policy_targetdetails'),
|
name='policy_targetdetails'),
|
||||||
url(r'^ext_policy_target/'
|
url(r'^ext_policy_target/(?P<ext_policy_target_id>[^/]+)/$',
|
||||||
'(?P<ext_policy_target_id>[^/]+)/$',
|
|
||||||
views.ExternalPTGDetailsView.as_view(),
|
views.ExternalPTGDetailsView.as_view(),
|
||||||
name='ext_policy_targetdetails'),
|
name='ext_policy_targetdetails'),
|
||||||
url(r'^addvm/(?P<policy_target_id>[^/]+)/$',
|
url(r'^addvm/(?P<policy_target_id>[^/]+)/$',
|
||||||
views.LaunchVMView.as_view(), name='addvm'),
|
views.LaunchVMView.as_view(), name='addvm'),
|
||||||
url(r'^ext_add_policy_rule_set/'
|
url(r'^ext_add_policy_rule_set/(?P<ext_policy_target_id>[^/]+)/$',
|
||||||
'(?P<ext_policy_target_id>[^/]+)/$',
|
|
||||||
views.ExtAddProvidedPRSView.as_view(),
|
views.ExtAddProvidedPRSView.as_view(),
|
||||||
name='ext_add_provided_prs'),
|
name='ext_add_provided_prs'),
|
||||||
url(r'^add_policy_rule_set/'
|
url(r'^add_policy_rule_set/(?P<policy_target_id>[^/]+)/$',
|
||||||
'(?P<policy_target_id>[^/]+)/$',
|
|
||||||
views.AddProvidedPRSView.as_view(),
|
views.AddProvidedPRSView.as_view(),
|
||||||
name='add_provided_prs'),
|
name='add_provided_prs'),
|
||||||
url(r'^ext_remove_policy_rule_set/'
|
url(r'^ext_remove_policy_rule_set/(?P<ext_policy_target_id>[^/]+)/$',
|
||||||
'(?P<ext_policy_target_id>[^/]+)/$',
|
|
||||||
views.ExtRemoveProvidedPRSView.as_view(),
|
views.ExtRemoveProvidedPRSView.as_view(),
|
||||||
name='ext_remove_provided_prs'),
|
name='ext_remove_provided_prs'),
|
||||||
url(r'^remove_policy_rule_set/'
|
url(r'^remove_policy_rule_set/(?P<policy_target_id>[^/]+)/$',
|
||||||
'(?P<policy_target_id>[^/]+)/$',
|
|
||||||
views.RemoveProvidedPRSView.as_view(),
|
views.RemoveProvidedPRSView.as_view(),
|
||||||
name='remove_provided_prs'),
|
name='remove_provided_prs'),
|
||||||
url(r'^add_consumed/(?P<policy_target_id>[^/]+)/$',
|
url(r'^add_consumed/(?P<policy_target_id>[^/]+)/$',
|
||||||
views.AddConsumedPRSView.as_view(),
|
views.AddConsumedPRSView.as_view(),
|
||||||
name='add_consumed_prs'),
|
name='add_consumed_prs'),
|
||||||
url(r'^ext_add_consumed/'
|
url(r'^ext_add_consumed/(?P<ext_policy_target_id>[^/]+)/$',
|
||||||
'(?P<ext_policy_target_id>[^/]+)/$',
|
|
||||||
views.ExtAddConsumedPRSView.as_view(),
|
views.ExtAddConsumedPRSView.as_view(),
|
||||||
name='ext_add_consumed_prs'),
|
name='ext_add_consumed_prs'),
|
||||||
url(r'^remove_consumed/(?P<policy_target_id>[^/]+)/$',
|
url(r'^remove_consumed/(?P<policy_target_id>[^/]+)/$',
|
||||||
views.RemoveConsumedPRSView.as_view(),
|
views.RemoveConsumedPRSView.as_view(),
|
||||||
name='remove_consumed_prs'),
|
name='remove_consumed_prs'),
|
||||||
url(r'^ext_remove_consumed/'
|
url(r'^ext_remove_consumed/(?P<ext_policy_target_id>[^/]+)/$',
|
||||||
'(?P<ext_policy_target_id>[^/]+)/$',
|
|
||||||
views.ExtRemoveConsumedPRSView.as_view(),
|
views.ExtRemoveConsumedPRSView.as_view(),
|
||||||
name='ext_remove_consumed_prs'),
|
name='ext_remove_consumed_prs'),
|
||||||
url(r'/check_ip_availability',
|
url(r'/check_ip_availability',
|
||||||
views.check_ip_availability,
|
views.check_ip_availability,
|
||||||
name='check_ip_availability'),
|
name='check_ip_availability'),
|
||||||
)
|
]
|
||||||
|
|
Loading…
Reference in New Issue