Merge "Remove patterns call from urls"

This commit is contained in:
Jenkins 2017-09-14 21:35:30 +00:00 committed by Gerrit Code Review
commit f14de1c22a
4 changed files with 143 additions and 165 deletions

View File

@ -11,13 +11,11 @@
# under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
import views
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^addpolicy_rule_set$', views.AddPolicyRuleSetView.as_view(),
name='addpolicy_rule_set'),
@ -48,4 +46,4 @@ urlpatterns = patterns(
url(r'^policy_rule_set/(?P<policy_rule_set_id>[^/]+)/$',
views.PolicyRuleSetDetailsView.as_view(),
name='policy_rule_set_details'),
)
]

View File

@ -11,69 +11,60 @@
# under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
import views
urlpatterns = patterns('',
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^addl3policy$',
views.AddL3policyView.as_view(),
name='addl3policy'),
url(r'^addservicepolicy$',
views.CreateServicePolicyView.as_view(),
name='create_servicepolicy'),
url(r'^addexternalsegmentparam$',
views.AddExternalSegmentParamView.as_view(),
name='add_external_segment_param'),
url(r'^addnetworkserviceparam$',
views.AddNetworkServiceParamView.as_view(),
name='add_network_service_param'),
url(r'^addexternalrouteparam$',
views.AddExternalRouteParamView.as_view(),
name='add_external_route_param'),
url(r'^createexternalconnectivity$',
views.CreateExternalConnectivityView.as_view(),
name='create_external_connectivity'),
url(r'^createnatpool$',
views.CreateNATPoolView.as_view(),
name='create_nat_pool'),
url(r'^update_servicepolicy/(?P<service_policy_id>[^/]+)/$',
views.UpdateServicePolicyView.as_view(),
name='update_service_policy'),
url(r'^update_externalconnectivity/'
'(?P<external_connectivity_id>[^/]+)/$',
views.UpdateExternalConnectivityView.as_view(),
name='update_externalconnectivity'),
url(r'^update_natpool/'
'(?P<nat_pool_id>[^/]+)/$',
views.UpdateNATPoolView.as_view(),
name='update_natpool'),
url(r'^natpool/'
'(?P<nat_pool_id>[^/]+)/$',
views.NATPoolDetailsView.as_view(),
name='nat_pool_details'),
url(r'^servicepolicy/(?P<service_policy_id>[^/]+)/$',
views.ServicePolicyDetailsView.as_view(),
name='service_policy_details'),
url(r'^externalconnectivity/'
'(?P<external_connectivity_id>[^/]+)/$',
views.ExternalConnectivityDetailsView.as_view(),
name='external_connectivity_details'),
url(r'^addl2policy$',
views.AddL2policyView.as_view(),
name='addl2policy'),
url(r'^l3policy_details/(?P<l3policy_id>[^/]+)/$',
views.L3PolicyDetailsView.as_view(),
name='l3policy_details'),
url(r'^l3policy_update/(?P<l3policy_id>[^/]+)/$',
views.L3PolicyUpdateView.as_view(),
name='update_l3policy'),
url(r'^l2policy_details/(?P<l2policy_id>[^/]+)/$',
views.L2PolicyDetailsView.as_view(),
name='l2policy_details'),
url(r'^l2policy_update/(?P<l2policy_id>[^/]+)/$',
views.L2PolicyUpdateView.as_view(),
name='update_l2policy'),
)
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^addl3policy$', views.AddL3policyView.as_view(), name='addl3policy'),
url(r'^addservicepolicy$',
views.CreateServicePolicyView.as_view(),
name='create_servicepolicy'),
url(r'^addexternalsegmentparam$',
views.AddExternalSegmentParamView.as_view(),
name='add_external_segment_param'),
url(r'^addnetworkserviceparam$',
views.AddNetworkServiceParamView.as_view(),
name='add_network_service_param'),
url(r'^addexternalrouteparam$',
views.AddExternalRouteParamView.as_view(),
name='add_external_route_param'),
url(r'^createexternalconnectivity$',
views.CreateExternalConnectivityView.as_view(),
name='create_external_connectivity'),
url(r'^createnatpool$',
views.CreateNATPoolView.as_view(),
name='create_nat_pool'),
url(r'^update_servicepolicy/(?P<service_policy_id>[^/]+)/$',
views.UpdateServicePolicyView.as_view(),
name='update_service_policy'),
url(r'^update_externalconnectivity/(?P<external_connectivity_id>[^/]+)/$',
views.UpdateExternalConnectivityView.as_view(),
name='update_externalconnectivity'),
url(r'^update_natpool/(?P<nat_pool_id>[^/]+)/$',
views.UpdateNATPoolView.as_view(),
name='update_natpool'),
url(r'^natpool/(?P<nat_pool_id>[^/]+)/$',
views.NATPoolDetailsView.as_view(),
name='nat_pool_details'),
url(r'^servicepolicy/(?P<service_policy_id>[^/]+)/$',
views.ServicePolicyDetailsView.as_view(),
name='service_policy_details'),
url(r'^externalconnectivity/(?P<external_connectivity_id>[^/]+)/$',
views.ExternalConnectivityDetailsView.as_view(),
name='external_connectivity_details'),
url(r'^addl2policy$', views.AddL2policyView.as_view(), name='addl2policy'),
url(r'^l3policy_details/(?P<l3policy_id>[^/]+)/$',
views.L3PolicyDetailsView.as_view(),
name='l3policy_details'),
url(r'^l3policy_update/(?P<l3policy_id>[^/]+)/$',
views.L3PolicyUpdateView.as_view(),
name='update_l3policy'),
url(r'^l2policy_details/(?P<l2policy_id>[^/]+)/$',
views.L2PolicyDetailsView.as_view(),
name='l2policy_details'),
url(r'^l2policy_update/(?P<l2policy_id>[^/]+)/$',
views.L2PolicyUpdateView.as_view(),
name='update_l2policy'),
]

View File

@ -11,44 +11,43 @@
# under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
import views
urlpatterns = patterns('',
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^create_service_profile$',
views.CreateServiceProfileView.as_view(),
name='create_service_profile'),
url(r'^serviceprofile/(?P<sp_id>[^/]+)/$',
views.ServiceProfileDetailsView.as_view(),
name='service_profile_details'),
url(r'^create_sc_node$',
views.CreateServiceChainNodeView.as_view(),
name='create_sc_node'),
url(r'^update_sc_node/(?P<scnode_id>[^/]+)/$',
views.UpdateServiceChainNodeView.as_view(),
name='update_sc_node'),
url(r'^sc_node/(?P<scnode_id>[^/]+)/$',
views.ServiceChainNodeDetailsView.as_view(),
name='sc_node_details'),
url(r'^create_sc_spec$',
views.CreateServiceChainSpecView.as_view(),
name='create_sc_spec'),
url(r'^update_sc_spec/(?P<scspec_id>[^/]+)/$',
views.UpdateServiceChainSpecView.as_view(),
name='update_sc_spec'),
url(r'^sc_spec/(?P<scspec_id>[^/]+)/$',
views.ServiceChainSpecDetailsView.as_view(),
name='sc_spec_details'),
url(r'^create_sc_instance$',
views.CreateServiceChainInstanceView.as_view(),
name='create_sc_instance'),
url(r'^update_sc_instance/(?P<scinstance_id>[^/]+)/$',
views.UpdateServiceChainInstanceView.as_view(),
name='update_sc_instance'),
url(r'^sc_instance/(?P<scinstance_id>[^/]+)/$',
views.ServiceChainInstanceDetailsView.as_view(),
name='sc_instance_details'),
)
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^create_service_profile$',
views.CreateServiceProfileView.as_view(),
name='create_service_profile'),
url(r'^serviceprofile/(?P<sp_id>[^/]+)/$',
views.ServiceProfileDetailsView.as_view(),
name='service_profile_details'),
url(r'^create_sc_node$',
views.CreateServiceChainNodeView.as_view(),
name='create_sc_node'),
url(r'^update_sc_node/(?P<scnode_id>[^/]+)/$',
views.UpdateServiceChainNodeView.as_view(),
name='update_sc_node'),
url(r'^sc_node/(?P<scnode_id>[^/]+)/$',
views.ServiceChainNodeDetailsView.as_view(),
name='sc_node_details'),
url(r'^create_sc_spec$',
views.CreateServiceChainSpecView.as_view(),
name='create_sc_spec'),
url(r'^update_sc_spec/(?P<scspec_id>[^/]+)/$',
views.UpdateServiceChainSpecView.as_view(),
name='update_sc_spec'),
url(r'^sc_spec/(?P<scspec_id>[^/]+)/$',
views.ServiceChainSpecDetailsView.as_view(),
name='sc_spec_details'),
url(r'^create_sc_instance$',
views.CreateServiceChainInstanceView.as_view(),
name='create_sc_instance'),
url(r'^update_sc_instance/(?P<scinstance_id>[^/]+)/$',
views.UpdateServiceChainInstanceView.as_view(),
name='update_sc_instance'),
url(r'^sc_instance/(?P<scinstance_id>[^/]+)/$',
views.ServiceChainInstanceDetailsView.as_view(),
name='sc_instance_details'),
]

View File

@ -11,69 +11,59 @@
# under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa
import views
urlpatterns = patterns('',
url(r'^$',
views.IndexView.as_view(),
name='index'),
url(r'^addpolicy_target$',
views.AddPTGView.as_view(),
name='addpolicy_target'),
url(r'^addexternal_policy_target$',
views.AddExternalPTGView.as_view(),
name='addexternal_policy_target'),
url(r'^updatepolicy_target/'
'(?P<policy_target_id>[^/]+)/$',
views.UpdatePTGView.as_view(),
name='updatepolicy_target'),
url(r'^update_ext_policy_target/'
'(?P<ext_policy_target_id>[^/]+)/$',
views.UpdateExternalPTGView.as_view(),
name='update_ext_policy_target'),
url(r'^policy_target/(?P<policy_target_id>[^/]+)/$',
views.PTGDetailsView.as_view(),
name='policy_targetdetails'),
url(r'^ext_policy_target/'
'(?P<ext_policy_target_id>[^/]+)/$',
views.ExternalPTGDetailsView.as_view(),
name='ext_policy_targetdetails'),
url(r'^addvm/(?P<policy_target_id>[^/]+)/$',
views.LaunchVMView.as_view(), name='addvm'),
url(r'^ext_add_policy_rule_set/'
'(?P<ext_policy_target_id>[^/]+)/$',
views.ExtAddProvidedPRSView.as_view(),
name='ext_add_provided_prs'),
url(r'^add_policy_rule_set/'
'(?P<policy_target_id>[^/]+)/$',
views.AddProvidedPRSView.as_view(),
name='add_provided_prs'),
url(r'^ext_remove_policy_rule_set/'
'(?P<ext_policy_target_id>[^/]+)/$',
views.ExtRemoveProvidedPRSView.as_view(),
name='ext_remove_provided_prs'),
url(r'^remove_policy_rule_set/'
'(?P<policy_target_id>[^/]+)/$',
views.RemoveProvidedPRSView.as_view(),
name='remove_provided_prs'),
url(r'^add_consumed/(?P<policy_target_id>[^/]+)/$',
views.AddConsumedPRSView.as_view(),
name='add_consumed_prs'),
url(r'^ext_add_consumed/'
'(?P<ext_policy_target_id>[^/]+)/$',
views.ExtAddConsumedPRSView.as_view(),
name='ext_add_consumed_prs'),
url(r'^remove_consumed/(?P<policy_target_id>[^/]+)/$',
views.RemoveConsumedPRSView.as_view(),
name='remove_consumed_prs'),
url(r'^ext_remove_consumed/'
'(?P<ext_policy_target_id>[^/]+)/$',
views.ExtRemoveConsumedPRSView.as_view(),
name='ext_remove_consumed_prs'),
url(r'/check_ip_availability',
views.check_ip_availability,
name='check_ip_availability'),
)
urlpatterns = [
url(r'^$',
views.IndexView.as_view(),
name='index'),
url(r'^addpolicy_target$',
views.AddPTGView.as_view(),
name='addpolicy_target'),
url(r'^addexternal_policy_target$',
views.AddExternalPTGView.as_view(),
name='addexternal_policy_target'),
url(r'^updatepolicy_target/(?P<policy_target_id>[^/]+)/$',
views.UpdatePTGView.as_view(),
name='updatepolicy_target'),
url(r'^update_ext_policy_target/(?P<ext_policy_target_id>[^/]+)/$',
views.UpdateExternalPTGView.as_view(),
name='update_ext_policy_target'),
url(r'^policy_target/(?P<policy_target_id>[^/]+)/$',
views.PTGDetailsView.as_view(),
name='policy_targetdetails'),
url(r'^ext_policy_target/(?P<ext_policy_target_id>[^/]+)/$',
views.ExternalPTGDetailsView.as_view(),
name='ext_policy_targetdetails'),
url(r'^addvm/(?P<policy_target_id>[^/]+)/$',
views.LaunchVMView.as_view(), name='addvm'),
url(r'^ext_add_policy_rule_set/(?P<ext_policy_target_id>[^/]+)/$',
views.ExtAddProvidedPRSView.as_view(),
name='ext_add_provided_prs'),
url(r'^add_policy_rule_set/(?P<policy_target_id>[^/]+)/$',
views.AddProvidedPRSView.as_view(),
name='add_provided_prs'),
url(r'^ext_remove_policy_rule_set/(?P<ext_policy_target_id>[^/]+)/$',
views.ExtRemoveProvidedPRSView.as_view(),
name='ext_remove_provided_prs'),
url(r'^remove_policy_rule_set/(?P<policy_target_id>[^/]+)/$',
views.RemoveProvidedPRSView.as_view(),
name='remove_provided_prs'),
url(r'^add_consumed/(?P<policy_target_id>[^/]+)/$',
views.AddConsumedPRSView.as_view(),
name='add_consumed_prs'),
url(r'^ext_add_consumed/(?P<ext_policy_target_id>[^/]+)/$',
views.ExtAddConsumedPRSView.as_view(),
name='ext_add_consumed_prs'),
url(r'^remove_consumed/(?P<policy_target_id>[^/]+)/$',
views.RemoveConsumedPRSView.as_view(),
name='remove_consumed_prs'),
url(r'^ext_remove_consumed/(?P<ext_policy_target_id>[^/]+)/$',
views.ExtRemoveConsumedPRSView.as_view(),
name='ext_remove_consumed_prs'),
url(r'/check_ip_availability',
views.check_ip_availability,
name='check_ip_availability'),
]