Fix neutron-lbaas-dashboard and octavia-dashboard
This patch fixes neutron-lbaas-dashboard to function properly when installed in horizon with octavia-dashboard. Story: 2004913 Task: 29266 Change-Id: Ib3e1e4d0bef08745bdbba2437481bfba169931ec
This commit is contained in:
parent
0c03857b1c
commit
cddbf697e6
@ -23,4 +23,4 @@ in https://wiki.openstack.org/wiki/APIChangeGuidelines.
|
|||||||
|
|
||||||
# import REST API modules here
|
# import REST API modules here
|
||||||
from neutron_lbaas_dashboard.api.rest import barbican # noqa
|
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
|
||||||
|
@ -406,7 +406,7 @@ class LoadBalancers(generic.View):
|
|||||||
"""API for load balancers.
|
"""API for load balancers.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/loadbalancers/$'
|
url_regex = r'nlbaas/loadbalancers/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
@ -436,13 +436,13 @@ class LoadBalancerStatusTree(generic.View):
|
|||||||
"""API for retrieving the resource status tree for a single load balancer.
|
"""API for retrieving the resource status tree for a single load balancer.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/statuses/$'
|
url_regex = r'nlbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/statuses/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request, loadbalancer_id):
|
def get(self, request, loadbalancer_id):
|
||||||
"""Get the status tree for a specific load balancer.
|
"""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(
|
return neutronclient(request).retrieve_loadbalancer_status(
|
||||||
loadbalancer_id)
|
loadbalancer_id)
|
||||||
@ -453,13 +453,13 @@ class LoadBalancer(generic.View):
|
|||||||
"""API for retrieving, updating, and deleting a single load balancer.
|
"""API for retrieving, updating, and deleting a single load balancer.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/$'
|
url_regex = r'nlbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request, loadbalancer_id):
|
def get(self, request, loadbalancer_id):
|
||||||
"""Get a specific load balancer.
|
"""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 = neutronclient(request).show_loadbalancer(
|
||||||
loadbalancer_id).get('loadbalancer')
|
loadbalancer_id).get('loadbalancer')
|
||||||
@ -479,7 +479,7 @@ class LoadBalancer(generic.View):
|
|||||||
def delete(self, request, loadbalancer_id):
|
def delete(self, request, loadbalancer_id):
|
||||||
"""Delete a specific load balancer.
|
"""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)
|
neutronclient(request).delete_loadbalancer(loadbalancer_id)
|
||||||
|
|
||||||
@ -489,7 +489,7 @@ class Listeners(generic.View):
|
|||||||
"""API for load balancer listeners.
|
"""API for load balancer listeners.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/listeners/$'
|
url_regex = r'nlbaas/listeners/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
@ -531,7 +531,7 @@ class Listener(generic.View):
|
|||||||
"""API for retrieving, updating, and deleting a single listener.
|
"""API for retrieving, updating, and deleting a single listener.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/listeners/(?P<listener_id>[^/]+)/$'
|
url_regex = r'nlbaas/listeners/(?P<listener_id>[^/]+)/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request, listener_id):
|
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
|
the details of all resources that exist under the listener will be
|
||||||
returned along with the listener details.
|
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 = neutronclient(request).show_listener(
|
||||||
listener_id).get('listener')
|
listener_id).get('listener')
|
||||||
@ -584,7 +584,7 @@ class Listener(generic.View):
|
|||||||
def delete(self, request, listener_id):
|
def delete(self, request, listener_id):
|
||||||
"""Delete a specific listener.
|
"""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)
|
neutronclient(request).delete_listener(listener_id)
|
||||||
|
|
||||||
@ -594,7 +594,7 @@ class Pools(generic.View):
|
|||||||
"""API for load balancer pools.
|
"""API for load balancer pools.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/pools/$'
|
url_regex = r'nlbaas/pools/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
@ -613,7 +613,7 @@ class Pool(generic.View):
|
|||||||
"""API for retrieving a single pool.
|
"""API for retrieving a single pool.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)/$'
|
url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request, pool_id):
|
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
|
the details of all resources that exist under the pool will be
|
||||||
returned along with the pool details.
|
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')
|
pool = neutronclient(request).show_lbaas_pool(pool_id).get('pool')
|
||||||
|
|
||||||
@ -659,7 +659,7 @@ class Pool(generic.View):
|
|||||||
def delete(self, request, pool_id):
|
def delete(self, request, pool_id):
|
||||||
"""Delete a specific pool.
|
"""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)
|
neutronclient(request).delete_lbaas_pool(pool_id)
|
||||||
|
|
||||||
@ -669,7 +669,7 @@ class Members(generic.View):
|
|||||||
"""API for load balancer members.
|
"""API for load balancer members.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)/members/$'
|
url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)/members/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request, pool_id):
|
def get(self, request, pool_id):
|
||||||
@ -708,7 +708,7 @@ class Member(generic.View):
|
|||||||
"""API for retrieving a single member.
|
"""API for retrieving a single member.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)' + \
|
url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)' + \
|
||||||
'/members/(?P<member_id>[^/]+)/$'
|
'/members/(?P<member_id>[^/]+)/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
@ -737,7 +737,7 @@ class HealthMonitors(generic.View):
|
|||||||
"""API for load balancer pool health monitors.
|
"""API for load balancer pool health monitors.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/healthmonitors/$'
|
url_regex = r'nlbaas/healthmonitors/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
@ -754,7 +754,7 @@ class HealthMonitor(generic.View):
|
|||||||
"""API for retrieving a single health monitor.
|
"""API for retrieving a single health monitor.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
url_regex = r'lbaas/healthmonitors/(?P<healthmonitor_id>[^/]+)/$'
|
url_regex = r'nlbaas/healthmonitors/(?P<healthmonitor_id>[^/]+)/$'
|
||||||
|
|
||||||
@rest_utils.ajax()
|
@rest_utils.ajax()
|
||||||
def get(self, request, healthmonitor_id):
|
def get(self, request, healthmonitor_id):
|
||||||
@ -768,7 +768,7 @@ class HealthMonitor(generic.View):
|
|||||||
def delete(self, request, healthmonitor_id):
|
def delete(self, request, healthmonitor_id):
|
||||||
"""Delete a specific health monitor.
|
"""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)
|
neutronclient(request).delete_lbaas_healthmonitor(healthmonitor_id)
|
||||||
|
|
@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__)
|
|||||||
|
|
||||||
|
|
||||||
class NGLoadBalancers(horizon.Panel):
|
class NGLoadBalancers(horizon.Panel):
|
||||||
name = _("Load Balancers")
|
name = _("Neutron Load Balancers")
|
||||||
slug = 'ngloadbalancersv2'
|
slug = 'ngloadbalancersv2'
|
||||||
permissions = ('openstack.services.network',)
|
permissions = ('openstack.services.network',)
|
||||||
|
|
||||||
|
@ -17,4 +17,4 @@ from horizon.views import HorizonTemplateView
|
|||||||
|
|
||||||
class IndexView(HorizonTemplateView):
|
class IndexView(HorizonTemplateView):
|
||||||
template_name = 'project/ngloadbalancersv2/index.html'
|
template_name = 'project/ngloadbalancersv2/index.html'
|
||||||
page_title = 'Load Balancers'
|
page_title = 'Neutron Load Balancers'
|
||||||
|
@ -26,8 +26,8 @@ ADD_PANEL = (
|
|||||||
|
|
||||||
ADD_INSTALLED_APPS = ['neutron_lbaas_dashboard']
|
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
|
AUTO_DISCOVER_STATIC_FILES = True
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.app.core.openstack-service-api')
|
.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 = [
|
lbaasv2API.$inject = [
|
||||||
'horizon.framework.util.http.service',
|
'horizon.framework.util.http.service',
|
||||||
@ -68,7 +68,7 @@
|
|||||||
// Load Balancers
|
// Load Balancers
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancers
|
* @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancers
|
||||||
* @description
|
* @description
|
||||||
* Get a list of load balancers.
|
* Get a list of load balancers.
|
||||||
* @param {boolean} full
|
* @param {boolean} full
|
||||||
@ -78,14 +78,14 @@
|
|||||||
|
|
||||||
function getLoadBalancers(full) {
|
function getLoadBalancers(full) {
|
||||||
var params = { full: full };
|
var params = { full: full };
|
||||||
return apiService.get('/api/lbaas/loadbalancers/', { params: params })
|
return apiService.get('/api/nlbaas/loadbalancers/', { params: params })
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve load balancers.'));
|
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
|
* @description
|
||||||
* Get a single load balancer by ID
|
* Get a single load balancer by ID
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -95,14 +95,14 @@
|
|||||||
|
|
||||||
function getLoadBalancer(id, full) {
|
function getLoadBalancer(id, full) {
|
||||||
var params = { full: 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 () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve load balancer.'));
|
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
|
* @description
|
||||||
* Delete a single load balancer by ID
|
* Delete a single load balancer by ID
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -111,14 +111,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function deleteLoadBalancer(id, quiet) {
|
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 () {
|
return quiet ? promise : promise.error(function () {
|
||||||
toastService.add('error', gettext('Unable to delete load balancer.'));
|
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
|
* @description
|
||||||
* Create a new load balancer
|
* Create a new load balancer
|
||||||
* @param {object} spec
|
* @param {object} spec
|
||||||
@ -126,14 +126,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function createLoadBalancer(spec) {
|
function createLoadBalancer(spec) {
|
||||||
return apiService.post('/api/lbaas/loadbalancers/', spec)
|
return apiService.post('/api/nlbaas/loadbalancers/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to create load balancer.'));
|
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
|
* @description
|
||||||
* Edit a load balancer
|
* Edit a load balancer
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -142,14 +142,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function editLoadBalancer(id, spec) {
|
function editLoadBalancer(id, spec) {
|
||||||
return apiService.put('/api/lbaas/loadbalancers/' + id + '/', spec)
|
return apiService.put('/api/nlbaas/loadbalancers/' + id + '/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to update load balancer.'));
|
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
|
* @description
|
||||||
* Get the status tree for a load balancer
|
* Get the status tree for a load balancer
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -157,7 +157,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function getLoadBalancerStatusTree(id) {
|
function getLoadBalancerStatusTree(id) {
|
||||||
return apiService.get('/api/lbaas/loadbalancers/' + id + '/statuses/')
|
return apiService.get('/api/nlbaas/loadbalancers/' + id + '/statuses/')
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve load balancer status tree.'));
|
toastService.add('error', gettext('Unable to retrieve load balancer status tree.'));
|
||||||
});
|
});
|
||||||
@ -166,7 +166,7 @@
|
|||||||
// Listeners
|
// Listeners
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name horizon.app.core.openstack-service-api.lbaasv2.getListeners
|
* @name horizon.app.core.openstack-service-api.nlbaasv2.getListeners
|
||||||
* @description
|
* @description
|
||||||
* Get the list of listeners.
|
* Get the list of listeners.
|
||||||
* If a loadbalancer ID is passed as a parameter, the returning list of
|
* If a loadbalancer ID is passed as a parameter, the returning list of
|
||||||
@ -181,14 +181,14 @@
|
|||||||
|
|
||||||
function getListeners(id) {
|
function getListeners(id) {
|
||||||
var params = id ? {params: {loadbalancerId: id}} : {};
|
var params = id ? {params: {loadbalancerId: id}} : {};
|
||||||
return apiService.get('/api/lbaas/listeners/', params)
|
return apiService.get('/api/nlbaas/listeners/', params)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve listeners.'));
|
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
|
* @description
|
||||||
* Get a single listener by ID.
|
* Get a single listener by ID.
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -201,14 +201,14 @@
|
|||||||
var params = includeChildResources
|
var params = includeChildResources
|
||||||
? {params: {includeChildResources: includeChildResources}}
|
? {params: {includeChildResources: includeChildResources}}
|
||||||
: {};
|
: {};
|
||||||
return apiService.get('/api/lbaas/listeners/' + id + '/', params)
|
return apiService.get('/api/nlbaas/listeners/' + id + '/', params)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve listener.'));
|
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
|
* @description
|
||||||
* Create a new listener
|
* Create a new listener
|
||||||
* @param {object} spec
|
* @param {object} spec
|
||||||
@ -216,14 +216,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function createListener(spec) {
|
function createListener(spec) {
|
||||||
return apiService.post('/api/lbaas/listeners/', spec)
|
return apiService.post('/api/nlbaas/listeners/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to create listener.'));
|
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
|
* @description
|
||||||
* Edit a listener
|
* Edit a listener
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -233,14 +233,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function editListener(id, spec) {
|
function editListener(id, spec) {
|
||||||
return apiService.put('/api/lbaas/listeners/' + id + '/', spec)
|
return apiService.put('/api/nlbaas/listeners/' + id + '/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to update listener.'));
|
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
|
* @description
|
||||||
* Delete a single listener by ID
|
* Delete a single listener by ID
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -249,7 +249,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function deleteListener(id, quiet) {
|
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 () {
|
return quiet ? promise : promise.error(function () {
|
||||||
toastService.add('error', gettext('Unable to delete listener.'));
|
toastService.add('error', gettext('Unable to delete listener.'));
|
||||||
});
|
});
|
||||||
@ -258,7 +258,7 @@
|
|||||||
// Pools
|
// Pools
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name horizon.app.core.openstack-service-api.lbaasv2.getPool
|
* @name horizon.app.core.openstack-service-api.nlbaasv2.getPool
|
||||||
* @description
|
* @description
|
||||||
* Get a single Pool by ID.
|
* Get a single Pool by ID.
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -271,14 +271,14 @@
|
|||||||
var params = includeChildResources
|
var params = includeChildResources
|
||||||
? {params: {includeChildResources: includeChildResources}}
|
? {params: {includeChildResources: includeChildResources}}
|
||||||
: {};
|
: {};
|
||||||
return apiService.get('/api/lbaas/pools/' + id + '/', params)
|
return apiService.get('/api/nlbaas/pools/' + id + '/', params)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve pool.'));
|
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
|
* @description
|
||||||
* Create a new pool
|
* Create a new pool
|
||||||
* @param {object} spec
|
* @param {object} spec
|
||||||
@ -286,14 +286,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function createPool(spec) {
|
function createPool(spec) {
|
||||||
return apiService.post('/api/lbaas/pools/', spec)
|
return apiService.post('/api/nlbaas/pools/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to create pool.'));
|
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
|
* @description
|
||||||
* Edit a pool
|
* Edit a pool
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -303,14 +303,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function editPool(id, spec) {
|
function editPool(id, spec) {
|
||||||
return apiService.put('/api/lbaas/pools/' + id + '/', spec)
|
return apiService.put('/api/nlbaas/pools/' + id + '/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to update pool.'));
|
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
|
* @description
|
||||||
* Delete a single pool by ID
|
* Delete a single pool by ID
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -319,7 +319,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function deletePool(id, quiet) {
|
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 () {
|
return quiet ? promise : promise.error(function () {
|
||||||
toastService.add('error', gettext('Unable to delete pool.'));
|
toastService.add('error', gettext('Unable to delete pool.'));
|
||||||
});
|
});
|
||||||
@ -328,7 +328,7 @@
|
|||||||
// Members
|
// Members
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name horizon.app.core.openstack-service-api.lbaasv2.getMembers
|
* @name horizon.app.core.openstack-service-api.nlbaasv2.getMembers
|
||||||
* @description
|
* @description
|
||||||
* Get a list of members.
|
* Get a list of members.
|
||||||
* @param {string} poolId
|
* @param {string} poolId
|
||||||
@ -339,14 +339,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function getMembers(poolId) {
|
function getMembers(poolId) {
|
||||||
return apiService.get('/api/lbaas/pools/' + poolId + '/members/')
|
return apiService.get('/api/nlbaas/pools/' + poolId + '/members/')
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve members.'));
|
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
|
* @description
|
||||||
* Get a single pool Member by ID.
|
* Get a single pool Member by ID.
|
||||||
* @param {string} poolId
|
* @param {string} poolId
|
||||||
@ -356,14 +356,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function getMember(poolId, memberId) {
|
function getMember(poolId, memberId) {
|
||||||
return apiService.get('/api/lbaas/pools/' + poolId + '/members/' + memberId + '/')
|
return apiService.get('/api/nlbaas/pools/' + poolId + '/members/' + memberId + '/')
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve member.'));
|
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
|
* @description
|
||||||
* Edit a pool member.
|
* Edit a pool member.
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -373,14 +373,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function editMember(poolId, memberId, spec) {
|
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 () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to update member.'));
|
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
|
* @description
|
||||||
* Update the list of pool members by adding or removing the necessary members.
|
* Update the list of pool members by adding or removing the necessary members.
|
||||||
* @param {string} poolId
|
* @param {string} poolId
|
||||||
@ -390,7 +390,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function updateMemberList(poolId, spec) {
|
function updateMemberList(poolId, spec) {
|
||||||
return apiService.put('/api/lbaas/pools/' + poolId + '/members/', spec)
|
return apiService.put('/api/nlbaas/pools/' + poolId + '/members/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to update member list.'));
|
toastService.add('error', gettext('Unable to update member list.'));
|
||||||
});
|
});
|
||||||
@ -399,7 +399,7 @@
|
|||||||
// Health Monitors
|
// Health Monitors
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @name horizon.app.core.openstack-service-api.lbaasv2.getHealthMonitor
|
* @name horizon.app.core.openstack-service-api.nlbaasv2.getHealthMonitor
|
||||||
* @description
|
* @description
|
||||||
* Get a single pool health monitor by ID.
|
* Get a single pool health monitor by ID.
|
||||||
* @param {string} monitorId
|
* @param {string} monitorId
|
||||||
@ -407,14 +407,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function getHealthMonitor(monitorId) {
|
function getHealthMonitor(monitorId) {
|
||||||
return apiService.get('/api/lbaas/healthmonitors/' + monitorId + '/')
|
return apiService.get('/api/nlbaas/healthmonitors/' + monitorId + '/')
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to retrieve health monitor.'));
|
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
|
* @description
|
||||||
* Edit a health monitor
|
* Edit a health monitor
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -424,14 +424,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function editHealthMonitor(id, spec) {
|
function editHealthMonitor(id, spec) {
|
||||||
return apiService.put('/api/lbaas/healthmonitors/' + id + '/', spec)
|
return apiService.put('/api/nlbaas/healthmonitors/' + id + '/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to update health monitor.'));
|
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
|
* @description
|
||||||
* Delete a single health monitor by ID
|
* Delete a single health monitor by ID
|
||||||
* @param {string} id
|
* @param {string} id
|
||||||
@ -440,14 +440,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function deleteHealthMonitor(id, quiet) {
|
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 () {
|
return quiet ? promise : promise.error(function () {
|
||||||
toastService.add('error', gettext('Unable to delete health monitor.'));
|
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
|
* @description
|
||||||
* Create a new health monitor
|
* Create a new health monitor
|
||||||
* @param {object} spec
|
* @param {object} spec
|
||||||
@ -455,7 +455,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function createHealthMonitor(spec) {
|
function createHealthMonitor(spec) {
|
||||||
return apiService.post('/api/lbaas/healthmonitors/', spec)
|
return apiService.post('/api/nlbaas/healthmonitors/', spec)
|
||||||
.error(function () {
|
.error(function () {
|
||||||
toastService.add('error', gettext('Unable to create health monitor.'));
|
toastService.add('error', gettext('Unable to create health monitor.'));
|
||||||
});
|
});
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
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;
|
service = lbaasv2API;
|
||||||
}]));
|
}]));
|
||||||
|
|
||||||
@ -39,7 +39,7 @@
|
|||||||
{
|
{
|
||||||
func: 'getLoadBalancers',
|
func: 'getLoadBalancers',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/loadbalancers/',
|
path: '/api/nlbaas/loadbalancers/',
|
||||||
error: 'Unable to retrieve load balancers.',
|
error: 'Unable to retrieve load balancers.',
|
||||||
testInput: [ true ],
|
testInput: [ true ],
|
||||||
data: { params: { full: true } }
|
data: { params: { full: true } }
|
||||||
@ -47,7 +47,7 @@
|
|||||||
{
|
{
|
||||||
func: 'getLoadBalancer',
|
func: 'getLoadBalancer',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/loadbalancers/1234/',
|
path: '/api/nlbaas/loadbalancers/1234/',
|
||||||
error: 'Unable to retrieve load balancer.',
|
error: 'Unable to retrieve load balancer.',
|
||||||
testInput: [ '1234', true ],
|
testInput: [ '1234', true ],
|
||||||
data: { params: { full: true } }
|
data: { params: { full: true } }
|
||||||
@ -55,21 +55,21 @@
|
|||||||
{
|
{
|
||||||
func: 'deleteLoadBalancer',
|
func: 'deleteLoadBalancer',
|
||||||
method: 'delete',
|
method: 'delete',
|
||||||
path: '/api/lbaas/loadbalancers/1234/',
|
path: '/api/nlbaas/loadbalancers/1234/',
|
||||||
error: 'Unable to delete load balancer.',
|
error: 'Unable to delete load balancer.',
|
||||||
testInput: [ '1234' ]
|
testInput: [ '1234' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'getLoadBalancerStatusTree',
|
func: 'getLoadBalancerStatusTree',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/loadbalancers/1234/statuses/',
|
path: '/api/nlbaas/loadbalancers/1234/statuses/',
|
||||||
error: 'Unable to retrieve load balancer status tree.',
|
error: 'Unable to retrieve load balancer status tree.',
|
||||||
testInput: [ '1234' ]
|
testInput: [ '1234' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'getListeners',
|
func: 'getListeners',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/listeners/',
|
path: '/api/nlbaas/listeners/',
|
||||||
error: 'Unable to retrieve listeners.',
|
error: 'Unable to retrieve listeners.',
|
||||||
testInput: [ '1234' ],
|
testInput: [ '1234' ],
|
||||||
data: { params: { loadbalancerId: '1234' } }
|
data: { params: { loadbalancerId: '1234' } }
|
||||||
@ -77,14 +77,14 @@
|
|||||||
{
|
{
|
||||||
func: 'getListeners',
|
func: 'getListeners',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/listeners/',
|
path: '/api/nlbaas/listeners/',
|
||||||
data: {},
|
data: {},
|
||||||
error: 'Unable to retrieve listeners.'
|
error: 'Unable to retrieve listeners.'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'getListener',
|
func: 'getListener',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/listeners/1234/',
|
path: '/api/nlbaas/listeners/1234/',
|
||||||
data: { params: { includeChildResources: true } },
|
data: { params: { includeChildResources: true } },
|
||||||
error: 'Unable to retrieve listener.',
|
error: 'Unable to retrieve listener.',
|
||||||
testInput: [ '1234', true ]
|
testInput: [ '1234', true ]
|
||||||
@ -92,7 +92,7 @@
|
|||||||
{
|
{
|
||||||
func: 'getListener',
|
func: 'getListener',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/listeners/1234/',
|
path: '/api/nlbaas/listeners/1234/',
|
||||||
data: {},
|
data: {},
|
||||||
error: 'Unable to retrieve listener.',
|
error: 'Unable to retrieve listener.',
|
||||||
testInput: [ '1234', false ]
|
testInput: [ '1234', false ]
|
||||||
@ -100,7 +100,7 @@
|
|||||||
{
|
{
|
||||||
func: 'getPool',
|
func: 'getPool',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/pools/1234/',
|
path: '/api/nlbaas/pools/1234/',
|
||||||
data: { params: { includeChildResources: true } },
|
data: { params: { includeChildResources: true } },
|
||||||
error: 'Unable to retrieve pool.',
|
error: 'Unable to retrieve pool.',
|
||||||
testInput: [ '1234', true ]
|
testInput: [ '1234', true ]
|
||||||
@ -108,7 +108,7 @@
|
|||||||
{
|
{
|
||||||
func: 'getPool',
|
func: 'getPool',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/pools/1234/',
|
path: '/api/nlbaas/pools/1234/',
|
||||||
data: {},
|
data: {},
|
||||||
error: 'Unable to retrieve pool.',
|
error: 'Unable to retrieve pool.',
|
||||||
testInput: [ '1234', false ]
|
testInput: [ '1234', false ]
|
||||||
@ -116,28 +116,28 @@
|
|||||||
{
|
{
|
||||||
func: 'deletePool',
|
func: 'deletePool',
|
||||||
method: 'delete',
|
method: 'delete',
|
||||||
path: '/api/lbaas/pools/1234/',
|
path: '/api/nlbaas/pools/1234/',
|
||||||
error: 'Unable to delete pool.',
|
error: 'Unable to delete pool.',
|
||||||
testInput: [ '1234' ]
|
testInput: [ '1234' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'getMembers',
|
func: 'getMembers',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/pools/1234/members/',
|
path: '/api/nlbaas/pools/1234/members/',
|
||||||
error: 'Unable to retrieve members.',
|
error: 'Unable to retrieve members.',
|
||||||
testInput: [ '1234' ]
|
testInput: [ '1234' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'getMember',
|
func: 'getMember',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/pools/1234/members/5678/',
|
path: '/api/nlbaas/pools/1234/members/5678/',
|
||||||
error: 'Unable to retrieve member.',
|
error: 'Unable to retrieve member.',
|
||||||
testInput: [ '1234', '5678' ]
|
testInput: [ '1234', '5678' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'editMember',
|
func: 'editMember',
|
||||||
method: 'put',
|
method: 'put',
|
||||||
path: '/api/lbaas/pools/1234/members/5678/',
|
path: '/api/nlbaas/pools/1234/members/5678/',
|
||||||
error: 'Unable to update member.',
|
error: 'Unable to update member.',
|
||||||
data: { weight: 2 },
|
data: { weight: 2 },
|
||||||
testInput: [ '1234', '5678', { weight: 2 } ]
|
testInput: [ '1234', '5678', { weight: 2 } ]
|
||||||
@ -145,14 +145,14 @@
|
|||||||
{
|
{
|
||||||
func: 'getHealthMonitor',
|
func: 'getHealthMonitor',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
path: '/api/lbaas/healthmonitors/1234/',
|
path: '/api/nlbaas/healthmonitors/1234/',
|
||||||
error: 'Unable to retrieve health monitor.',
|
error: 'Unable to retrieve health monitor.',
|
||||||
testInput: [ '1234' ]
|
testInput: [ '1234' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'editHealthMonitor',
|
func: 'editHealthMonitor',
|
||||||
method: 'put',
|
method: 'put',
|
||||||
path: '/api/lbaas/healthmonitors/1234/',
|
path: '/api/nlbaas/healthmonitors/1234/',
|
||||||
error: 'Unable to update health monitor.',
|
error: 'Unable to update health monitor.',
|
||||||
data: { name: 'healthmonitor-1' },
|
data: { name: 'healthmonitor-1' },
|
||||||
testInput: [ '1234', { name: 'healthmonitor-1' } ]
|
testInput: [ '1234', { name: 'healthmonitor-1' } ]
|
||||||
@ -160,14 +160,14 @@
|
|||||||
{
|
{
|
||||||
func: 'deleteHealthMonitor',
|
func: 'deleteHealthMonitor',
|
||||||
method: 'delete',
|
method: 'delete',
|
||||||
path: '/api/lbaas/healthmonitors/1234/',
|
path: '/api/nlbaas/healthmonitors/1234/',
|
||||||
error: 'Unable to delete health monitor.',
|
error: 'Unable to delete health monitor.',
|
||||||
testInput: [ '1234' ]
|
testInput: [ '1234' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'createLoadBalancer',
|
func: 'createLoadBalancer',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
path: '/api/lbaas/loadbalancers/',
|
path: '/api/nlbaas/loadbalancers/',
|
||||||
error: 'Unable to create load balancer.',
|
error: 'Unable to create load balancer.',
|
||||||
data: { name: 'loadbalancer-1' },
|
data: { name: 'loadbalancer-1' },
|
||||||
testInput: [ { name: 'loadbalancer-1' } ]
|
testInput: [ { name: 'loadbalancer-1' } ]
|
||||||
@ -175,7 +175,7 @@
|
|||||||
{
|
{
|
||||||
func: 'editLoadBalancer',
|
func: 'editLoadBalancer',
|
||||||
method: 'put',
|
method: 'put',
|
||||||
path: '/api/lbaas/loadbalancers/1234/',
|
path: '/api/nlbaas/loadbalancers/1234/',
|
||||||
error: 'Unable to update load balancer.',
|
error: 'Unable to update load balancer.',
|
||||||
data: { name: 'loadbalancer-1' },
|
data: { name: 'loadbalancer-1' },
|
||||||
testInput: [ '1234', { name: 'loadbalancer-1' } ]
|
testInput: [ '1234', { name: 'loadbalancer-1' } ]
|
||||||
@ -183,7 +183,7 @@
|
|||||||
{
|
{
|
||||||
func: 'createListener',
|
func: 'createListener',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
path: '/api/lbaas/listeners/',
|
path: '/api/nlbaas/listeners/',
|
||||||
error: 'Unable to create listener.',
|
error: 'Unable to create listener.',
|
||||||
data: { name: 'listener-1' },
|
data: { name: 'listener-1' },
|
||||||
testInput: [ { name: 'listener-1' } ]
|
testInput: [ { name: 'listener-1' } ]
|
||||||
@ -191,7 +191,7 @@
|
|||||||
{
|
{
|
||||||
func: 'editListener',
|
func: 'editListener',
|
||||||
method: 'put',
|
method: 'put',
|
||||||
path: '/api/lbaas/listeners/1234/',
|
path: '/api/nlbaas/listeners/1234/',
|
||||||
error: 'Unable to update listener.',
|
error: 'Unable to update listener.',
|
||||||
data: { name: 'listener-1' },
|
data: { name: 'listener-1' },
|
||||||
testInput: [ '1234', { name: 'listener-1' } ]
|
testInput: [ '1234', { name: 'listener-1' } ]
|
||||||
@ -199,14 +199,14 @@
|
|||||||
{
|
{
|
||||||
func: 'deleteListener',
|
func: 'deleteListener',
|
||||||
method: 'delete',
|
method: 'delete',
|
||||||
path: '/api/lbaas/listeners/1234/',
|
path: '/api/nlbaas/listeners/1234/',
|
||||||
error: 'Unable to delete listener.',
|
error: 'Unable to delete listener.',
|
||||||
testInput: [ '1234' ]
|
testInput: [ '1234' ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
func: 'createPool',
|
func: 'createPool',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
path: '/api/lbaas/pools/',
|
path: '/api/nlbaas/pools/',
|
||||||
error: 'Unable to create pool.',
|
error: 'Unable to create pool.',
|
||||||
data: { name: 'pool-1' },
|
data: { name: 'pool-1' },
|
||||||
testInput: [ { name: 'pool-1' } ]
|
testInput: [ { name: 'pool-1' } ]
|
||||||
@ -214,7 +214,7 @@
|
|||||||
{
|
{
|
||||||
func: 'editPool',
|
func: 'editPool',
|
||||||
method: 'put',
|
method: 'put',
|
||||||
path: '/api/lbaas/pools/1234/',
|
path: '/api/nlbaas/pools/1234/',
|
||||||
error: 'Unable to update pool.',
|
error: 'Unable to update pool.',
|
||||||
data: { name: 'pool-1' },
|
data: { name: 'pool-1' },
|
||||||
testInput: [ '1234', { name: 'pool-1' } ]
|
testInput: [ '1234', { name: 'pool-1' } ]
|
||||||
@ -222,7 +222,7 @@
|
|||||||
{
|
{
|
||||||
func: 'createHealthMonitor',
|
func: 'createHealthMonitor',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
path: '/api/lbaas/healthmonitors/',
|
path: '/api/nlbaas/healthmonitors/',
|
||||||
error: 'Unable to create health monitor.',
|
error: 'Unable to create health monitor.',
|
||||||
data: { name: 'healthmonitor-1' },
|
data: { name: 'healthmonitor-1' },
|
||||||
testInput: [ { name: 'healthmonitor-1' } ]
|
testInput: [ { name: 'healthmonitor-1' } ]
|
||||||
@ -230,7 +230,7 @@
|
|||||||
{
|
{
|
||||||
func: 'updateMemberList',
|
func: 'updateMemberList',
|
||||||
method: 'put',
|
method: 'put',
|
||||||
path: '/api/lbaas/pools/1234/members/',
|
path: '/api/nlbaas/pools/1234/members/',
|
||||||
error: 'Unable to update member list.',
|
error: 'Unable to update member list.',
|
||||||
data: { name: 'member-1' },
|
data: { name: 'member-1' },
|
||||||
testInput: [ '1234', { name: 'member-1' } ]
|
testInput: [ '1234', { name: 'member-1' } ]
|
@ -17,13 +17,13 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors')
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.create', createService);
|
.factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create', createService);
|
||||||
|
|
||||||
createService.$inject = [
|
createService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$location',
|
'$location',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
'horizon.framework.util.q.extensions'
|
'horizon.framework.util.q.extensions'
|
||||||
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.createService
|
* @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.createService
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for creating a health monitor resource.
|
* Provides the service for creating a health monitor resource.
|
||||||
* @param $q The angular service for promises.
|
* @param $q The angular service for promises.
|
||||||
@ -47,7 +47,7 @@
|
|||||||
var loadbalancerId, listenerId, poolId, statePromise;
|
var loadbalancerId, listenerId, poolId, statePromise;
|
||||||
|
|
||||||
var create = workflowModal.init({
|
var create = workflowModal.init({
|
||||||
controller: 'CreateHealthMonitorWizardController',
|
controller: 'nLBaaSCreateHealthMonitorWizardController',
|
||||||
message: gettext('A new health monitor is being created.'),
|
message: gettext('A new health monitor is being created.'),
|
||||||
handle: onCreate,
|
handle: onCreate,
|
||||||
allowed: allowed
|
allowed: allowed
|
@ -38,7 +38,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('$uibModal', {
|
$provide.value('$uibModal', {
|
||||||
@ -59,7 +59,7 @@
|
|||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
$location = $injector.get('$location');
|
$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;
|
init = service.init;
|
||||||
loadBalancerState = $q.defer();
|
loadBalancerState = $q.defer();
|
||||||
}));
|
}));
|
@ -17,14 +17,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors')
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors')
|
||||||
.controller('CreateHealthMonitorWizardController', CreateHealthMonitorWizardController);
|
.controller('nLBaaSCreateHealthMonitorWizardController', CreateHealthMonitorWizardController);
|
||||||
|
|
||||||
CreateHealthMonitorWizardController.$inject = [
|
CreateHealthMonitorWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -32,14 +32,14 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller) {
|
beforeEach(inject(function ($controller) {
|
||||||
spyOn(model, 'initialize');
|
spyOn(model, 'initialize');
|
||||||
ctrl = $controller('CreateHealthMonitorWizardController', { $scope: scope });
|
ctrl = $controller('nLBaaSCreateHealthMonitorWizardController', { $scope: scope });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('defines the controller', function() {
|
it('defines the controller', function() {
|
@ -17,22 +17,22 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors')
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete', deleteService);
|
.factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete', deleteService);
|
||||||
|
|
||||||
deleteService.$inject = [
|
deleteService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$location',
|
'$location',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.framework.widgets.modal.deleteModalService',
|
'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.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.deleteService
|
* @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.deleteService
|
||||||
* @description
|
* @description
|
||||||
* Brings up the delete health monitor confirmation modal dialog.
|
* Brings up the delete health monitor confirmation modal dialog.
|
||||||
* On submit, deletes selected health monitor.
|
* On submit, deletes selected health monitor.
|
@ -52,7 +52,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
monitor = { id: '1', name: 'HealthMonitor1' };
|
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() {
|
deleteHealthMonitor: function() {
|
||||||
return makePromise();
|
return makePromise();
|
||||||
}
|
}
|
||||||
@ -80,13 +80,13 @@
|
|||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
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');
|
modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
|
||||||
$scope = $injector.get('$rootScope').$new();
|
$scope = $injector.get('$rootScope').$new();
|
||||||
$location = $injector.get('$location');
|
$location = $injector.get('$location');
|
||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
toast = $injector.get('horizon.framework.widgets.toast.service');
|
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'));
|
service.init('1', '2', '3', isActionable('active'));
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}));
|
}));
|
@ -17,20 +17,20 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors')
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit', editService);
|
.factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit', editService);
|
||||||
|
|
||||||
editService.$inject = [
|
editService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.editService
|
* @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.editService
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for editing a health monitor resource.
|
* Provides the service for editing a health monitor resource.
|
||||||
* @param $q The angular service for promises.
|
* @param $q The angular service for promises.
|
||||||
@ -45,7 +45,7 @@
|
|||||||
var statePromise;
|
var statePromise;
|
||||||
|
|
||||||
var edit = workflowModal.init({
|
var edit = workflowModal.init({
|
||||||
controller: 'EditHealthMonitorWizardController',
|
controller: 'nLBaaSEditHealthMonitorWizardController',
|
||||||
message: gettext('The health monitor has been updated.'),
|
message: gettext('The health monitor has been updated.'),
|
||||||
handle: handle,
|
handle: handle,
|
||||||
allowed: allowed
|
allowed: allowed
|
@ -38,7 +38,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('$uibModal', {
|
$provide.value('$uibModal', {
|
||||||
@ -59,7 +59,7 @@
|
|||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
$route = $injector.get('$route');
|
$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;
|
init = service.init;
|
||||||
loadBalancerState = $q.defer();
|
loadBalancerState = $q.defer();
|
||||||
}));
|
}));
|
@ -17,13 +17,13 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors')
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors')
|
||||||
.controller('EditHealthMonitorWizardController', EditHealthMonitorWizardController);
|
.controller('nLBaaSEditHealthMonitorWizardController', EditHealthMonitorWizardController);
|
||||||
|
|
||||||
EditHealthMonitorWizardController.$inject = [
|
EditHealthMonitorWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -32,14 +32,14 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller) {
|
beforeEach(inject(function ($controller) {
|
||||||
spyOn(model, 'initialize');
|
spyOn(model, 'initialize');
|
||||||
ctrl = $controller('EditHealthMonitorWizardController', { $scope: scope });
|
ctrl = $controller('nLBaaSEditHealthMonitorWizardController', { $scope: scope });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('defines the controller', function() {
|
it('defines the controller', function() {
|
@ -17,20 +17,20 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors')
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions',
|
.factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions',
|
||||||
rowActions);
|
rowActions);
|
||||||
|
|
||||||
rowActions.$inject = [
|
rowActions.$inject = [
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit',
|
'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit',
|
||||||
'horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete'
|
'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions
|
* @ngname horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for the health monitor row actions.
|
* Provides the service for the health monitor row actions.
|
@ -23,14 +23,14 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
var rowActionsService = $injector.get(
|
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();
|
actions = rowActionsService.init('1', '2', '3').actions();
|
||||||
var loadbalancerService = $injector.get(
|
var loadbalancerService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service');
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service');
|
||||||
spyOn(loadbalancerService, 'isActionable').and.returnValue(true);
|
spyOn(loadbalancerService, 'isActionable').and.returnValue(true);
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,12 +17,12 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors')
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors')
|
||||||
.controller('HealthMonitorDetailController', HealthMonitorDetailController);
|
.controller('nLBaaSHealthMonitorDetailController', HealthMonitorDetailController);
|
||||||
|
|
||||||
HealthMonitorDetailController.$inject = [
|
HealthMonitorDetailController.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions',
|
'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'$q'
|
'$q'
|
||||||
];
|
];
|
@ -45,7 +45,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createController() {
|
function createController() {
|
||||||
return $controller('HealthMonitorDetailController', {
|
return $controller('nLBaaSHealthMonitorDetailController', {
|
||||||
$routeParams: {
|
$routeParams: {
|
||||||
loadbalancerId: 'loadbalancerId',
|
loadbalancerId: 'loadbalancerId',
|
||||||
listenerId: 'listenerId',
|
listenerId: 'listenerId',
|
||||||
@ -61,7 +61,7 @@
|
|||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
apiFail = false;
|
apiFail = false;
|
||||||
@ -71,7 +71,7 @@
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function($injector) {
|
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, 'getHealthMonitor').and.callFake(fakeAPI);
|
||||||
spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI);
|
||||||
spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
|
||||||
@ -79,7 +79,7 @@
|
|||||||
$controller = $injector.get('$controller');
|
$controller = $injector.get('$controller');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should invoke lbaasv2 apis', function() {
|
it('should invoke nlbaasv2 apis', function() {
|
||||||
var ctrl = createController();
|
var ctrl = createController();
|
||||||
expect(lbaasv2API.getHealthMonitor).toHaveBeenCalledWith('healthmonitorId');
|
expect(lbaasv2API.getHealthMonitor).toHaveBeenCalledWith('healthmonitorId');
|
||||||
expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId');
|
expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId');
|
@ -1,5 +1,5 @@
|
|||||||
<div ng-controller="HealthMonitorDetailController as ctrl">
|
<div ng-controller="nLBaaSHealthMonitorDetailController as ctrl">
|
||||||
<detail-status loading="ctrl.loading" error="ctrl.error"></detail-status>
|
<nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
|
||||||
<div ng-if="!ctrl.loading && !ctrl.error">
|
<div ng-if="!ctrl.loading && !ctrl.error">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc overview
|
* @ngdoc overview
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.healthmonitors
|
* @ngname horizon.dashboard.project.nlbaasv2.healthmonitors
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the services and widgets required to support and display the project healthmonitors
|
* Provides the services and widgets required to support and display the project healthmonitors
|
||||||
@ -26,6 +26,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.healthmonitors', []);
|
.module('horizon.dashboard.project.nlbaasv2.healthmonitors', []);
|
||||||
|
|
||||||
})();
|
})();
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
describe('LBaaS v2 Healthmonitors Module', function() {
|
describe('LBaaS v2 Healthmonitors Module', function() {
|
||||||
it('should exist', function() {
|
it('should exist', function() {
|
||||||
expect(angular.module('horizon.dashboard.project.lbaasv2.healthmonitors')).toBeDefined();
|
expect(angular.module('horizon.dashboard.project.nlbaasv2.healthmonitors')).toBeDefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -17,23 +17,23 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners')
|
.module('horizon.dashboard.project.nlbaasv2.listeners')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.listeners.actions.batchActions',
|
.factory('horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions',
|
||||||
tableBatchActions);
|
tableBatchActions);
|
||||||
|
|
||||||
tableBatchActions.$inject = [
|
tableBatchActions.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$location',
|
'$location',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.delete'
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.delete'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.listeners.actions.batchActions
|
* @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for the Listeners table batch actions.
|
* Provides the service for the Listeners table batch actions.
|
||||||
@ -54,7 +54,7 @@
|
|||||||
var loadBalancerIsActionable, loadBalancerId;
|
var loadBalancerIsActionable, loadBalancerId;
|
||||||
|
|
||||||
var create = workflowModal.init({
|
var create = workflowModal.init({
|
||||||
controller: 'CreateListenerWizardController',
|
controller: 'nLBaaSCreateListenerWizardController',
|
||||||
message: gettext('A new listener is being created.'),
|
message: gettext('A new listener is being created.'),
|
||||||
handle: onCreate,
|
handle: onCreate,
|
||||||
allowed: canCreate
|
allowed: canCreate
|
@ -23,7 +23,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
var response = {
|
var response = {
|
||||||
@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
$provide.value('$uibModal', modal);
|
$provide.value('$uibModal', modal);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.loadbalancers.service', {
|
$provide.value('horizon.dashboard.project.nlbaasv2.loadbalancers.service', {
|
||||||
isActionable: function() {
|
isActionable: function() {
|
||||||
return $q.when();
|
return $q.when();
|
||||||
}
|
}
|
||||||
@ -61,7 +61,7 @@
|
|||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
var batchActionsService = $injector.get(
|
var batchActionsService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions');
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions');
|
||||||
actions = batchActionsService.init('1234').actions();
|
actions = batchActionsService.init('1234').actions();
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
}));
|
}));
|
@ -17,14 +17,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners')
|
.module('horizon.dashboard.project.nlbaasv2.listeners')
|
||||||
.controller('CreateListenerWizardController', CreateListenerWizardController);
|
.controller('nLBaaSCreateListenerWizardController', CreateListenerWizardController);
|
||||||
|
|
||||||
CreateListenerWizardController.$inject = [
|
CreateListenerWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -30,14 +30,14 @@
|
|||||||
var scope = {};
|
var scope = {};
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller) {
|
beforeEach(inject(function ($controller) {
|
||||||
spyOn(model, 'initialize');
|
spyOn(model, 'initialize');
|
||||||
ctrl = $controller('CreateListenerWizardController', { $scope: scope });
|
ctrl = $controller('nLBaaSCreateListenerWizardController', { $scope: scope });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('defines the controller', function() {
|
it('defines the controller', function() {
|
@ -17,15 +17,15 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners')
|
.module('horizon.dashboard.project.nlbaasv2.listeners')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.listeners.actions.delete', deleteService);
|
.factory('horizon.dashboard.project.nlbaasv2.listeners.actions.delete', deleteService);
|
||||||
|
|
||||||
deleteService.$inject = [
|
deleteService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$location',
|
'$location',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.framework.widgets.modal.deleteModalService',
|
'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.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.widgets.toast.service',
|
'horizon.framework.widgets.toast.service',
|
||||||
'horizon.framework.util.q.extensions',
|
'horizon.framework.util.q.extensions',
|
||||||
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.listeners.actions.deleteService
|
* @name horizon.dashboard.project.nlbaasv2.listeners.actions.deleteService
|
||||||
* @description
|
* @description
|
||||||
* Brings up the delete listeners confirmation modal dialog.
|
* Brings up the delete listeners confirmation modal dialog.
|
||||||
* On submit, deletes selected listeners.
|
* On submit, deletes selected listeners.
|
@ -43,7 +43,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
items = [{ id: '1', name: 'First' },
|
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() {
|
deleteListener: function() {
|
||||||
return makePromise();
|
return makePromise();
|
||||||
}
|
}
|
||||||
@ -72,14 +72,14 @@
|
|||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
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');
|
modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
|
||||||
$scope = $injector.get('$rootScope').$new();
|
$scope = $injector.get('$rootScope').$new();
|
||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
$location = $injector.get('$location');
|
$location = $injector.get('$location');
|
||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
toast = $injector.get('horizon.framework.widgets.toast.service');
|
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());
|
service.init('1', makePromise());
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,14 +17,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.controller('EditListenerWizardController', EditListenerWizardController);
|
.controller('nLBaaSEditListenerWizardController', EditListenerWizardController);
|
||||||
|
|
||||||
EditListenerWizardController.$inject = [
|
EditListenerWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'$q',
|
'$q',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -36,18 +36,18 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
|
workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller, $injector) {
|
beforeEach(inject(function ($controller, $injector) {
|
||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
scope = $injector.get('$rootScope').$new();
|
scope = $injector.get('$rootScope').$new();
|
||||||
scope.launchContext = { id: '1234' };
|
scope.launchContext = { id: '1234' };
|
||||||
spyOn(model, 'initialize').and.callThrough();
|
spyOn(model, 'initialize').and.callThrough();
|
||||||
ctrl = $controller('EditListenerWizardController', { $scope: scope });
|
ctrl = $controller('nLBaaSEditListenerWizardController', { $scope: scope });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('defines the controller', function() {
|
it('defines the controller', function() {
|
@ -17,24 +17,24 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners')
|
.module('horizon.dashboard.project.nlbaasv2.listeners')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.listeners.actions.rowActions',
|
.factory('horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
|
||||||
tableRowActions);
|
tableRowActions);
|
||||||
|
|
||||||
tableRowActions.$inject = [
|
tableRowActions.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.delete',
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.delete',
|
||||||
'horizon.dashboard.project.lbaasv2.pools.actions.create'
|
'horizon.dashboard.project.nlbaasv2.pools.actions.create'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.listeners.actions.rowActions
|
* @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for the Listener table row actions.
|
* Provides the service for the Listener table row actions.
|
||||||
@ -57,7 +57,7 @@
|
|||||||
var loadbalancerId, loadBalancerIsActionable;
|
var loadbalancerId, loadBalancerIsActionable;
|
||||||
|
|
||||||
var edit = workflowModal.init({
|
var edit = workflowModal.init({
|
||||||
controller: 'EditListenerWizardController',
|
controller: 'nLBaaSEditListenerWizardController',
|
||||||
message: gettext('The listener has been updated.'),
|
message: gettext('The listener has been updated.'),
|
||||||
handle: onEdit,
|
handle: onEdit,
|
||||||
allowed: canEdit
|
allowed: canEdit
|
@ -45,7 +45,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
var response = {
|
var response = {
|
||||||
@ -73,11 +73,11 @@
|
|||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
var rowActionsService = $injector.get(
|
var rowActionsService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions');
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions');
|
||||||
actions = rowActionsService.actions();
|
actions = rowActionsService.actions();
|
||||||
init = rowActionsService.init;
|
init = rowActionsService.init;
|
||||||
var loadbalancerService = $injector.get(
|
var loadbalancerService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service');
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service');
|
||||||
spyOn(loadbalancerService, 'isActionable').and.callFake(isActionableMock);
|
spyOn(loadbalancerService, 'isActionable').and.callFake(isActionableMock);
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,12 +17,12 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners')
|
.module('horizon.dashboard.project.nlbaasv2.listeners')
|
||||||
.controller('ListenerDetailController', ListenerDetailController);
|
.controller('nLBaaSListenerDetailController', ListenerDetailController);
|
||||||
|
|
||||||
ListenerDetailController.$inject = [
|
ListenerDetailController.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions',
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'$q'
|
'$q'
|
||||||
];
|
];
|
@ -45,7 +45,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createController() {
|
function createController() {
|
||||||
return $controller('ListenerDetailController', {
|
return $controller('nLBaaSListenerDetailController', {
|
||||||
$routeParams: {
|
$routeParams: {
|
||||||
loadbalancerId: 'loadbalancerId',
|
loadbalancerId: 'loadbalancerId',
|
||||||
listenerId: 'listenerId'
|
listenerId: 'listenerId'
|
||||||
@ -59,7 +59,7 @@
|
|||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
apiFail = false;
|
apiFail = false;
|
||||||
@ -70,13 +70,13 @@
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function($injector) {
|
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, 'getListener').and.callFake(fakeAPI);
|
||||||
spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(loadbalancerAPI);
|
spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(loadbalancerAPI);
|
||||||
$controller = $injector.get('$controller');
|
$controller = $injector.get('$controller');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should invoke lbaasv2 apis', function() {
|
it('should invoke nlbaasv2 apis', function() {
|
||||||
var ctrl = createController();
|
var ctrl = createController();
|
||||||
expect(lbaasv2API.getListener).toHaveBeenCalledWith('listenerId');
|
expect(lbaasv2API.getListener).toHaveBeenCalledWith('listenerId');
|
||||||
expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('loadbalancerId');
|
expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('loadbalancerId');
|
@ -1,5 +1,5 @@
|
|||||||
<div ng-controller="ListenerDetailController as ctrl">
|
<div ng-controller="nLBaaSListenerDetailController as ctrl">
|
||||||
<detail-status loading="ctrl.loading" error="ctrl.error"></detail-status>
|
<nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
|
||||||
<div ng-if="!ctrl.loading && !ctrl.error">
|
<div ng-if="!ctrl.loading && !ctrl.error">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc overview
|
* @ngdoc overview
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.listeners
|
* @ngname horizon.dashboard.project.nlbaasv2.listeners
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the services and widgets required to support and display the project listeners
|
* Provides the services and widgets required to support and display the project listeners
|
||||||
@ -26,6 +26,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners', []);
|
.module('horizon.dashboard.project.nlbaasv2.listeners', []);
|
||||||
|
|
||||||
})();
|
})();
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
describe('LBaaS v2 Listeners Module', function() {
|
describe('LBaaS v2 Listeners Module', function() {
|
||||||
it('should exist', function() {
|
it('should exist', function() {
|
||||||
expect(angular.module('horizon.dashboard.project.lbaasv2.listeners')).toBeDefined();
|
expect(angular.module('horizon.dashboard.project.nlbaasv2.listeners')).toBeDefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -17,14 +17,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.listeners')
|
.module('horizon.dashboard.project.nlbaasv2.listeners')
|
||||||
.controller('ListenersTableController', ListenersTableController);
|
.controller('nLBaaSListenersTableController', ListenersTableController);
|
||||||
|
|
||||||
ListenersTableController.$inject = [
|
ListenersTableController.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions',
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions'
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
@ -43,24 +43,24 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('$uibModal', {});
|
$provide.value('$uibModal', {});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function($injector) {
|
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');
|
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(
|
batchActions = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions');
|
'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions');
|
||||||
spyOn(rowActions, 'init').and.callFake(initMock);
|
spyOn(rowActions, 'init').and.callFake(initMock);
|
||||||
spyOn(lbaasv2API, 'getListeners').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getListeners').and.callFake(fakeAPI);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
function createController() {
|
function createController() {
|
||||||
return controller('ListenersTableController', {
|
return controller('nLBaaSListenersTableController', {
|
||||||
$routeParams: { loadbalancerId: '1234' }
|
$routeParams: { loadbalancerId: '1234' }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -80,7 +80,7 @@
|
|||||||
expect(ctrl.batchActions).toEqual(batchActions);
|
expect(ctrl.batchActions).toEqual(batchActions);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should invoke lbaasv2 apis', function() {
|
it('should invoke nlbaasv2 apis', function() {
|
||||||
var ctrl = createController();
|
var ctrl = createController();
|
||||||
expect(lbaasv2API.getListeners).toHaveBeenCalled();
|
expect(lbaasv2API.getListeners).toHaveBeenCalled();
|
||||||
expect(ctrl.src.length).toBe(1);
|
expect(ctrl.src.length).toBe(1);
|
@ -1,4 +1,4 @@
|
|||||||
<table ng-controller="ListenersTableController as table"
|
<table ng-controller="nLBaaSListenersTableController as table"
|
||||||
hz-table ng-cloak
|
hz-table ng-cloak
|
||||||
st-table="table.items"
|
st-table="table.items"
|
||||||
st-safe-src="table.src"
|
st-safe-src="table.src"
|
||||||
@ -112,7 +112,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr table-status table="table" column-count="7"></tr>
|
<tr nlbaas-table-status table="table" column-count="7"></tr>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
<!--
|
<!--
|
@ -17,8 +17,8 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.controller('AssociateFloatingIpModalController', AssociateFloatingIpModalController);
|
.controller('nLBaaSAssociateFloatingIpModalController', AssociateFloatingIpModalController);
|
||||||
|
|
||||||
AssociateFloatingIpModalController.$inject = [
|
AssociateFloatingIpModalController.$inject = [
|
||||||
'$uibModalInstance',
|
'$uibModalInstance',
|
@ -21,7 +21,7 @@
|
|||||||
var associateFail = false;
|
var associateFail = false;
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util.i18n'));
|
beforeEach(module('horizon.framework.util.i18n'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
floatingIps = [{ id: 'ip1', ip: '1', fixed_ip: '1' },
|
floatingIps = [{ id: 'ip1', ip: '1', fixed_ip: '1' },
|
||||||
@ -68,14 +68,14 @@
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
it('should define controller properties', function() {
|
it('should define controller properties', function() {
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
expect(ctrl.cancel).toBeDefined();
|
expect(ctrl.cancel).toBeDefined();
|
||||||
expect(ctrl.save).toBeDefined();
|
expect(ctrl.save).toBeDefined();
|
||||||
expect(ctrl.saving).toBe(false);
|
expect(ctrl.saving).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should initialize options', function() {
|
it('should initialize options', function() {
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
expect(ctrl.options.length).toBe(2);
|
expect(ctrl.options.length).toBe(2);
|
||||||
expect(ctrl.options[0].id).toBe('ip2');
|
expect(ctrl.options[0].id).toBe('ip2');
|
||||||
expect(ctrl.options[1].id).toBe('pool1');
|
expect(ctrl.options[1].id).toBe('pool1');
|
||||||
@ -84,7 +84,7 @@
|
|||||||
it('should use ids instead of ip or name if not provided', function() {
|
it('should use ids instead of ip or name if not provided', function() {
|
||||||
delete floatingIps[1].ip;
|
delete floatingIps[1].ip;
|
||||||
delete floatingIpPools[0].name;
|
delete floatingIpPools[0].name;
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
expect(ctrl.options.length).toBe(2);
|
expect(ctrl.options.length).toBe(2);
|
||||||
expect(ctrl.options[0].name).toBe('ip2');
|
expect(ctrl.options[0].name).toBe('ip2');
|
||||||
expect(ctrl.options[1].name).toBe('pool1');
|
expect(ctrl.options[1].name).toBe('pool1');
|
||||||
@ -92,19 +92,19 @@
|
|||||||
|
|
||||||
it('should initialize selected option when only one option', function() {
|
it('should initialize selected option when only one option', function() {
|
||||||
floatingIps[1].fixed_ip = '2';
|
floatingIps[1].fixed_ip = '2';
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
expect(ctrl.options.length).toBe(1);
|
expect(ctrl.options.length).toBe(1);
|
||||||
expect(ctrl.selected).toBe(ctrl.options[0]);
|
expect(ctrl.selected).toBe(ctrl.options[0]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not initialize selected option when more than one option', function() {
|
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.options.length).toBe(2);
|
||||||
expect(ctrl.selected).toBeNull();
|
expect(ctrl.selected).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should associate floating IP if floating IP selected', function() {
|
it('should associate floating IP if floating IP selected', function() {
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
ctrl.selected = ctrl.options[0];
|
ctrl.selected = ctrl.options[0];
|
||||||
spyOn(network, 'associateFloatingIp').and.callThrough();
|
spyOn(network, 'associateFloatingIp').and.callThrough();
|
||||||
spyOn($uibModalInstance, 'close');
|
spyOn($uibModalInstance, 'close');
|
||||||
@ -115,7 +115,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should allocate floating IP if floating IP pool selected', function() {
|
it('should allocate floating IP if floating IP pool selected', function() {
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
ctrl.selected = ctrl.options[1];
|
ctrl.selected = ctrl.options[1];
|
||||||
spyOn(network, 'allocateFloatingIp').and.callThrough();
|
spyOn(network, 'allocateFloatingIp').and.callThrough();
|
||||||
spyOn(network, 'associateFloatingIp').and.callThrough();
|
spyOn(network, 'associateFloatingIp').and.callThrough();
|
||||||
@ -128,14 +128,14 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should dismiss modal if cancel clicked', function() {
|
it('should dismiss modal if cancel clicked', function() {
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
spyOn($uibModalInstance, 'dismiss');
|
spyOn($uibModalInstance, 'dismiss');
|
||||||
ctrl.cancel();
|
ctrl.cancel();
|
||||||
expect($uibModalInstance.dismiss).toHaveBeenCalledWith('cancel');
|
expect($uibModalInstance.dismiss).toHaveBeenCalledWith('cancel');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not dismiss modal if save fails', function() {
|
it('should not dismiss modal if save fails', function() {
|
||||||
ctrl = $controller('AssociateFloatingIpModalController');
|
ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
|
||||||
ctrl.selected = ctrl.options[0];
|
ctrl.selected = ctrl.options[0];
|
||||||
associateFail = true;
|
associateFail = true;
|
||||||
spyOn($uibModalInstance, 'dismiss');
|
spyOn($uibModalInstance, 'dismiss');
|
@ -17,15 +17,15 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service',
|
.factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service',
|
||||||
modalService);
|
modalService);
|
||||||
|
|
||||||
modalService.$inject = [
|
modalService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$uibModal',
|
'$uibModal',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.dashboard.project.lbaasv2.basePath',
|
'horizon.dashboard.project.nlbaasv2.basePath',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.app.core.openstack-service-api.network',
|
'horizon.app.core.openstack-service-api.network',
|
||||||
'horizon.framework.util.q.extensions',
|
'horizon.framework.util.q.extensions',
|
||||||
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @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
|
* @description
|
||||||
* Provides the service for the Load Balancer Associate Floating IP action.
|
* Provides the service for the Load Balancer Associate Floating IP action.
|
||||||
@ -96,7 +96,7 @@
|
|||||||
function open(item) {
|
function open(item) {
|
||||||
var spec = {
|
var spec = {
|
||||||
backdrop: 'static',
|
backdrop: 'static',
|
||||||
controller: 'AssociateFloatingIpModalController as modal',
|
controller: 'nLBaaSAssociateFloatingIpModalController as modal',
|
||||||
templateUrl: basePath + 'loadbalancers/actions/associate-ip/modal.html',
|
templateUrl: basePath + 'loadbalancers/actions/associate-ip/modal.html',
|
||||||
resolve: {
|
resolve: {
|
||||||
loadbalancer: function() {
|
loadbalancer: function() {
|
@ -38,7 +38,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
item = { id: '1', name: 'First', floating_ip: {} };
|
item = { id: '1', name: 'First', floating_ip: {} };
|
||||||
@ -76,7 +76,7 @@
|
|||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
$uibModal = $injector.get('$uibModal');
|
$uibModal = $injector.get('$uibModal');
|
||||||
service = $injector.get(
|
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() {
|
it('should have the "allowed" and "perform" functions', function() {
|
@ -17,29 +17,29 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions',
|
.factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions',
|
||||||
tableBatchActions);
|
tableBatchActions);
|
||||||
|
|
||||||
tableBatchActions.$inject = [
|
tableBatchActions.$inject = [
|
||||||
'$location',
|
'$location',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.dashboard.project.lbaasv2.basePath',
|
'horizon.dashboard.project.nlbaasv2.basePath',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions
|
* @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for the Load Balancers table batch actions.
|
* Provides the service for the Load Balancers table batch actions.
|
||||||
*
|
*
|
||||||
* @param $location The angular $location service.
|
* @param $location The angular $location service.
|
||||||
* @param workflowModal The LBaaS workflow modal 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 deleteService The load balancer delete service.
|
||||||
* @param policy The horizon policy service.
|
* @param policy The horizon policy service.
|
||||||
* @param gettext The horizon gettext function for translation.
|
* @param gettext The horizon gettext function for translation.
|
||||||
@ -49,7 +49,7 @@
|
|||||||
function tableBatchActions($location, workflowModal, basePath, deleteService, policy, gettext) {
|
function tableBatchActions($location, workflowModal, basePath, deleteService, policy, gettext) {
|
||||||
|
|
||||||
var create = workflowModal.init({
|
var create = workflowModal.init({
|
||||||
controller: 'CreateLoadBalancerWizardController',
|
controller: 'nLBaaSCreateLoadBalancerWizardController',
|
||||||
message: gettext('A new load balancer is being created.'),
|
message: gettext('A new load balancer is being created.'),
|
||||||
handle: onCreate,
|
handle: onCreate,
|
||||||
allowed: canCreate
|
allowed: canCreate
|
@ -23,7 +23,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
var response = {
|
var response = {
|
||||||
@ -49,7 +49,7 @@
|
|||||||
$location = $injector.get('$location');
|
$location = $injector.get('$location');
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
var batchActionsService = $injector.get(
|
var batchActionsService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions');
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions');
|
||||||
actions = batchActionsService.actions();
|
actions = batchActionsService.actions();
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,13 +17,13 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.controller('CreateLoadBalancerWizardController', CreateLoadBalancerWizardController);
|
.controller('nLBaaSCreateLoadBalancerWizardController', CreateLoadBalancerWizardController);
|
||||||
|
|
||||||
CreateLoadBalancerWizardController.$inject = [
|
CreateLoadBalancerWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -30,14 +30,14 @@
|
|||||||
var scope = {};
|
var scope = {};
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller) {
|
beforeEach(inject(function ($controller) {
|
||||||
spyOn(model, 'initialize');
|
spyOn(model, 'initialize');
|
||||||
ctrl = $controller('CreateLoadBalancerWizardController', { $scope: scope });
|
ctrl = $controller('nLBaaSCreateLoadBalancerWizardController', { $scope: scope });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('defines the controller', function() {
|
it('defines the controller', function() {
|
@ -17,15 +17,15 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete', deleteService);
|
.factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete', deleteService);
|
||||||
|
|
||||||
deleteService.$inject = [
|
deleteService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$location',
|
'$location',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.framework.widgets.modal.deleteModalService',
|
'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.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.widgets.toast.service',
|
'horizon.framework.widgets.toast.service',
|
||||||
'horizon.framework.util.q.extensions',
|
'horizon.framework.util.q.extensions',
|
||||||
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.loadbalancers.actions.deleteService
|
* @name horizon.dashboard.project.nlbaasv2.loadbalancers.actions.deleteService
|
||||||
* @description
|
* @description
|
||||||
* Brings up the delete load balancers confirmation modal dialog.
|
* Brings up the delete load balancers confirmation modal dialog.
|
||||||
* On submit, deletes selected load balancers.
|
* On submit, deletes selected load balancers.
|
@ -43,7 +43,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
items = [{ id: '1', name: 'First', provisioning_status: 'ACTIVE' },
|
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() {
|
deleteLoadBalancer: function() {
|
||||||
return makePromise();
|
return makePromise();
|
||||||
}
|
}
|
||||||
@ -72,14 +72,14 @@
|
|||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
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');
|
modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
|
||||||
$scope = $injector.get('$rootScope').$new();
|
$scope = $injector.get('$rootScope').$new();
|
||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
$location = $injector.get('$location');
|
$location = $injector.get('$location');
|
||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
toast = $injector.get('horizon.framework.widgets.toast.service');
|
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() {
|
it('should have the "allowed" and "perform" functions', function() {
|
@ -17,9 +17,9 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.factory(
|
.factory(
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service',
|
||||||
modalService);
|
modalService);
|
||||||
|
|
||||||
modalService.$inject = [
|
modalService.$inject = [
|
||||||
@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @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
|
* @description
|
||||||
* Brings up the disassociate floating IP confirmation modal dialog.
|
* Brings up the disassociate floating IP confirmation modal dialog.
|
||||||
* On submit, dsiassociates the floating IP address from the load balancer.
|
* On submit, dsiassociates the floating IP address from the load balancer.
|
@ -38,7 +38,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
item = { id: '1', name: 'First', floating_ip: { id: 'ip1', ip: '1' } };
|
item = { id: '1', name: 'First', floating_ip: { id: 'ip1', ip: '1' } };
|
||||||
@ -71,7 +71,7 @@
|
|||||||
$scope = $injector.get('$rootScope').$new();
|
$scope = $injector.get('$rootScope').$new();
|
||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
service = $injector.get(
|
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() {
|
it('should have the "allowed" and "perform" functions', function() {
|
@ -17,13 +17,13 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.controller('EditLoadBalancerWizardController', EditLoadBalancerWizardController);
|
.controller('nLBaaSEditLoadBalancerWizardController', EditLoadBalancerWizardController);
|
||||||
|
|
||||||
EditLoadBalancerWizardController.$inject = [
|
EditLoadBalancerWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -30,15 +30,15 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
|
workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller) {
|
beforeEach(inject(function ($controller) {
|
||||||
spyOn(model, 'initialize');
|
spyOn(model, 'initialize');
|
||||||
ctrl = $controller('EditLoadBalancerWizardController', { $scope: scope });
|
ctrl = $controller('nLBaaSEditLoadBalancerWizardController', { $scope: scope });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('defines the controller', function() {
|
it('defines the controller', function() {
|
@ -17,17 +17,17 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions',
|
.factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions',
|
||||||
tableRowActions);
|
tableRowActions);
|
||||||
|
|
||||||
tableRowActions.$inject = [
|
tableRowActions.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-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.policy',
|
||||||
'horizon.app.core.openstack-service-api.network',
|
'horizon.app.core.openstack-service-api.network',
|
||||||
'horizon.framework.util.q.extensions',
|
'horizon.framework.util.q.extensions',
|
||||||
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions
|
* @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for the Load Balancers table row actions.
|
* Provides the service for the Load Balancers table row actions.
|
||||||
@ -67,7 +67,7 @@
|
|||||||
gettext
|
gettext
|
||||||
) {
|
) {
|
||||||
var edit = workflowModal.init({
|
var edit = workflowModal.init({
|
||||||
controller: 'EditLoadBalancerWizardController',
|
controller: 'nLBaaSEditLoadBalancerWizardController',
|
||||||
message: gettext('The load balancer has been updated.'),
|
message: gettext('The load balancer has been updated.'),
|
||||||
handle: onEdit,
|
handle: onEdit,
|
||||||
allowed: canEdit
|
allowed: canEdit
|
@ -37,7 +37,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
var response = {
|
var response = {
|
||||||
@ -64,7 +64,7 @@
|
|||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
rowActionsService = $injector.get(
|
rowActionsService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions');
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions');
|
||||||
actions = rowActionsService.actions();
|
actions = rowActionsService.actions();
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,13 +17,13 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.controller('LoadBalancerDetailController', LoadBalancerDetailController);
|
.controller('nLBaaSLoadBalancerDetailController', LoadBalancerDetailController);
|
||||||
|
|
||||||
LoadBalancerDetailController.$inject = [
|
LoadBalancerDetailController.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'$window',
|
'$window',
|
||||||
'$scope'
|
'$scope'
|
@ -32,7 +32,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createController() {
|
function createController() {
|
||||||
return $controller('LoadBalancerDetailController', {
|
return $controller('nLBaaSLoadBalancerDetailController', {
|
||||||
$scope: $scope,
|
$scope: $scope,
|
||||||
$window: $window,
|
$window: $window,
|
||||||
$routeParams: { loadbalancerId: '1234' }
|
$routeParams: { loadbalancerId: '1234' }
|
||||||
@ -45,7 +45,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
apiFail = false;
|
apiFail = false;
|
||||||
@ -53,14 +53,14 @@
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function($injector) {
|
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);
|
spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(fakeAPI);
|
||||||
$scope = $injector.get('$rootScope').$new();
|
$scope = $injector.get('$rootScope').$new();
|
||||||
$window = {};
|
$window = {};
|
||||||
$controller = $injector.get('$controller');
|
$controller = $injector.get('$controller');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should invoke lbaasv2 apis', function() {
|
it('should invoke nlbaasv2 apis', function() {
|
||||||
createController();
|
createController();
|
||||||
expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('1234', true);
|
expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('1234', true);
|
||||||
});
|
});
|
@ -1,5 +1,5 @@
|
|||||||
<div ng-controller="LoadBalancerDetailController as ctrl">
|
<div ng-controller="nLBaaSLoadBalancerDetailController as ctrl">
|
||||||
<detail-status loading="ctrl.loading" error="ctrl.error"></detail-status>
|
<nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
|
||||||
<div ng-if="!ctrl.loading && !ctrl.error">
|
<div ng-if="!ctrl.loading && !ctrl.error">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
||||||
@ -50,7 +50,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</tab>
|
</tab>
|
||||||
<tab heading="{$ 'Listeners' | translate $}" active="ctrl.listenersTabActive">
|
<tab heading="{$ 'Listeners' | translate $}" active="ctrl.listenersTabActive">
|
||||||
<ng-include src="'static/dashboard/project/lbaasv2/listeners/table.html'"></ng-include>
|
<ng-include src="'static/dashboard/project/nlbaasv2/listeners/table.html'"></ng-include>
|
||||||
</tab>
|
</tab>
|
||||||
</tabset>
|
</tabset>
|
||||||
</div>
|
</div>
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc overview
|
* @ngdoc overview
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.loadbalancers
|
* @ngname horizon.dashboard.project.nlbaasv2.loadbalancers
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the services and widgets required to support and display the project load
|
* Provides the services and widgets required to support and display the project load
|
||||||
@ -26,6 +26,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers', []);
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers', []);
|
||||||
|
|
||||||
})();
|
})();
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
describe('LBaaS v2 Load Balancers Module', function() {
|
describe('LBaaS v2 Load Balancers Module', function() {
|
||||||
it('should exist', function() {
|
it('should exist', function() {
|
||||||
expect(angular.module('horizon.dashboard.project.lbaasv2.loadbalancers')).toBeDefined();
|
expect(angular.module('horizon.dashboard.project.nlbaasv2.loadbalancers')).toBeDefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -17,18 +17,18 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.loadbalancers.service', loadBalancersService);
|
.factory('horizon.dashboard.project.nlbaasv2.loadbalancers.service', loadBalancersService);
|
||||||
|
|
||||||
loadBalancersService.$inject = [
|
loadBalancersService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @name horizon.dashboard.project.lbaasv2.loadbalancers.service
|
* @name horizon.dashboard.project.nlbaasv2.loadbalancers.service
|
||||||
* @description General service for LBaaS v2 load balancers.
|
* @description General service for LBaaS v2 load balancers.
|
||||||
* @param $q The angular service for promises.
|
* @param $q The angular service for promises.
|
||||||
* @param api The LBaaS V2 service API.
|
* @param api The LBaaS V2 service API.
|
||||||
@ -65,7 +65,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc method
|
* @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
|
* @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.
|
* allows for it or child resources to be updated or deleted.
|
||||||
* @param id The load balancer id.
|
* @param id The load balancer id.
|
@ -23,10 +23,10 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
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) {
|
getLoadBalancer: function(index) {
|
||||||
var loadbalancers = [{ provisioning_status: 'ACTIVE' },
|
var loadbalancers = [{ provisioning_status: 'ACTIVE' },
|
||||||
{ provisioning_status: 'PENDING_UPDATE' }];
|
{ provisioning_status: 'PENDING_UPDATE' }];
|
||||||
@ -42,7 +42,7 @@
|
|||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
$scope = $injector.get('$rootScope').$new();
|
$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() {
|
it('should define value mappings', function() {
|
@ -17,14 +17,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.loadbalancers')
|
.module('horizon.dashboard.project.nlbaasv2.loadbalancers')
|
||||||
.controller('LoadBalancersTableController', LoadBalancersTableController);
|
.controller('nLBaaSLoadBalancersTableController', LoadBalancersTableController);
|
||||||
|
|
||||||
LoadBalancersTableController.$inject = [
|
LoadBalancersTableController.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service'
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
@ -39,21 +39,21 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('$uibModal', {});
|
$provide.value('$uibModal', {});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function($injector) {
|
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');
|
controller = $injector.get('$controller');
|
||||||
scope = $injector.get('$rootScope').$new();
|
scope = $injector.get('$rootScope').$new();
|
||||||
spyOn(lbaasv2API, 'getLoadBalancers').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getLoadBalancers').and.callFake(fakeAPI);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
function createController() {
|
function createController() {
|
||||||
return controller('LoadBalancersTableController', { $scope: scope });
|
return controller('nLBaaSLoadBalancersTableController', { $scope: scope });
|
||||||
}
|
}
|
||||||
|
|
||||||
it('should initialize correctly', function() {
|
it('should initialize correctly', function() {
|
||||||
@ -69,7 +69,7 @@
|
|||||||
expect(ctrl.provisioningStatus).toBeDefined();
|
expect(ctrl.provisioningStatus).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should invoke lbaasv2 apis', function() {
|
it('should invoke nlbaasv2 apis', function() {
|
||||||
var ctrl = createController();
|
var ctrl = createController();
|
||||||
expect(lbaasv2API.getLoadBalancers).toHaveBeenCalled();
|
expect(lbaasv2API.getLoadBalancers).toHaveBeenCalled();
|
||||||
expect(ctrl.src.length).toBe(1);
|
expect(ctrl.src.length).toBe(1);
|
@ -1,6 +1,6 @@
|
|||||||
<hz-page-header header="{$ 'Load Balancers' | translate $}"></hz-page-header>
|
<hz-page-header header="{$ 'Load Balancers' | translate $}"></hz-page-header>
|
||||||
|
|
||||||
<table ng-controller="LoadBalancersTableController as table"
|
<table ng-controller="nLBaaSLoadBalancersTableController as table"
|
||||||
hz-table ng-cloak
|
hz-table ng-cloak
|
||||||
st-table="table.items"
|
st-table="table.items"
|
||||||
st-safe-src="table.src"
|
st-safe-src="table.src"
|
||||||
@ -143,7 +143,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr table-status table="table" column-count="9"></tr>
|
<tr nlbaas-table-status table="table" column-count="9"></tr>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
<!--
|
<!--
|
@ -17,19 +17,19 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.members.actions.batchActions',
|
.factory('horizon.dashboard.project.nlbaasv2.members.actions.batchActions',
|
||||||
tableBatchActions);
|
tableBatchActions);
|
||||||
|
|
||||||
tableBatchActions.$inject = [
|
tableBatchActions.$inject = [
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.update-member-list'
|
'horizon.dashboard.project.nlbaasv2.members.actions.update-member-list'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.pools.actions.batchActions
|
* @ngname horizon.dashboard.project.nlbaasv2.pools.actions.batchActions
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for the Members table batch actions.
|
* Provides the service for the Members table batch actions.
|
@ -23,7 +23,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
var response = {
|
var response = {
|
||||||
@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
var batchActionsService = $injector.get(
|
var batchActionsService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.batchActions');
|
'horizon.dashboard.project.nlbaasv2.members.actions.batchActions');
|
||||||
actions = batchActionsService.actions();
|
actions = batchActionsService.actions();
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,12 +17,12 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.controller('EditWeightModalController', EditWeightModalController);
|
.controller('nLBaaSEditWeightModalController', EditWeightModalController);
|
||||||
|
|
||||||
EditWeightModalController.$inject = [
|
EditWeightModalController.$inject = [
|
||||||
'$uibModalInstance',
|
'$uibModalInstance',
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
// Dependencies injected with resolve by $uibModal.open
|
// Dependencies injected with resolve by $uibModal.open
|
||||||
'poolId',
|
'poolId',
|
@ -27,7 +27,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util.i18n'));
|
beforeEach(module('horizon.framework.util.i18n'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('$uibModalInstance', {
|
$provide.value('$uibModalInstance', {
|
||||||
@ -39,7 +39,7 @@
|
|||||||
id: 'member1',
|
id: 'member1',
|
||||||
weight: 1
|
weight: 1
|
||||||
});
|
});
|
||||||
$provide.value('horizon.app.core.openstack-service-api.lbaasv2', {
|
$provide.value('horizon.app.core.openstack-service-api.nlbaasv2', {
|
||||||
editMember: function() {
|
editMember: function() {
|
||||||
return makePromise(fail);
|
return makePromise(fail);
|
||||||
}
|
}
|
||||||
@ -47,12 +47,12 @@
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
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');
|
$controller = $injector.get('$controller');
|
||||||
$uibModalInstance = $injector.get('$uibModalInstance');
|
$uibModalInstance = $injector.get('$uibModalInstance');
|
||||||
$scope = $injector.get('$rootScope').$new();
|
$scope = $injector.get('$rootScope').$new();
|
||||||
$q = $injector.get('$q');
|
$q = $injector.get('$q');
|
||||||
ctrl = $controller('EditWeightModalController');
|
ctrl = $controller('nLBaaSEditWeightModalController');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should define controller properties', function() {
|
it('should define controller properties', function() {
|
@ -17,15 +17,15 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.members.actions.edit-weight.modal.service',
|
.factory('horizon.dashboard.project.nlbaasv2.members.actions.edit-weight.modal.service',
|
||||||
modalService);
|
modalService);
|
||||||
|
|
||||||
modalService.$inject = [
|
modalService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$uibModal',
|
'$uibModal',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.dashboard.project.lbaasv2.basePath',
|
'horizon.dashboard.project.nlbaasv2.basePath',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.widgets.toast.service',
|
'horizon.framework.widgets.toast.service',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @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
|
* @description
|
||||||
* Provides the service for the pool member Edit Weight action.
|
* Provides the service for the pool member Edit Weight action.
|
||||||
@ -99,7 +99,7 @@
|
|||||||
function open(item) {
|
function open(item) {
|
||||||
var spec = {
|
var spec = {
|
||||||
backdrop: 'static',
|
backdrop: 'static',
|
||||||
controller: 'EditWeightModalController as modal',
|
controller: 'nLBaaSEditWeightModalController as modal',
|
||||||
templateUrl: basePath + 'members/actions/edit-weight/modal.html',
|
templateUrl: basePath + 'members/actions/edit-weight/modal.html',
|
||||||
resolve: {
|
resolve: {
|
||||||
poolId: function() {
|
poolId: function() {
|
@ -46,7 +46,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('$uibModal', {
|
$provide.value('$uibModal', {
|
||||||
@ -65,7 +65,7 @@
|
|||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
$uibModal = $injector.get('$uibModal');
|
$uibModal = $injector.get('$uibModal');
|
||||||
service = $injector.get(
|
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());
|
service.init('pool1', fakePromise());
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,18 +17,18 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.members.actions.rowActions', rowActions);
|
.factory('horizon.dashboard.project.nlbaasv2.members.actions.rowActions', rowActions);
|
||||||
|
|
||||||
rowActions.$inject = [
|
rowActions.$inject = [
|
||||||
'horizon.framework.util.i18n.gettext',
|
'horizon.framework.util.i18n.gettext',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.edit-weight.modal.service'
|
'horizon.dashboard.project.nlbaasv2.members.actions.edit-weight.modal.service'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.members.actions.rowActions
|
* @ngname horizon.dashboard.project.nlbaasv2.members.actions.rowActions
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for the pool members row actions.
|
* Provides the service for the pool members row actions.
|
@ -23,14 +23,14 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
var rowActionsService = $injector.get(
|
var rowActionsService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.rowActions');
|
'horizon.dashboard.project.nlbaasv2.members.actions.rowActions');
|
||||||
actions = rowActionsService.init('1', '2').actions();
|
actions = rowActionsService.init('1', '2').actions();
|
||||||
var loadbalancerService = $injector.get(
|
var loadbalancerService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service');
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service');
|
||||||
spyOn(loadbalancerService, 'isActionable').and.returnValue(true);
|
spyOn(loadbalancerService, 'isActionable').and.returnValue(true);
|
||||||
}));
|
}));
|
||||||
|
|
@ -17,21 +17,21 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.members.actions.update-member-list',
|
.factory('horizon.dashboard.project.nlbaasv2.members.actions.update-member-list',
|
||||||
updateMemberListService);
|
updateMemberListService);
|
||||||
|
|
||||||
updateMemberListService.$inject = [
|
updateMemberListService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.listeners.actions.updateMemberListService
|
* @name horizon.dashboard.project.nlbaasv2.listeners.actions.updateMemberListService
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for updating the list of pool members.
|
* Provides the service for updating the list of pool members.
|
||||||
* @param $q The angular service for promises.
|
* @param $q The angular service for promises.
|
||||||
@ -48,7 +48,7 @@
|
|||||||
var statePromise;
|
var statePromise;
|
||||||
|
|
||||||
var updateList = workflowModal.init({
|
var updateList = workflowModal.init({
|
||||||
controller: 'UpdateMemberListWizardController',
|
controller: 'nLBaaSUpdateMemberListWizardController',
|
||||||
message: gettext('The pool members have been updated.'),
|
message: gettext('The pool members have been updated.'),
|
||||||
handle: onUpdate,
|
handle: onUpdate,
|
||||||
allowed: allowed
|
allowed: allowed
|
@ -37,7 +37,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
var response = {
|
var response = {
|
||||||
@ -65,7 +65,7 @@
|
|||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
$route = $injector.get('$route');
|
$route = $injector.get('$route');
|
||||||
updateMemberListService = $injector.get(
|
updateMemberListService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.update-member-list');
|
'horizon.dashboard.project.nlbaasv2.members.actions.update-member-list');
|
||||||
init = updateMemberListService.init;
|
init = updateMemberListService.init;
|
||||||
defer = $q.defer();
|
defer = $q.defer();
|
||||||
}));
|
}));
|
@ -17,14 +17,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.controller('UpdateMemberListWizardController', UpdateMemberListWizardController);
|
.controller('nLBaaSUpdateMemberListWizardController', UpdateMemberListWizardController);
|
||||||
|
|
||||||
UpdateMemberListWizardController.$inject = [
|
UpdateMemberListWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -27,16 +27,16 @@
|
|||||||
var workflow = 'foo';
|
var workflow = 'foo';
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
|
workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller, $injector) {
|
beforeEach(inject(function ($controller, $injector) {
|
||||||
scope = $injector.get('$rootScope').$new();
|
scope = $injector.get('$rootScope').$new();
|
||||||
spyOn(model, 'initialize').and.callThrough();
|
spyOn(model, 'initialize').and.callThrough();
|
||||||
ctrl = $controller('UpdateMemberListWizardController', {
|
ctrl = $controller('nLBaaSUpdateMemberListWizardController', {
|
||||||
$scope: scope,
|
$scope: scope,
|
||||||
$routeParams: {loadbalancerId: 'loadbalancerId',
|
$routeParams: {loadbalancerId: 'loadbalancerId',
|
||||||
poolId: 'poolId'}});
|
poolId: 'poolId'}});
|
@ -17,16 +17,16 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.controller('MemberDetailController', MemberDetailController);
|
.controller('nLBaaSMemberDetailController', MemberDetailController);
|
||||||
|
|
||||||
MemberDetailController.$inject = [
|
MemberDetailController.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.rowActions',
|
'horizon.dashboard.project.nlbaasv2.members.actions.rowActions',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'$q',
|
'$q',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'horizon.dashboard.project.lbaasv2.members.service'
|
'horizon.dashboard.project.nlbaasv2.members.service'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
@ -45,7 +45,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createController() {
|
function createController() {
|
||||||
return $controller('MemberDetailController', {
|
return $controller('nLBaaSMemberDetailController', {
|
||||||
$routeParams: {
|
$routeParams: {
|
||||||
loadbalancerId: 'loadbalancerId',
|
loadbalancerId: 'loadbalancerId',
|
||||||
listenerId: 'listenerId',
|
listenerId: 'listenerId',
|
||||||
@ -61,7 +61,7 @@
|
|||||||
beforeEach(module('horizon.framework.widgets.toast'));
|
beforeEach(module('horizon.framework.widgets.toast'));
|
||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
apiFail = false;
|
apiFail = false;
|
||||||
@ -69,7 +69,7 @@
|
|||||||
|
|
||||||
$provide.value('$q', { all: qAll });
|
$provide.value('$q', { all: qAll });
|
||||||
$provide.value('$uibModal', {});
|
$provide.value('$uibModal', {});
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.members.actions.rowActions', {
|
$provide.value('horizon.dashboard.project.nlbaasv2.members.actions.rowActions', {
|
||||||
init: function() {
|
init: function() {
|
||||||
return {
|
return {
|
||||||
actions: 'member-actions'
|
actions: 'member-actions'
|
||||||
@ -79,9 +79,9 @@
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function($injector) {
|
beforeEach(inject(function($injector) {
|
||||||
lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
|
lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
|
||||||
actions = $injector.get('horizon.dashboard.project.lbaasv2.members.actions.rowActions');
|
actions = $injector.get('horizon.dashboard.project.nlbaasv2.members.actions.rowActions');
|
||||||
membersService = $injector.get('horizon.dashboard.project.lbaasv2.members.service');
|
membersService = $injector.get('horizon.dashboard.project.nlbaasv2.members.service');
|
||||||
spyOn(lbaasv2API, 'getMember').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getMember').and.callFake(fakeAPI);
|
||||||
spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI);
|
||||||
spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
|
||||||
@ -91,7 +91,7 @@
|
|||||||
$controller = $injector.get('$controller');
|
$controller = $injector.get('$controller');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should invoke lbaasv2 apis', function() {
|
it('should invoke nlbaasv2 apis', function() {
|
||||||
var ctrl = createController();
|
var ctrl = createController();
|
||||||
expect(lbaasv2API.getMember).toHaveBeenCalledWith('poolId','memberId');
|
expect(lbaasv2API.getMember).toHaveBeenCalledWith('poolId','memberId');
|
||||||
expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId');
|
expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId');
|
@ -1,5 +1,5 @@
|
|||||||
<div ng-controller="MemberDetailController as ctrl">
|
<div ng-controller="nLBaaSMemberDetailController as ctrl">
|
||||||
<detail-status loading="ctrl.loading" error="ctrl.error"></detail-status>
|
<nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
|
||||||
<div ng-if="!ctrl.loading && !ctrl.error">
|
<div ng-if="!ctrl.loading && !ctrl.error">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<ol class="breadcrumb">
|
<ol class="breadcrumb">
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc overview
|
* @ngdoc overview
|
||||||
* @ngname horizon.dashboard.project.lbaasv2.members
|
* @ngname horizon.dashboard.project.nlbaasv2.members
|
||||||
*
|
*
|
||||||
* @description
|
* @description
|
||||||
* Provides the services and widgets required to support and display the project members
|
* Provides the services and widgets required to support and display the project members
|
||||||
@ -26,6 +26,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members', []);
|
.module('horizon.dashboard.project.nlbaasv2.members', []);
|
||||||
|
|
||||||
})();
|
})();
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
describe('LBaaS v2 Members Module', function() {
|
describe('LBaaS v2 Members Module', function() {
|
||||||
it('should exist', function() {
|
it('should exist', function() {
|
||||||
expect(angular.module('horizon.dashboard.project.lbaasv2.members')).toBeDefined();
|
expect(angular.module('horizon.dashboard.project.nlbaasv2.members')).toBeDefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -17,16 +17,16 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.members.service', membersService);
|
.factory('horizon.dashboard.project.nlbaasv2.members.service', membersService);
|
||||||
|
|
||||||
membersService.$inject = [
|
membersService.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2'
|
'horizon.app.core.openstack-service-api.nlbaasv2'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc service
|
* @ngdoc service
|
||||||
* @name horizon.dashboard.project.lbaasv2.members.service
|
* @name horizon.dashboard.project.nlbaasv2.members.service
|
||||||
* @description General service for LBaaS v2 members.
|
* @description General service for LBaaS v2 members.
|
||||||
* @param api The LBaaS V2 service API.
|
* @param api The LBaaS V2 service API.
|
||||||
* @returns The members service.
|
* @returns The members service.
|
||||||
@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc method
|
* @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
|
* @description Associates the list of specified members with their corresponding statuses
|
||||||
* that are retrieved from the load balancer status tree.
|
* that are retrieved from the load balancer status tree.
|
||||||
* @param loadBalancerId The load balancer ID.
|
* @param loadBalancerId The load balancer ID.
|
@ -23,10 +23,10 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('horizon.app.core.openstack-service-api.lbaasv2', {
|
$provide.value('horizon.app.core.openstack-service-api.nlbaasv2', {
|
||||||
getLoadBalancerStatusTree: function() {
|
getLoadBalancerStatusTree: function() {
|
||||||
var deferred = $q.defer();
|
var deferred = $q.defer();
|
||||||
var response = {
|
var response = {
|
||||||
@ -76,7 +76,7 @@
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
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');
|
$q = $injector.get('$q');
|
||||||
scope = $injector.get('$rootScope').$new();
|
scope = $injector.get('$rootScope').$new();
|
||||||
}));
|
}));
|
@ -17,16 +17,16 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.members')
|
.module('horizon.dashboard.project.nlbaasv2.members')
|
||||||
.controller('MembersTableController', MembersTableController);
|
.controller('nLBaaSMembersTableController', MembersTableController);
|
||||||
|
|
||||||
MembersTableController.$inject = [
|
MembersTableController.$inject = [
|
||||||
'horizon.app.core.openstack-service-api.lbaasv2',
|
'horizon.app.core.openstack-service-api.nlbaasv2',
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.rowActions',
|
'horizon.dashboard.project.nlbaasv2.members.actions.rowActions',
|
||||||
'horizon.dashboard.project.lbaasv2.members.actions.batchActions',
|
'horizon.dashboard.project.nlbaasv2.members.actions.batchActions',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers.service',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
|
||||||
'horizon.dashboard.project.lbaasv2.members.service'
|
'horizon.dashboard.project.nlbaasv2.members.service'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
@ -40,21 +40,21 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
$provide.value('$uibModal', {});
|
$provide.value('$uibModal', {});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
beforeEach(inject(function($injector) {
|
beforeEach(inject(function($injector) {
|
||||||
lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
|
lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
|
||||||
membersService = $injector.get('horizon.dashboard.project.lbaasv2.members.service');
|
membersService = $injector.get('horizon.dashboard.project.nlbaasv2.members.service');
|
||||||
controller = $injector.get('$controller');
|
controller = $injector.get('$controller');
|
||||||
spyOn(lbaasv2API, 'getMembers').and.callFake(fakeAPI);
|
spyOn(lbaasv2API, 'getMembers').and.callFake(fakeAPI);
|
||||||
spyOn(membersService, 'associateMemberStatuses');
|
spyOn(membersService, 'associateMemberStatuses');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
function createController() {
|
function createController() {
|
||||||
return controller('MembersTableController', {
|
return controller('nLBaaSMembersTableController', {
|
||||||
$scope: scope,
|
$scope: scope,
|
||||||
$routeParams: {
|
$routeParams: {
|
||||||
loadbalancerId: 'loadbaancerId',
|
loadbalancerId: 'loadbaancerId',
|
||||||
@ -79,7 +79,7 @@
|
|||||||
expect(ctrl.provisioningStatus).toBeDefined();
|
expect(ctrl.provisioningStatus).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should invoke lbaasv2 apis', function() {
|
it('should invoke nlbaasv2 apis', function() {
|
||||||
var ctrl = createController();
|
var ctrl = createController();
|
||||||
expect(lbaasv2API.getMembers).toHaveBeenCalled();
|
expect(lbaasv2API.getMembers).toHaveBeenCalled();
|
||||||
expect(ctrl.src.length).toBe(1);
|
expect(ctrl.src.length).toBe(1);
|
@ -1,4 +1,4 @@
|
|||||||
<table ng-controller="MembersTableController as table"
|
<table ng-controller="nLBaaSMembersTableController as table"
|
||||||
hz-table ng-cloak
|
hz-table ng-cloak
|
||||||
st-table="table.items"
|
st-table="table.items"
|
||||||
st-safe-src="table.src"
|
st-safe-src="table.src"
|
||||||
@ -77,7 +77,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr table-status table="table" column-count="6"></tr>
|
<tr nlbaas-table-status table="table" column-count="6"></tr>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
<!--
|
<!--
|
@ -18,22 +18,22 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngdoc overview
|
* @ngdoc overview
|
||||||
* @name horizon.dashboard.project.lbaasv2
|
* @name horizon.dashboard.project.nlbaasv2
|
||||||
* @description
|
* @description
|
||||||
* The LBaaS v2 dashboard's top level module.
|
* The LBaaS v2 dashboard's top level module.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2', [
|
.module('horizon.dashboard.project.nlbaasv2', [
|
||||||
'ngRoute',
|
'ngRoute',
|
||||||
'horizon.dashboard.project.lbaasv2.loadbalancers',
|
'horizon.dashboard.project.nlbaasv2.loadbalancers',
|
||||||
'horizon.dashboard.project.lbaasv2.listeners',
|
'horizon.dashboard.project.nlbaasv2.listeners',
|
||||||
'horizon.dashboard.project.lbaasv2.pools',
|
'horizon.dashboard.project.nlbaasv2.pools',
|
||||||
'horizon.dashboard.project.lbaasv2.members',
|
'horizon.dashboard.project.nlbaasv2.members',
|
||||||
'horizon.dashboard.project.lbaasv2.healthmonitors'
|
'horizon.dashboard.project.nlbaasv2.healthmonitors'
|
||||||
])
|
])
|
||||||
.config(config)
|
.config(config)
|
||||||
.constant('horizon.dashboard.project.lbaasv2.patterns', {
|
.constant('horizon.dashboard.project.nlbaasv2.patterns', {
|
||||||
/* eslint-disable max-len */
|
/* 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]?))$',
|
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}))|:)))(%.+)?$',
|
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
|
// URL path - must start with "/" and can include anything after that
|
||||||
urlPath: /^((\/)|(\/[^/]+)+)$/
|
urlPath: /^((\/)|(\/[^/]+)+)$/
|
||||||
})
|
})
|
||||||
.constant('horizon.dashboard.project.lbaasv2.popovers', {
|
.constant('horizon.dashboard.project.nlbaasv2.popovers', {
|
||||||
ipAddresses: '<ul><li ng-repeat="addr in member.addresses">{$ addr.ip $}</li></ul>'
|
ipAddresses: '<ul><li ng-repeat="addr in member.addresses">{$ addr.ip $}</li></ul>'
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -54,8 +54,8 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
function config($provide, $windowProvider, $routeProvider) {
|
function config($provide, $windowProvider, $routeProvider) {
|
||||||
var basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/lbaasv2/';
|
var basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/nlbaasv2/';
|
||||||
$provide.constant('horizon.dashboard.project.lbaasv2.basePath', basePath);
|
$provide.constant('horizon.dashboard.project.nlbaasv2.basePath', basePath);
|
||||||
|
|
||||||
var loadbalancers = '/project/ngloadbalancersv2';
|
var loadbalancers = '/project/ngloadbalancersv2';
|
||||||
var listener = loadbalancers + '/:loadbalancerId/listeners/:listenerId';
|
var listener = loadbalancers + '/:loadbalancerId/listeners/:listenerId';
|
@ -18,17 +18,17 @@
|
|||||||
|
|
||||||
describe('LBaaS v2 Module', function () {
|
describe('LBaaS v2 Module', function () {
|
||||||
it('should be defined', 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 () {
|
describe('LBaaS v2 Module Base Path', function () {
|
||||||
var basePath, staticUrl;
|
var basePath, staticUrl;
|
||||||
|
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
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;
|
staticUrl = $injector.get('$window').STATIC_URL;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@ -37,18 +37,18 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should be correct', function () {
|
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 () {
|
describe('LBaaS v2 Module Constants', function () {
|
||||||
var patterns, popovers;
|
var patterns, popovers;
|
||||||
|
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(inject(function ($injector) {
|
beforeEach(inject(function ($injector) {
|
||||||
patterns = $injector.get('horizon.dashboard.project.lbaasv2.patterns');
|
patterns = $injector.get('horizon.dashboard.project.nlbaasv2.patterns');
|
||||||
popovers = $injector.get('horizon.dashboard.project.lbaasv2.popovers');
|
popovers = $injector.get('horizon.dashboard.project.nlbaasv2.popovers');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should define patterns', function () {
|
it('should define patterns', function () {
|
||||||
@ -95,12 +95,12 @@
|
|||||||
angular.module('configTest', [])
|
angular.module('configTest', [])
|
||||||
.config(function(_$routeProvider_, $windowProvider) {
|
.config(function(_$routeProvider_, $windowProvider) {
|
||||||
$routeProvider = _$routeProvider_;
|
$routeProvider = _$routeProvider_;
|
||||||
basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/lbaasv2/';
|
basePath = $windowProvider.$get().STATIC_URL + 'dashboard/project/nlbaasv2/';
|
||||||
spyOn($routeProvider, 'when').and.callThrough();
|
spyOn($routeProvider, 'when').and.callThrough();
|
||||||
});
|
});
|
||||||
module('ngRoute');
|
module('ngRoute');
|
||||||
module('configTest');
|
module('configTest');
|
||||||
module('horizon.dashboard.project.lbaasv2');
|
module('horizon.dashboard.project.nlbaasv2');
|
||||||
inject();
|
inject();
|
||||||
});
|
});
|
||||||
|
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* Load Balancer Wizard */
|
/* Load Balancer Wizard */
|
||||||
.lbaas-wizard {
|
.nlbaas-wizard {
|
||||||
|
|
||||||
/* Field widths for editable inputs in the members table */
|
/* Field widths for editable inputs in the members table */
|
||||||
table {
|
table {
|
||||||
@ -69,8 +69,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Progress indicator while data is loading */
|
/* Progress indicator while data is loading */
|
||||||
[table-status],
|
[nlbaas-table-status],
|
||||||
detail-status {
|
nlbaas-detail-status {
|
||||||
.progress {
|
.progress {
|
||||||
margin: 0px auto;
|
margin: 0px auto;
|
||||||
width: 25%;
|
width: 25%;
|
||||||
@ -80,7 +80,7 @@ detail-status {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
detail-status {
|
nlbaas-detail-status {
|
||||||
.progress {
|
.progress {
|
||||||
margin-top: 25vh;
|
margin-top: 25vh;
|
||||||
}
|
}
|
@ -17,13 +17,13 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.pools')
|
.module('horizon.dashboard.project.nlbaasv2.pools')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.pools.actions.create', createService);
|
.factory('horizon.dashboard.project.nlbaasv2.pools.actions.create', createService);
|
||||||
|
|
||||||
createService.$inject = [
|
createService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$location',
|
'$location',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.modal',
|
'horizon.dashboard.project.nlbaasv2.workflow.modal',
|
||||||
'horizon.app.core.openstack-service-api.policy',
|
'horizon.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.q.extensions',
|
'horizon.framework.util.q.extensions',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.listeners.actions.createService
|
* @name horizon.dashboard.project.nlbaasv2.listeners.actions.createService
|
||||||
* @description
|
* @description
|
||||||
* Provides the service for creating a pool resource.
|
* Provides the service for creating a pool resource.
|
||||||
* @param $q The angular service for promises.
|
* @param $q The angular service for promises.
|
||||||
@ -49,7 +49,7 @@
|
|||||||
var loadbalancerId, listenerId, statePromise;
|
var loadbalancerId, listenerId, statePromise;
|
||||||
|
|
||||||
var create = workflowModal.init({
|
var create = workflowModal.init({
|
||||||
controller: 'CreatePoolWizardController',
|
controller: 'nLBaaSCreatePoolWizardController',
|
||||||
message: gettext('A new pool is being created.'),
|
message: gettext('A new pool is being created.'),
|
||||||
handle: onCreate,
|
handle: onCreate,
|
||||||
allowed: allowed
|
allowed: allowed
|
@ -37,7 +37,7 @@
|
|||||||
beforeEach(module('horizon.framework.conf'));
|
beforeEach(module('horizon.framework.conf'));
|
||||||
beforeEach(module('horizon.framework.widgets'));
|
beforeEach(module('horizon.framework.widgets'));
|
||||||
beforeEach(module('horizon.app.core.openstack-service-api'));
|
beforeEach(module('horizon.app.core.openstack-service-api'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
|
|
||||||
beforeEach(module(function($provide) {
|
beforeEach(module(function($provide) {
|
||||||
var response = {
|
var response = {
|
||||||
@ -65,7 +65,7 @@
|
|||||||
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
policy = $injector.get('horizon.app.core.openstack-service-api.policy');
|
||||||
$location = $injector.get('$location');
|
$location = $injector.get('$location');
|
||||||
createPoolService = $injector.get(
|
createPoolService = $injector.get(
|
||||||
'horizon.dashboard.project.lbaasv2.pools.actions.create');
|
'horizon.dashboard.project.nlbaasv2.pools.actions.create');
|
||||||
init = createPoolService.init;
|
init = createPoolService.init;
|
||||||
defer = $q.defer();
|
defer = $q.defer();
|
||||||
}));
|
}));
|
@ -17,14 +17,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.pools')
|
.module('horizon.dashboard.project.nlbaasv2.pools')
|
||||||
.controller('CreatePoolWizardController', CreatePoolWizardController);
|
.controller('nLBaaSCreatePoolWizardController', CreatePoolWizardController);
|
||||||
|
|
||||||
CreatePoolWizardController.$inject = [
|
CreatePoolWizardController.$inject = [
|
||||||
'$scope',
|
'$scope',
|
||||||
'$routeParams',
|
'$routeParams',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.model',
|
'horizon.dashboard.project.nlbaasv2.workflow.model',
|
||||||
'horizon.dashboard.project.lbaasv2.workflow.workflow',
|
'horizon.dashboard.project.nlbaasv2.workflow.workflow',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
@ -32,14 +32,14 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
beforeEach(module('horizon.framework.util'));
|
beforeEach(module('horizon.framework.util'));
|
||||||
beforeEach(module('horizon.dashboard.project.lbaasv2'));
|
beforeEach(module('horizon.dashboard.project.nlbaasv2'));
|
||||||
beforeEach(module(function ($provide) {
|
beforeEach(module(function ($provide) {
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
|
||||||
$provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
|
$provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
|
||||||
}));
|
}));
|
||||||
beforeEach(inject(function ($controller) {
|
beforeEach(inject(function ($controller) {
|
||||||
spyOn(model, 'initialize');
|
spyOn(model, 'initialize');
|
||||||
ctrl = $controller('CreatePoolWizardController', { $scope: scope });
|
ctrl = $controller('nLBaaSCreatePoolWizardController', { $scope: scope });
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('defines the controller', function() {
|
it('defines the controller', function() {
|
@ -17,22 +17,22 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular
|
angular
|
||||||
.module('horizon.dashboard.project.lbaasv2.pools')
|
.module('horizon.dashboard.project.nlbaasv2.pools')
|
||||||
.factory('horizon.dashboard.project.lbaasv2.pools.actions.delete', deleteService);
|
.factory('horizon.dashboard.project.nlbaasv2.pools.actions.delete', deleteService);
|
||||||
|
|
||||||
deleteService.$inject = [
|
deleteService.$inject = [
|
||||||
'$q',
|
'$q',
|
||||||
'$location',
|
'$location',
|
||||||
'$route',
|
'$route',
|
||||||
'horizon.framework.widgets.modal.deleteModalService',
|
'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.app.core.openstack-service-api.policy',
|
||||||
'horizon.framework.util.i18n.gettext'
|
'horizon.framework.util.i18n.gettext'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ngDoc factory
|
* @ngDoc factory
|
||||||
* @name horizon.dashboard.project.lbaasv2.pools.actions.deleteService
|
* @name horizon.dashboard.project.nlbaasv2.pools.actions.deleteService
|
||||||
* @description
|
* @description
|
||||||
* Brings up the delete pool confirmation modal dialog.
|
* Brings up the delete pool confirmation modal dialog.
|
||||||
* On submit, deletes selected pool.
|
* On submit, deletes selected pool.
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user