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. # import REST API modules here from neutron_lbaas_dashboard.api.rest import barbican # noqa -from neutron_lbaas_dashboard.api.rest import lbaasv2 # noqa +from 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 similarity index 95% rename from neutron_lbaas_dashboard/api/rest/lbaasv2.py rename to 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): """API for load balancers. """ - url_regex = r'lbaas/loadbalancers/$' + url_regex = r'nlbaas/loadbalancers/$' @rest_utils.ajax() def get(self, request): @@ -436,13 +436,13 @@ class LoadBalancerStatusTree(generic.View): """API for retrieving the resource status tree for a single load balancer. """ - url_regex = r'lbaas/loadbalancers/(?P[^/]+)/statuses/$' + url_regex = r'nlbaas/loadbalancers/(?P[^/]+)/statuses/$' @rest_utils.ajax() def get(self, request, loadbalancer_id): """Get the status tree for a specific load balancer. - http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915/statuses + http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915/statuses """ return neutronclient(request).retrieve_loadbalancer_status( loadbalancer_id) @@ -453,13 +453,13 @@ class LoadBalancer(generic.View): """API for retrieving, updating, and deleting a single load balancer. """ - url_regex = r'lbaas/loadbalancers/(?P[^/]+)/$' + url_regex = r'nlbaas/loadbalancers/(?P[^/]+)/$' @rest_utils.ajax() def get(self, request, loadbalancer_id): """Get a specific load balancer. - http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915 + http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915 """ loadbalancer = neutronclient(request).show_loadbalancer( loadbalancer_id).get('loadbalancer') @@ -479,7 +479,7 @@ class LoadBalancer(generic.View): def delete(self, request, loadbalancer_id): """Delete a specific load balancer. - http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915 + http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915 """ neutronclient(request).delete_loadbalancer(loadbalancer_id) @@ -489,7 +489,7 @@ class Listeners(generic.View): """API for load balancer listeners. """ - url_regex = r'lbaas/listeners/$' + url_regex = r'nlbaas/listeners/$' @rest_utils.ajax() def get(self, request): @@ -531,7 +531,7 @@ class Listener(generic.View): """API for retrieving, updating, and deleting a single listener. """ - url_regex = r'lbaas/listeners/(?P[^/]+)/$' + url_regex = r'nlbaas/listeners/(?P[^/]+)/$' @rest_utils.ajax() def get(self, request, listener_id): @@ -541,7 +541,7 @@ class Listener(generic.View): the details of all resources that exist under the listener will be returned along with the listener details. - http://localhost/api/lbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915 + http://localhost/api/nlbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915 """ listener = neutronclient(request).show_listener( listener_id).get('listener') @@ -584,7 +584,7 @@ class Listener(generic.View): def delete(self, request, listener_id): """Delete a specific listener. - http://localhost/api/lbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915 + http://localhost/api/nlbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915 """ neutronclient(request).delete_listener(listener_id) @@ -594,7 +594,7 @@ class Pools(generic.View): """API for load balancer pools. """ - url_regex = r'lbaas/pools/$' + url_regex = r'nlbaas/pools/$' @rest_utils.ajax() def post(self, request): @@ -613,7 +613,7 @@ class Pool(generic.View): """API for retrieving a single pool. """ - url_regex = r'lbaas/pools/(?P[^/]+)/$' + url_regex = r'nlbaas/pools/(?P[^/]+)/$' @rest_utils.ajax() def get(self, request, pool_id): @@ -623,7 +623,7 @@ class Pool(generic.View): the details of all resources that exist under the pool will be returned along with the pool details. - http://localhost/api/lbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915 + http://localhost/api/nlbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915 """ pool = neutronclient(request).show_lbaas_pool(pool_id).get('pool') @@ -659,7 +659,7 @@ class Pool(generic.View): def delete(self, request, pool_id): """Delete a specific pool. - http://localhost/api/lbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915 + http://localhost/api/nlbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915 """ neutronclient(request).delete_lbaas_pool(pool_id) @@ -669,7 +669,7 @@ class Members(generic.View): """API for load balancer members. """ - url_regex = r'lbaas/pools/(?P[^/]+)/members/$' + url_regex = r'nlbaas/pools/(?P[^/]+)/members/$' @rest_utils.ajax() def get(self, request, pool_id): @@ -708,7 +708,7 @@ class Member(generic.View): """API for retrieving a single member. """ - url_regex = r'lbaas/pools/(?P[^/]+)' + \ + url_regex = r'nlbaas/pools/(?P[^/]+)' + \ '/members/(?P[^/]+)/$' @rest_utils.ajax() @@ -737,7 +737,7 @@ class HealthMonitors(generic.View): """API for load balancer pool health monitors. """ - url_regex = r'lbaas/healthmonitors/$' + url_regex = r'nlbaas/healthmonitors/$' @rest_utils.ajax() def post(self, request): @@ -754,7 +754,7 @@ class HealthMonitor(generic.View): """API for retrieving a single health monitor. """ - url_regex = r'lbaas/healthmonitors/(?P[^/]+)/$' + url_regex = r'nlbaas/healthmonitors/(?P[^/]+)/$' @rest_utils.ajax() def get(self, request, healthmonitor_id): @@ -768,7 +768,7 @@ class HealthMonitor(generic.View): def delete(self, request, healthmonitor_id): """Delete a specific health monitor. - http://localhost/api/lbaas/healthmonitors/cc758c90-3d98-4ea1-af44-aab405c9c915 + http://localhost/api/nlbaas/healthmonitors/cc758c90-3d98-4ea1-af44-aab405c9c915 """ neutronclient(request).delete_lbaas_healthmonitor(healthmonitor_id) 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__) class NGLoadBalancers(horizon.Panel): - name = _("Load Balancers") + name = _("Neutron Load Balancers") slug = 'ngloadbalancersv2' permissions = ('openstack.services.network',) 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 class IndexView(HorizonTemplateView): template_name = 'project/ngloadbalancersv2/index.html' - page_title = 'Load Balancers' + 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 = ( ADD_INSTALLED_APPS = ['neutron_lbaas_dashboard'] -ADD_ANGULAR_MODULES = ['horizon.dashboard.project.lbaasv2'] +ADD_ANGULAR_MODULES = ['horizon.dashboard.project.nlbaasv2'] -ADD_SCSS_FILES = ['dashboard/project/lbaasv2/lbaasv2.scss'] +ADD_SCSS_FILES = ['dashboard/project/nlbaasv2/nlbaasv2.scss'] AUTO_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 similarity index 77% rename from neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.js rename to 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 @@ angular .module('horizon.app.core.openstack-service-api') - .factory('horizon.app.core.openstack-service-api.lbaasv2', lbaasv2API); + .factory('horizon.app.core.openstack-service-api.nlbaasv2', lbaasv2API); lbaasv2API.$inject = [ 'horizon.framework.util.http.service', @@ -68,7 +68,7 @@ // Load Balancers /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancers + * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancers * @description * Get a list of load balancers. * @param {boolean} full @@ -78,14 +78,14 @@ function getLoadBalancers(full) { var params = { full: full }; - return apiService.get('/api/lbaas/loadbalancers/', { params: params }) + return apiService.get('/api/nlbaas/loadbalancers/', { params: params }) .error(function () { toastService.add('error', gettext('Unable to retrieve load balancers.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancer + * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancer * @description * Get a single load balancer by ID * @param {string} id @@ -95,14 +95,14 @@ function getLoadBalancer(id, full) { var params = { full: full }; - return apiService.get('/api/lbaas/loadbalancers/' + id + '/', { params: params }) + return apiService.get('/api/nlbaas/loadbalancers/' + id + '/', { params: params }) .error(function () { toastService.add('error', gettext('Unable to retrieve load balancer.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.deleteLoadBalancer + * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteLoadBalancer * @description * Delete a single load balancer by ID * @param {string} id @@ -111,14 +111,14 @@ */ function deleteLoadBalancer(id, quiet) { - var promise = apiService.delete('/api/lbaas/loadbalancers/' + id + '/'); + var promise = apiService.delete('/api/nlbaas/loadbalancers/' + id + '/'); return quiet ? promise : promise.error(function () { toastService.add('error', gettext('Unable to delete load balancer.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.createLoadBalancer + * @name horizon.app.core.openstack-service-api.nlbaasv2.createLoadBalancer * @description * Create a new load balancer * @param {object} spec @@ -126,14 +126,14 @@ */ function createLoadBalancer(spec) { - return apiService.post('/api/lbaas/loadbalancers/', spec) + return apiService.post('/api/nlbaas/loadbalancers/', spec) .error(function () { toastService.add('error', gettext('Unable to create load balancer.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.editLoadBalancer + * @name horizon.app.core.openstack-service-api.nlbaasv2.editLoadBalancer * @description * Edit a load balancer * @param {string} id @@ -142,14 +142,14 @@ */ function editLoadBalancer(id, spec) { - return apiService.put('/api/lbaas/loadbalancers/' + id + '/', spec) + return apiService.put('/api/nlbaas/loadbalancers/' + id + '/', spec) .error(function () { toastService.add('error', gettext('Unable to update load balancer.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancerStatusTree + * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancerStatusTree * @description * Get the status tree for a load balancer * @param {string} id @@ -157,7 +157,7 @@ */ function getLoadBalancerStatusTree(id) { - return apiService.get('/api/lbaas/loadbalancers/' + id + '/statuses/') + return apiService.get('/api/nlbaas/loadbalancers/' + id + '/statuses/') .error(function () { toastService.add('error', gettext('Unable to retrieve load balancer status tree.')); }); @@ -166,7 +166,7 @@ // Listeners /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getListeners + * @name horizon.app.core.openstack-service-api.nlbaasv2.getListeners * @description * Get the list of listeners. * If a loadbalancer ID is passed as a parameter, the returning list of @@ -181,14 +181,14 @@ function getListeners(id) { var params = id ? {params: {loadbalancerId: id}} : {}; - return apiService.get('/api/lbaas/listeners/', params) + return apiService.get('/api/nlbaas/listeners/', params) .error(function () { toastService.add('error', gettext('Unable to retrieve listeners.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getListener + * @name horizon.app.core.openstack-service-api.nlbaasv2.getListener * @description * Get a single listener by ID. * @param {string} id @@ -201,14 +201,14 @@ var params = includeChildResources ? {params: {includeChildResources: includeChildResources}} : {}; - return apiService.get('/api/lbaas/listeners/' + id + '/', params) + return apiService.get('/api/nlbaas/listeners/' + id + '/', params) .error(function () { toastService.add('error', gettext('Unable to retrieve listener.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.createListener + * @name horizon.app.core.openstack-service-api.nlbaasv2.createListener * @description * Create a new listener * @param {object} spec @@ -216,14 +216,14 @@ */ function createListener(spec) { - return apiService.post('/api/lbaas/listeners/', spec) + return apiService.post('/api/nlbaas/listeners/', spec) .error(function () { toastService.add('error', gettext('Unable to create listener.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.editListener + * @name horizon.app.core.openstack-service-api.nlbaasv2.editListener * @description * Edit a listener * @param {string} id @@ -233,14 +233,14 @@ */ function editListener(id, spec) { - return apiService.put('/api/lbaas/listeners/' + id + '/', spec) + return apiService.put('/api/nlbaas/listeners/' + id + '/', spec) .error(function () { toastService.add('error', gettext('Unable to update listener.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.deleteListener + * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteListener * @description * Delete a single listener by ID * @param {string} id @@ -249,7 +249,7 @@ */ function deleteListener(id, quiet) { - var promise = apiService.delete('/api/lbaas/listeners/' + id + '/'); + var promise = apiService.delete('/api/nlbaas/listeners/' + id + '/'); return quiet ? promise : promise.error(function () { toastService.add('error', gettext('Unable to delete listener.')); }); @@ -258,7 +258,7 @@ // Pools /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getPool + * @name horizon.app.core.openstack-service-api.nlbaasv2.getPool * @description * Get a single Pool by ID. * @param {string} id @@ -271,14 +271,14 @@ var params = includeChildResources ? {params: {includeChildResources: includeChildResources}} : {}; - return apiService.get('/api/lbaas/pools/' + id + '/', params) + return apiService.get('/api/nlbaas/pools/' + id + '/', params) .error(function () { toastService.add('error', gettext('Unable to retrieve pool.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.createPool + * @name horizon.app.core.openstack-service-api.nlbaasv2.createPool * @description * Create a new pool * @param {object} spec @@ -286,14 +286,14 @@ */ function createPool(spec) { - return apiService.post('/api/lbaas/pools/', spec) + return apiService.post('/api/nlbaas/pools/', spec) .error(function () { toastService.add('error', gettext('Unable to create pool.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.editPool + * @name horizon.app.core.openstack-service-api.nlbaasv2.editPool * @description * Edit a pool * @param {string} id @@ -303,14 +303,14 @@ */ function editPool(id, spec) { - return apiService.put('/api/lbaas/pools/' + id + '/', spec) + return apiService.put('/api/nlbaas/pools/' + id + '/', spec) .error(function () { toastService.add('error', gettext('Unable to update pool.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.deletePool + * @name horizon.app.core.openstack-service-api.nlbaasv2.deletePool * @description * Delete a single pool by ID * @param {string} id @@ -319,7 +319,7 @@ */ function deletePool(id, quiet) { - var promise = apiService.delete('/api/lbaas/pools/' + id + '/'); + var promise = apiService.delete('/api/nlbaas/pools/' + id + '/'); return quiet ? promise : promise.error(function () { toastService.add('error', gettext('Unable to delete pool.')); }); @@ -328,7 +328,7 @@ // Members /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getMembers + * @name horizon.app.core.openstack-service-api.nlbaasv2.getMembers * @description * Get a list of members. * @param {string} poolId @@ -339,14 +339,14 @@ */ function getMembers(poolId) { - return apiService.get('/api/lbaas/pools/' + poolId + '/members/') + return apiService.get('/api/nlbaas/pools/' + poolId + '/members/') .error(function () { toastService.add('error', gettext('Unable to retrieve members.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getMember + * @name horizon.app.core.openstack-service-api.nlbaasv2.getMember * @description * Get a single pool Member by ID. * @param {string} poolId @@ -356,14 +356,14 @@ */ function getMember(poolId, memberId) { - return apiService.get('/api/lbaas/pools/' + poolId + '/members/' + memberId + '/') + return apiService.get('/api/nlbaas/pools/' + poolId + '/members/' + memberId + '/') .error(function () { toastService.add('error', gettext('Unable to retrieve member.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.editMember + * @name horizon.app.core.openstack-service-api.nlbaasv2.editMember * @description * Edit a pool member. * @param {string} id @@ -373,14 +373,14 @@ */ function editMember(poolId, memberId, spec) { - return apiService.put('/api/lbaas/pools/' + poolId + '/members/' + memberId + '/', spec) + return apiService.put('/api/nlbaas/pools/' + poolId + '/members/' + memberId + '/', spec) .error(function () { toastService.add('error', gettext('Unable to update member.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.updateMemberList + * @name horizon.app.core.openstack-service-api.nlbaasv2.updateMemberList * @description * Update the list of pool members by adding or removing the necessary members. * @param {string} poolId @@ -390,7 +390,7 @@ */ function updateMemberList(poolId, spec) { - return apiService.put('/api/lbaas/pools/' + poolId + '/members/', spec) + return apiService.put('/api/nlbaas/pools/' + poolId + '/members/', spec) .error(function () { toastService.add('error', gettext('Unable to update member list.')); }); @@ -399,7 +399,7 @@ // Health Monitors /** - * @name horizon.app.core.openstack-service-api.lbaasv2.getHealthMonitor + * @name horizon.app.core.openstack-service-api.nlbaasv2.getHealthMonitor * @description * Get a single pool health monitor by ID. * @param {string} monitorId @@ -407,14 +407,14 @@ */ function getHealthMonitor(monitorId) { - return apiService.get('/api/lbaas/healthmonitors/' + monitorId + '/') + return apiService.get('/api/nlbaas/healthmonitors/' + monitorId + '/') .error(function () { toastService.add('error', gettext('Unable to retrieve health monitor.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.editHealthMonitor + * @name horizon.app.core.openstack-service-api.nlbaasv2.editHealthMonitor * @description * Edit a health monitor * @param {string} id @@ -424,14 +424,14 @@ */ function editHealthMonitor(id, spec) { - return apiService.put('/api/lbaas/healthmonitors/' + id + '/', spec) + return apiService.put('/api/nlbaas/healthmonitors/' + id + '/', spec) .error(function () { toastService.add('error', gettext('Unable to update health monitor.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.deleteHealthMonitor + * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteHealthMonitor * @description * Delete a single health monitor by ID * @param {string} id @@ -440,14 +440,14 @@ */ function deleteHealthMonitor(id, quiet) { - var promise = apiService.delete('/api/lbaas/healthmonitors/' + id + '/'); + var promise = apiService.delete('/api/nlbaas/healthmonitors/' + id + '/'); return quiet ? promise : promise.error(function () { toastService.add('error', gettext('Unable to delete health monitor.')); }); } /** - * @name horizon.app.core.openstack-service-api.lbaasv2.createHealthMonitor + * @name horizon.app.core.openstack-service-api.nlbaasv2.createHealthMonitor * @description * Create a new health monitor * @param {object} spec @@ -455,7 +455,7 @@ */ function createHealthMonitor(spec) { - return apiService.post('/api/lbaas/healthmonitors/', spec) + return apiService.post('/api/nlbaas/healthmonitors/', spec) .error(function () { toastService.add('error', gettext('Unable to create health monitor.')); }); 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 similarity index 84% rename from neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.spec.js rename to 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 @@ beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(inject(['horizon.app.core.openstack-service-api.lbaasv2', function(lbaasv2API) { + beforeEach(inject(['horizon.app.core.openstack-service-api.nlbaasv2', function(lbaasv2API) { service = lbaasv2API; }])); @@ -39,7 +39,7 @@ { func: 'getLoadBalancers', method: 'get', - path: '/api/lbaas/loadbalancers/', + path: '/api/nlbaas/loadbalancers/', error: 'Unable to retrieve load balancers.', testInput: [ true ], data: { params: { full: true } } @@ -47,7 +47,7 @@ { func: 'getLoadBalancer', method: 'get', - path: '/api/lbaas/loadbalancers/1234/', + path: '/api/nlbaas/loadbalancers/1234/', error: 'Unable to retrieve load balancer.', testInput: [ '1234', true ], data: { params: { full: true } } @@ -55,21 +55,21 @@ { func: 'deleteLoadBalancer', method: 'delete', - path: '/api/lbaas/loadbalancers/1234/', + path: '/api/nlbaas/loadbalancers/1234/', error: 'Unable to delete load balancer.', testInput: [ '1234' ] }, { func: 'getLoadBalancerStatusTree', method: 'get', - path: '/api/lbaas/loadbalancers/1234/statuses/', + path: '/api/nlbaas/loadbalancers/1234/statuses/', error: 'Unable to retrieve load balancer status tree.', testInput: [ '1234' ] }, { func: 'getListeners', method: 'get', - path: '/api/lbaas/listeners/', + path: '/api/nlbaas/listeners/', error: 'Unable to retrieve listeners.', testInput: [ '1234' ], data: { params: { loadbalancerId: '1234' } } @@ -77,14 +77,14 @@ { func: 'getListeners', method: 'get', - path: '/api/lbaas/listeners/', + path: '/api/nlbaas/listeners/', data: {}, error: 'Unable to retrieve listeners.' }, { func: 'getListener', method: 'get', - path: '/api/lbaas/listeners/1234/', + path: '/api/nlbaas/listeners/1234/', data: { params: { includeChildResources: true } }, error: 'Unable to retrieve listener.', testInput: [ '1234', true ] @@ -92,7 +92,7 @@ { func: 'getListener', method: 'get', - path: '/api/lbaas/listeners/1234/', + path: '/api/nlbaas/listeners/1234/', data: {}, error: 'Unable to retrieve listener.', testInput: [ '1234', false ] @@ -100,7 +100,7 @@ { func: 'getPool', method: 'get', - path: '/api/lbaas/pools/1234/', + path: '/api/nlbaas/pools/1234/', data: { params: { includeChildResources: true } }, error: 'Unable to retrieve pool.', testInput: [ '1234', true ] @@ -108,7 +108,7 @@ { func: 'getPool', method: 'get', - path: '/api/lbaas/pools/1234/', + path: '/api/nlbaas/pools/1234/', data: {}, error: 'Unable to retrieve pool.', testInput: [ '1234', false ] @@ -116,28 +116,28 @@ { func: 'deletePool', method: 'delete', - path: '/api/lbaas/pools/1234/', + path: '/api/nlbaas/pools/1234/', error: 'Unable to delete pool.', testInput: [ '1234' ] }, { func: 'getMembers', method: 'get', - path: '/api/lbaas/pools/1234/members/', + path: '/api/nlbaas/pools/1234/members/', error: 'Unable to retrieve members.', testInput: [ '1234' ] }, { func: 'getMember', method: 'get', - path: '/api/lbaas/pools/1234/members/5678/', + path: '/api/nlbaas/pools/1234/members/5678/', error: 'Unable to retrieve member.', testInput: [ '1234', '5678' ] }, { func: 'editMember', method: 'put', - path: '/api/lbaas/pools/1234/members/5678/', + path: '/api/nlbaas/pools/1234/members/5678/', error: 'Unable to update member.', data: { weight: 2 }, testInput: [ '1234', '5678', { weight: 2 } ] @@ -145,14 +145,14 @@ { func: 'getHealthMonitor', method: 'get', - path: '/api/lbaas/healthmonitors/1234/', + path: '/api/nlbaas/healthmonitors/1234/', error: 'Unable to retrieve health monitor.', testInput: [ '1234' ] }, { func: 'editHealthMonitor', method: 'put', - path: '/api/lbaas/healthmonitors/1234/', + path: '/api/nlbaas/healthmonitors/1234/', error: 'Unable to update health monitor.', data: { name: 'healthmonitor-1' }, testInput: [ '1234', { name: 'healthmonitor-1' } ] @@ -160,14 +160,14 @@ { func: 'deleteHealthMonitor', method: 'delete', - path: '/api/lbaas/healthmonitors/1234/', + path: '/api/nlbaas/healthmonitors/1234/', error: 'Unable to delete health monitor.', testInput: [ '1234' ] }, { func: 'createLoadBalancer', method: 'post', - path: '/api/lbaas/loadbalancers/', + path: '/api/nlbaas/loadbalancers/', error: 'Unable to create load balancer.', data: { name: 'loadbalancer-1' }, testInput: [ { name: 'loadbalancer-1' } ] @@ -175,7 +175,7 @@ { func: 'editLoadBalancer', method: 'put', - path: '/api/lbaas/loadbalancers/1234/', + path: '/api/nlbaas/loadbalancers/1234/', error: 'Unable to update load balancer.', data: { name: 'loadbalancer-1' }, testInput: [ '1234', { name: 'loadbalancer-1' } ] @@ -183,7 +183,7 @@ { func: 'createListener', method: 'post', - path: '/api/lbaas/listeners/', + path: '/api/nlbaas/listeners/', error: 'Unable to create listener.', data: { name: 'listener-1' }, testInput: [ { name: 'listener-1' } ] @@ -191,7 +191,7 @@ { func: 'editListener', method: 'put', - path: '/api/lbaas/listeners/1234/', + path: '/api/nlbaas/listeners/1234/', error: 'Unable to update listener.', data: { name: 'listener-1' }, testInput: [ '1234', { name: 'listener-1' } ] @@ -199,14 +199,14 @@ { func: 'deleteListener', method: 'delete', - path: '/api/lbaas/listeners/1234/', + path: '/api/nlbaas/listeners/1234/', error: 'Unable to delete listener.', testInput: [ '1234' ] }, { func: 'createPool', method: 'post', - path: '/api/lbaas/pools/', + path: '/api/nlbaas/pools/', error: 'Unable to create pool.', data: { name: 'pool-1' }, testInput: [ { name: 'pool-1' } ] @@ -214,7 +214,7 @@ { func: 'editPool', method: 'put', - path: '/api/lbaas/pools/1234/', + path: '/api/nlbaas/pools/1234/', error: 'Unable to update pool.', data: { name: 'pool-1' }, testInput: [ '1234', { name: 'pool-1' } ] @@ -222,7 +222,7 @@ { func: 'createHealthMonitor', method: 'post', - path: '/api/lbaas/healthmonitors/', + path: '/api/nlbaas/healthmonitors/', error: 'Unable to create health monitor.', data: { name: 'healthmonitor-1' }, testInput: [ { name: 'healthmonitor-1' } ] @@ -230,7 +230,7 @@ { func: 'updateMemberList', method: 'put', - path: '/api/lbaas/pools/1234/members/', + path: '/api/nlbaas/pools/1234/members/', error: 'Unable to update member list.', data: { name: 'member-1' }, 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 similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors') - .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.create', createService); + .module('horizon.dashboard.project.nlbaasv2.healthmonitors') + .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create', createService); createService.$inject = [ '$q', '$location', - 'horizon.dashboard.project.lbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext', 'horizon.framework.util.q.extensions' @@ -31,7 +31,7 @@ /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.createService + * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.createService * @description * Provides the service for creating a health monitor resource. * @param $q The angular service for promises. @@ -47,7 +47,7 @@ var loadbalancerId, listenerId, poolId, statePromise; var create = workflowModal.init({ - controller: 'CreateHealthMonitorWizardController', + controller: 'nLBaaSCreateHealthMonitorWizardController', message: gettext('A new health monitor is being created.'), handle: onCreate, 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 similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { $provide.value('$uibModal', { @@ -59,7 +59,7 @@ $q = $injector.get('$q'); policy = $injector.get('horizon.app.core.openstack-service-api.policy'); $location = $injector.get('$location'); - service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.create'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create'); init = service.init; loadBalancerState = $q.defer(); })); 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 similarity index 81% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors') - .controller('CreateHealthMonitorWizardController', CreateHealthMonitorWizardController); + .module('horizon.dashboard.project.nlbaasv2.healthmonitors') + .controller('nLBaaSCreateHealthMonitorWizardController', CreateHealthMonitorWizardController); CreateHealthMonitorWizardController.$inject = [ '$scope', '$routeParams', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; 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 similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.spec.js rename to 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 @@ }; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow); })); beforeEach(inject(function ($controller) { spyOn(model, 'initialize'); - ctrl = $controller('CreateHealthMonitorWizardController', { $scope: scope }); + ctrl = $controller('nLBaaSCreateHealthMonitorWizardController', { $scope: scope }); })); 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 similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors') - .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete', deleteService); + .module('horizon.dashboard.project.nlbaasv2.healthmonitors') + .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete', deleteService); deleteService.$inject = [ '$q', '$location', '$route', 'horizon.framework.widgets.modal.deleteModalService', - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext' ]; /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.deleteService + * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.deleteService * @description * Brings up the delete health monitor confirmation modal dialog. * 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 similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { monitor = { id: '1', name: 'HealthMonitor1' }; @@ -66,7 +66,7 @@ }; } }); - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { deleteHealthMonitor: function() { return makePromise(); } @@ -80,13 +80,13 @@ beforeEach(inject(function ($injector) { policy = $injector.get('horizon.app.core.openstack-service-api.policy'); - lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); modal = $injector.get('horizon.framework.widgets.modal.deleteModalService'); $scope = $injector.get('$rootScope').$new(); $location = $injector.get('$location'); $q = $injector.get('$q'); toast = $injector.get('horizon.framework.widgets.toast.service'); - service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete'); service.init('1', '2', '3', isActionable('active')); $scope.$apply(); })); 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 similarity index 84% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors') - .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit', editService); + .module('horizon.dashboard.project.nlbaasv2.healthmonitors') + .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit', editService); editService.$inject = [ '$q', '$route', - 'horizon.dashboard.project.lbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext' ]; /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.editService + * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.editService * @description * Provides the service for editing a health monitor resource. * @param $q The angular service for promises. @@ -45,7 +45,7 @@ var statePromise; var edit = workflowModal.init({ - controller: 'EditHealthMonitorWizardController', + controller: 'nLBaaSEditHealthMonitorWizardController', message: gettext('The health monitor has been updated.'), handle: handle, 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 similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { $provide.value('$uibModal', { @@ -59,7 +59,7 @@ $q = $injector.get('$q'); policy = $injector.get('horizon.app.core.openstack-service-api.policy'); $route = $injector.get('$route'); - service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit'); init = service.init; loadBalancerState = $q.defer(); })); 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 similarity index 80% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors') - .controller('EditHealthMonitorWizardController', EditHealthMonitorWizardController); + .module('horizon.dashboard.project.nlbaasv2.healthmonitors') + .controller('nLBaaSEditHealthMonitorWizardController', EditHealthMonitorWizardController); EditHealthMonitorWizardController.$inject = [ '$scope', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; 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 similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js rename to 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 @@ }; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow); })); beforeEach(inject(function ($controller) { spyOn(model, 'initialize'); - ctrl = $controller('EditHealthMonitorWizardController', { $scope: scope }); + ctrl = $controller('nLBaaSEditHealthMonitorWizardController', { $scope: scope }); })); 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 similarity index 82% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors') - .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions', + .module('horizon.dashboard.project.nlbaasv2.healthmonitors') + .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions', rowActions); rowActions.$inject = [ 'horizon.framework.util.i18n.gettext', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit', - 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit', + 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete' ]; /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions + * @ngname horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions * * @description * 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 similarity index 88% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function ($injector) { var rowActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions'); + 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions'); actions = rowActionsService.init('1', '2', '3').actions(); var loadbalancerService = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.service'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service'); spyOn(loadbalancerService, 'isActionable').and.returnValue(true); })); 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 similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors') - .controller('HealthMonitorDetailController', HealthMonitorDetailController); + .module('horizon.dashboard.project.nlbaasv2.healthmonitors') + .controller('nLBaaSHealthMonitorDetailController', HealthMonitorDetailController); HealthMonitorDetailController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', - 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions', + 'horizon.app.core.openstack-service-api.nlbaasv2', + 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions', '$routeParams', '$q' ]; 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 similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.spec.js rename to 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 @@ } function createController() { - return $controller('HealthMonitorDetailController', { + return $controller('nLBaaSHealthMonitorDetailController', { $routeParams: { loadbalancerId: 'loadbalancerId', listenerId: 'listenerId', @@ -61,7 +61,7 @@ beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { apiFail = false; @@ -71,7 +71,7 @@ })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); spyOn(lbaasv2API, 'getHealthMonitor').and.callFake(fakeAPI); spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI); spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI); @@ -79,7 +79,7 @@ $controller = $injector.get('$controller'); })); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { var ctrl = createController(); expect(lbaasv2API.getHealthMonitor).toHaveBeenCalledWith('healthmonitorId'); 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 similarity index 93% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.html rename to 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 @@ -
- +
+
    @@ -39,4 +39,4 @@
-
\ No newline at end of file + 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 similarity index 86% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js rename to 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 @@ /** * @ngdoc overview - * @ngname horizon.dashboard.project.lbaasv2.healthmonitors + * @ngname horizon.dashboard.project.nlbaasv2.healthmonitors * * @description * Provides the services and widgets required to support and display the project healthmonitors @@ -26,6 +26,6 @@ */ angular - .module('horizon.dashboard.project.lbaasv2.healthmonitors', []); + .module('horizon.dashboard.project.nlbaasv2.healthmonitors', []); })(); 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 similarity index 88% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.spec.js rename to 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 @@ describe('LBaaS v2 Healthmonitors Module', function() { it('should exist', function() { - expect(angular.module('horizon.dashboard.project.lbaasv2.healthmonitors')).toBeDefined(); + expect(angular.module('horizon.dashboard.project.nlbaasv2.healthmonitors')).toBeDefined(); }); }); 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 similarity index 85% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.listeners') - .factory('horizon.dashboard.project.lbaasv2.listeners.actions.batchActions', + .module('horizon.dashboard.project.nlbaasv2.listeners') + .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions', tableBatchActions); tableBatchActions.$inject = [ '$q', '$location', - 'horizon.dashboard.project.lbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.listeners.actions.delete' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.listeners.actions.delete' ]; /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.listeners.actions.batchActions + * @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions * * @description * Provides the service for the Listeners table batch actions. @@ -54,7 +54,7 @@ var loadBalancerIsActionable, loadBalancerId; var create = workflowModal.init({ - controller: 'CreateListenerWizardController', + controller: 'nLBaaSCreateListenerWizardController', message: gettext('A new listener is being created.'), handle: onCreate, 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 similarity index 93% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -43,7 +43,7 @@ } }; $provide.value('$uibModal', modal); - $provide.value('horizon.dashboard.project.lbaasv2.loadbalancers.service', { + $provide.value('horizon.dashboard.project.nlbaasv2.loadbalancers.service', { isActionable: function() { return $q.when(); } @@ -61,7 +61,7 @@ $q = $injector.get('$q'); policy = $injector.get('horizon.app.core.openstack-service-api.policy'); var batchActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions'); + 'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions'); actions = batchActionsService.init('1234').actions(); $scope.$apply(); })); 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 similarity index 82% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.listeners') - .controller('CreateListenerWizardController', CreateListenerWizardController); + .module('horizon.dashboard.project.nlbaasv2.listeners') + .controller('nLBaaSCreateListenerWizardController', CreateListenerWizardController); CreateListenerWizardController.$inject = [ '$scope', '$routeParams', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; 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 similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.spec.js rename to 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 @@ var scope = {}; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow); })); beforeEach(inject(function ($controller) { spyOn(model, 'initialize'); - ctrl = $controller('CreateListenerWizardController', { $scope: scope }); + ctrl = $controller('nLBaaSCreateListenerWizardController', { $scope: scope }); })); 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 similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.listeners') - .factory('horizon.dashboard.project.lbaasv2.listeners.actions.delete', deleteService); + .module('horizon.dashboard.project.nlbaasv2.listeners') + .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.delete', deleteService); deleteService.$inject = [ '$q', '$location', '$route', 'horizon.framework.widgets.modal.deleteModalService', - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.widgets.toast.service', 'horizon.framework.util.q.extensions', @@ -34,7 +34,7 @@ /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.listeners.actions.deleteService + * @name horizon.dashboard.project.nlbaasv2.listeners.actions.deleteService * @description * Brings up the delete listeners confirmation modal dialog. * 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 similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { items = [{ id: '1', name: 'First' }, @@ -58,7 +58,7 @@ }; } }); - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { deleteListener: function() { return makePromise(); } @@ -72,14 +72,14 @@ beforeEach(inject(function ($injector) { policy = $injector.get('horizon.app.core.openstack-service-api.policy'); - lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); modal = $injector.get('horizon.framework.widgets.modal.deleteModalService'); $scope = $injector.get('$rootScope').$new(); $route = $injector.get('$route'); $location = $injector.get('$location'); $q = $injector.get('$q'); toast = $injector.get('horizon.framework.widgets.toast.service'); - service = $injector.get('horizon.dashboard.project.lbaasv2.listeners.actions.delete'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.listeners.actions.delete'); service.init('1', makePromise()); })); 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 similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .controller('EditListenerWizardController', EditListenerWizardController); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .controller('nLBaaSEditListenerWizardController', EditListenerWizardController); EditListenerWizardController.$inject = [ '$scope', '$q', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; 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 similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.spec.js rename to 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 @@ }; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy); })); beforeEach(inject(function ($controller, $injector) { $q = $injector.get('$q'); scope = $injector.get('$rootScope').$new(); scope.launchContext = { id: '1234' }; spyOn(model, 'initialize').and.callThrough(); - ctrl = $controller('EditListenerWizardController', { $scope: scope }); + ctrl = $controller('nLBaaSEditListenerWizardController', { $scope: scope }); })); 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 similarity index 84% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.listeners') - .factory('horizon.dashboard.project.lbaasv2.listeners.actions.rowActions', + .module('horizon.dashboard.project.nlbaasv2.listeners') + .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions', tableRowActions); tableRowActions.$inject = [ '$q', '$route', - 'horizon.dashboard.project.lbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.listeners.actions.delete', - 'horizon.dashboard.project.lbaasv2.pools.actions.create' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.listeners.actions.delete', + 'horizon.dashboard.project.nlbaasv2.pools.actions.create' ]; /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.listeners.actions.rowActions + * @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions * * @description * Provides the service for the Listener table row actions. @@ -57,7 +57,7 @@ var loadbalancerId, loadBalancerIsActionable; var edit = workflowModal.init({ - controller: 'EditListenerWizardController', + controller: 'nLBaaSEditListenerWizardController', message: gettext('The listener has been updated.'), handle: onEdit, 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 similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -73,11 +73,11 @@ $route = $injector.get('$route'); policy = $injector.get('horizon.app.core.openstack-service-api.policy'); var rowActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions'); + 'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions'); actions = rowActionsService.actions(); init = rowActionsService.init; var loadbalancerService = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.service'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service'); spyOn(loadbalancerService, 'isActionable').and.callFake(isActionableMock); })); 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 similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.listeners') - .controller('ListenerDetailController', ListenerDetailController); + .module('horizon.dashboard.project.nlbaasv2.listeners') + .controller('nLBaaSListenerDetailController', ListenerDetailController); ListenerDetailController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', - 'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions', + 'horizon.app.core.openstack-service-api.nlbaasv2', + 'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions', '$routeParams', '$q' ]; 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 similarity index 93% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.spec.js rename to 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 @@ } function createController() { - return $controller('ListenerDetailController', { + return $controller('nLBaaSListenerDetailController', { $routeParams: { loadbalancerId: 'loadbalancerId', listenerId: 'listenerId' @@ -59,7 +59,7 @@ beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { apiFail = false; @@ -70,13 +70,13 @@ })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI); spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(loadbalancerAPI); $controller = $injector.get('$controller'); })); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { var ctrl = createController(); expect(lbaasv2API.getListener).toHaveBeenCalledWith('listenerId'); 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 similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html rename to 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 @@ -
- +
+
    @@ -39,4 +39,4 @@
-
\ No newline at end of file + 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 similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js rename to 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 @@ /** * @ngdoc overview - * @ngname horizon.dashboard.project.lbaasv2.listeners + * @ngname horizon.dashboard.project.nlbaasv2.listeners * * @description * Provides the services and widgets required to support and display the project listeners @@ -26,6 +26,6 @@ */ angular - .module('horizon.dashboard.project.lbaasv2.listeners', []); + .module('horizon.dashboard.project.nlbaasv2.listeners', []); })(); 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 similarity index 88% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.spec.js rename to 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 @@ describe('LBaaS v2 Listeners Module', function() { it('should exist', function() { - expect(angular.module('horizon.dashboard.project.lbaasv2.listeners')).toBeDefined(); + expect(angular.module('horizon.dashboard.project.nlbaasv2.listeners')).toBeDefined(); }); }); 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 similarity index 85% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.listeners') - .controller('ListenersTableController', ListenersTableController); + .module('horizon.dashboard.project.nlbaasv2.listeners') + .controller('nLBaaSListenersTableController', ListenersTableController); ListenersTableController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', '$routeParams', - 'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions', - 'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions' + 'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions', + 'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions' ]; /** 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 similarity index 88% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { $provide.value('$uibModal', {}); })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); controller = $injector.get('$controller'); - rowActions = $injector.get('horizon.dashboard.project.lbaasv2.listeners.actions.rowActions'); + rowActions = $injector.get('horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions'); batchActions = $injector.get( - 'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions'); + 'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions'); spyOn(rowActions, 'init').and.callFake(initMock); spyOn(lbaasv2API, 'getListeners').and.callFake(fakeAPI); })); function createController() { - return controller('ListenersTableController', { + return controller('nLBaaSListenersTableController', { $routeParams: { loadbalancerId: '1234' } }); } @@ -80,7 +80,7 @@ expect(ctrl.batchActions).toEqual(batchActions); }); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { var ctrl = createController(); expect(lbaasv2API.getListeners).toHaveBeenCalled(); 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 similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html rename to 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 @@ - - + -
\ No newline at end of file + 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 similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .controller('AssociateFloatingIpModalController', AssociateFloatingIpModalController); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .controller('nLBaaSAssociateFloatingIpModalController', AssociateFloatingIpModalController); AssociateFloatingIpModalController.$inject = [ '$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 similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js rename to 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 @@ var associateFail = false; beforeEach(module('horizon.framework.util.i18n')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { floatingIps = [{ id: 'ip1', ip: '1', fixed_ip: '1' }, @@ -68,14 +68,14 @@ })); it('should define controller properties', function() { - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); expect(ctrl.cancel).toBeDefined(); expect(ctrl.save).toBeDefined(); expect(ctrl.saving).toBe(false); }); it('should initialize options', function() { - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); expect(ctrl.options.length).toBe(2); expect(ctrl.options[0].id).toBe('ip2'); expect(ctrl.options[1].id).toBe('pool1'); @@ -84,7 +84,7 @@ it('should use ids instead of ip or name if not provided', function() { delete floatingIps[1].ip; delete floatingIpPools[0].name; - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); expect(ctrl.options.length).toBe(2); expect(ctrl.options[0].name).toBe('ip2'); expect(ctrl.options[1].name).toBe('pool1'); @@ -92,19 +92,19 @@ it('should initialize selected option when only one option', function() { floatingIps[1].fixed_ip = '2'; - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); expect(ctrl.options.length).toBe(1); expect(ctrl.selected).toBe(ctrl.options[0]); }); it('should not initialize selected option when more than one option', function() { - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); expect(ctrl.options.length).toBe(2); expect(ctrl.selected).toBeNull(); }); it('should associate floating IP if floating IP selected', function() { - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); ctrl.selected = ctrl.options[0]; spyOn(network, 'associateFloatingIp').and.callThrough(); spyOn($uibModalInstance, 'close'); @@ -115,7 +115,7 @@ }); it('should allocate floating IP if floating IP pool selected', function() { - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); ctrl.selected = ctrl.options[1]; spyOn(network, 'allocateFloatingIp').and.callThrough(); spyOn(network, 'associateFloatingIp').and.callThrough(); @@ -128,14 +128,14 @@ }); it('should dismiss modal if cancel clicked', function() { - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); spyOn($uibModalInstance, 'dismiss'); ctrl.cancel(); expect($uibModalInstance.dismiss).toHaveBeenCalledWith('cancel'); }); it('should not dismiss modal if save fails', function() { - ctrl = $controller('AssociateFloatingIpModalController'); + ctrl = $controller('nLBaaSAssociateFloatingIpModalController'); ctrl.selected = ctrl.options[0]; associateFail = true; 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 similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.html rename to 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 similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service', + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service', modalService); modalService.$inject = [ '$q', '$uibModal', '$route', - 'horizon.dashboard.project.lbaasv2.basePath', + 'horizon.dashboard.project.nlbaasv2.basePath', 'horizon.app.core.openstack-service-api.policy', 'horizon.app.core.openstack-service-api.network', 'horizon.framework.util.q.extensions', @@ -35,7 +35,7 @@ /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service + * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service * * @description * Provides the service for the Load Balancer Associate Floating IP action. @@ -96,7 +96,7 @@ function open(item) { var spec = { backdrop: 'static', - controller: 'AssociateFloatingIpModalController as modal', + controller: 'nLBaaSAssociateFloatingIpModalController as modal', templateUrl: basePath + 'loadbalancers/actions/associate-ip/modal.html', resolve: { 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 similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { item = { id: '1', name: 'First', floating_ip: {} }; @@ -76,7 +76,7 @@ $route = $injector.get('$route'); $uibModal = $injector.get('$uibModal'); service = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service'); })); 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 similarity index 81% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions', + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions', tableBatchActions); tableBatchActions.$inject = [ '$location', - 'horizon.dashboard.project.lbaasv2.workflow.modal', - 'horizon.dashboard.project.lbaasv2.basePath', - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.basePath', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext' ]; /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions + * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions * * @description * Provides the service for the Load Balancers table batch actions. * * @param $location The angular $location service. * @param workflowModal The LBaaS workflow modal service. - * @param basePath The lbaasv2 module base path. + * @param basePath The nlbaasv2 module base path. * @param deleteService The load balancer delete service. * @param policy The horizon policy service. * @param gettext The horizon gettext function for translation. @@ -49,7 +49,7 @@ function tableBatchActions($location, workflowModal, basePath, deleteService, policy, gettext) { var create = workflowModal.init({ - controller: 'CreateLoadBalancerWizardController', + controller: 'nLBaaSCreateLoadBalancerWizardController', message: gettext('A new load balancer is being created.'), handle: onCreate, 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 similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.spec.js rename to 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 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -49,7 +49,7 @@ $location = $injector.get('$location'); policy = $injector.get('horizon.app.core.openstack-service-api.policy'); var batchActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions'); actions = batchActionsService.actions(); })); 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 similarity index 82% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.js rename to 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 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .controller('CreateLoadBalancerWizardController', CreateLoadBalancerWizardController); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .controller('nLBaaSCreateLoadBalancerWizardController', CreateLoadBalancerWizardController); CreateLoadBalancerWizardController.$inject = [ '$scope', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.spec.js similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.spec.js index c5b9423..4ab4fe7 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.spec.js @@ -30,14 +30,14 @@ var scope = {}; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow); })); beforeEach(inject(function ($controller) { spyOn(model, 'initialize'); - ctrl = $controller('CreateLoadBalancerWizardController', { $scope: scope }); + ctrl = $controller('nLBaaSCreateLoadBalancerWizardController', { $scope: scope }); })); it('defines the controller', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.js similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.js index 29d027c..2c1e729 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.js @@ -17,15 +17,15 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete', deleteService); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete', deleteService); deleteService.$inject = [ '$q', '$location', '$route', 'horizon.framework.widgets.modal.deleteModalService', - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.widgets.toast.service', 'horizon.framework.util.q.extensions', @@ -34,7 +34,7 @@ /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.loadbalancers.actions.deleteService + * @name horizon.dashboard.project.nlbaasv2.loadbalancers.actions.deleteService * @description * Brings up the delete load balancers confirmation modal dialog. * On submit, deletes selected load balancers. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js index 372d7b6..67fa3e3 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js @@ -43,7 +43,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { items = [{ id: '1', name: 'First', provisioning_status: 'ACTIVE' }, @@ -58,7 +58,7 @@ }; } }); - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { deleteLoadBalancer: function() { return makePromise(); } @@ -72,14 +72,14 @@ beforeEach(inject(function ($injector) { policy = $injector.get('horizon.app.core.openstack-service-api.policy'); - lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); modal = $injector.get('horizon.framework.widgets.modal.deleteModalService'); $scope = $injector.get('$rootScope').$new(); $route = $injector.get('$route'); $location = $injector.get('$location'); $q = $injector.get('$q'); toast = $injector.get('horizon.framework.widgets.toast.service'); - service = $injector.get('horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete'); })); it('should have the "allowed" and "perform" functions', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js index 2337012..103cec3 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js @@ -17,9 +17,9 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') .factory( - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service', modalService); modalService.$inject = [ @@ -34,7 +34,7 @@ /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service + * @name horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service * @description * Brings up the disassociate floating IP confirmation modal dialog. * On submit, dsiassociates the floating IP address from the load balancer. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js index 8c07d3b..ff2efbd 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js @@ -38,7 +38,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { item = { id: '1', name: 'First', floating_ip: { id: 'ip1', ip: '1' } }; @@ -71,7 +71,7 @@ $scope = $injector.get('$rootScope').$new(); $route = $injector.get('$route'); service = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service'); })); it('should have the "allowed" and "perform" functions', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.js similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.js index 114df56..5b74ef3 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.js @@ -17,13 +17,13 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .controller('EditLoadBalancerWizardController', EditLoadBalancerWizardController); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .controller('nLBaaSEditLoadBalancerWizardController', EditLoadBalancerWizardController); EditLoadBalancerWizardController.$inject = [ '$scope', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js similarity index 85% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js index 231dcf4..267ba70 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js @@ -30,15 +30,15 @@ }; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy); })); beforeEach(inject(function ($controller) { spyOn(model, 'initialize'); - ctrl = $controller('EditLoadBalancerWizardController', { $scope: scope }); + ctrl = $controller('nLBaaSEditLoadBalancerWizardController', { $scope: scope }); })); it('defines the controller', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.js similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.js index e8b6a8e..fa11607 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.js @@ -17,17 +17,17 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions', + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions', tableRowActions); tableRowActions.$inject = [ '$q', '$route', - 'horizon.dashboard.project.lbaasv2.workflow.modal', - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete', - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service', - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service', 'horizon.app.core.openstack-service-api.policy', 'horizon.app.core.openstack-service-api.network', 'horizon.framework.util.q.extensions', @@ -36,7 +36,7 @@ /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions + * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions * * @description * Provides the service for the Load Balancers table row actions. @@ -67,7 +67,7 @@ gettext ) { var edit = workflowModal.init({ - controller: 'EditLoadBalancerWizardController', + controller: 'nLBaaSEditLoadBalancerWizardController', message: gettext('The load balancer has been updated.'), handle: onEdit, allowed: canEdit diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.spec.js similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.spec.js index 8cb0656..916cde0 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.spec.js @@ -37,7 +37,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -64,7 +64,7 @@ $route = $injector.get('$route'); policy = $injector.get('horizon.app.core.openstack-service-api.policy'); rowActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions'); actions = rowActionsService.actions(); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.js index e01f5f5..5b86561 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.js @@ -17,13 +17,13 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .controller('LoadBalancerDetailController', LoadBalancerDetailController); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .controller('nLBaaSLoadBalancerDetailController', LoadBalancerDetailController); LoadBalancerDetailController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', + 'horizon.app.core.openstack-service-api.nlbaasv2', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', '$routeParams', '$window', '$scope' diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.spec.js similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.spec.js index 538f0b4..02abda9 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.spec.js @@ -32,7 +32,7 @@ } function createController() { - return $controller('LoadBalancerDetailController', { + return $controller('nLBaaSLoadBalancerDetailController', { $scope: $scope, $window: $window, $routeParams: { loadbalancerId: '1234' } @@ -45,7 +45,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { apiFail = false; @@ -53,14 +53,14 @@ })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(fakeAPI); $scope = $injector.get('$rootScope').$new(); $window = {}; $controller = $injector.get('$controller'); })); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { createController(); expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('1234', true); }); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.html similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.html index 74c2572..4ee278b 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.html @@ -1,5 +1,5 @@ -
- +
+
    @@ -50,8 +50,8 @@
- +
-
\ No newline at end of file +
diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.js similarity index 86% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.js index ee5fd19..eb33748 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.js @@ -18,7 +18,7 @@ /** * @ngdoc overview - * @ngname horizon.dashboard.project.lbaasv2.loadbalancers + * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers * * @description * Provides the services and widgets required to support and display the project load @@ -26,6 +26,6 @@ */ angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers', []); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers', []); })(); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.spec.js similarity index 88% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.spec.js index e48dc89..8ac5a8e 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.module.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.spec.js @@ -18,7 +18,7 @@ describe('LBaaS v2 Load Balancers Module', function() { it('should exist', function() { - expect(angular.module('horizon.dashboard.project.lbaasv2.loadbalancers')).toBeDefined(); + expect(angular.module('horizon.dashboard.project.nlbaasv2.loadbalancers')).toBeDefined(); }); }); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.js similarity index 85% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.js index bcd5be4..277597f 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.js @@ -17,18 +17,18 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .factory('horizon.dashboard.project.lbaasv2.loadbalancers.service', loadBalancersService); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.service', loadBalancersService); loadBalancersService.$inject = [ '$q', - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', 'horizon.framework.util.i18n.gettext' ]; /** * @ngdoc service - * @name horizon.dashboard.project.lbaasv2.loadbalancers.service + * @name horizon.dashboard.project.nlbaasv2.loadbalancers.service * @description General service for LBaaS v2 load balancers. * @param $q The angular service for promises. * @param api The LBaaS V2 service API. @@ -65,7 +65,7 @@ /** * @ngdoc method - * @name horizon.dashboard.project.lbaasv2.loadbalancers.service.isActionable + * @name horizon.dashboard.project.nlbaasv2.loadbalancers.service.isActionable * @description Returns a promise that is resolved if the load balancer is in a state that * allows for it or child resources to be updated or deleted. * @param id The load balancer id. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.spec.js similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.spec.js index 3df0b31..6517fb8 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.spec.js @@ -23,10 +23,10 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { getLoadBalancer: function(index) { var loadbalancers = [{ provisioning_status: 'ACTIVE' }, { provisioning_status: 'PENDING_UPDATE' }]; @@ -42,7 +42,7 @@ beforeEach(inject(function ($injector) { $q = $injector.get('$q'); $scope = $injector.get('$rootScope').$new(); - service = $injector.get('horizon.dashboard.project.lbaasv2.loadbalancers.service'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.loadbalancers.service'); })); it('should define value mappings', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.js similarity index 82% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.js index 2046fcf..98b7965 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.js @@ -17,14 +17,14 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .controller('LoadBalancersTableController', LoadBalancersTableController); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .controller('nLBaaSLoadBalancersTableController', LoadBalancersTableController); LoadBalancersTableController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions', - 'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service' + 'horizon.app.core.openstack-service-api.nlbaasv2', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions', + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service' ]; /** diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.spec.js similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.spec.js index 933f6c0..676354b 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.spec.js @@ -39,21 +39,21 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { $provide.value('$uibModal', {}); })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); controller = $injector.get('$controller'); scope = $injector.get('$rootScope').$new(); spyOn(lbaasv2API, 'getLoadBalancers').and.callFake(fakeAPI); })); function createController() { - return controller('LoadBalancersTableController', { $scope: scope }); + return controller('nLBaaSLoadBalancersTableController', { $scope: scope }); } it('should initialize correctly', function() { @@ -69,7 +69,7 @@ expect(ctrl.provisioningStatus).toBeDefined(); }); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { var ctrl = createController(); expect(lbaasv2API.getLoadBalancers).toHaveBeenCalled(); expect(ctrl.src.length).toBe(1); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.html similarity index 97% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.html index e4cecb0..18e22f0 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/table.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.html @@ -1,6 +1,6 @@ - - + -
\ No newline at end of file + diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.js similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.js index f8ac9e4..1d9ef86 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.js @@ -17,19 +17,19 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .factory('horizon.dashboard.project.lbaasv2.members.actions.batchActions', + .module('horizon.dashboard.project.nlbaasv2.members') + .factory('horizon.dashboard.project.nlbaasv2.members.actions.batchActions', tableBatchActions); tableBatchActions.$inject = [ 'horizon.framework.util.i18n.gettext', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.members.actions.update-member-list' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.members.actions.update-member-list' ]; /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.pools.actions.batchActions + * @ngname horizon.dashboard.project.nlbaasv2.pools.actions.batchActions * * @description * Provides the service for the Members table batch actions. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.spec.js similarity index 93% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.spec.js index 110582d..aaa47ea 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/batch-actions.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.spec.js @@ -23,7 +23,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -47,7 +47,7 @@ beforeEach(inject(function ($injector) { var batchActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.members.actions.batchActions'); + 'horizon.dashboard.project.nlbaasv2.members.actions.batchActions'); actions = batchActionsService.actions(); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.js similarity index 91% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.js index ec08f0e..1bc13d3 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.js @@ -17,12 +17,12 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .controller('EditWeightModalController', EditWeightModalController); + .module('horizon.dashboard.project.nlbaasv2.members') + .controller('nLBaaSEditWeightModalController', EditWeightModalController); EditWeightModalController.$inject = [ '$uibModalInstance', - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', 'horizon.framework.util.i18n.gettext', // Dependencies injected with resolve by $uibModal.open 'poolId', diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.spec.js similarity index 93% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.spec.js index 7395e31..0d002df 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.spec.js @@ -27,7 +27,7 @@ } beforeEach(module('horizon.framework.util.i18n')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { $provide.value('$uibModalInstance', { @@ -39,7 +39,7 @@ id: 'member1', weight: 1 }); - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { editMember: function() { return makePromise(fail); } @@ -47,12 +47,12 @@ })); beforeEach(inject(function ($injector) { - api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); $controller = $injector.get('$controller'); $uibModalInstance = $injector.get('$uibModalInstance'); $scope = $injector.get('$rootScope').$new(); $q = $injector.get('$q'); - ctrl = $controller('EditWeightModalController'); + ctrl = $controller('nLBaaSEditWeightModalController'); })); it('should define controller properties', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.js similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.js index 32396db..f8937c6 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.js @@ -17,15 +17,15 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .factory('horizon.dashboard.project.lbaasv2.members.actions.edit-weight.modal.service', + .module('horizon.dashboard.project.nlbaasv2.members') + .factory('horizon.dashboard.project.nlbaasv2.members.actions.edit-weight.modal.service', modalService); modalService.$inject = [ '$q', '$uibModal', '$route', - 'horizon.dashboard.project.lbaasv2.basePath', + 'horizon.dashboard.project.nlbaasv2.basePath', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.widgets.toast.service', 'horizon.framework.util.i18n.gettext' @@ -33,7 +33,7 @@ /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.members.actions.edit-weight.modal.service + * @ngname horizon.dashboard.project.nlbaasv2.members.actions.edit-weight.modal.service * * @description * Provides the service for the pool member Edit Weight action. @@ -99,7 +99,7 @@ function open(item) { var spec = { backdrop: 'static', - controller: 'EditWeightModalController as modal', + controller: 'nLBaaSEditWeightModalController as modal', templateUrl: basePath + 'members/actions/edit-weight/modal.html', resolve: { poolId: function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.spec.js similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.spec.js index 11bdf76..251fc3f 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.spec.js @@ -46,7 +46,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { $provide.value('$uibModal', { @@ -65,7 +65,7 @@ $route = $injector.get('$route'); $uibModal = $injector.get('$uibModal'); service = $injector.get( - 'horizon.dashboard.project.lbaasv2.members.actions.edit-weight.modal.service'); + 'horizon.dashboard.project.nlbaasv2.members.actions.edit-weight.modal.service'); service.init('pool1', fakePromise()); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.js similarity index 82% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.js index e031f89..3ef421e 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.js @@ -17,18 +17,18 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .factory('horizon.dashboard.project.lbaasv2.members.actions.rowActions', rowActions); + .module('horizon.dashboard.project.nlbaasv2.members') + .factory('horizon.dashboard.project.nlbaasv2.members.actions.rowActions', rowActions); rowActions.$inject = [ 'horizon.framework.util.i18n.gettext', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.members.actions.edit-weight.modal.service' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.members.actions.edit-weight.modal.service' ]; /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.members.actions.rowActions + * @ngname horizon.dashboard.project.nlbaasv2.members.actions.rowActions * * @description * Provides the service for the pool members row actions. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.spec.js similarity index 88% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.spec.js index 1e7e55a..8e873cc 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/row-actions.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.spec.js @@ -23,14 +23,14 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function ($injector) { var rowActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.members.actions.rowActions'); + 'horizon.dashboard.project.nlbaasv2.members.actions.rowActions'); actions = rowActionsService.init('1', '2').actions(); var loadbalancerService = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.service'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service'); spyOn(loadbalancerService, 'isActionable').and.returnValue(true); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.js similarity index 85% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.js index 1169270..2452d73 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.js @@ -17,21 +17,21 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .factory('horizon.dashboard.project.lbaasv2.members.actions.update-member-list', + .module('horizon.dashboard.project.nlbaasv2.members') + .factory('horizon.dashboard.project.nlbaasv2.members.actions.update-member-list', updateMemberListService); updateMemberListService.$inject = [ '$q', '$route', - 'horizon.dashboard.project.lbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext' ]; /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.listeners.actions.updateMemberListService + * @name horizon.dashboard.project.nlbaasv2.listeners.actions.updateMemberListService * @description * Provides the service for updating the list of pool members. * @param $q The angular service for promises. @@ -48,7 +48,7 @@ var statePromise; var updateList = workflowModal.init({ - controller: 'UpdateMemberListWizardController', + controller: 'nLBaaSUpdateMemberListWizardController', message: gettext('The pool members have been updated.'), handle: onUpdate, allowed: allowed diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.spec.js similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.spec.js index effe9e9..6b031cc 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/update-member-list.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.spec.js @@ -37,7 +37,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -65,7 +65,7 @@ policy = $injector.get('horizon.app.core.openstack-service-api.policy'); $route = $injector.get('$route'); updateMemberListService = $injector.get( - 'horizon.dashboard.project.lbaasv2.members.actions.update-member-list'); + 'horizon.dashboard.project.nlbaasv2.members.actions.update-member-list'); init = updateMemberListService.init; defer = $q.defer(); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.js similarity index 82% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.js index 36d25e9..b3396e7 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.js @@ -17,14 +17,14 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .controller('UpdateMemberListWizardController', UpdateMemberListWizardController); + .module('horizon.dashboard.project.nlbaasv2.members') + .controller('nLBaaSUpdateMemberListWizardController', UpdateMemberListWizardController); UpdateMemberListWizardController.$inject = [ '$scope', '$routeParams', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.spec.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.spec.js index a4e78ca..7158634 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/update-list/wizard.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.spec.js @@ -27,16 +27,16 @@ var workflow = 'foo'; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy); })); beforeEach(inject(function ($controller, $injector) { scope = $injector.get('$rootScope').$new(); spyOn(model, 'initialize').and.callThrough(); - ctrl = $controller('UpdateMemberListWizardController', { + ctrl = $controller('nLBaaSUpdateMemberListWizardController', { $scope: scope, $routeParams: {loadbalancerId: 'loadbalancerId', poolId: 'poolId'}}); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.js similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.js index 8df0504..3833386 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.js @@ -17,16 +17,16 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .controller('MemberDetailController', MemberDetailController); + .module('horizon.dashboard.project.nlbaasv2.members') + .controller('nLBaaSMemberDetailController', MemberDetailController); MemberDetailController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', - 'horizon.dashboard.project.lbaasv2.members.actions.rowActions', + 'horizon.app.core.openstack-service-api.nlbaasv2', + 'horizon.dashboard.project.nlbaasv2.members.actions.rowActions', '$routeParams', '$q', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.members.service' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.members.service' ]; /** diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.spec.js similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.spec.js index 93542c1..eb9330d 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.spec.js @@ -45,7 +45,7 @@ } function createController() { - return $controller('MemberDetailController', { + return $controller('nLBaaSMemberDetailController', { $routeParams: { loadbalancerId: 'loadbalancerId', listenerId: 'listenerId', @@ -61,7 +61,7 @@ beforeEach(module('horizon.framework.widgets.toast')); beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { apiFail = false; @@ -69,7 +69,7 @@ $provide.value('$q', { all: qAll }); $provide.value('$uibModal', {}); - $provide.value('horizon.dashboard.project.lbaasv2.members.actions.rowActions', { + $provide.value('horizon.dashboard.project.nlbaasv2.members.actions.rowActions', { init: function() { return { actions: 'member-actions' @@ -79,9 +79,9 @@ })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); - actions = $injector.get('horizon.dashboard.project.lbaasv2.members.actions.rowActions'); - membersService = $injector.get('horizon.dashboard.project.lbaasv2.members.service'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); + actions = $injector.get('horizon.dashboard.project.nlbaasv2.members.actions.rowActions'); + membersService = $injector.get('horizon.dashboard.project.nlbaasv2.members.service'); spyOn(lbaasv2API, 'getMember').and.callFake(fakeAPI); spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI); spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI); @@ -91,7 +91,7 @@ $controller = $injector.get('$controller'); })); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { var ctrl = createController(); expect(lbaasv2API.getMember).toHaveBeenCalledWith('poolId','memberId'); expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId'); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.html similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.html index ebb4079..524b926 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/detail.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.html @@ -1,5 +1,5 @@ -
- +
+
    diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.js index 0beeab5..d1fe252 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.js @@ -18,7 +18,7 @@ /** * @ngdoc overview - * @ngname horizon.dashboard.project.lbaasv2.members + * @ngname horizon.dashboard.project.nlbaasv2.members * * @description * Provides the services and widgets required to support and display the project members @@ -26,6 +26,6 @@ */ angular - .module('horizon.dashboard.project.lbaasv2.members', []); + .module('horizon.dashboard.project.nlbaasv2.members', []); })(); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.spec.js similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.spec.js index 1806d83..93159da 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.module.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.spec.js @@ -18,7 +18,7 @@ describe('LBaaS v2 Members Module', function() { it('should exist', function() { - expect(angular.module('horizon.dashboard.project.lbaasv2.members')).toBeDefined(); + expect(angular.module('horizon.dashboard.project.nlbaasv2.members')).toBeDefined(); }); }); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.js similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.js index 5538dcd..7cf7100 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.js @@ -17,16 +17,16 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .factory('horizon.dashboard.project.lbaasv2.members.service', membersService); + .module('horizon.dashboard.project.nlbaasv2.members') + .factory('horizon.dashboard.project.nlbaasv2.members.service', membersService); membersService.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2' + 'horizon.app.core.openstack-service-api.nlbaasv2' ]; /** * @ngdoc service - * @name horizon.dashboard.project.lbaasv2.members.service + * @name horizon.dashboard.project.nlbaasv2.members.service * @description General service for LBaaS v2 members. * @param api The LBaaS V2 service API. * @returns The members service. @@ -43,7 +43,7 @@ /** * @ngdoc method - * @name horizon.dashboard.project.lbaasv2.members.service.associateMemberStatuses + * @name horizon.dashboard.project.nlbaasv2.members.service.associateMemberStatuses * @description Associates the list of specified members with their corresponding statuses * that are retrieved from the load balancer status tree. * @param loadBalancerId The load balancer ID. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.spec.js similarity index 93% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.spec.js index 6352f46..329de0d 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/members.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.spec.js @@ -23,10 +23,10 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { getLoadBalancerStatusTree: function() { var deferred = $q.defer(); var response = { @@ -76,7 +76,7 @@ })); beforeEach(inject(function ($injector) { - service = $injector.get('horizon.dashboard.project.lbaasv2.members.service'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.members.service'); $q = $injector.get('$q'); scope = $injector.get('$rootScope').$new(); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.js similarity index 84% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.js index e173544..84ab08e 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.js @@ -17,16 +17,16 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.members') - .controller('MembersTableController', MembersTableController); + .module('horizon.dashboard.project.nlbaasv2.members') + .controller('nLBaaSMembersTableController', MembersTableController); MembersTableController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', - 'horizon.dashboard.project.lbaasv2.members.actions.rowActions', - 'horizon.dashboard.project.lbaasv2.members.actions.batchActions', + 'horizon.app.core.openstack-service-api.nlbaasv2', + 'horizon.dashboard.project.nlbaasv2.members.actions.rowActions', + 'horizon.dashboard.project.nlbaasv2.members.actions.batchActions', '$routeParams', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.members.service' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.members.service' ]; /** diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.spec.js similarity index 93% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.spec.js index 2a2af8e..ce810b6 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.spec.js @@ -40,21 +40,21 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { $provide.value('$uibModal', {}); })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); - membersService = $injector.get('horizon.dashboard.project.lbaasv2.members.service'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); + membersService = $injector.get('horizon.dashboard.project.nlbaasv2.members.service'); controller = $injector.get('$controller'); spyOn(lbaasv2API, 'getMembers').and.callFake(fakeAPI); spyOn(membersService, 'associateMemberStatuses'); })); function createController() { - return controller('MembersTableController', { + return controller('nLBaaSMembersTableController', { $scope: scope, $routeParams: { loadbalancerId: 'loadbaancerId', @@ -79,7 +79,7 @@ expect(ctrl.provisioningStatus).toBeDefined(); }); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { var ctrl = createController(); expect(lbaasv2API.getMembers).toHaveBeenCalled(); expect(ctrl.src.length).toBe(1); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.html similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.html index b666551..5c4901e 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/table.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.html @@ -1,4 +1,4 @@ - - + -
    \ No newline at end of file + diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.js similarity index 85% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.js index c4225cd..4043e3d 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.js @@ -18,22 +18,22 @@ /** * @ngdoc overview - * @name horizon.dashboard.project.lbaasv2 + * @name horizon.dashboard.project.nlbaasv2 * @description * The LBaaS v2 dashboard's top level module. */ angular - .module('horizon.dashboard.project.lbaasv2', [ + .module('horizon.dashboard.project.nlbaasv2', [ 'ngRoute', - 'horizon.dashboard.project.lbaasv2.loadbalancers', - 'horizon.dashboard.project.lbaasv2.listeners', - 'horizon.dashboard.project.lbaasv2.pools', - 'horizon.dashboard.project.lbaasv2.members', - 'horizon.dashboard.project.lbaasv2.healthmonitors' + 'horizon.dashboard.project.nlbaasv2.loadbalancers', + 'horizon.dashboard.project.nlbaasv2.listeners', + 'horizon.dashboard.project.nlbaasv2.pools', + 'horizon.dashboard.project.nlbaasv2.members', + 'horizon.dashboard.project.nlbaasv2.healthmonitors' ]) .config(config) - .constant('horizon.dashboard.project.lbaasv2.patterns', { + .constant('horizon.dashboard.project.nlbaasv2.patterns', { /* eslint-disable max-len */ ipv4: '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$', ipv6: '^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?$', @@ -43,7 +43,7 @@ // URL path - must start with "/" and can include anything after that urlPath: /^((\/)|(\/[^/]+)+)$/ }) - .constant('horizon.dashboard.project.lbaasv2.popovers', { + .constant('horizon.dashboard.project.nlbaasv2.popovers', { ipAddresses: '
    • {$ addr.ip $}
    ' }); @@ -54,8 +54,8 @@ ]; function config($provide, $windowProvider, $routeProvider) { - var basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/lbaasv2/'; - $provide.constant('horizon.dashboard.project.lbaasv2.basePath', basePath); + var basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/nlbaasv2/'; + $provide.constant('horizon.dashboard.project.nlbaasv2.basePath', basePath); var loadbalancers = '/project/ngloadbalancersv2'; var listener = loadbalancers + '/:loadbalancerId/listeners/:listenerId'; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.spec.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.spec.js index ead904e..acb2832 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.module.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.spec.js @@ -18,17 +18,17 @@ describe('LBaaS v2 Module', function () { it('should be defined', function () { - expect(angular.module('horizon.dashboard.project.lbaasv2')).toBeDefined(); + expect(angular.module('horizon.dashboard.project.nlbaasv2')).toBeDefined(); }); }); describe('LBaaS v2 Module Base Path', function () { var basePath, staticUrl; - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function ($injector) { - basePath = $injector.get('horizon.dashboard.project.lbaasv2.basePath'); + basePath = $injector.get('horizon.dashboard.project.nlbaasv2.basePath'); staticUrl = $injector.get('$window').STATIC_URL; })); @@ -37,18 +37,18 @@ }); it('should be correct', function () { - expect(basePath).toEqual(staticUrl + 'dashboard/project/lbaasv2/'); + expect(basePath).toEqual(staticUrl + 'dashboard/project/nlbaasv2/'); }); }); describe('LBaaS v2 Module Constants', function () { var patterns, popovers; - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function ($injector) { - patterns = $injector.get('horizon.dashboard.project.lbaasv2.patterns'); - popovers = $injector.get('horizon.dashboard.project.lbaasv2.popovers'); + patterns = $injector.get('horizon.dashboard.project.nlbaasv2.patterns'); + popovers = $injector.get('horizon.dashboard.project.nlbaasv2.popovers'); })); it('should define patterns', function () { @@ -95,12 +95,12 @@ angular.module('configTest', []) .config(function(_$routeProvider_, $windowProvider) { $routeProvider = _$routeProvider_; - basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/lbaasv2/'; + basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/nlbaasv2/'; spyOn($routeProvider, 'when').and.callThrough(); }); module('ngRoute'); module('configTest'); - module('horizon.dashboard.project.lbaasv2'); + module('horizon.dashboard.project.nlbaasv2'); inject(); }); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.scss b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.scss similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.scss rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.scss index 6e51091..7542b5d 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/lbaasv2.scss +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.scss @@ -15,7 +15,7 @@ */ /* Load Balancer Wizard */ -.lbaas-wizard { +.nlbaas-wizard { /* Field widths for editable inputs in the members table */ table { @@ -69,8 +69,8 @@ } /* Progress indicator while data is loading */ -[table-status], -detail-status { +[nlbaas-table-status], +nlbaas-detail-status { .progress { margin: 0px auto; width: 25%; @@ -80,7 +80,7 @@ detail-status { } } } -detail-status { +nlbaas-detail-status { .progress { margin-top: 25vh; } @@ -88,4 +88,4 @@ detail-status { text-align: center; margin-top: 10px; } -} \ No newline at end of file +} diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.js index 25115f1..00276cf 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.js @@ -17,13 +17,13 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.pools') - .factory('horizon.dashboard.project.lbaasv2.pools.actions.create', createService); + .module('horizon.dashboard.project.nlbaasv2.pools') + .factory('horizon.dashboard.project.nlbaasv2.pools.actions.create', createService); createService.$inject = [ '$q', '$location', - 'horizon.dashboard.project.lbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.q.extensions', 'horizon.framework.util.i18n.gettext' @@ -31,7 +31,7 @@ /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.listeners.actions.createService + * @name horizon.dashboard.project.nlbaasv2.listeners.actions.createService * @description * Provides the service for creating a pool resource. * @param $q The angular service for promises. @@ -49,7 +49,7 @@ var loadbalancerId, listenerId, statePromise; var create = workflowModal.init({ - controller: 'CreatePoolWizardController', + controller: 'nLBaaSCreatePoolWizardController', message: gettext('A new pool is being created.'), handle: onCreate, allowed: allowed diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.spec.js similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.spec.js index f12a07d..a54f798 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/create.action.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.spec.js @@ -37,7 +37,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -65,7 +65,7 @@ policy = $injector.get('horizon.app.core.openstack-service-api.policy'); $location = $injector.get('$location'); createPoolService = $injector.get( - 'horizon.dashboard.project.lbaasv2.pools.actions.create'); + 'horizon.dashboard.project.nlbaasv2.pools.actions.create'); init = createPoolService.init; defer = $q.defer(); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.js similarity index 82% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.js index e1cccda..ba1352d 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.js @@ -17,14 +17,14 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.pools') - .controller('CreatePoolWizardController', CreatePoolWizardController); + .module('horizon.dashboard.project.nlbaasv2.pools') + .controller('nLBaaSCreatePoolWizardController', CreatePoolWizardController); CreatePoolWizardController.$inject = [ '$scope', '$routeParams', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.spec.js similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.spec.js index 88c8935..2f455d9 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/create/wizard.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.spec.js @@ -32,14 +32,14 @@ }; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow); })); beforeEach(inject(function ($controller) { spyOn(model, 'initialize'); - ctrl = $controller('CreatePoolWizardController', { $scope: scope }); + ctrl = $controller('nLBaaSCreatePoolWizardController', { $scope: scope }); })); it('defines the controller', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.js similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.js index caa4f6a..13c0db8 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.js @@ -17,22 +17,22 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.pools') - .factory('horizon.dashboard.project.lbaasv2.pools.actions.delete', deleteService); + .module('horizon.dashboard.project.nlbaasv2.pools') + .factory('horizon.dashboard.project.nlbaasv2.pools.actions.delete', deleteService); deleteService.$inject = [ '$q', '$location', '$route', 'horizon.framework.widgets.modal.deleteModalService', - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext' ]; /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.pools.actions.deleteService + * @name horizon.dashboard.project.nlbaasv2.pools.actions.deleteService * @description * Brings up the delete pool confirmation modal dialog. * On submit, deletes selected pool. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.spec.js similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.spec.js index b9115f3..6ac1e7f 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/delete/delete.action.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.spec.js @@ -51,7 +51,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { pool = { id: '1', name: 'Pool1' }; @@ -65,7 +65,7 @@ }; } }); - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { deletePool: function() { return makePromise(); } @@ -79,13 +79,13 @@ beforeEach(inject(function ($injector) { policy = $injector.get('horizon.app.core.openstack-service-api.policy'); - lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); modal = $injector.get('horizon.framework.widgets.modal.deleteModalService'); $scope = $injector.get('$rootScope').$new(); $location = $injector.get('$location'); $q = $injector.get('$q'); toast = $injector.get('horizon.framework.widgets.toast.service'); - service = $injector.get('horizon.dashboard.project.lbaasv2.pools.actions.delete'); + service = $injector.get('horizon.dashboard.project.nlbaasv2.pools.actions.delete'); service.init('1', '2', isActionable('active')); $scope.$apply(); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.js similarity index 85% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.js index 40f81fb..d015205 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.js @@ -17,20 +17,20 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.pools') - .factory('horizon.dashboard.project.lbaasv2.pools.actions.edit', editService); + .module('horizon.dashboard.project.nlbaasv2.pools') + .factory('horizon.dashboard.project.nlbaasv2.pools.actions.edit', editService); editService.$inject = [ '$q', '$route', - 'horizon.dashboard.project.lbaasv2.workflow.modal', + 'horizon.dashboard.project.nlbaasv2.workflow.modal', 'horizon.app.core.openstack-service-api.policy', 'horizon.framework.util.i18n.gettext' ]; /** * @ngDoc factory - * @name horizon.dashboard.project.lbaasv2.listeners.actions.editService + * @name horizon.dashboard.project.nlbaasv2.listeners.actions.editService * @description * Provides the service for editing a pool resource. * @param $q The angular service for promises. @@ -47,7 +47,7 @@ var statePromise; var edit = workflowModal.init({ - controller: 'EditPoolWizardController', + controller: 'nLBaaSEditPoolWizardController', message: gettext('The pool has been updated.'), handle: onEdit, allowed: allowed diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.spec.js similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.spec.js index 66fceaa..a491c36 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/edit.action.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/edit.action.service.spec.js @@ -37,7 +37,7 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { var response = { @@ -65,7 +65,7 @@ policy = $injector.get('horizon.app.core.openstack-service-api.policy'); $route = $injector.get('$route'); editPoolService = $injector.get( - 'horizon.dashboard.project.lbaasv2.pools.actions.edit'); + 'horizon.dashboard.project.nlbaasv2.pools.actions.edit'); init = editPoolService.init; defer = $q.defer(); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.js similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.js index 0f0534b..f873ea2 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.js @@ -17,15 +17,15 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.loadbalancers') - .controller('EditPoolWizardController', EditPoolWizardController); + .module('horizon.dashboard.project.nlbaasv2.loadbalancers') + .controller('nLBaaSEditPoolWizardController', EditPoolWizardController); EditPoolWizardController.$inject = [ '$scope', '$routeParams', '$q', - 'horizon.dashboard.project.lbaasv2.workflow.model', - 'horizon.dashboard.project.lbaasv2.workflow.workflow', + 'horizon.dashboard.project.nlbaasv2.workflow.model', + 'horizon.dashboard.project.nlbaasv2.workflow.workflow', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.spec.js similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.spec.js index f6ce010..0242270 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/edit/wizard.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/edit/wizard.controller.spec.js @@ -36,18 +36,18 @@ }; beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function ($provide) { workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model); - $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model); + $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy); })); beforeEach(inject(function ($controller, $injector) { $q = $injector.get('$q'); scope = $injector.get('$rootScope').$new(); scope.launchContext = { id: 'poolId' }; spyOn(model, 'initialize').and.callThrough(); - ctrl = $controller('EditPoolWizardController', { + ctrl = $controller('nLBaaSEditPoolWizardController', { $scope: scope, $routeParams: {loadbalancerId: 'loadbalancerId'}}); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.js similarity index 83% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.js index c823cf1..4a337c1 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.js @@ -17,21 +17,21 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.pools') - .factory('horizon.dashboard.project.lbaasv2.pools.actions.rowActions', + .module('horizon.dashboard.project.nlbaasv2.pools') + .factory('horizon.dashboard.project.nlbaasv2.pools.actions.rowActions', rowActions); rowActions.$inject = [ 'horizon.framework.util.i18n.gettext', - 'horizon.dashboard.project.lbaasv2.loadbalancers.service', - 'horizon.dashboard.project.lbaasv2.pools.actions.edit', - 'horizon.dashboard.project.lbaasv2.pools.actions.delete', - 'horizon.dashboard.project.lbaasv2.healthmonitors.actions.create' + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service', + 'horizon.dashboard.project.nlbaasv2.pools.actions.edit', + 'horizon.dashboard.project.nlbaasv2.pools.actions.delete', + 'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create' ]; /** * @ngdoc service - * @ngname horizon.dashboard.project.lbaasv2.pools.actions.rowActions + * @ngname horizon.dashboard.project.nlbaasv2.pools.actions.rowActions * * @description * Provides the service for the pool row actions. diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.spec.js similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.spec.js index b2b72b4..aa8aeda 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/actions/row-actions.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/row-actions.service.spec.js @@ -23,14 +23,14 @@ beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function ($injector) { var rowActionsService = $injector.get( - 'horizon.dashboard.project.lbaasv2.pools.actions.rowActions'); + 'horizon.dashboard.project.nlbaasv2.pools.actions.rowActions'); actions = rowActionsService.init('1', '2').actions(); var loadbalancerService = $injector.get( - 'horizon.dashboard.project.lbaasv2.loadbalancers.service'); + 'horizon.dashboard.project.nlbaasv2.loadbalancers.service'); spyOn(loadbalancerService, 'isActionable').and.returnValue(true); })); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.js similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.js index 4f0e188..558a1be 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.js @@ -17,12 +17,12 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2.pools') - .controller('PoolDetailController', PoolDetailController); + .module('horizon.dashboard.project.nlbaasv2.pools') + .controller('nLBaaSPoolDetailController', PoolDetailController); PoolDetailController.$inject = [ - 'horizon.app.core.openstack-service-api.lbaasv2', - 'horizon.dashboard.project.lbaasv2.pools.actions.rowActions', + 'horizon.app.core.openstack-service-api.nlbaasv2', + 'horizon.dashboard.project.nlbaasv2.pools.actions.rowActions', '$routeParams', 'horizon.framework.util.i18n.gettext', '$window', diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.spec.js similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.spec.js index 894383d..c59df26 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.controller.spec.js @@ -45,7 +45,7 @@ } function createController() { - return $controller('PoolDetailController', { + return $controller('nLBaaSPoolDetailController', { $scope: $scope, $window: $window, $routeParams: { @@ -62,7 +62,7 @@ beforeEach(module('horizon.framework.widgets')); beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.app.core.openstack-service-api')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { apiFail = false; @@ -72,7 +72,7 @@ })); beforeEach(inject(function($injector) { - lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2'); + lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2'); spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI); spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI); spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(loadbalancerAPI); @@ -81,7 +81,7 @@ $controller = $injector.get('$controller'); })); - it('should invoke lbaasv2 apis', function() { + it('should invoke nlbaasv2 apis', function() { var ctrl = createController(); expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId'); expect(lbaasv2API.getListener).toHaveBeenCalledWith('listenerId'); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.html similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.html index 510deaa..5790887 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/detail.html @@ -1,5 +1,5 @@ -
    - +
    +
      @@ -43,8 +43,8 @@
    - +
    -
    \ No newline at end of file +
    diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.js index ee56bb4..d30cde5 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.js @@ -18,7 +18,7 @@ /** * @ngdoc overview - * @ngname horizon.dashboard.project.lbaasv2.pools + * @ngname horizon.dashboard.project.nlbaasv2.pools * * @description * Provides the services and widgets required to support and display the project pools @@ -26,6 +26,6 @@ */ angular - .module('horizon.dashboard.project.lbaasv2.pools', []); + .module('horizon.dashboard.project.nlbaasv2.pools', []); })(); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.spec.js similarity index 89% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.spec.js index 58497c4..52a4ad9 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/pools.module.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/pools.module.spec.js @@ -18,7 +18,7 @@ describe('LBaaS v2 Pools Module', function() { it('should exist', function() { - expect(angular.module('horizon.dashboard.project.lbaasv2.pools')).toBeDefined(); + expect(angular.module('horizon.dashboard.project.nlbaasv2.pools')).toBeDefined(); }); }); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.js similarity index 86% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.js index ac11ecb..656561d 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.js @@ -18,7 +18,7 @@ /** * @ngdoc directive - * @name horizon.dashboard.project.lbaasv2:validateUnique + * @name horizon.dashboard.project.nlbaasv2:validateUnique * @element ng-model * @description * The `validateUnique` directive provides validation @@ -37,8 +37,8 @@ */ angular - .module('horizon.dashboard.project.lbaasv2') - .directive('validateUnique', validateUnique); + .module('horizon.dashboard.project.nlbaasv2') + .directive('nlbaasValidateUnique', validateUnique); function validateUnique() { var directive = { @@ -55,12 +55,12 @@ ctrl.$parsers.push(uniqueValidator); ctrl.$formatters.push(uniqueValidator); - attrs.$observe('validateUnique', function () { + attrs.$observe('nlbaasValidateUnique', function () { uniqueValidator(ctrl.$modelValue); }); function uniqueValidator(value) { - var values = scope.$eval(attrs.validateUnique); + var values = scope.$eval(attrs.nlbaasValidateUnique); if (angular.isArray(values) && values.length > 0 && values.indexOf(value) > -1) { ctrl.$setValidity('unique', false); } else { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.spec.js similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.spec.js index 5a3768e..9e9ad13 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/util/validators/validate-unique.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/util/validators/validate-unique.spec.js @@ -21,12 +21,12 @@ var $compile, scope, element, port, name; var markup = '
    ' + - '' + - '' + + '' + + '' + '
    '; beforeEach(module('horizon.framework.widgets')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function ($injector) { $compile = $injector.get('$compile'); scope = $injector.get('$rootScope').$new(); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.js similarity index 86% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.js index 24cb0f9..a570663 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.js @@ -17,16 +17,16 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2') - .directive('detailStatus', detailStatus); + .module('horizon.dashboard.project.nlbaasv2') + .directive('nlbaasDetailStatus', detailStatus); detailStatus.$inject = [ - 'horizon.dashboard.project.lbaasv2.basePath' + 'horizon.dashboard.project.nlbaasv2.basePath' ]; /** * @ngdoc directive - * @name horizon.dashboard.project.lbaasv2:detailStatus + * @name horizon.dashboard.project.nlbaasv2:detailStatus * @description * The `detailStatus` directive provides a status indicator while loading detail pages. It will * show a loading indicator while the page is loading and an error indicator if there is an diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.spec.js similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.spec.js index c26c5fd..6ab7857 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.directive.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.directive.spec.js @@ -23,11 +23,11 @@ return element; } - describe('detailStatus directive', function() { + describe('nlbaasDetailStatus directive', function() { var $scope, $compile, markup, ctrl; beforeEach(module('templates')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function($injector) { $compile = $injector.get('$compile'); @@ -37,7 +37,8 @@ error: false }; $scope.ctrl = ctrl; - markup = ''; + markup = + ''; })); it('initially shows loading status', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/detail/detail-status.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/detail/detail-status.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.js index 2319276..eaf3bd2 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.js @@ -17,16 +17,16 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2') - .directive('tableStatus', tableStatus); + .module('horizon.dashboard.project.nlbaasv2') + .directive('nlbaasTableStatus', tableStatus); tableStatus.$inject = [ - 'horizon.dashboard.project.lbaasv2.basePath' + 'horizon.dashboard.project.nlbaasv2.basePath' ]; /** * @ngdoc directive - * @name horizon.dashboard.project.lbaasv2:tableStatus + * @name horizon.dashboard.project.nlbaasv2:tableStatus * @description * The `tableStatus` directive provides a status indicator while loading a table. The table * should have loading and error properties that give the status of the table, and an items diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.spec.js similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.spec.js index 7e6da02..12f1ffc 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.directive.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.directive.spec.js @@ -23,11 +23,11 @@ return element; } - describe('tableStatus directive', function() { + describe('nlbaasTableStatus directive', function() { var $scope, $compile, markup, table; beforeEach(module('templates')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function($injector) { $compile = $injector.get('$compile'); @@ -38,7 +38,7 @@ items: [] }; $scope.table = table; - markup = ''; + markup = ''; })); it('initially shows loading status', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/widgets/table/table-status.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/widgets/table/table-status.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.js similarity index 92% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.js index f23ba3e..71a047e 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.js @@ -17,8 +17,8 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2') - .controller('CertificatesController', CertificatesController); + .module('horizon.dashboard.project.nlbaasv2') + .controller('nLBaaSCertificatesController', CertificatesController); CertificatesController.$inject = [ '$scope', diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.spec.js similarity index 90% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.spec.js index a6e5eee..b33a690 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.controller.spec.js @@ -24,9 +24,9 @@ }]; beforeEach(module('horizon.framework.util.i18n')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); - describe('CertificatesController', function() { + describe('nLBaaSCertificatesController', function() { var ctrl, scope; beforeEach(inject(function($controller) { @@ -38,7 +38,7 @@ certificates: certs } }; - ctrl = $controller('CertificatesController', { $scope: scope }); + ctrl = $controller('nLBaaSCertificatesController', { $scope: scope }); })); it('should define transfer table properties', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.help.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.help.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.help.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.help.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.html similarity index 98% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.html index 79d7c45..909a4d6 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/certificates/certificates.html @@ -1,4 +1,4 @@ -
    +

    Select one or more SSL certificates for the listener.

    +

    Provide the details for the listener.

    @@ -49,7 +49,7 @@ + nlbaas-validate-unique="model.listenerPorts"> {$ ::ctrl.portNumberError $} diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.js similarity index 88% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.js index 5b74d3d..9a243b7 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.js @@ -17,11 +17,11 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2') - .controller('LoadBalancerDetailsController', LoadBalancerDetailsController); + .module('horizon.dashboard.project.nlbaasv2') + .controller('nLBaaSLoadBalancerDetailsController', LoadBalancerDetailsController); LoadBalancerDetailsController.$inject = [ - 'horizon.dashboard.project.lbaasv2.patterns', + 'horizon.dashboard.project.nlbaasv2.patterns', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js similarity index 84% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js index 6a7ba77..698bcbb 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.controller.spec.js @@ -19,13 +19,13 @@ describe('Load Balancer Details Step', function() { beforeEach(module('horizon.framework.util.i18n')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); - describe('LoadBalancerDetailsController', function() { + describe('nLBaaSLoadBalancerDetailsController', function() { var ctrl; beforeEach(inject(function($controller) { - ctrl = $controller('LoadBalancerDetailsController'); + ctrl = $controller('nLBaaSLoadBalancerDetailsController'); })); it('should define error messages for invalid fields', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.help.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.help.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.help.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.help.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.html similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.html index de4c570..86886d6 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/loadbalancer/loadbalancer.html @@ -1,4 +1,4 @@ -
    +

    Provide the details for the load balancer.

    diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.js similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.js index 7382dea..25c372e 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.js @@ -17,14 +17,14 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2') - .controller('MemberDetailsController', MemberDetailsController); + .module('horizon.dashboard.project.nlbaasv2') + .controller('nLBaaSMemberDetailsController', MemberDetailsController); MemberDetailsController.$inject = [ '$scope', '$compile', - 'horizon.dashboard.project.lbaasv2.popovers', - 'horizon.dashboard.project.lbaasv2.patterns', + 'horizon.dashboard.project.nlbaasv2.popovers', + 'horizon.dashboard.project.nlbaasv2.patterns', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.spec.js similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.spec.js index 44e33a2..a747737 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.controller.spec.js @@ -20,7 +20,7 @@ var model; beforeEach(module('horizon.framework.util.i18n')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { model = { @@ -47,11 +47,11 @@ }; }); - describe('MemberDetailsController', function() { + describe('nLBaaSMemberDetailsController', function() { var ctrl; beforeEach(inject(function($controller) { - ctrl = $controller('MemberDetailsController', { $scope: { model: model } }); + ctrl = $controller('nLBaaSMemberDetailsController', { $scope: { model: model } }); })); it('should define error messages for invalid fields', function() { @@ -121,13 +121,13 @@ var $scope, $element, popoverContent; beforeEach(module('templates')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function($injector) { var $compile = $injector.get('$compile'); var $templateCache = $injector.get('$templateCache'); - var basePath = $injector.get('horizon.dashboard.project.lbaasv2.basePath'); - var popoverTemplates = $injector.get('horizon.dashboard.project.lbaasv2.popovers'); + var basePath = $injector.get('horizon.dashboard.project.nlbaasv2.basePath'); + var popoverTemplates = $injector.get('horizon.dashboard.project.nlbaasv2.popovers'); var markup = $templateCache.get(basePath + 'workflow/members/members.html'); $scope = $injector.get('$rootScope').$new(); $scope.model = model; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.help.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.help.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.help.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.help.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.html similarity index 99% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.html index 2087578..8315dc3 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/members/members.html @@ -1,4 +1,4 @@ -
    +

    Add members to the load balancer pool.

    ', windowClass: 'modal-dialog-wizard', resolve: { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/modal.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/modal.service.spec.js similarity index 95% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/modal.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/modal.service.spec.js index a9a6480..4ba30b7 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/modal.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/modal.service.spec.js @@ -22,7 +22,7 @@ beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets.toast')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(module(function($provide) { response = { @@ -46,7 +46,7 @@ })); beforeEach(inject(function ($injector) { - modalService = $injector.get('horizon.dashboard.project.lbaasv2.workflow.modal'); + modalService = $injector.get('horizon.dashboard.project.nlbaasv2.workflow.modal'); })); it('should define an init function', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.js similarity index 98% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.js index 8617b7a..afeec10 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.js @@ -19,14 +19,14 @@ var push = Array.prototype.push; angular - .module('horizon.dashboard.project.lbaasv2') - .factory('horizon.dashboard.project.lbaasv2.workflow.model', workflowModel); + .module('horizon.dashboard.project.nlbaasv2') + .factory('horizon.dashboard.project.nlbaasv2.workflow.model', workflowModel); workflowModel.$inject = [ '$q', 'horizon.app.core.openstack-service-api.neutron', 'horizon.app.core.openstack-service-api.nova', - 'horizon.app.core.openstack-service-api.lbaasv2', + 'horizon.app.core.openstack-service-api.nlbaasv2', 'horizon.app.core.openstack-service-api.barbican', 'horizon.app.core.openstack-service-api.serviceCatalog', 'horizon.framework.util.i18n.gettext' @@ -34,7 +34,7 @@ /** * @ngdoc service - * @name horizon.dashboard.project.lbaasv2.workflow.model + * @name horizon.dashboard.project.nlbaasv2.workflow.model * * @description * This is the M part of the MVC design pattern for the LBaaS wizard workflow. It is responsible diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.spec.js similarity index 99% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.spec.js index 605f9e4..f168184 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/model.service.spec.js @@ -21,7 +21,7 @@ var includeChildResources = true; beforeEach(module('horizon.framework.util.i18n')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(function() { listenerResources = { @@ -73,7 +73,7 @@ }); beforeEach(module(function($provide) { - $provide.value('horizon.app.core.openstack-service-api.lbaasv2', { + $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', { getLoadBalancers: function() { var loadbalancers = [ { id: '1234', name: 'Load Balancer 1' }, @@ -295,7 +295,7 @@ beforeEach(inject(function ($injector) { model = $injector.get( - 'horizon.dashboard.project.lbaasv2.workflow.model' + 'horizon.dashboard.project.nlbaasv2.workflow.model' ); $q = $injector.get('$q'); scope = $injector.get('$rootScope').$new(); diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.js similarity index 91% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.js index 1d9e6ce..b1d7498 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.js @@ -17,11 +17,11 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2') - .controller('MonitorDetailsController', MonitorDetailsController); + .module('horizon.dashboard.project.nlbaasv2') + .controller('nLBaaSMonitorDetailsController', MonitorDetailsController); MonitorDetailsController.$inject = [ - 'horizon.dashboard.project.lbaasv2.patterns', + 'horizon.dashboard.project.nlbaasv2.patterns', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.spec.js similarity index 87% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.spec.js index 9627410..f534eed 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.controller.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.controller.spec.js @@ -19,13 +19,13 @@ describe('Monitor Details Step', function() { beforeEach(module('horizon.framework.util')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); - describe('MonitorDetailsController', function() { + describe('nLBaaSMonitorDetailsController', function() { var ctrl; beforeEach(inject(function($controller) { - ctrl = $controller('MonitorDetailsController'); + ctrl = $controller('nLBaaSMonitorDetailsController'); })); it('should define error messages for invalid fields', function() { diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.help.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.help.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.html similarity index 98% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.html index 193ddc3..1b5ecf9 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/monitor/monitor.html @@ -1,4 +1,4 @@ -
    +

    Provide the details for the health monitor.

    diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/pool/pool.help.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/pool/pool.help.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/pool/pool.html similarity index 100% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/pool/pool.html diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.js similarity index 94% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.js index aa386a8..1d301a4 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.js @@ -17,11 +17,11 @@ 'use strict'; angular - .module('horizon.dashboard.project.lbaasv2') - .factory('horizon.dashboard.project.lbaasv2.workflow.workflow', lbaasWorkflow); + .module('horizon.dashboard.project.nlbaasv2') + .factory('horizon.dashboard.project.nlbaasv2.workflow.workflow', lbaasWorkflow); lbaasWorkflow.$inject = [ - 'horizon.dashboard.project.lbaasv2.basePath', + 'horizon.dashboard.project.nlbaasv2.basePath', 'horizon.app.core.workflow.factory', 'horizon.framework.util.i18n.gettext' ]; diff --git a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.spec.js b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.spec.js similarity index 96% rename from neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.spec.js rename to neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.spec.js index f7d414f..52657ff 100644 --- a/neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/workflow.service.spec.js +++ b/neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/workflow/workflow.service.spec.js @@ -23,11 +23,11 @@ beforeEach(module('horizon.framework.util')); beforeEach(module('horizon.framework.conf')); beforeEach(module('horizon.framework.widgets.toast')); - beforeEach(module('horizon.dashboard.project.lbaasv2')); + beforeEach(module('horizon.dashboard.project.nlbaasv2')); beforeEach(inject(function ($injector) { workflowService = $injector.get( - 'horizon.dashboard.project.lbaasv2.workflow.workflow' + 'horizon.dashboard.project.nlbaasv2.workflow.workflow' ); }));