openstack
/
neutron-lbaas-dashboard
Code Issues Proposed changes

Get rid of removed Django code 

Change-Id: Ia67b6a3a5cacfcb432ce7052e97297f94cded85d
This commit is contained in:
Rob Cresswell 2017-07-25 09:41:53 +01:00
parent 789e7cea2d
commit 34bc1ed1de
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
neutron_lbaas_dashboard/dashboards/project/loadbalancersv2/urls.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.conf.urls import patterns
from django.conf.urls import url from django.conf.urls import url
from .views import DetailView # noqa from .views import DetailView # noqa
@ -22,15 +21,10 @@ from .views import UpdateView # noqa
INSTANCES = r'^(?P<loadbalancer_id>[^/]+)/%s$' INSTANCES = r'^(?P<loadbalancer_id>[^/]+)/%s$'
VIEW_MOD = 'openstack_dashboard.dashboards.project.loadbalancersv2.views'
urlpatterns = [
urlpatterns = patterns(VIEW_MOD, url(r'^$', IndexView.as_view(), name='index'),
url(r'^$', IndexView.as_view(), name='index'), url(r'^launch$', LaunchLoadBalancerView.as_view(), name='launch'),
url(r'^launch$', url(r'^(?P<loadbalancer_id>[^/]+)/$', DetailView.as_view(), name='detail'),
LaunchLoadBalancerView.as_view(), name='launch'), url(INSTANCES % 'update', UpdateView.as_view(), name='update'),
url(r'^(?P<loadbalancer_id>[^/]+)/$', ]
DetailView.as_view(), name='detail'),
url(INSTANCES %
'update', UpdateView.as_view(), name='update'),
)

6
neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/urls.py
View File

@ -12,13 +12,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.conf.urls import patterns
from django.conf.urls import url from django.conf.urls import url
from neutron_lbaas_dashboard.dashboards.project.ngloadbalancersv2 import views from neutron_lbaas_dashboard.dashboards.project.ngloadbalancersv2 import views
urlpatterns = patterns( urlpatterns = [
'neutron_lbaas_dashboard.dashboards.project.ngloadbalancersv2.views',
url('', views.IndexView.as_view(), name='index'), url('', views.IndexView.as_view(), name='index'),
) ]

9
neutron_lbaas_dashboard/tests/urls.py
View File

@ -12,9 +12,8 @@
# under the License. # under the License.
from django.conf import urls from django.conf import urls
import openstack_dashboard.urls from openstack_dashboard import urls as dashboard_urls
urlpatterns = urls.patterns( urlpatterns = [
'', urls.url(r'', urls.include(dashboard_urls))
urls.url(r'', urls.include(openstack_dashboard.urls)) ]
)