summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Johnson <johnsomor@gmail.com>2019-03-12 17:40:08 -0700
committerMichael Johnson <johnsomor@gmail.com>2019-03-18 17:19:44 +0000
commitcddbf697e6b2db25ad924ec8a96a82e2dc83ff00 (patch)
treedd5ef3bb67596b2a54881625d8c5e6bd0d476b3f
parent0c03857b1cd25eaf5b4cb295fa1c8385974b6c2a (diff)
Fix neutron-lbaas-dashboard and octavia-dashboard
This patch fixes neutron-lbaas-dashboard to function properly when installed in horizon with octavia-dashboard. Story: 2004913 Task: 29266 Change-Id: Ib3e1e4d0bef08745bdbba2437481bfba169931ec
Notes
Notes (review): Code-Review+2: Carlos Goncalves <cgoncalves@redhat.com> Code-Review+2: German Eichberger <German.eichberger@rackspace.com> Workflow+1: German Eichberger <German.eichberger@rackspace.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 18 Mar 2019 20:30:26 +0000 Reviewed-on: https://review.openstack.org/642931 Project: openstack/neutron-lbaas-dashboard Branch: refs/heads/master
-rw-r--r--neutron_lbaas_dashboard/api/rest/__init__.py2
-rw-r--r--neutron_lbaas_dashboard/api/rest/nlbaasv2.py (renamed from neutron_lbaas_dashboard/api/rest/lbaasv2.py)38
-rw-r--r--neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/panel.py2
-rw-r--r--neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/views.py2
-rw-r--r--neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py4
-rw-r--r--neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.js (renamed from neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.js)94
-rw-r--r--neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.spec.js (renamed from neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.spec.js)54
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.js)12
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.html)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.spec.js)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.js)14
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.js)16
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.spec.js)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.spec.js)12
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js)20
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.js)16
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.js)16
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.html)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.spec.js)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.js)12
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.html)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.js)12
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.spec.js)14
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.html)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.spec.js)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.js)14
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.spec.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.html)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.js)22
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.spec.js)18
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.scss (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.scss)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js)14
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.spec.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.html)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.spec.js)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.js)10
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.spec.js)7
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.help.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.help.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.html)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/listener/listener.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/listener/listener.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.controller.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/listener/listener.help.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/listener/listener.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.help.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.help.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js)12
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.help.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.help.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/modal.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/modal.service.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/modal.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/modal.service.spec.js)4
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js)8
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.spec.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.help.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html)2
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/pool/pool.help.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/pool/pool.html (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html)0
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.js)6
-rw-r--r--neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.spec.js (renamed from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.spec.js)4
148 files changed, 589 insertions, 588 deletions
diff --git a/neutron_lbaas_dashboard/api/rest/__init__.py b/neutron_lbaas_dashboard/api/rest/__init__.py
index 0773bf2..429b252 100644
--- a/neutron_lbaas_dashboard/api/rest/__init__.py
+++ b/neutron_lbaas_dashboard/api/rest/__init__.py
@@ -23,4 +23,4 @@ in https://wiki.openstack.org/wiki/APIChangeGuidelines.
23 23
24# import REST API modules here 24# import REST API modules here
25from neutron_lbaas_dashboard.api.rest import barbican # noqa 25from neutron_lbaas_dashboard.api.rest import barbican # noqa
26from neutron_lbaas_dashboard.api.rest import lbaasv2 # noqa 26from neutron_lbaas_dashboard.api.rest import nlbaasv2 # noqa
diff --git a/neutron_lbaas_dashboard/api/rest/lbaasv2.py b/neutron_lbaas_dashboard/api/rest/nlbaasv2.py
index 09e7361..64122a6 100644
--- a/neutron_lbaas_dashboard/api/rest/lbaasv2.py
+++ b/neutron_lbaas_dashboard/api/rest/nlbaasv2.py
@@ -406,7 +406,7 @@ class LoadBalancers(generic.View):
406 """API for load balancers. 406 """API for load balancers.
407 407
408 """ 408 """
409 url_regex = r'lbaas/loadbalancers/$' 409 url_regex = r'nlbaas/loadbalancers/$'
410 410
411 @rest_utils.ajax() 411 @rest_utils.ajax()
412 def get(self, request): 412 def get(self, request):
@@ -436,13 +436,13 @@ class LoadBalancerStatusTree(generic.View):
436 """API for retrieving the resource status tree for a single load balancer. 436 """API for retrieving the resource status tree for a single load balancer.
437 437
438 """ 438 """
439 url_regex = r'lbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/statuses/$' 439 url_regex = r'nlbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/statuses/$'
440 440
441 @rest_utils.ajax() 441 @rest_utils.ajax()
442 def get(self, request, loadbalancer_id): 442 def get(self, request, loadbalancer_id):
443 """Get the status tree for a specific load balancer. 443 """Get the status tree for a specific load balancer.
444 444
445 http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915/statuses 445 http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915/statuses
446 """ 446 """
447 return neutronclient(request).retrieve_loadbalancer_status( 447 return neutronclient(request).retrieve_loadbalancer_status(
448 loadbalancer_id) 448 loadbalancer_id)
@@ -453,13 +453,13 @@ class LoadBalancer(generic.View):
453 """API for retrieving, updating, and deleting a single load balancer. 453 """API for retrieving, updating, and deleting a single load balancer.
454 454
455 """ 455 """
456 url_regex = r'lbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/$' 456 url_regex = r'nlbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/$'
457 457
458 @rest_utils.ajax() 458 @rest_utils.ajax()
459 def get(self, request, loadbalancer_id): 459 def get(self, request, loadbalancer_id):
460 """Get a specific load balancer. 460 """Get a specific load balancer.
461 461
462 http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915 462 http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915
463 """ 463 """
464 loadbalancer = neutronclient(request).show_loadbalancer( 464 loadbalancer = neutronclient(request).show_loadbalancer(
465 loadbalancer_id).get('loadbalancer') 465 loadbalancer_id).get('loadbalancer')
@@ -479,7 +479,7 @@ class LoadBalancer(generic.View):
479 def delete(self, request, loadbalancer_id): 479 def delete(self, request, loadbalancer_id):
480 """Delete a specific load balancer. 480 """Delete a specific load balancer.
481 481
482 http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915 482 http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915
483 """ 483 """
484 neutronclient(request).delete_loadbalancer(loadbalancer_id) 484 neutronclient(request).delete_loadbalancer(loadbalancer_id)
485 485
@@ -489,7 +489,7 @@ class Listeners(generic.View):
489 """API for load balancer listeners. 489 """API for load balancer listeners.
490 490
491 """ 491 """
492 url_regex = r'lbaas/listeners/$' 492 url_regex = r'nlbaas/listeners/$'
493 493
494 @rest_utils.ajax() 494 @rest_utils.ajax()
495 def get(self, request): 495 def get(self, request):
@@ -531,7 +531,7 @@ class Listener(generic.View):
531 """API for retrieving, updating, and deleting a single listener. 531 """API for retrieving, updating, and deleting a single listener.
532 532
533 """ 533 """
534 url_regex = r'lbaas/listeners/(?P<listener_id>[^/]+)/$' 534 url_regex = r'nlbaas/listeners/(?P<listener_id>[^/]+)/$'
535 535
536 @rest_utils.ajax() 536 @rest_utils.ajax()
537 def get(self, request, listener_id): 537 def get(self, request, listener_id):
@@ -541,7 +541,7 @@ class Listener(generic.View):
541 the details of all resources that exist under the listener will be 541 the details of all resources that exist under the listener will be
542 returned along with the listener details. 542 returned along with the listener details.
543 543
544 http://localhost/api/lbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915 544 http://localhost/api/nlbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915
545 """ 545 """
546 listener = neutronclient(request).show_listener( 546 listener = neutronclient(request).show_listener(
547 listener_id).get('listener') 547 listener_id).get('listener')
@@ -584,7 +584,7 @@ class Listener(generic.View):
584 def delete(self, request, listener_id): 584 def delete(self, request, listener_id):
585 """Delete a specific listener. 585 """Delete a specific listener.
586 586
587 http://localhost/api/lbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915 587 http://localhost/api/nlbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915
588 """ 588 """
589 neutronclient(request).delete_listener(listener_id) 589 neutronclient(request).delete_listener(listener_id)
590 590
@@ -594,7 +594,7 @@ class Pools(generic.View):
594 """API for load balancer pools. 594 """API for load balancer pools.
595 595
596 """ 596 """
597 url_regex = r'lbaas/pools/$' 597 url_regex = r'nlbaas/pools/$'
598 598
599 @rest_utils.ajax() 599 @rest_utils.ajax()
600 def post(self, request): 600 def post(self, request):
@@ -613,7 +613,7 @@ class Pool(generic.View):
613 """API for retrieving a single pool. 613 """API for retrieving a single pool.
614 614
615 """ 615 """
616 url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)/$' 616 url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)/$'
617 617
618 @rest_utils.ajax() 618 @rest_utils.ajax()
619 def get(self, request, pool_id): 619 def get(self, request, pool_id):
@@ -623,7 +623,7 @@ class Pool(generic.View):
623 the details of all resources that exist under the pool will be 623 the details of all resources that exist under the pool will be
624 returned along with the pool details. 624 returned along with the pool details.
625 625
626 http://localhost/api/lbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915 626 http://localhost/api/nlbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915
627 """ 627 """
628 pool = neutronclient(request).show_lbaas_pool(pool_id).get('pool') 628 pool = neutronclient(request).show_lbaas_pool(pool_id).get('pool')
629 629
@@ -659,7 +659,7 @@ class Pool(generic.View):
659 def delete(self, request, pool_id): 659 def delete(self, request, pool_id):
660 """Delete a specific pool. 660 """Delete a specific pool.
661 661
662 http://localhost/api/lbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915 662 http://localhost/api/nlbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915
663 """ 663 """
664 neutronclient(request).delete_lbaas_pool(pool_id) 664 neutronclient(request).delete_lbaas_pool(pool_id)
665 665
@@ -669,7 +669,7 @@ class Members(generic.View):
669 """API for load balancer members. 669 """API for load balancer members.
670 670
671 """ 671 """
672 url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)/members/$' 672 url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)/members/$'
673 673
674 @rest_utils.ajax() 674 @rest_utils.ajax()
675 def get(self, request, pool_id): 675 def get(self, request, pool_id):
@@ -708,7 +708,7 @@ class Member(generic.View):
708 """API for retrieving a single member. 708 """API for retrieving a single member.
709 709
710 """ 710 """
711 url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)' + \ 711 url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)' + \
712 '/members/(?P<member_id>[^/]+)/$' 712 '/members/(?P<member_id>[^/]+)/$'
713 713
714 @rest_utils.ajax() 714 @rest_utils.ajax()
@@ -737,7 +737,7 @@ class HealthMonitors(generic.View):
737 """API for load balancer pool health monitors. 737 """API for load balancer pool health monitors.
738 738
739 """ 739 """
740 url_regex = r'lbaas/healthmonitors/$' 740 url_regex = r'nlbaas/healthmonitors/$'
741 741
742 @rest_utils.ajax() 742 @rest_utils.ajax()
743 def post(self, request): 743 def post(self, request):
@@ -754,7 +754,7 @@ class HealthMonitor(generic.View):
754 """API for retrieving a single health monitor. 754 """API for retrieving a single health monitor.
755 755
756 """ 756 """
757 url_regex = r'lbaas/healthmonitors/(?P<healthmonitor_id>[^/]+)/$' 757 url_regex = r'nlbaas/healthmonitors/(?P<healthmonitor_id>[^/]+)/$'
758 758
759 @rest_utils.ajax() 759 @rest_utils.ajax()
760 def get(self, request, healthmonitor_id): 760 def get(self, request, healthmonitor_id):
@@ -768,7 +768,7 @@ class HealthMonitor(generic.View):
768 def delete(self, request, healthmonitor_id): 768 def delete(self, request, healthmonitor_id):
769 """Delete a specific health monitor. 769 """Delete a specific health monitor.
770 770
771 http://localhost/api/lbaas/healthmonitors/cc758c90-3d98-4ea1-af44-aab405c9c915 771 http://localhost/api/nlbaas/healthmonitors/cc758c90-3d98-4ea1-af44-aab405c9c915
772 """ 772 """
773 neutronclient(request).delete_lbaas_healthmonitor(healthmonitor_id) 773 neutronclient(request).delete_lbaas_healthmonitor(healthmonitor_id)
774 774
diff --git a/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/panel.py b/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/panel.py
index 80fcf95..0ad59c4 100644
--- a/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/panel.py
+++ b/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/panel.py
@@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__)
24 24
25 25
26class NGLoadBalancers(horizon.Panel): 26class NGLoadBalancers(horizon.Panel):
27 name = _("Load Balancers") 27 name = _("Neutron Load Balancers")
28 slug = 'ngloadbalancersv2' 28 slug = 'ngloadbalancersv2'
29 permissions = ('openstack.services.network',) 29 permissions = ('openstack.services.network',)
30 30
diff --git a/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/views.py b/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/views.py
index 83978d9..b6ab3d9 100644
--- a/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/views.py
+++ b/neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/views.py
@@ -17,4 +17,4 @@ from horizon.views import HorizonTemplateView
17 17
18class IndexView(HorizonTemplateView): 18class IndexView(HorizonTemplateView):
19 template_name = 'project/ngloadbalancersv2/index.html' 19 template_name = 'project/ngloadbalancersv2/index.html'
20 page_title = 'Load Balancers' 20 page_title = 'Neutron Load Balancers'
diff --git a/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py b/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py
index 50f0fb0..bcd6ec9 100644
--- a/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py
+++ b/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py
@@ -26,8 +26,8 @@ ADD_PANEL = (
26 26
27ADD_INSTALLED_APPS = ['neutron_lbaas_dashboard'] 27ADD_INSTALLED_APPS = ['neutron_lbaas_dashboard']
28 28
29ADD_ANGULAR_MODULES = ['horizon.dashboard.project.lbaasv2'] 29ADD_ANGULAR_MODULES = ['horizon.dashboard.project.nlbaasv2']
30 30
31ADD_SCSS_FILES = ['dashboard/project/lbaasv2/lbaasv2.scss'] 31ADD_SCSS_FILES = ['dashboard/project/nlbaasv2/nlbaasv2.scss']
32 32
33AUTO_DISCOVER_STATIC_FILES = True 33AUTO_DISCOVER_STATIC_FILES = True
diff --git a/neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.js b/neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.js
index e63676b..7d186d0 100644
--- a/neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.js
+++ b/neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.js
@@ -18,7 +18,7 @@
18 18
19 angular 19 angular
20 .module('horizon.app.core.openstack-service-api') 20 .module('horizon.app.core.openstack-service-api')
21 .factory('horizon.app.core.openstack-service-api.lbaasv2', lbaasv2API); 21 .factory('horizon.app.core.openstack-service-api.nlbaasv2', lbaasv2API);
22 22
23 lbaasv2API.$inject = [ 23 lbaasv2API.$inject = [
24 'horizon.framework.util.http.service', 24 'horizon.framework.util.http.service',
@@ -68,7 +68,7 @@
68 // Load Balancers 68 // Load Balancers
69 69
70 /** 70 /**
71 * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancers 71 * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancers
72 * @description 72 * @description
73 * Get a list of load balancers. 73 * Get a list of load balancers.
74 * @param {boolean} full 74 * @param {boolean} full
@@ -78,14 +78,14 @@
78 78
79 function getLoadBalancers(full) { 79 function getLoadBalancers(full) {
80 var params = { full: full }; 80 var params = { full: full };
81 return apiService.get('/api/lbaas/loadbalancers/', { params: params }) 81 return apiService.get('/api/nlbaas/loadbalancers/', { params: params })
82 .error(function () { 82 .error(function () {
83 toastService.add('error', gettext('Unable to retrieve load balancers.')); 83 toastService.add('error', gettext('Unable to retrieve load balancers.'));
84 }); 84 });
85 } 85 }
86 86
87 /** 87 /**
88 * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancer 88 * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancer
89 * @description 89 * @description
90 * Get a single load balancer by ID 90 * Get a single load balancer by ID
91 * @param {string} id 91 * @param {string} id
@@ -95,14 +95,14 @@
95 95
96 function getLoadBalancer(id, full) { 96 function getLoadBalancer(id, full) {
97 var params = { full: full }; 97 var params = { full: full };
98 return apiService.get('/api/lbaas/loadbalancers/' + id + '/', { params: params }) 98 return apiService.get('/api/nlbaas/loadbalancers/' + id + '/', { params: params })
99 .error(function () { 99 .error(function () {
100 toastService.add('error', gettext('Unable to retrieve load balancer.')); 100 toastService.add('error', gettext('Unable to retrieve load balancer.'));
101 }); 101 });
102 } 102 }
103 103
104 /** 104 /**
105 * @name horizon.app.core.openstack-service-api.lbaasv2.deleteLoadBalancer 105 * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteLoadBalancer
106 * @description 106 * @description
107 * Delete a single load balancer by ID 107 * Delete a single load balancer by ID
108 * @param {string} id 108 * @param {string} id
@@ -111,14 +111,14 @@
111 */ 111 */
112 112
113 function deleteLoadBalancer(id, quiet) { 113 function deleteLoadBalancer(id, quiet) {
114 var promise = apiService.delete('/api/lbaas/loadbalancers/' + id + '/'); 114 var promise = apiService.delete('/api/nlbaas/loadbalancers/' + id + '/');
115 return quiet ? promise : promise.error(function () { 115 return quiet ? promise : promise.error(function () {
116 toastService.add('error', gettext('Unable to delete load balancer.')); 116 toastService.add('error', gettext('Unable to delete load balancer.'));
117 }); 117 });
118 } 118 }
119 119
120 /** 120 /**
121 * @name horizon.app.core.openstack-service-api.lbaasv2.createLoadBalancer 121 * @name horizon.app.core.openstack-service-api.nlbaasv2.createLoadBalancer
122 * @description 122 * @description
123 * Create a new load balancer 123 * Create a new load balancer
124 * @param {object} spec 124 * @param {object} spec
@@ -126,14 +126,14 @@
126 */ 126 */
127 127
128 function createLoadBalancer(spec) { 128 function createLoadBalancer(spec) {
129 return apiService.post('/api/lbaas/loadbalancers/', spec) 129 return apiService.post('/api/nlbaas/loadbalancers/', spec)
130 .error(function () { 130 .error(function () {
131 toastService.add('error', gettext('Unable to create load balancer.')); 131 toastService.add('error', gettext('Unable to create load balancer.'));
132 }); 132 });
133 } 133 }
134 134
135 /** 135 /**
136 * @name horizon.app.core.openstack-service-api.lbaasv2.editLoadBalancer 136 * @name horizon.app.core.openstack-service-api.nlbaasv2.editLoadBalancer
137 * @description 137 * @description
138 * Edit a load balancer 138 * Edit a load balancer
139 * @param {string} id 139 * @param {string} id
@@ -142,14 +142,14 @@
142 */ 142 */
143 143
144 function editLoadBalancer(id, spec) { 144 function editLoadBalancer(id, spec) {
145 return apiService.put('/api/lbaas/loadbalancers/' + id + '/', spec) 145 return apiService.put('/api/nlbaas/loadbalancers/' + id + '/', spec)
146 .error(function () { 146 .error(function () {
147 toastService.add('error', gettext('Unable to update load balancer.')); 147 toastService.add('error', gettext('Unable to update load balancer.'));
148 }); 148 });
149 } 149 }
150 150
151 /** 151 /**
152 * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancerStatusTree 152 * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancerStatusTree
153 * @description 153 * @description
154 * Get the status tree for a load balancer 154 * Get the status tree for a load balancer
155 * @param {string} id 155 * @param {string} id
@@ -157,7 +157,7 @@
157 */ 157 */
158 158
159 function getLoadBalancerStatusTree(id) { 159 function getLoadBalancerStatusTree(id) {
160 return apiService.get('/api/lbaas/loadbalancers/' + id + '/statuses/') 160 return apiService.get('/api/nlbaas/loadbalancers/' + id + '/statuses/')
161 .error(function () { 161 .error(function () {
162 toastService.add('error', gettext('Unable to retrieve load balancer status tree.')); 162 toastService.add('error', gettext('Unable to retrieve load balancer status tree.'));
163 }); 163 });
@@ -166,7 +166,7 @@
166 // Listeners 166 // Listeners
167 167
168 /** 168 /**
169 * @name horizon.app.core.openstack-service-api.lbaasv2.getListeners 169 * @name horizon.app.core.openstack-service-api.nlbaasv2.getListeners
170 * @description 170 * @description
171 * Get the list of listeners. 171 * Get the list of listeners.
172 * If a loadbalancer ID is passed as a parameter, the returning list of 172 * If a loadbalancer ID is passed as a parameter, the returning list of
@@ -181,14 +181,14 @@
181 181
182 function getListeners(id) { 182 function getListeners(id) {
183 var params = id ? {params: {loadbalancerId: id}} : {}; 183 var params = id ? {params: {loadbalancerId: id}} : {};
184 return apiService.get('/api/lbaas/listeners/', params) 184 return apiService.get('/api/nlbaas/listeners/', params)
185 .error(function () { 185 .error(function () {
186 toastService.add('error', gettext('Unable to retrieve listeners.')); 186 toastService.add('error', gettext('Unable to retrieve listeners.'));
187 }); 187 });
188 } 188 }
189 189
190 /** 190 /**
191 * @name horizon.app.core.openstack-service-api.lbaasv2.getListener 191 * @name horizon.app.core.openstack-service-api.nlbaasv2.getListener
192 * @description 192 * @description
193 * Get a single listener by ID. 193 * Get a single listener by ID.
194 * @param {string} id 194 * @param {string} id
@@ -201,14 +201,14 @@
201 var params = includeChildResources 201 var params = includeChildResources
202 ? {params: {includeChildResources: includeChildResources}} 202 ? {params: {includeChildResources: includeChildResources}}
203 : {}; 203 : {};
204 return apiService.get('/api/lbaas/listeners/' + id + '/', params) 204 return apiService.get('/api/nlbaas/listeners/' + id + '/', params)
205 .error(function () { 205 .error(function () {
206 toastService.add('error', gettext('Unable to retrieve listener.')); 206 toastService.add('error', gettext('Unable to retrieve listener.'));
207 }); 207 });
208 } 208 }
209 209
210 /** 210 /**
211 * @name horizon.app.core.openstack-service-api.lbaasv2.createListener 211 * @name horizon.app.core.openstack-service-api.nlbaasv2.createListener
212 * @description 212 * @description
213 * Create a new listener 213 * Create a new listener
214 * @param {object} spec 214 * @param {object} spec
@@ -216,14 +216,14 @@
216 */ 216 */
217 217
218 function createListener(spec) { 218 function createListener(spec) {
219 return apiService.post('/api/lbaas/listeners/', spec) 219 return apiService.post('/api/nlbaas/listeners/', spec)
220 .error(function () { 220 .error(function () {
221 toastService.add('error', gettext('Unable to create listener.')); 221 toastService.add('error', gettext('Unable to create listener.'));
222 }); 222 });
223 } 223 }
224 224
225 /** 225 /**
226 * @name horizon.app.core.openstack-service-api.lbaasv2.editListener 226 * @name horizon.app.core.openstack-service-api.nlbaasv2.editListener
227 * @description 227 * @description
228 * Edit a listener 228 * Edit a listener
229 * @param {string} id 229 * @param {string} id
@@ -233,14 +233,14 @@
233 */ 233 */
234 234
235 function editListener(id, spec) { 235 function editListener(id, spec) {
236 return apiService.put('/api/lbaas/listeners/' + id + '/', spec) 236 return apiService.put('/api/nlbaas/listeners/' + id + '/', spec)
237 .error(function () { 237 .error(function () {
238 toastService.add('error', gettext('Unable to update listener.')); 238 toastService.add('error', gettext('Unable to update listener.'));
239 }); 239 });
240 } 240 }
241 241
242 /** 242 /**
243 * @name horizon.app.core.openstack-service-api.lbaasv2.deleteListener 243 * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteListener
244 * @description 244 * @description
245 * Delete a single listener by ID 245 * Delete a single listener by ID
246 * @param {string} id 246 * @param {string} id
@@ -249,7 +249,7 @@
249 */ 249 */
250 250
251 function deleteListener(id, quiet) { 251 function deleteListener(id, quiet) {
252 var promise = apiService.delete('/api/lbaas/listeners/' + id + '/'); 252 var promise = apiService.delete('/api/nlbaas/listeners/' + id + '/');
253 return quiet ? promise : promise.error(function () { 253 return quiet ? promise : promise.error(function () {
254 toastService.add('error', gettext('Unable to delete listener.')); 254 toastService.add('error', gettext('Unable to delete listener.'));
255 }); 255 });
@@ -258,7 +258,7 @@
258 // Pools 258 // Pools
259 259
260 /** 260 /**
261 * @name horizon.app.core.openstack-service-api.lbaasv2.getPool 261 * @name horizon.app.core.openstack-service-api.nlbaasv2.getPool
262 * @description 262 * @description
263 * Get a single Pool by ID. 263 * Get a single Pool by ID.
264 * @param {string} id 264 * @param {string} id
@@ -271,14 +271,14 @@
271 var params = includeChildResources 271 var params = includeChildResources
272 ? {params: {includeChildResources: includeChildResources}} 272 ? {params: {includeChildResources: includeChildResources}}
273 : {}; 273 : {};
274 return apiService.get('/api/lbaas/pools/' + id + '/', params) 274 return apiService.get('/api/nlbaas/pools/' + id + '/', params)
275 .error(function () { 275 .error(function () {
276 toastService.add('error', gettext('Unable to retrieve pool.')); 276 toastService.add('error', gettext('Unable to retrieve pool.'));
277 }); 277 });
278 } 278 }
279 279
280 /** 280 /**
281 * @name horizon.app.core.openstack-service-api.lbaasv2.createPool 281 * @name horizon.app.core.openstack-service-api.nlbaasv2.createPool
282 * @description 282 * @description
283 * Create a new pool 283 * Create a new pool
284 * @param {object} spec 284 * @param {object} spec
@@ -286,14 +286,14 @@
286 */ 286 */
287 287
288 function createPool(spec) { 288 function createPool(spec) {
289 return apiService.post('/api/lbaas/pools/', spec) 289 return apiService.post('/api/nlbaas/pools/', spec)
290 .error(function () { 290 .error(function () {
291 toastService.add('error', gettext('Unable to create pool.')); 291 toastService.add('error', gettext('Unable to create pool.'));
292 }); 292 });
293 } 293 }
294 294
295 /** 295 /**
296 * @name horizon.app.core.openstack-service-api.lbaasv2.editPool 296 * @name horizon.app.core.openstack-service-api.nlbaasv2.editPool
297 * @description 297 * @description
298 * Edit a pool 298 * Edit a pool
299 * @param {string} id 299 * @param {string} id
@@ -303,14 +303,14 @@
303 */ 303 */
304 304
305 function editPool(id, spec) { 305 function editPool(id, spec) {
306 return apiService.put('/api/lbaas/pools/' + id + '/', spec) 306 return apiService.put('/api/nlbaas/pools/' + id + '/', spec)
307 .error(function () { 307 .error(function () {
308 toastService.add('error', gettext('Unable to update pool.')); 308 toastService.add('error', gettext('Unable to update pool.'));
309 }); 309 });
310 } 310 }
311 311
312 /** 312 /**
313 * @name horizon.app.core.openstack-service-api.lbaasv2.deletePool 313 * @name horizon.app.core.openstack-service-api.nlbaasv2.deletePool
314 * @description 314 * @description
315 * Delete a single pool by ID 315 * Delete a single pool by ID
316 * @param {string} id 316 * @param {string} id
@@ -319,7 +319,7 @@
319 */ 319 */
320 320
321 function deletePool(id, quiet) { 321 function deletePool(id, quiet) {
322 var promise = apiService.delete('/api/lbaas/pools/' + id + '/'); 322 var promise = apiService.delete('/api/nlbaas/pools/' + id + '/');
323 return quiet ? promise : promise.error(function () { 323 return quiet ? promise : promise.error(function () {
324 toastService.add('error', gettext('Unable to delete pool.')); 324 toastService.add('error', gettext('Unable to delete pool.'));
325 }); 325 });
@@ -328,7 +328,7 @@
328 // Members 328 // Members
329 329
330 /** 330 /**
331 * @name horizon.app.core.openstack-service-api.lbaasv2.getMembers 331 * @name horizon.app.core.openstack-service-api.nlbaasv2.getMembers
332 * @description 332 * @description
333 * Get a list of members. 333 * Get a list of members.
334 * @param {string} poolId 334 * @param {string} poolId
@@ -339,14 +339,14 @@
339 */ 339 */
340 340
341 function getMembers(poolId) { 341 function getMembers(poolId) {
342 return apiService.get('/api/lbaas/pools/' + poolId + '/members/') 342 return apiService.get('/api/nlbaas/pools/' + poolId + '/members/')
343 .error(function () { 343 .error(function () {
344 toastService.add('error', gettext('Unable to retrieve members.')); 344 toastService.add('error', gettext('Unable to retrieve members.'));
345 }); 345 });
346 } 346 }
347 347
348 /** 348 /**
349 * @name horizon.app.core.openstack-service-api.lbaasv2.getMember 349 * @name horizon.app.core.openstack-service-api.nlbaasv2.getMember
350 * @description 350 * @description
351 * Get a single pool Member by ID. 351 * Get a single pool Member by ID.
352 * @param {string} poolId 352 * @param {string} poolId
@@ -356,14 +356,14 @@
356 */ 356 */
357 357
358 function getMember(poolId, memberId) { 358 function getMember(poolId, memberId) {
359 return apiService.get('/api/lbaas/pools/' + poolId + '/members/' + memberId + '/') 359 return apiService.get('/api/nlbaas/pools/' + poolId + '/members/' + memberId + '/')
360 .error(function () { 360 .error(function () {
361 toastService.add('error', gettext('Unable to retrieve member.')); 361 toastService.add('error', gettext('Unable to retrieve member.'));
362 }); 362 });
363 } 363 }
364 364
365 /** 365 /**
366 * @name horizon.app.core.openstack-service-api.lbaasv2.editMember 366 * @name horizon.app.core.openstack-service-api.nlbaasv2.editMember
367 * @description 367 * @description
368 * Edit a pool member. 368 * Edit a pool member.
369 * @param {string} id 369 * @param {string} id
@@ -373,14 +373,14 @@
373 */ 373 */
374 374
375 function editMember(poolId, memberId, spec) { 375 function editMember(poolId, memberId, spec) {
376 return apiService.put('/api/lbaas/pools/' + poolId + '/members/' + memberId + '/', spec) 376 return apiService.put('/api/nlbaas/pools/' + poolId + '/members/' + memberId + '/', spec)
377 .error(function () { 377 .error(function () {
378 toastService.add('error', gettext('Unable to update member.')); 378 toastService.add('error', gettext('Unable to update member.'));
379 }); 379 });
380 } 380 }
381 381
382 /** 382 /**
383 * @name horizon.app.core.openstack-service-api.lbaasv2.updateMemberList 383 * @name horizon.app.core.openstack-service-api.nlbaasv2.updateMemberList
384 * @description 384 * @description
385 * Update the list of pool members by adding or removing the necessary members. 385 * Update the list of pool members by adding or removing the necessary members.
386 * @param {string} poolId 386 * @param {string} poolId
@@ -390,7 +390,7 @@
390 */ 390 */
391 391
392 function updateMemberList(poolId, spec) { 392 function updateMemberList(poolId, spec) {
393 return apiService.put('/api/lbaas/pools/' + poolId + '/members/', spec) 393 return apiService.put('/api/nlbaas/pools/' + poolId + '/members/', spec)
394 .error(function () { 394 .error(function () {
395 toastService.add('error', gettext('Unable to update member list.')); 395 toastService.add('error', gettext('Unable to update member list.'));
396 }); 396 });
@@ -399,7 +399,7 @@
399 // Health Monitors 399 // Health Monitors
400 400
401 /** 401 /**
402 * @name horizon.app.core.openstack-service-api.lbaasv2.getHealthMonitor 402 * @name horizon.app.core.openstack-service-api.nlbaasv2.getHealthMonitor
403 * @description 403 * @description
404 * Get a single pool health monitor by ID. 404 * Get a single pool health monitor by ID.
405 * @param {string} monitorId 405 * @param {string} monitorId
@@ -407,14 +407,14 @@
407 */ 407 */
408 408
409 function getHealthMonitor(monitorId) { 409 function getHealthMonitor(monitorId) {
410 return apiService.get('/api/lbaas/healthmonitors/' + monitorId + '/') 410 return apiService.get('/api/nlbaas/healthmonitors/' + monitorId + '/')
411 .error(function () { 411 .error(function () {
412 toastService.add('error', gettext('Unable to retrieve health monitor.')); 412 toastService.add('error', gettext('Unable to retrieve health monitor.'));
413 }); 413 });
414 } 414 }
415 415
416 /** 416 /**
417 * @name horizon.app.core.openstack-service-api.lbaasv2.editHealthMonitor 417 * @name horizon.app.core.openstack-service-api.nlbaasv2.editHealthMonitor
418 * @description 418 * @description
419 * Edit a health monitor 419 * Edit a health monitor
420 * @param {string} id 420 * @param {string} id
@@ -424,14 +424,14 @@
424 */ 424 */
425 425
426 function editHealthMonitor(id, spec) { 426 function editHealthMonitor(id, spec) {
427 return apiService.put('/api/lbaas/healthmonitors/' + id + '/', spec) 427 return apiService.put('/api/nlbaas/healthmonitors/' + id + '/', spec)
428 .error(function () { 428 .error(function () {
429 toastService.add('error', gettext('Unable to update health monitor.')); 429 toastService.add('error', gettext('Unable to update health monitor.'));
430 }); 430 });
431 } 431 }
432 432
433 /** 433 /**
434 * @name horizon.app.core.openstack-service-api.lbaasv2.deleteHealthMonitor 434 * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteHealthMonitor
435 * @description 435 * @description
436 * Delete a single health monitor by ID 436 * Delete a single health monitor by ID
437 * @param {string} id 437 * @param {string} id
@@ -440,14 +440,14 @@
440 */ 440 */
441 441
442 function deleteHealthMonitor(id, quiet) { 442 function deleteHealthMonitor(id, quiet) {
443 var promise = apiService.delete('/api/lbaas/healthmonitors/' + id + '/'); 443 var promise = apiService.delete('/api/nlbaas/healthmonitors/' + id + '/');
444 return quiet ? promise : promise.error(function () { 444 return quiet ? promise : promise.error(function () {
445 toastService.add('error', gettext('Unable to delete health monitor.')); 445 toastService.add('error', gettext('Unable to delete health monitor.'));
446 }); 446 });
447 } 447 }
448 448
449 /** 449 /**
450 * @name horizon.app.core.openstack-service-api.lbaasv2.createHealthMonitor 450 * @name horizon.app.core.openstack-service-api.nlbaasv2.createHealthMonitor
451 * @description 451 * @description
452 * Create a new health monitor 452 * Create a new health monitor
453 * @param {object} spec 453 * @param {object} spec
@@ -455,7 +455,7 @@
455 */ 455 */
456 456
457 function createHealthMonitor(spec) { 457 function createHealthMonitor(spec) {
458 return apiService.post('/api/lbaas/healthmonitors/', spec) 458 return apiService.post('/api/nlbaas/healthmonitors/', spec)
459 .error(function () { 459 .error(function () {
460 toastService.add('error', gettext('Unable to create health monitor.')); 460 toastService.add('error', gettext('Unable to create health monitor.'));
461 }); 461 });
diff --git a/neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.spec.js b/neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.spec.js
index ee23ad6..8db3555 100644
--- a/neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.spec.js
+++ b/neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.spec.js
@@ -27,7 +27,7 @@
27 27
28 beforeEach(module('horizon.app.core.openstack-service-api')); 28 beforeEach(module('horizon.app.core.openstack-service-api'));
29 29
30 beforeEach(inject(['horizon.app.core.openstack-service-api.lbaasv2', function(lbaasv2API) { 30 beforeEach(inject(['horizon.app.core.openstack-service-api.nlbaasv2', function(lbaasv2API) {
31 service = lbaasv2API; 31 service = lbaasv2API;
32 }])); 32 }]));
33 33
@@ -39,7 +39,7 @@
39 { 39 {
40 func: 'getLoadBalancers', 40 func: 'getLoadBalancers',
41 method: 'get', 41 method: 'get',
42 path: '/api/lbaas/loadbalancers/', 42 path: '/api/nlbaas/loadbalancers/',
43 error: 'Unable to retrieve load balancers.', 43 error: 'Unable to retrieve load balancers.',
44 testInput: [ true ], 44 testInput: [ true ],
45 data: { params: { full: true } } 45 data: { params: { full: true } }
@@ -47,7 +47,7 @@
47 { 47 {
48 func: 'getLoadBalancer', 48 func: 'getLoadBalancer',
49 method: 'get', 49 method: 'get',
50 path: '/api/lbaas/loadbalancers/1234/', 50 path: '/api/nlbaas/loadbalancers/1234/',
51 error: 'Unable to retrieve load balancer.', 51 error: 'Unable to retrieve load balancer.',
52 testInput: [ '1234', true ], 52 testInput: [ '1234', true ],
53 data: { params: { full: true } } 53 data: { params: { full: true } }
@@ -55,21 +55,21 @@
55 { 55 {
56 func: 'deleteLoadBalancer', 56 func: 'deleteLoadBalancer',
57 method: 'delete', 57 method: 'delete',
58 path: '/api/lbaas/loadbalancers/1234/', 58 path: '/api/nlbaas/loadbalancers/1234/',
59 error: 'Unable to delete load balancer.', 59 error: 'Unable to delete load balancer.',
60 testInput: [ '1234' ] 60 testInput: [ '1234' ]
61 }, 61 },
62 { 62 {
63 func: 'getLoadBalancerStatusTree', 63 func: 'getLoadBalancerStatusTree',
64 method: 'get', 64 method: 'get',
65 path: '/api/lbaas/loadbalancers/1234/statuses/', 65 path: '/api/nlbaas/loadbalancers/1234/statuses/',
66 error: 'Unable to retrieve load balancer status tree.', 66 error: 'Unable to retrieve load balancer status tree.',
67 testInput: [ '1234' ] 67 testInput: [ '1234' ]
68 }, 68 },
69 { 69 {
70 func: 'getListeners', 70 func: 'getListeners',
71 method: 'get', 71 method: 'get',
72 path: '/api/lbaas/listeners/', 72 path: '/api/nlbaas/listeners/',
73 error: 'Unable to retrieve listeners.', 73 error: 'Unable to retrieve listeners.',
74 testInput: [ '1234' ], 74 testInput: [ '1234' ],
75 data: { params: { loadbalancerId: '1234' } } 75 data: { params: { loadbalancerId: '1234' } }
@@ -77,14 +77,14 @@
77 { 77 {
78 func: 'getListeners', 78 func: 'getListeners',
79 method: 'get', 79 method: 'get',
80 path: '/api/lbaas/listeners/', 80 path: '/api/nlbaas/listeners/',
81 data: {}, 81 data: {},
82 error: 'Unable to retrieve listeners.' 82 error: 'Unable to retrieve listeners.'
83 }, 83 },
84 { 84 {
85 func: 'getListener', 85 func: 'getListener',
86 method: 'get', 86 method: 'get',
87 path: '/api/lbaas/listeners/1234/', 87 path: '/api/nlbaas/listeners/1234/',
88 data: { params: { includeChildResources: true } }, 88 data: { params: { includeChildResources: true } },
89 error: 'Unable to retrieve listener.', 89 error: 'Unable to retrieve listener.',
90 testInput: [ '1234', true ] 90 testInput: [ '1234', true ]
@@ -92,7 +92,7 @@
92 { 92 {
93 func: 'getListener', 93 func: 'getListener',
94 method: 'get', 94 method: 'get',
95 path: '/api/lbaas/listeners/1234/', 95 path: '/api/nlbaas/listeners/1234/',
96 data: {}, 96 data: {},
97 error: 'Unable to retrieve listener.', 97 error: 'Unable to retrieve listener.',
98 testInput: [ '1234', false ] 98 testInput: [ '1234', false ]
@@ -100,7 +100,7 @@
100 { 100 {
101 func: 'getPool', 101 func: 'getPool',
102 method: 'get', 102 method: 'get',
103 path: '/api/lbaas/pools/1234/', 103 path: '/api/nlbaas/pools/1234/',
104 data: { params: { includeChildResources: true } }, 104 data: { params: { includeChildResources: true } },
105 error: 'Unable to retrieve pool.', 105 error: 'Unable to retrieve pool.',
106 testInput: [ '1234', true ] 106 testInput: [ '1234', true ]
@@ -108,7 +108,7 @@
108 { 108 {
109 func: 'getPool', 109 func: 'getPool',
110 method: 'get', 110 method: 'get',
111 path: '/api/lbaas/pools/1234/', 111 path: '/api/nlbaas/pools/1234/',
112 data: {}, 112 data: {},
113 error: 'Unable to retrieve pool.', 113 error: 'Unable to retrieve pool.',
114 testInput: [ '1234', false ] 114 testInput: [ '1234', false ]
@@ -116,28 +116,28 @@
116 { 116 {
117 func: 'deletePool', 117 func: 'deletePool',
118 method: 'delete', 118 method: 'delete',
119 path: '/api/lbaas/pools/1234/', 119 path: '/api/nlbaas/pools/1234/',
120 error: 'Unable to delete pool.', 120 error: 'Unable to delete pool.',
121 testInput: [ '1234' ] 121 testInput: [ '1234' ]
122 }, 122 },
123 { 123 {
124 func: 'getMembers', 124 func: 'getMembers',
125 method: 'get', 125 method: 'get',
126 path: '/api/lbaas/pools/1234/members/', 126 path: '/api/nlbaas/pools/1234/members/',
127 error: 'Unable to retrieve members.', 127 error: 'Unable to retrieve members.',
128 testInput: [ '1234' ] 128 testInput: [ '1234' ]
129 }, 129 },
130 { 130 {
131 func: 'getMember', 131 func: 'getMember',
132 method: 'get', 132 method: 'get',
133 path: '/api/lbaas/pools/1234/members/5678/', 133 path: '/api/nlbaas/pools/1234/members/5678/',
134 error: 'Unable to retrieve member.', 134 error: 'Unable to retrieve member.',
135 testInput: [ '1234', '5678' ] 135 testInput: [ '1234', '5678' ]
136 }, 136 },
137 { 137 {
138 func: 'editMember', 138 func: 'editMember',
139 method: 'put', 139 method: 'put',
140 path: '/api/lbaas/pools/1234/members/5678/', 140 path: '/api/nlbaas/pools/1234/members/5678/',
141 error: 'Unable to update member.', 141 error: 'Unable to update member.',
142 data: { weight: 2 }, 142 data: { weight: 2 },
143 testInput: [ '1234', '5678', { weight: 2 } ] 143 testInput: [ '1234', '5678', { weight: 2 } ]
@@ -145,14 +145,14 @@
145 { 145 {
146 func: 'getHealthMonitor', 146 func: 'getHealthMonitor',
147 method: 'get', 147 method: 'get',
148 path: '/api/lbaas/healthmonitors/1234/', 148 path: '/api/nlbaas/healthmonitors/1234/',
149 error: 'Unable to retrieve health monitor.', 149 error: 'Unable to retrieve health monitor.',
150 testInput: [ '1234' ] 150 testInput: [ '1234' ]
151 }, 151 },
152 { 152 {
153 func: 'editHealthMonitor', 153 func: 'editHealthMonitor',
154 method: 'put', 154 method: 'put',
155 path: '/api/lbaas/healthmonitors/1234/', 155 path: '/api/nlbaas/healthmonitors/1234/',
156 error: 'Unable to update health monitor.', 156 error: 'Unable to update health monitor.',
157 data: { name: 'healthmonitor-1' }, 157 data: { name: 'healthmonitor-1' },
158 testInput: [ '1234', { name: 'healthmonitor-1' } ] 158 testInput: [ '1234', { name: 'healthmonitor-1' } ]
@@ -160,14 +160,14 @@
160 { 160 {
161 func: 'deleteHealthMonitor', 161 func: 'deleteHealthMonitor',
162 method: 'delete', 162 method: 'delete',
163 path: '/api/lbaas/healthmonitors/1234/', 163 path: '/api/nlbaas/healthmonitors/1234/',
164 error: 'Unable to delete health monitor.', 164 error: 'Unable to delete health monitor.',
165 testInput: [ '1234' ] 165 testInput: [ '1234' ]
166 }, 166 },
167 { 167 {
168 func: 'createLoadBalancer', 168 func: 'createLoadBalancer',
169 method: 'post', 169 method: 'post',
170 path: '/api/lbaas/loadbalancers/', 170 path: '/api/nlbaas/loadbalancers/',
171 error: 'Unable to create load balancer.', 171 error: 'Unable to create load balancer.',
172 data: { name: 'loadbalancer-1' }, 172 data: { name: 'loadbalancer-1' },
173 testInput: [ { name: 'loadbalancer-1' } ] 173 testInput: [ { name: 'loadbalancer-1' } ]
@@ -175,7 +175,7 @@
175 { 175 {
176 func: 'editLoadBalancer', 176 func: 'editLoadBalancer',
177 method: 'put', 177 method: 'put',
178 path: '/api/lbaas/loadbalancers/1234/', 178 path: '/api/nlbaas/loadbalancers/1234/',
179 error: 'Unable to update load balancer.', 179 error: 'Unable to update load balancer.',
180 data: { name: 'loadbalancer-1' }, 180 data: { name: 'loadbalancer-1' },
181 testInput: [ '1234', { name: 'loadbalancer-1' } ] 181 testInput: [ '1234', { name: 'loadbalancer-1' } ]
@@ -183,7 +183,7 @@
183 { 183 {
184 func: 'createListener', 184 func: 'createListener',
185 method: 'post', 185 method: 'post',
186 path: '/api/lbaas/listeners/', 186 path: '/api/nlbaas/listeners/',
187 error: 'Unable to create listener.', 187 error: 'Unable to create listener.',
188 data: { name: 'listener-1' }, 188 data: { name: 'listener-1' },
189 testInput: [ { name: 'listener-1' } ] 189 testInput: [ { name: 'listener-1' } ]
@@ -191,7 +191,7 @@
191 { 191 {
192 func: 'editListener', 192 func: 'editListener',
193 method: 'put', 193 method: 'put',
194 path: '/api/lbaas/listeners/1234/', 194 path: '/api/nlbaas/listeners/1234/',
195 error: 'Unable to update listener.', 195 error: 'Unable to update listener.',
196 data: { name: 'listener-1' }, 196 data: { name: 'listener-1' },
197 testInput: [ '1234', { name: 'listener-1' } ] 197 testInput: [ '1234', { name: 'listener-1' } ]
@@ -199,14 +199,14 @@
199 { 199 {
200 func: 'deleteListener', 200 func: 'deleteListener',
201 method: 'delete', 201 method: 'delete',
202 path: '/api/lbaas/listeners/1234/', 202 path: '/api/nlbaas/listeners/1234/',
203 error: 'Unable to delete listener.', 203 error: 'Unable to delete listener.',
204 testInput: [ '1234' ] 204 testInput: [ '1234' ]
205 }, 205 },
206 { 206 {
207 func: 'createPool', 207 func: 'createPool',
208 method: 'post', 208 method: 'post',
209 path: '/api/lbaas/pools/', 209 path: '/api/nlbaas/pools/',
210 error: 'Unable to create pool.', 210 error: 'Unable to create pool.',
211 data: { name: 'pool-1' }, 211 data: { name: 'pool-1' },
212 testInput: [ { name: 'pool-1' } ] 212 testInput: [ { name: 'pool-1' } ]
@@ -214,7 +214,7 @@
214 { 214 {
215 func: 'editPool', 215 func: 'editPool',
216 method: 'put', 216 method: 'put',
217 path: '/api/lbaas/pools/1234/', 217 path: '/api/nlbaas/pools/1234/',
218 error: 'Unable to update pool.', 218 error: 'Unable to update pool.',
219 data: { name: 'pool-1' }, 219 data: { name: 'pool-1' },
220 testInput: [ '1234', { name: 'pool-1' } ] 220 testInput: [ '1234', { name: 'pool-1' } ]
@@ -222,7 +222,7 @@
222 { 222 {
223 func: 'createHealthMonitor', 223 func: 'createHealthMonitor',
224 method: 'post', 224 method: 'post',
225 path: '/api/lbaas/healthmonitors/', 225 path: '/api/nlbaas/healthmonitors/',
226 error: 'Unable to create health monitor.', 226 error: 'Unable to create health monitor.',
227 data: { name: 'healthmonitor-1' }, 227 data: { name: 'healthmonitor-1' },
228 testInput: [ { name: 'healthmonitor-1' } ] 228 testInput: [ { name: 'healthmonitor-1' } ]
@@ -230,7 +230,7 @@
230 { 230 {
231 func: 'updateMemberList', 231 func: 'updateMemberList',
232 method: 'put', 232 method: 'put',
233 path: '/api/lbaas/pools/1234/members/', 233 path: '/api/nlbaas/pools/1234/members/',
234 error: 'Unable to update member list.', 234 error: 'Unable to update member list.',
235 data: { name: 'member-1' }, 235 data: { name: 'member-1' },
236 testInput: [ '1234', { name: 'member-1' } ] 236 testInput: [ '1234', { name: 'member-1' } ]
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.js
index 3a0891b..6d21950 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.js
@@ -17,13 +17,13 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.healthmonitors') 20 .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21 .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.create', createService); 21 .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create', createService);
22 22
23 createService.$inject = [ 23 createService.$inject = [
24 '$q', 24 '$q',
25 '$location', 25 '$location',
26 'horizon.dashboard.project.lbaasv2.workflow.modal', 26 'horizon.dashboard.project.nlbaasv2.workflow.modal',
27 'horizon.app.core.openstack-service-api.policy', 27 'horizon.app.core.openstack-service-api.policy',
28 'horizon.framework.util.i18n.gettext', 28 'horizon.framework.util.i18n.gettext',
29 'horizon.framework.util.q.extensions' 29 'horizon.framework.util.q.extensions'
@@ -31,7 +31,7 @@
31 31
32 /** 32 /**
33 * @ngDoc factory 33 * @ngDoc factory
34 * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.createService 34 * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.createService
35 * @description 35 * @description
36 * Provides the service for creating a health monitor resource. 36 * Provides the service for creating a health monitor resource.
37 * @param $q The angular service for promises. 37 * @param $q The angular service for promises.
@@ -47,7 +47,7 @@
47 var loadbalancerId, listenerId, poolId, statePromise; 47 var loadbalancerId, listenerId, poolId, statePromise;
48 48
49 var create = workflowModal.init({ 49 var create = workflowModal.init({
50 controller: 'CreateHealthMonitorWizardController', 50 controller: 'nLBaaSCreateHealthMonitorWizardController',
51 message: gettext('A new health monitor is being created.'), 51 message: gettext('A new health monitor is being created.'),
52 handle: onCreate, 52 handle: onCreate,
53 allowed: allowed 53 allowed: allowed
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.spec.js
index 1030317..b45e336 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.spec.js
@@ -38,7 +38,7 @@
38 beforeEach(module('horizon.framework.conf')); 38 beforeEach(module('horizon.framework.conf'));
39 beforeEach(module('horizon.framework.widgets')); 39 beforeEach(module('horizon.framework.widgets'));
40 beforeEach(module('horizon.app.core.openstack-service-api')); 40 beforeEach(module('horizon.app.core.openstack-service-api'));
41 beforeEach(module('horizon.dashboard.project.lbaasv2')); 41 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
42 42
43 beforeEach(module(function($provide) { 43 beforeEach(module(function($provide) {
44 $provide.value('$uibModal', { 44 $provide.value('$uibModal', {
@@ -59,7 +59,7 @@
59 $q = $injector.get('$q'); 59 $q = $injector.get('$q');
60 policy = $injector.get('horizon.app.core.openstack-service-api.policy'); 60 policy = $injector.get('horizon.app.core.openstack-service-api.policy');
61 $location = $injector.get('$location'); 61 $location = $injector.get('$location');
62 service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.create'); 62 service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create');
63 init = service.init; 63 init = service.init;
64 loadBalancerState = $q.defer(); 64 loadBalancerState = $q.defer();
65 })); 65 }));
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.js
index 8356fe1..0ab0b8e 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.js
@@ -17,14 +17,14 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.healthmonitors') 20 .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21 .controller('CreateHealthMonitorWizardController', CreateHealthMonitorWizardController); 21 .controller('nLBaaSCreateHealthMonitorWizardController', CreateHealthMonitorWizardController);
22 22
23 CreateHealthMonitorWizardController.$inject = [ 23 CreateHealthMonitorWizardController.$inject = [
24 '$scope', 24 '$scope',
25 '$routeParams', 25 '$routeParams',
26 'horizon.dashboard.project.lbaasv2.workflow.model', 26 'horizon.dashboard.project.nlbaasv2.workflow.model',
27 'horizon.dashboard.project.lbaasv2.workflow.workflow', 27 'horizon.dashboard.project.nlbaasv2.workflow.workflow',
28 'horizon.framework.util.i18n.gettext' 28 'horizon.framework.util.i18n.gettext'
29 ]; 29 ];
30 30
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.spec.js
index 3a09b08..07ce60b 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.spec.js
@@ -32,14 +32,14 @@
32 }; 32 };
33 33
34 beforeEach(module('horizon.framework.util')); 34 beforeEach(module('horizon.framework.util'));
35 beforeEach(module('horizon.dashboard.project.lbaasv2')); 35 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
36 beforeEach(module(function ($provide) { 36 beforeEach(module(function ($provide) {
37 $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); 37 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
38 $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); 38 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
39 })); 39 }));
40 beforeEach(inject(function ($controller) { 40 beforeEach(inject(function ($controller) {
41 spyOn(model, 'initialize'); 41 spyOn(model, 'initialize');
42 ctrl = $controller('CreateHealthMonitorWizardController', { $scope: scope }); 42 ctrl = $controller('nLBaaSCreateHealthMonitorWizardController', { $scope: scope });
43 })); 43 }));
44 44
45 it('defines the controller', function() { 45 it('defines the controller', function() {
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.js
index b3d6e81..6af8f32 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.js
@@ -17,22 +17,22 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.healthmonitors') 20 .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21 .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete', deleteService); 21 .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete', deleteService);
22 22
23 deleteService.$inject = [ 23 deleteService.$inject = [
24 '$q', 24 '$q',
25 '$location', 25 '$location',
26 '$route', 26 '$route',
27 'horizon.framework.widgets.modal.deleteModalService', 27 'horizon.framework.widgets.modal.deleteModalService',
28 'horizon.app.core.openstack-service-api.lbaasv2', 28 'horizon.app.core.openstack-service-api.nlbaasv2',
29 'horizon.app.core.openstack-service-api.policy', 29 'horizon.app.core.openstack-service-api.policy',
30 'horizon.framework.util.i18n.gettext' 30 'horizon.framework.util.i18n.gettext'
31 ]; 31 ];
32 32
33 /** 33 /**
34 * @ngDoc factory 34 * @ngDoc factory
35 * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.deleteService 35 * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.deleteService
36 * @description 36 * @description
37 * Brings up the delete health monitor confirmation modal dialog. 37 * Brings up the delete health monitor confirmation modal dialog.
38 * On submit, deletes selected health monitor. 38 * On submit, deletes selected health monitor.
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js
index 326376d..e7cb0b0 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js
@@ -52,7 +52,7 @@
52 beforeEach(module('horizon.framework.conf')); 52 beforeEach(module('horizon.framework.conf'));
53 beforeEach(module('horizon.framework.widgets')); 53 beforeEach(module('horizon.framework.widgets'));
54 beforeEach(module('horizon.app.core.openstack-service-api')); 54 beforeEach(module('horizon.app.core.openstack-service-api'));
55 beforeEach(module('horizon.dashboard.project.lbaasv2')); 55 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
56 56
57 beforeEach(function() { 57 beforeEach(function() {
58 monitor = { id: '1', name: 'HealthMonitor1' }; 58 monitor = { id: '1', name: 'HealthMonitor1' };
@@ -66,7 +66,7 @@
66 }; 66 };
67 } 67 }
68 }); 68 });
69 $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { 69 $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', {
70 deleteHealthMonitor: function() { 70 deleteHealthMonitor: function() {
71 return makePromise(); 71 return makePromise();
72 } 72 }
@@ -80,13 +80,13 @@
80 80
81 beforeEach(inject(function ($injector) { 81 beforeEach(inject(function ($injector) {
82 policy = $injector.get('horizon.app.core.openstack-service-api.policy'); 82 policy = $injector.get('horizon.app.core.openstack-service-api.policy');
83 lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); 83 lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
84 modal = $injector.get('horizon.framework.widgets.modal.deleteModalService'); 84 modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
85 $scope = $injector.get('$rootScope').$new(); 85 $scope = $injector.get('$rootScope').$new();
86 $location = $injector.get('$location'); 86 $location = $injector.get('$location');
87 $q = $injector.get('$q'); 87 $q = $injector.get('$q');
88 toast = $injector.get('horizon.framework.widgets.toast.service'); 88 toast = $injector.get('horizon.framework.widgets.toast.service');
89 service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete'); 89 service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete');
90 service.init('1', '2', '3', isActionable('active')); 90 service.init('1', '2', '3', isActionable('active'));
91 $scope.$apply(); 91 $scope.$apply();
92 })); 92 }));
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.js
index baf6153..128bcfb 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.js
@@ -17,20 +17,20 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.healthmonitors') 20 .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21 .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit', editService); 21 .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit', editService);
22 22
23 editService.$inject = [ 23 editService.$inject = [
24 '$q', 24 '$q',
25 '$route', 25 '$route',
26 'horizon.dashboard.project.lbaasv2.workflow.modal', 26 'horizon.dashboard.project.nlbaasv2.workflow.modal',
27 'horizon.app.core.openstack-service-api.policy', 27 'horizon.app.core.openstack-service-api.policy',
28 'horizon.framework.util.i18n.gettext' 28 'horizon.framework.util.i18n.gettext'
29 ]; 29 ];
30 30
31 /** 31 /**
32 * @ngDoc factory 32 * @ngDoc factory
33 * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.editService 33 * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.editService
34 * @description 34 * @description
35 * Provides the service for editing a health monitor resource. 35 * Provides the service for editing a health monitor resource.
36 * @param $q The angular service for promises. 36 * @param $q The angular service for promises.
@@ -45,7 +45,7 @@
45 var statePromise; 45 var statePromise;
46 46
47 var edit = workflowModal.init({ 47 var edit = workflowModal.init({
48 controller: 'EditHealthMonitorWizardController', 48 controller: 'nLBaaSEditHealthMonitorWizardController',
49 message: gettext('The health monitor has been updated.'), 49 message: gettext('The health monitor has been updated.'),
50 handle: handle, 50 handle: handle,
51 allowed: allowed 51 allowed: allowed
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js
index 9852285..70c6f69 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js
@@ -38,7 +38,7 @@
38 beforeEach(module('horizon.framework.conf')); 38 beforeEach(module('horizon.framework.conf'));
39 beforeEach(module('horizon.framework.widgets')); 39 beforeEach(module('horizon.framework.widgets'));
40 beforeEach(module('horizon.app.core.openstack-service-api')); 40 beforeEach(module('horizon.app.core.openstack-service-api'));
41 beforeEach(module('horizon.dashboard.project.lbaasv2')); 41 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
42 42
43 beforeEach(module(function($provide) { 43 beforeEach(module(function($provide) {
44 $provide.value('$uibModal', { 44 $provide.value('$uibModal', {
@@ -59,7 +59,7 @@
59 $q = $injector.get('$q'); 59 $q = $injector.get('$q');
60 policy = $injector.get('horizon.app.core.openstack-service-api.policy'); 60 policy = $injector.get('horizon.app.core.openstack-service-api.policy');
61 $route = $injector.get('$route'); 61 $route = $injector.get('$route');
62 service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit'); 62 service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit');
63 init = service.init; 63 init = service.init;
64 loadBalancerState = $q.defer(); 64 loadBalancerState = $q.defer();
65 })); 65 }));
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.js
index cd1b414..862c481 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.js
@@ -17,13 +17,13 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.healthmonitors') 20 .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21 .controller('EditHealthMonitorWizardController', EditHealthMonitorWizardController); 21 .controller('nLBaaSEditHealthMonitorWizardController', EditHealthMonitorWizardController);
22 22
23 EditHealthMonitorWizardController.$inject = [ 23 EditHealthMonitorWizardController.$inject = [
24 '$scope', 24 '$scope',
25 'horizon.dashboard.project.lbaasv2.workflow.model', 25 'horizon.dashboard.project.nlbaasv2.workflow.model',
26 'horizon.dashboard.project.lbaasv2.workflow.workflow', 26 'horizon.dashboard.project.nlbaasv2.workflow.workflow',
27 'horizon.framework.util.i18n.gettext' 27 'horizon.framework.util.i18n.gettext'
28 ]; 28 ];
29 29
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js
index 627df8c..0c052a7 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js
@@ -32,14 +32,14 @@
32 }; 32 };
33 33
34 beforeEach(module('horizon.framework.util')); 34 beforeEach(module('horizon.framework.util'));
35 beforeEach(module('horizon.dashboard.project.lbaasv2')); 35 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
36 beforeEach(module(function ($provide) { 36 beforeEach(module(function ($provide) {
37 $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); 37 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
38 $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); 38 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
39 })); 39 }));
40 beforeEach(inject(function ($controller) { 40 beforeEach(inject(function ($controller) {
41 spyOn(model, 'initialize'); 41 spyOn(model, 'initialize');
42 ctrl = $controller('EditHealthMonitorWizardController', { $scope: scope }); 42 ctrl = $controller('nLBaaSEditHealthMonitorWizardController', { $scope: scope });
43 })); 43 }));
44 44
45 it('defines the controller', function() { 45 it('defines the controller', function() {
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.js
index 9bc4394..a4704d8 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.js
@@ -17,20 +17,20 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.healthmonitors') 20 .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21 .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions', 21 .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions',
22 rowActions); 22 rowActions);
23 23
24 rowActions.$inject = [ 24 rowActions.$inject = [
25 'horizon.framework.util.i18n.gettext', 25 'horizon.framework.util.i18n.gettext',
26 'horizon.dashboard.project.lbaasv2.loadbalancers.service', 26 'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
27 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit', 27 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit',
28 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete' 28 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete'
29 ]; 29 ];
30 30
31 /** 31 /**
32 * @ngdoc service 32 * @ngdoc service
33 * @ngname horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions 33 * @ngname horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions
34 * 34 *
35 * @description 35 * @description
36 * Provides the service for the health monitor row actions. 36 * Provides the service for the health monitor row actions.
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.spec.js
index 31abe59..e66d5a0 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.spec.js
@@ -23,14 +23,14 @@
23 beforeEach(module('horizon.framework.conf')); 23 beforeEach(module('horizon.framework.conf'));
24 beforeEach(module('horizon.framework.widgets')); 24 beforeEach(module('horizon.framework.widgets'));
25 beforeEach(module('horizon.app.core.openstack-service-api')); 25 beforeEach(module('horizon.app.core.openstack-service-api'));
26 beforeEach(module('horizon.dashboard.project.lbaasv2')); 26 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
27 27
28 beforeEach(inject(function ($injector) { 28 beforeEach(inject(function ($injector) {
29 var rowActionsService = $injector.get( 29 var rowActionsService = $injector.get(
30 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions'); 30 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions');
31 actions = rowActionsService.init('1', '2', '3').actions(); 31 actions = rowActionsService.init('1', '2', '3').actions();
32 var loadbalancerService = $injector.get( 32 var loadbalancerService = $injector.get(
33 'horizon.dashboard.project.lbaasv2.loadbalancers.service'); 33 'horizon.dashboard.project.nlbaasv2.loadbalancers.service');
34 spyOn(loadbalancerService, 'isActionable').and.returnValue(true); 34 spyOn(loadbalancerService, 'isActionable').and.returnValue(true);
35 })); 35 }));
36 36
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.js
index 908b461..d06782a 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.js
@@ -17,12 +17,12 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.healthmonitors') 20 .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21 .controller('HealthMonitorDetailController', HealthMonitorDetailController); 21 .controller('nLBaaSHealthMonitorDetailController', HealthMonitorDetailController);
22 22
23 HealthMonitorDetailController.$inject = [ 23 HealthMonitorDetailController.$inject = [
24 'horizon.app.core.openstack-service-api.lbaasv2', 24 'horizon.app.core.openstack-service-api.nlbaasv2',
25 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions', 25 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions',
26 '$routeParams', 26 '$routeParams',
27 '$q' 27 '$q'
28 ]; 28 ];
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.spec.js
index fd02239..3160841 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.spec.js
@@ -45,7 +45,7 @@
45 } 45 }
46 46
47 function createController() { 47 function createController() {
48 return $controller('HealthMonitorDetailController', { 48 return $controller('nLBaaSHealthMonitorDetailController', {
49 $routeParams: { 49 $routeParams: {
50 loadbalancerId: 'loadbalancerId', 50 loadbalancerId: 'loadbalancerId',
51 listenerId: 'listenerId', 51 listenerId: 'listenerId',
@@ -61,7 +61,7 @@
61 beforeEach(module('horizon.framework.widgets')); 61 beforeEach(module('horizon.framework.widgets'));
62 beforeEach(module('horizon.framework.conf')); 62 beforeEach(module('horizon.framework.conf'));
63 beforeEach(module('horizon.app.core.openstack-service-api')); 63 beforeEach(module('horizon.app.core.openstack-service-api'));
64 beforeEach(module('horizon.dashboard.project.lbaasv2')); 64 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
65 65
66 beforeEach(module(function($provide) { 66 beforeEach(module(function($provide) {
67 apiFail = false; 67 apiFail = false;
@@ -71,7 +71,7 @@
71 })); 71 }));
72 72
73 beforeEach(inject(function($injector) { 73 beforeEach(inject(function($injector) {
74 lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); 74 lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
75 spyOn(lbaasv2API, 'getHealthMonitor').and.callFake(fakeAPI); 75 spyOn(lbaasv2API, 'getHealthMonitor').and.callFake(fakeAPI);
76 spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI); 76 spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI);
77 spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI); 77 spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
@@ -79,7 +79,7 @@
79 $controller = $injector.get('$controller'); 79 $controller = $injector.get('$controller');
80 })); 80 }));
81 81
82 it('should invoke lbaasv2 apis', function() { 82 it('should invoke nlbaasv2 apis', function() {
83 var ctrl = createController(); 83 var ctrl = createController();
84 expect(lbaasv2API.getHealthMonitor).toHaveBeenCalledWith('healthmonitorId'); 84 expect(lbaasv2API.getHealthMonitor).toHaveBeenCalledWith('healthmonitorId');
85 expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId'); 85 expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId');
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.html
index fe1b965..2fe4775 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.html
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.html
@@ -1,5 +1,5 @@
1<div ng-controller="HealthMonitorDetailController as ctrl"> 1<div ng-controller="nLBaaSHealthMonitorDetailController as ctrl">
2 <detail-status loading="ctrl.loading" error="ctrl.error"></detail-status> 2 <nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
3 <div ng-if="!ctrl.loading && !ctrl.error"> 3 <div ng-if="!ctrl.loading && !ctrl.error">
4 <div class="page-header"> 4 <div class="page-header">
5 <ol class="breadcrumb"> 5 <ol class="breadcrumb">
@@ -39,4 +39,4 @@
39 </div> 39 </div>
40 </div> 40 </div>
41 </div> 41 </div>
42</div> \ No newline at end of file 42</div>
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.js
index 0a7d50f..7bc6aa6 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.js
@@ -18,7 +18,7 @@
18 18
19 /** 19 /**
20 * @ngdoc overview 20 * @ngdoc overview
21 * @ngname horizon.dashboard.project.lbaasv2.healthmonitors 21 * @ngname horizon.dashboard.project.nlbaasv2.healthmonitors
22 * 22 *
23 * @description 23 * @description
24 * Provides the services and widgets required to support and display the project healthmonitors 24 * Provides the services and widgets required to support and display the project healthmonitors
@@ -26,6 +26,6 @@
26 */ 26 */
27 27
28 angular 28 angular
29 .module('horizon.dashboard.project.lbaasv2.healthmonitors', []); 29 .module('horizon.dashboard.project.nlbaasv2.healthmonitors', []);
30 30
31})(); 31})();
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.spec.js
index 63198d6..4ca11b9 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.spec.js
@@ -18,7 +18,7 @@
18 18
19 describe('LBaaS v2 Healthmonitors Module', function() { 19 describe('LBaaS v2 Healthmonitors Module', function() {
20 it('should exist', function() { 20 it('should exist', function() {
21 expect(angular.module('horizon.dashboard.project.lbaasv2.healthmonitors')).toBeDefined(); 21 expect(angular.module('horizon.dashboard.project.nlbaasv2.healthmonitors')).toBeDefined();
22 }); 22 });
23 }); 23 });
24 24
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.js
index 1a03956..44bc00f 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.js
@@ -17,23 +17,23 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.listeners') 20 .module('horizon.dashboard.project.nlbaasv2.listeners')
21 .factory('horizon.dashboard.project.lbaasv2.listeners.actions.batchActions', 21 .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions',
22 tableBatchActions); 22 tableBatchActions);
23 23
24 tableBatchActions.$inject = [ 24 tableBatchActions.$inject = [
25 '$q', 25 '$q',
26 '$location', 26 '$location',
27 'horizon.dashboard.project.lbaasv2.workflow.modal', 27 'horizon.dashboard.project.nlbaasv2.workflow.modal',
28 'horizon.app.core.openstack-service-api.policy', 28 'horizon.app.core.openstack-service-api.policy',
29 'horizon.framework.util.i18n.gettext', 29 'horizon.framework.util.i18n.gettext',
30 'horizon.dashboard.project.lbaasv2.loadbalancers.service', 30 'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
31 'horizon.dashboard.project.lbaasv2.listeners.actions.delete' 31 'horizon.dashboard.project.nlbaasv2.listeners.actions.delete'
32 ]; 32 ];
33 33
34 /** 34 /**
35 * @ngdoc service 35 * @ngdoc service
36 * @ngname horizon.dashboard.project.lbaasv2.listeners.actions.batchActions 36 * @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions
37 * 37 *
38 * @description 38 * @description
39 * Provides the service for the Listeners table batch actions. 39 * Provides the service for the Listeners table batch actions.
@@ -54,7 +54,7 @@
54 var loadBalancerIsActionable, loadBalancerId; 54 var loadBalancerIsActionable, loadBalancerId;
55 55
56 var create = workflowModal.init({ 56 var create = workflowModal.init({
57 controller: 'CreateListenerWizardController', 57 controller: 'nLBaaSCreateListenerWizardController',
58 message: gettext('A new listener is being created.'), 58 message: gettext('A new listener is being created.'),
59 handle: onCreate, 59 handle: onCreate,
60 allowed: canCreate 60 allowed: canCreate
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.spec.js
index 4f190ec..b56bc2d 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.spec.js
@@ -23,7 +23,7 @@
23 beforeEach(module('horizon.framework.conf')); 23 beforeEach(module('horizon.framework.conf'));
24 beforeEach(module('horizon.framework.widgets')); 24 beforeEach(module('horizon.framework.widgets'));
25 beforeEach(module('horizon.app.core.openstack-service-api')); 25 beforeEach(module('horizon.app.core.openstack-service-api'));
26 beforeEach(module('horizon.dashboard.project.lbaasv2')); 26 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
27 27
28 beforeEach(module(function($provide) { 28 beforeEach(module(function($provide) {
29 var response = { 29 var response = {
@@ -43,7 +43,7 @@
43 } 43 }
44 }; 44 };
45 $provide.value('$uibModal', modal); 45 $provide.value('$uibModal', modal);
46 $provide.value('horizon.dashboard.project.lbaasv2.loadbalancers.service', { 46 $provide.value('horizon.dashboard.project.nlbaasv2.loadbalancers.service', {
47 isActionable: function() { 47 isActionable: function() {
48 return $q.when(); 48 return $q.when();
49 } 49 }
@@ -61,7 +61,7 @@
61 $q = $injector.get('$q'); 61 $q = $injector.get('$q');
62 policy = $injector.get('horizon.app.core.openstack-service-api.policy'); 62 policy = $injector.get('horizon.app.core.openstack-service-api.policy');
63 var batchActionsService = $injector.get( 63 var batchActionsService = $injector.get(
64 'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions'); 64 'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions');
65 actions = batchActionsService.init('1234').actions(); 65 actions = batchActionsService.init('1234').actions();
66 $scope.$apply(); 66 $scope.$apply();
67 })); 67 }));
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.js
index 43ca980..7afa238 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.js
@@ -17,14 +17,14 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.listeners') 20 .module('horizon.dashboard.project.nlbaasv2.listeners')
21 .controller('CreateListenerWizardController', CreateListenerWizardController); 21 .controller('nLBaaSCreateListenerWizardController', CreateListenerWizardController);
22 22
23 CreateListenerWizardController.$inject = [ 23 CreateListenerWizardController.$inject = [
24 '$scope', 24 '$scope',
25 '$routeParams', 25 '$routeParams',
26 'horizon.dashboard.project.lbaasv2.workflow.model', 26 'horizon.dashboard.project.nlbaasv2.workflow.model',
27 'horizon.dashboard.project.lbaasv2.workflow.workflow', 27 'horizon.dashboard.project.nlbaasv2.workflow.workflow',
28 'horizon.framework.util.i18n.gettext' 28 'horizon.framework.util.i18n.gettext'
29 ]; 29 ];
30 30
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.spec.js
index e0b2a2f..b11356c 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.spec.js
@@ -30,14 +30,14 @@
30 var scope = {}; 30 var scope = {};
31 31
32 beforeEach(module('horizon.framework.util')); 32 beforeEach(module('horizon.framework.util'));
33 beforeEach(module('horizon.dashboard.project.lbaasv2')); 33 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
34 beforeEach(module(function ($provide) { 34 beforeEach(module(function ($provide) {
35 $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); 35 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
36 $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); 36 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
37 })); 37 }));
38 beforeEach(inject(function ($controller) { 38 beforeEach(inject(function ($controller) {
39 spyOn(model, 'initialize'); 39 spyOn(model, 'initialize');
40 ctrl = $controller('CreateListenerWizardController', { $scope: scope }); 40 ctrl = $controller('nLBaaSCreateListenerWizardController', { $scope: scope });
41 })); 41 }));
42 42
43 it('defines the controller', function() { 43 it('defines the controller', function() {
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.js
index eee835d..6548344 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.js
@@ -17,15 +17,15 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.listeners') 20 .module('horizon.dashboard.project.nlbaasv2.listeners')
21 .factory('horizon.dashboard.project.lbaasv2.listeners.actions.delete', deleteService); 21 .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.delete', deleteService);
22 22
23 deleteService.$inject = [ 23 deleteService.$inject = [
24 '$q', 24 '$q',
25 '$location', 25 '$location',
26 '$route', 26 '$route',
27 'horizon.framework.widgets.modal.deleteModalService', 27 'horizon.framework.widgets.modal.deleteModalService',
28 'horizon.app.core.openstack-service-api.lbaasv2', 28 'horizon.app.core.openstack-service-api.nlbaasv2',
29 'horizon.app.core.openstack-service-api.policy', 29 'horizon.app.core.openstack-service-api.policy',
30 'horizon.framework.widgets.toast.service', 30 'horizon.framework.widgets.toast.service',
31 'horizon.framework.util.q.extensions', 31 'horizon.framework.util.q.extensions',
@@ -34,7 +34,7 @@
34 34
35 /** 35 /**
36 * @ngDoc factory 36 * @ngDoc factory
37 * @name horizon.dashboard.project.lbaasv2.listeners.actions.deleteService 37 * @name horizon.dashboard.project.nlbaasv2.listeners.actions.deleteService
38 * @description 38 * @description
39 * Brings up the delete listeners confirmation modal dialog. 39 * Brings up the delete listeners confirmation modal dialog.
40 * On submit, deletes selected listeners. 40 * On submit, deletes selected listeners.
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.spec.js
index e696004..56b80ca 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.spec.js
@@ -43,7 +43,7 @@
43 beforeEach(module('horizon.framework.conf')); 43 beforeEach(module('horizon.framework.conf'));
44 beforeEach(module('horizon.framework.widgets')); 44 beforeEach(module('horizon.framework.widgets'));
45 beforeEach(module('horizon.app.core.openstack-service-api')); 45 beforeEach(module('horizon.app.core.openstack-service-api'));
46 beforeEach(module('horizon.dashboard.project.lbaasv2')); 46 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
47 47
48 beforeEach(function() { 48 beforeEach(function() {
49 items = [{ id: '1', name: 'First' }, 49 items = [{ id: '1', name: 'First' },
@@ -58,7 +58,7 @@
58 }; 58 };
59 } 59 }
60 }); 60 });
61 $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { 61 $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', {
62 deleteListener: function() { 62 deleteListener: function() {
63 return makePromise(); 63 return makePromise();
64 } 64 }
@@ -72,14 +72,14 @@
72 72
73 beforeEach(inject(function ($injector) { 73 beforeEach(inject(function ($injector) {
74 policy = $injector.get('horizon.app.core.openstack-service-api.policy'); 74 policy = $injector.get('horizon.app.core.openstack-service-api.policy');
75 lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); 75 lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
76 modal = $injector.get('horizon.framework.widgets.modal.deleteModalService'); 76 modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
77 $scope = $injector.get('$rootScope').$new(); 77 $scope = $injector.get('$rootScope').$new();
78 $route = $injector.get('$route'); 78 $route = $injector.get('$route');
79 $location = $injector.get('$location'); 79 $location = $injector.get('$location');
80 $q = $injector.get('$q'); 80 $q = $injector.get('$q');
81 toast = $injector.get('horizon.framework.widgets.toast.service'); 81 toast = $injector.get('horizon.framework.widgets.toast.service');
82 service = $injector.get('horizon.dashboard.project.lbaasv2.listeners.actions.delete'); 82 service = $injector.get('horizon.dashboard.project.nlbaasv2.listeners.actions.delete');
83 service.init('1', makePromise()); 83 service.init('1', makePromise());
84 })); 84 }));
85 85
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.js
index 67c87e6..8071235 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.js
@@ -17,14 +17,14 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.loadbalancers') 20 .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21 .controller('EditListenerWizardController', EditListenerWizardController); 21 .controller('nLBaaSEditListenerWizardController', EditListenerWizardController);
22 22
23 EditListenerWizardController.$inject = [ 23 EditListenerWizardController.$inject = [
24 '$scope', 24 '$scope',
25 '$q', 25 '$q',
26 'horizon.dashboard.project.lbaasv2.workflow.model', 26 'horizon.dashboard.project.nlbaasv2.workflow.model',
27 'horizon.dashboard.project.lbaasv2.workflow.workflow', 27 'horizon.dashboard.project.nlbaasv2.workflow.workflow',
28 'horizon.framework.util.i18n.gettext' 28 'horizon.framework.util.i18n.gettext'
29 ]; 29 ];
30 30
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.spec.js
index 9007b4c..6faf6b5 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.spec.js
@@ -36,18 +36,18 @@
36 }; 36 };
37 37
38 beforeEach(module('horizon.framework.util')); 38 beforeEach(module('horizon.framework.util'));
39 beforeEach(module('horizon.dashboard.project.lbaasv2')); 39 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
40 beforeEach(module(function ($provide) { 40 beforeEach(module(function ($provide) {
41 workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow); 41 workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
42 $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); 42 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
43 $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy); 43 $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy);
44 })); 44 }));
45 beforeEach(inject(function ($controller, $injector) { 45 beforeEach(inject(function ($controller, $injector) {
46 $q = $injector.get('$q'); 46 $q = $injector.get('$q');
47 scope = $injector.get('$rootScope').$new(); 47 scope = $injector.get('$rootScope').$new();
48 scope.launchContext = { id: '1234' }; 48 scope.launchContext = { id: '1234' };
49 spyOn(model, 'initialize').and.callThrough(); 49 spyOn(model, 'initialize').and.callThrough();
50 ctrl = $controller('EditListenerWizardController', { $scope: scope }); 50 ctrl = $controller('nLBaaSEditListenerWizardController', { $scope: scope });
51 })); 51 }));
52 52
53 it('defines the controller', function() { 53 it('defines the controller', function() {
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.js
index bb62eac..e29abcc 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.js
@@ -17,24 +17,24 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.listeners') 20 .module('horizon.dashboard.project.nlbaasv2.listeners')
21 .factory('horizon.dashboard.project.lbaasv2.listeners.actions.rowActions', 21 .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
22 tableRowActions); 22 tableRowActions);
23 23
24 tableRowActions.$inject = [ 24 tableRowActions.$inject = [
25 '$q', 25 '$q',
26 '$route', 26 '$route',
27 'horizon.dashboard.project.lbaasv2.workflow.modal', 27 'horizon.dashboard.project.nlbaasv2.workflow.modal',
28 'horizon.app.core.openstack-service-api.policy', 28 'horizon.app.core.openstack-service-api.policy',
29 'horizon.framework.util.i18n.gettext', 29 'horizon.framework.util.i18n.gettext',
30 'horizon.dashboard.project.lbaasv2.loadbalancers.service', 30 'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
31 'horizon.dashboard.project.lbaasv2.listeners.actions.delete', 31 'horizon.dashboard.project.nlbaasv2.listeners.actions.delete',
32 'horizon.dashboard.project.lbaasv2.pools.actions.create' 32 'horizon.dashboard.project.nlbaasv2.pools.actions.create'
33 ]; 33 ];
34 34
35 /** 35 /**
36 * @ngdoc service 36 * @ngdoc service
37 * @ngname horizon.dashboard.project.lbaasv2.listeners.actions.rowActions 37 * @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions
38 * 38 *
39 * @description 39 * @description
40 * Provides the service for the Listener table row actions. 40 * Provides the service for the Listener table row actions.
@@ -57,7 +57,7 @@
57 var loadbalancerId, loadBalancerIsActionable; 57 var loadbalancerId, loadBalancerIsActionable;
58 58
59 var edit = workflowModal.init({ 59 var edit = workflowModal.init({
60 controller: 'EditListenerWizardController', 60 controller: 'nLBaaSEditListenerWizardController',
61 message: gettext('The listener has been updated.'), 61 message: gettext('The listener has been updated.'),
62 handle: onEdit, 62 handle: onEdit,
63 allowed: canEdit 63 allowed: canEdit
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.spec.js
index 15debc8..198d61f 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.spec.js
@@ -45,7 +45,7 @@
45 beforeEach(module('horizon.framework.conf')); 45 beforeEach(module('horizon.framework.conf'));
46 beforeEach(module('horizon.framework.widgets')); 46 beforeEach(module('horizon.framework.widgets'));
47 beforeEach(module('horizon.app.core.openstack-service-api')); 47 beforeEach(module('horizon.app.core.openstack-service-api'));
48 beforeEach(module('horizon.dashboard.project.lbaasv2')); 48 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
49 49
50 beforeEach(module(function($provide) { 50 beforeEach(module(function($provide) {
51 var response = { 51 var response = {
@@ -73,11 +73,11 @@
73 $route = $injector.get('$route'); 73 $route = $injector.get('$route');
74 policy = $injector.get('horizon.app.core.openstack-service-api.policy'); 74 policy = $injector.get('horizon.app.core.openstack-service-api.policy');
75 var rowActionsService = $injector.get( 75 var rowActionsService = $injector.get(
76 'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions'); 76 'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions');
77 actions = rowActionsService.actions(); 77 actions = rowActionsService.actions();
78 init = rowActionsService.init; 78 init = rowActionsService.init;
79 var loadbalancerService = $injector.get( 79 var loadbalancerService = $injector.get(
80 'horizon.dashboard.project.lbaasv2.loadbalancers.service'); 80 'horizon.dashboard.project.nlbaasv2.loadbalancers.service');
81 spyOn(loadbalancerService, 'isActionable').and.callFake(isActionableMock); 81 spyOn(loadbalancerService, 'isActionable').and.callFake(isActionableMock);
82 })); 82 }));
83 83
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.js
index 3fe9dc3..b2c8b95 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.js
@@ -17,12 +17,12 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.listeners') 20 .module('horizon.dashboard.project.nlbaasv2.listeners')
21 .controller('ListenerDetailController', ListenerDetailController); 21 .controller('nLBaaSListenerDetailController', ListenerDetailController);
22 22
23 ListenerDetailController.$inject = [ 23 ListenerDetailController.$inject = [
24 'horizon.app.core.openstack-service-api.lbaasv2', 24 'horizon.app.core.openstack-service-api.nlbaasv2',
25 'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions', 25 'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
26 '$routeParams', 26 '$routeParams',
27 '$q' 27 '$q'
28 ]; 28 ];
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.spec.js
index 586fd2c..2715cee 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.spec.js
@@ -45,7 +45,7 @@
45 } 45 }
46 46
47 function createController() { 47 function createController() {
48 return $controller('ListenerDetailController', { 48 return $controller('nLBaaSListenerDetailController', {
49 $routeParams: { 49 $routeParams: {
50 loadbalancerId: 'loadbalancerId', 50 loadbalancerId: 'loadbalancerId',
51 listenerId: 'listenerId' 51 listenerId: 'listenerId'
@@ -59,7 +59,7 @@
59 beforeEach(module('horizon.framework.widgets')); 59 beforeEach(module('horizon.framework.widgets'));
60 beforeEach(module('horizon.framework.conf')); 60 beforeEach(module('horizon.framework.conf'));
61 beforeEach(module('horizon.app.core.openstack-service-api')); 61 beforeEach(module('horizon.app.core.openstack-service-api'));
62 beforeEach(module('horizon.dashboard.project.lbaasv2')); 62 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
63 63
64 beforeEach(module(function($provide) { 64 beforeEach(module(function($provide) {
65 apiFail = false; 65 apiFail = false;
@@ -70,13 +70,13 @@
70 })); 70 }));
71 71
72 beforeEach(inject(function($injector) { 72 beforeEach(inject(function($injector) {
73 lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); 73 lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
74 spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI); 74 spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
75 spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(loadbalancerAPI); 75 spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(loadbalancerAPI);
76 $controller = $injector.get('$controller'); 76 $controller = $injector.get('$controller');
77 })); 77 }));
78 78
79 it('should invoke lbaasv2 apis', function() { 79 it('should invoke nlbaasv2 apis', function() {
80 var ctrl = createController(); 80 var ctrl = createController();
81 expect(lbaasv2API.getListener).toHaveBeenCalledWith('listenerId'); 81 expect(lbaasv2API.getListener).toHaveBeenCalledWith('listenerId');
82 expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('loadbalancerId'); 82 expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('loadbalancerId');
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.html
index d24e60d..b060b21 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.html
@@ -1,5 +1,5 @@
1<div ng-controller="ListenerDetailController as ctrl"> 1<div ng-controller="nLBaaSListenerDetailController as ctrl">
2 <detail-status loading="ctrl.loading" error="ctrl.error"></detail-status> 2 <nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
3 <div ng-if="!ctrl.loading && !ctrl.error"> 3 <div ng-if="!ctrl.loading && !ctrl.error">
4 <div class="page-header"> 4 <div class="page-header">
5 <ol class="breadcrumb"> 5 <ol class="breadcrumb">
@@ -39,4 +39,4 @@
39 </div> 39 </div>
40 </div> 40 </div>
41 </div> 41 </div>
42</div> \ No newline at end of file 42</div>
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.js
index f97cae7..6cbb17b 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.js
@@ -18,7 +18,7 @@
18 18
19 /** 19 /**
20 * @ngdoc overview 20 * @ngdoc overview
21 * @ngname horizon.dashboard.project.lbaasv2.listeners 21 * @ngname horizon.dashboard.project.nlbaasv2.listeners
22 * 22 *
23 * @description 23 * @description
24 * Provides the services and widgets required to support and display the project listeners 24 * Provides the services and widgets required to support and display the project listeners
@@ -26,6 +26,6 @@
26 */ 26 */
27 27
28 angular 28 angular
29 .module('horizon.dashboard.project.lbaasv2.listeners', []); 29 .module('horizon.dashboard.project.nlbaasv2.listeners', []);
30 30
31})(); 31})();
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.spec.js
index 9cc8f68..ab3dcf0 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.spec.js
@@ -18,7 +18,7 @@
18 18
19 describe('LBaaS v2 Listeners Module', function() { 19 describe('LBaaS v2 Listeners Module', function() {
20 it('should exist', function() { 20 it('should exist', function() {
21 expect(angular.module('horizon.dashboard.project.lbaasv2.listeners')).toBeDefined(); 21 expect(angular.module('horizon.dashboard.project.nlbaasv2.listeners')).toBeDefined();
22 }); 22 });
23 }); 23 });
24 24
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.js
index cfe3b1f..35c2183 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.js
@@ -17,14 +17,14 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.listeners') 20 .module('horizon.dashboard.project.nlbaasv2.listeners')
21 .controller('ListenersTableController', ListenersTableController); 21 .controller('nLBaaSListenersTableController', ListenersTableController);
22 22
23 ListenersTableController.$inject = [ 23 ListenersTableController.$inject = [
24 'horizon.app.core.openstack-service-api.lbaasv2', 24 'horizon.app.core.openstack-service-api.nlbaasv2',
25 '$routeParams', 25 '$routeParams',
26 'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions', 26 'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
27 'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions' 27 'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions'
28 ]; 28 ];
29 29
30 /** 30 /**
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.spec.js
index 379f12d..de51734 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.spec.js
@@ -43,24 +43,24 @@
43 beforeEach(module('horizon.framework.conf')); 43 beforeEach(module('horizon.framework.conf'));
44 beforeEach(module('horizon.framework.util')); 44 beforeEach(module('horizon.framework.util'));
45 beforeEach(module('horizon.app.core.openstack-service-api')); 45 beforeEach(module('horizon.app.core.openstack-service-api'));
46 beforeEach(module('horizon.dashboard.project.lbaasv2')); 46 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
47 47
48 beforeEach(module(function($provide) { 48 beforeEach(module(function($provide) {
49 $provide.value('$uibModal', {}); 49 $provide.value('$uibModal', {});
50 })); 50 }));
51 51
52 beforeEach(inject(function($injector) { 52 beforeEach(inject(function($injector) {
53 lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); 53 lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
54 controller = $injector.get('$controller'); 54 controller = $injector.get('$controller');
55 rowActions = $injector.get('horizon.dashboard.project.lbaasv2.listeners.actions.rowActions'); 55 rowActions = $injector.get('horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions');
56 batchActions = $injector.get( 56 batchActions = $injector.get(
57 'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions'); 57 'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions');
58 spyOn(rowActions, 'init').and.callFake(initMock); 58 spyOn(rowActions, 'init').and.callFake(initMock);
59 spyOn(lbaasv2API, 'getListeners').and.callFake(fakeAPI); 59 spyOn(lbaasv2API, 'getListeners').and.callFake(fakeAPI);
60 })); 60 }));
61 61
62 function createController() { 62 function createController() {
63 return controller('ListenersTableController', { 63 return controller('nLBaaSListenersTableController', {
64 $routeParams: { loadbalancerId: '1234' } 64 $routeParams: { loadbalancerId: '1234' }
65 }); 65 });
66 } 66 }
@@ -80,7 +80,7 @@
80 expect(ctrl.batchActions).toEqual(batchActions); 80 expect(ctrl.batchActions).toEqual(batchActions);
81 }); 81 });
82 82
83 it('should invoke lbaasv2 apis', function() { 83 it('should invoke nlbaasv2 apis', function() {
84 var ctrl = createController(); 84 var ctrl = createController();
85 expect(lbaasv2API.getListeners).toHaveBeenCalled(); 85 expect(lbaasv2API.getListeners).toHaveBeenCalled();
86 expect(ctrl.src.length).toBe(1); 86 expect(ctrl.src.length).toBe(1);
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.html
index d31ae2f..efed01e 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.html
@@ -1,4 +1,4 @@
1<table ng-controller="ListenersTableController as table" 1<table ng-controller="nLBaaSListenersTableController as table"
2 hz-table ng-cloak 2 hz-table ng-cloak
3 st-table="table.items" 3 st-table="table.items"
4 st-safe-src="table.src" 4 st-safe-src="table.src"
@@ -112,7 +112,7 @@
112 </td> 112 </td>
113 </tr> 113 </tr>
114 114
115 <tr table-status table="table" column-count="7"></tr> 115 <tr nlbaas-table-status table="table" column-count="7"></tr>
116 116
117 </tbody> 117 </tbody>
118 <!-- 118 <!--
@@ -121,4 +121,4 @@
121 --> 121 -->
122 <tfoot hz-table-footer items="table.items"></tfoot> 122 <tfoot hz-table-footer items="table.items"></tfoot>
123 123
124</table> \ No newline at end of file 124</table>
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.js
index d1bc2e2..3487df8 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.js
@@ -17,8 +17,8 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.loadbalancers') 20 .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21 .controller('AssociateFloatingIpModalController', AssociateFloatingIpModalController); 21 .controller('nLBaaSAssociateFloatingIpModalController', AssociateFloatingIpModalController);
22 22
23 AssociateFloatingIpModalController.$inject = [ 23 AssociateFloatingIpModalController.$inject = [
24 '$uibModalInstance', 24 '$uibModalInstance',
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js
index f0eb544..2511cac 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js
@@ -21,7 +21,7 @@
21 var associateFail = false; 21 var associateFail = false;
22 22
23 beforeEach(module('horizon.framework.util.i18n')); 23 beforeEach(module('horizon.framework.util.i18n'));
24 beforeEach(module('horizon.dashboard.project.lbaasv2')); 24 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
25 25
26 beforeEach(function() { 26 beforeEach(function() {
27 floatingIps = [{ id: 'ip1', ip: '1', fixed_ip: '1' }, 27 floatingIps = [{ id: 'ip1', ip: '1', fixed_ip: '1' },
@@ -68,14 +68,14 @@
68 })); 68 }));
69 69
70 it('should define controller properties', function() { 70 it('should define controller properties', function() {
71 ctrl = $controller('AssociateFloatingIpModalController'); 71 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
72 expect(ctrl.cancel).toBeDefined(); 72 expect(ctrl.cancel).toBeDefined();
73 expect(ctrl.save).toBeDefined(); 73 expect(ctrl.save).toBeDefined();
74 expect(ctrl.saving).toBe(false); 74 expect(ctrl.saving).toBe(false);
75 }); 75 });
76 76
77 it('should initialize options', function() { 77 it('should initialize options', function() {
78 ctrl = $controller('AssociateFloatingIpModalController'); 78 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
79 expect(ctrl.options.length).toBe(2); 79 expect(ctrl.options.length).toBe(2);
80 expect(ctrl.options[0].id).toBe('ip2'); 80 expect(ctrl.options[0].id).toBe('ip2');
81 expect(ctrl.options[1].id).toBe('pool1'); 81 expect(ctrl.options[1].id).toBe('pool1');
@@ -84,7 +84,7 @@
84 it('should use ids instead of ip or name if not provided', function() { 84 it('should use ids instead of ip or name if not provided', function() {
85 delete floatingIps[1].ip; 85 delete floatingIps[1].ip;
86 delete floatingIpPools[0].name; 86 delete floatingIpPools[0].name;
87 ctrl = $controller('AssociateFloatingIpModalController'); 87 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
88 expect(ctrl.options.length).toBe(2); 88 expect(ctrl.options.length).toBe(2);
89 expect(ctrl.options[0].name).toBe('ip2'); 89 expect(ctrl.options[0].name).toBe('ip2');
90 expect(ctrl.options[1].name).toBe('pool1'); 90 expect(ctrl.options[1].name).toBe('pool1');
@@ -92,19 +92,19 @@
92 92
93 it('should initialize selected option when only one option', function() { 93 it('should initialize selected option when only one option', function() {
94 floatingIps[1].fixed_ip = '2'; 94 floatingIps[1].fixed_ip = '2';
95 ctrl = $controller('AssociateFloatingIpModalController'); 95 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
96 expect(ctrl.options.length).toBe(1); 96 expect(ctrl.options.length).toBe(1);
97 expect(ctrl.selected).toBe(ctrl.options[0]); 97 expect(ctrl.selected).toBe(ctrl.options[0]);
98 }); 98 });
99 99
100 it('should not initialize selected option when more than one option', function() { 100 it('should not initialize selected option when more than one option', function() {
101 ctrl = $controller('AssociateFloatingIpModalController'); 101 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
102 expect(ctrl.options.length).toBe(2); 102 expect(ctrl.options.length).toBe(2);
103 expect(ctrl.selected).toBeNull(); 103 expect(ctrl.selected).toBeNull();
104 }); 104 });
105 105
106 it('should associate floating IP if floating IP selected', function() { 106 it('should associate floating IP if floating IP selected', function() {
107 ctrl = $controller('AssociateFloatingIpModalController'); 107 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
108 ctrl.selected = ctrl.options[0]; 108 ctrl.selected = ctrl.options[0];
109 spyOn(network, 'associateFloatingIp').and.callThrough(); 109 spyOn(network, 'associateFloatingIp').and.callThrough();
110 spyOn($uibModalInstance, 'close'); 110 spyOn($uibModalInstance, 'close');
@@ -115,7 +115,7 @@
115 }); 115 });
116 116
117 it('should allocate floating IP if floating IP pool selected', function() { 117 it('should allocate floating IP if floating IP pool selected', function() {
118 ctrl = $controller('AssociateFloatingIpModalController'); 118 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
119 ctrl.selected = ctrl.options[1]; 119 ctrl.selected = ctrl.options[1];
120 spyOn(network, 'allocateFloatingIp').and.callThrough(); 120 spyOn(network, 'allocateFloatingIp').and.callThrough();
121 spyOn(network, 'associateFloatingIp').and.callThrough(); 121 spyOn(network, 'associateFloatingIp').and.callThrough();
@@ -128,14 +128,14 @@
128 }); 128 });
129 129
130 it('should dismiss modal if cancel clicked', function() { 130 it('should dismiss modal if cancel clicked', function() {
131 ctrl = $controller('AssociateFloatingIpModalController'); 131 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
132 spyOn($uibModalInstance, 'dismiss'); 132 spyOn($uibModalInstance, 'dismiss');
133 ctrl.cancel(); 133 ctrl.cancel();
134 expect($uibModalInstance.dismiss).toHaveBeenCalledWith('cancel'); 134 expect($uibModalInstance.dismiss).toHaveBeenCalledWith('cancel');
135 }); 135 });
136 136
137 it('should not dismiss modal if save fails', function() { 137 it('should not dismiss modal if save fails', function() {
138 ctrl = $controller('AssociateFloatingIpModalController'); 138 ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
139 ctrl.selected = ctrl.options[0]; 139 ctrl.selected = ctrl.options[0];
140 associateFail = true; 140 associateFail = true;
141 spyOn($uibModalInstance, 'dismiss'); 141 spyOn($uibModalInstance, 'dismiss');
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.html
index 6ff4534..6ff4534 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.html
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.html
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.js
index cec7389..2e57638 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.js
@@ -17,15 +17,15 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.loadbalancers') 20 .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21 .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service', 21 .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service',
22 modalService); 22 modalService);
23 23
24 modalService.$inject = [ 24 modalService.$inject = [
25 '$q', 25 '$q',
26 '$uibModal', 26 '$uibModal',
27 '$route', 27 '$route',
28 'horizon.dashboard.project.lbaasv2.basePath', 28 'horizon.dashboard.project.nlbaasv2.basePath',
29 'horizon.app.core.openstack-service-api.policy', 29 'horizon.app.core.openstack-service-api.policy',
30 'horizon.app.core.openstack-service-api.network', 30 'horizon.app.core.openstack-service-api.network',
31 'horizon.framework.util.q.extensions', 31 'horizon.framework.util.q.extensions',
@@ -35,7 +35,7 @@
35 35
36 /** 36 /**
37 * @ngdoc service 37 * @ngdoc service
38 * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service 38 * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service
39 * 39 *
40 * @description 40 * @description
41 * Provides the service for the Load Balancer Associate Floating IP action. 41 * Provides the service for the Load Balancer Associate Floating IP action.
@@ -96,7 +96,7 @@
96 function open(item) { 96 function open(item) {
97 var spec = { 97 var spec = {
98 backdrop: 'static', 98 backdrop: 'static',
99 controller: 'AssociateFloatingIpModalController as modal', 99 controller: 'nLBaaSAssociateFloatingIpModalController as modal',
100 templateUrl: basePath + 'loadbalancers/actions/associate-ip/modal.html', 100 templateUrl: basePath + 'loadbalancers/actions/associate-ip/modal.html',
101 resolve: { 101 resolve: {
102 loadbalancer: function() { 102 loadbalancer: function() {
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js
index a70c033..9758287 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js
@@ -38,7 +38,7 @@
38 beforeEach(module('horizon.framework.conf')); 38 beforeEach(module('horizon.framework.conf'));
39 beforeEach(module('horizon.framework.widgets')); 39 beforeEach(module('horizon.framework.widgets'));
40 beforeEach(module('horizon.app.core.openstack-service-api')); 40 beforeEach(module('horizon.app.core.openstack-service-api'));
41 beforeEach(module('horizon.dashboard.project.lbaasv2')); 41 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
42 42
43 beforeEach(function() { 43 beforeEach(function() {
44 item = { id: '1', name: 'First', floating_ip: {} }; 44 item = { id: '1', name: 'First', floating_ip: {} };
@@ -76,7 +76,7 @@
76 $route = $injector.get('$route'); 76 $route = $injector.get('$route');
77 $uibModal = $injector.get('$uibModal'); 77 $uibModal = $injector.get('$uibModal');
78 service = $injector.get( 78 service = $injector.get(
79 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service'); 79 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service');
80 })); 80 }));
81 81
82 it('should have the "allowed" and "perform" functions', function() { 82 it('should have the "allowed" and "perform" functions', function() {
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.js
index fbe0178..3351351 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.js
@@ -17,29 +17,29 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.loadbalancers') 20 .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21 .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions', 21 .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions',
22 tableBatchActions); 22 tableBatchActions);
23 23
24 tableBatchActions.$inject = [ 24 tableBatchActions.$inject = [
25 '$location', 25 '$location',
26 'horizon.dashboard.project.lbaasv2.workflow.modal', 26 'horizon.dashboard.project.nlbaasv2.workflow.modal',
27 'horizon.dashboard.project.lbaasv2.basePath', 27 'horizon.dashboard.project.nlbaasv2.basePath',
28 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete', 28 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete',
29 'horizon.app.core.openstack-service-api.policy', 29 'horizon.app.core.openstack-service-api.policy',
30 'horizon.framework.util.i18n.gettext' 30 'horizon.framework.util.i18n.gettext'
31 ]; 31 ];
32 32
33 /** 33 /**
34 * @ngdoc service 34 * @ngdoc service
35 * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions 35 * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions
36 * 36 *
37 * @description 37 * @description
38 * Provides the service for the Load Balancers table batch actions. 38 * Provides the service for the Load Balancers table batch actions.
39 * 39 *
40 * @param $location The angular $location service. 40 * @param $location The angular $location service.
41 * @param workflowModal The LBaaS workflow modal service. 41 * @param workflowModal The LBaaS workflow modal service.
42 * @param basePath The lbaasv2 module base path. 42 * @param basePath The nlbaasv2 module base path.
43 * @param deleteService The load balancer delete service. 43 * @param deleteService The load balancer delete service.
44 * @param policy The horizon policy service. 44 * @param policy The horizon policy service.
45 * @param gettext The horizon gettext function for translation. 45 * @param gettext The horizon gettext function for translation.
@@ -49,7 +49,7 @@
49 function tableBatchActions($location, workflowModal, basePath, deleteService, policy, gettext) { 49 function tableBatchActions($location, workflowModal, basePath, deleteService, policy, gettext) {
50 50
51 var create = workflowModal.init({ 51 var create = workflowModal.init({
52 controller: 'CreateLoadBalancerWizardController', 52 controller: 'nLBaaSCreateLoadBalancerWizardController',
53 message: gettext('A new load balancer is being created.'), 53 message: gettext('A new load balancer is being created.'),
54 handle: onCreate, 54 handle: onCreate,
55 allowed: canCreate 55 allowed: canCreate
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.spec.js
index c83d036..68b4b25 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.spec.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.spec.js
@@ -23,7 +23,7 @@
23 beforeEach(module('horizon.framework.conf')); 23 beforeEach(module('horizon.framework.conf'));
24 beforeEach(module('horizon.framework.widgets')); 24 beforeEach(module('horizon.framework.widgets'));
25 beforeEach(module('horizon.app.core.openstack-service-api')); 25 beforeEach(module('horizon.app.core.openstack-service-api'));
26 beforeEach(module('horizon.dashboard.project.lbaasv2')); 26 beforeEach(module('horizon.dashboard.project.nlbaasv2'));
27 27
28 beforeEach(module(function($provide) { 28 beforeEach(module(function($provide) {
29 var response = { 29 var response = {
@@ -49,7 +49,7 @@
49 $location = $injector.get('$location'); 49 $location = $injector.get('$location');
50 policy = $injector.get('horizon.app.core.openstack-service-api.policy'); 50 policy = $injector.get('horizon.app.core.openstack-service-api.policy');
51 var batchActionsService = $injector.get( 51 var batchActionsService = $injector.get(
52 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions'); 52 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions');
53 actions = batchActionsService.actions(); 53 actions = batchActionsService.actions();
54 })); 54 }));
55 55
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.js
index 3a99c6b..3f1daea 100644
--- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.js
+++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.js
@@ -17,13 +17,13 @@
17 'use strict'; 17 'use strict';
18 18
19 angular 19 angular
20 .module('horizon.dashboard.project.lbaasv2.loadbalancers') 20 .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21 .controller('CreateLoadBalancerWizardController', CreateLoadBalancerWizardController); 21 .controller('nLBaaSCreateLoadBalancerWizardController', CreateLoadBalancerWizardController);
22 22
23 CreateLoadBalancerWizardController.$inject = [ 23 CreateLoadBalancerWizardController.$inject = [
24 '$scope', 24 '$scope',
25 'horizon.dashboard.project