openstack
/
octavia-dashboard
Code Issues Proposed changes

Fix npm test 

Change-Id: I5fecf6a557558b11a7c1abcd25ffbffcd27f31ce
This commit is contained in:
Jacky Hu 2017-06-20 12:57:43 +08:00
parent 8b7bb910b2
commit 2224dc0f16
8 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_lbaas_dashboard/karma.conf.js
View File

@ -57,11 +57,13 @@ module.exports = function (config) {
toxPath + 'xstatic/pkg/angular/data/angular-cookies.js', toxPath + 'xstatic/pkg/angular/data/angular-cookies.js',
toxPath + 'xstatic/pkg/angular_bootstrap/data/angular-bootstrap.js', toxPath + 'xstatic/pkg/angular_bootstrap/data/angular-bootstrap.js',
toxPath + 'xstatic/pkg/angular_gettext/data/angular-gettext.js', toxPath + 'xstatic/pkg/angular_gettext/data/angular-gettext.js',
toxPath + 'xstatic/pkg/angular_fileupload/data/ng-file-upload-all.js',
toxPath + 'xstatic/pkg/angular/data/angular-sanitize.js', toxPath + 'xstatic/pkg/angular/data/angular-sanitize.js',
toxPath + 'xstatic/pkg/d3/data/d3.js', toxPath + 'xstatic/pkg/d3/data/d3.js',
toxPath + 'xstatic/pkg/rickshaw/data/rickshaw.js', toxPath + 'xstatic/pkg/rickshaw/data/rickshaw.js',
toxPath + 'xstatic/pkg/angular_smart_table/data/smart-table.js', toxPath + 'xstatic/pkg/angular_smart_table/data/smart-table.js',
toxPath + 'xstatic/pkg/angular_lrdragndrop/data/lrdragndrop.js', toxPath + 'xstatic/pkg/angular_lrdragndrop/data/lrdragndrop.js',
toxPath + 'xstatic/pkg/angular_schema_form/data/schema-form.js',
toxPath + 'xstatic/pkg/spin/data/spin.js', toxPath + 'xstatic/pkg/spin/data/spin.js',
toxPath + 'xstatic/pkg/spin/data/spin.jquery.js', toxPath + 'xstatic/pkg/spin/data/spin.jquery.js',

16
neutron_lbaas_dashboard/static/app/core/openstack-service-api/barbican.service.spec.js
View File

@ -37,16 +37,16 @@
var tests = [ var tests = [
{ {
"func": "getCertificates", func: "getCertificates",
"method": "get", method: "get",
"path": "/api/barbican/certificates/", path: "/api/barbican/certificates/",
"error": "Unable to retrieve SSL certificates." error: "Unable to retrieve SSL certificates."
}, },
{ {
"func": "getSecrets", func: "getSecrets",
"method": "get", method: "get",
"path": "/api/barbican/secrets/", path: "/api/barbican/secrets/",
"error": "Unable to retrieve secrets." error: "Unable to retrieve secrets."
} }
]; ];

6
neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.js
View File

@ -164,7 +164,7 @@
*/ */
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/lbaas/listeners/', params)
.error(function () { .error(function () {
toastService.add('error', gettext('Unable to retrieve listeners.')); toastService.add('error', gettext('Unable to retrieve listeners.'));
@ -183,7 +183,7 @@
function getListener(id, includeChildResources) { function getListener(id, includeChildResources) {
var params = includeChildResources var params = includeChildResources
? {'params': {'includeChildResources': includeChildResources}} ? {params: {includeChildResources: includeChildResources}}
: {}; : {};
return apiService.get('/api/lbaas/listeners/' + id + '/', params) return apiService.get('/api/lbaas/listeners/' + id + '/', params)
.error(function () { .error(function () {
@ -253,7 +253,7 @@
function getPool(id, includeChildResources) { function getPool(id, includeChildResources) {
var params = includeChildResources var params = includeChildResources
? {'params': {'includeChildResources': includeChildResources}} ? {params: {includeChildResources: includeChildResources}}
: {}; : {};
return apiService.get('/api/lbaas/pools/' + id + '/', params) return apiService.get('/api/lbaas/pools/' + id + '/', params)
.error(function () { .error(function () {

18
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/loadbalancers.service.js
View File

@ -38,18 +38,18 @@
function loadBalancersService($q, api, gettext) { function loadBalancersService($q, api, gettext) {
var operatingStatus = { var operatingStatus = {
'ONLINE': gettext('Online'), ONLINE: gettext('Online'),
'OFFLINE': gettext('Offline'), OFFLINE: gettext('Offline'),
'DEGRADED': gettext('Degraded'), DEGRADED: gettext('Degraded'),
'ERROR': gettext('Error') ERROR: gettext('Error')
}; };
var provisioningStatus = { var provisioningStatus = {
'ACTIVE': gettext('Active'), ACTIVE: gettext('Active'),
'PENDING_CREATE': gettext('Pending Create'), PENDING_CREATE: gettext('Pending Create'),
'PENDING_UPDATE': gettext('Pending Update'), PENDING_UPDATE: gettext('Pending Update'),
'PENDING_DELETE': gettext('Pending Delete'), PENDING_DELETE: gettext('Pending Delete'),
'ERROR': gettext('Error') ERROR: gettext('Error')
}; };
var service = { var service = {

6
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/pools/detail.controller.js
View File

@ -49,9 +49,9 @@
var ctrl = this; var ctrl = this;
ctrl.loadBalancerAlgorithm = { ctrl.loadBalancerAlgorithm = {
'ROUND_ROBIN': gettext('Round Robin'), ROUND_ROBIN: gettext('Round Robin'),
'LEAST_CONNECTIONS': gettext('Least Connections'), LEAST_CONNECTIONS: gettext('Least Connections'),
'SOURCE_IP': gettext('Source IP') SOURCE_IP: gettext('Source IP')
}; };
ctrl.actions = rowActions.init($routeParams.loadbalancerId, $routeParams.listenerId).actions; ctrl.actions = rowActions.init($routeParams.loadbalancerId, $routeParams.listenerId).actions;
ctrl.membersTabActive = $window.membersTabActive; ctrl.membersTabActive = $window.membersTabActive;

20
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js
View File

@ -184,15 +184,15 @@
} }
var promise = { var promise = {
'createloadbalancer': initCreateLoadBalancer, createloadbalancer: initCreateLoadBalancer,
'createlistener': initCreateListener, createlistener: initCreateListener,
'createpool': initCreatePool, createpool: initCreatePool,
'createmonitor': initCreateMonitor, createmonitor: initCreateMonitor,
'createmembers': initUpdateMemberList, createmembers: initUpdateMemberList,
'editloadbalancer': initEditLoadBalancer, editloadbalancer: initEditLoadBalancer,
'editlistener': initEditListener, editlistener: initEditListener,
'editpool': initEditPool, editpool: initEditPool,
'editmonitor': initEditMonitor editmonitor: initEditMonitor
}[type](keymanagerPromise); }[type](keymanagerPromise);
return promise.then(onInitSuccess, onInitFail); return promise.then(onInitSuccess, onInitFail);
@ -529,7 +529,7 @@
member.address = member.addresses[0]; member.address = member.addresses[0];
if (model.spec.pool.protocol) { if (model.spec.pool.protocol) {
member.port = {'HTTP': 80}[model.spec.pool.protocol]; member.port = {HTTP: 80}[model.spec.pool.protocol];
} }
}); });
} }

24
package.json
View File

@ -6,19 +6,19 @@
"repository": "none", "repository": "none",
"license": "Apache 2.0", "license": "Apache 2.0",
"devDependencies": { "devDependencies": {
"eslint": "1.2.1", "eslint": "1.10.3",
"eslint-config-openstack": "1.2.3", "eslint-config-openstack": "1.2.4",
"eslint-plugin-angular": "0.15.0", "eslint-plugin-angular": "1.0.1",
"jasmine-core": "2.2.0", "jasmine-core": "2.4.1",
"karma": "0.12.31", "karma": "1.1.2",
"karma-chrome-launcher": "0.1.8", "karma-chrome-launcher": "1.0.1",
"karma-cli": "0.0.4", "karma-cli": "1.0.1",
"karma-coverage": "0.3.1", "karma-coverage": "1.1.1",
"karma-jasmine": "0.3.5", "karma-jasmine": "1.0.2",
"karma-ng-html2js-preprocessor": "0.1.2", "karma-ng-html2js-preprocessor": "1.0.0",
"karma-phantomjs-launcher": "0.2.0", "karma-phantomjs-launcher": "1.0.4",
"karma-threshold-reporter": "0.1.15", "karma-threshold-reporter": "0.1.15",
"phantomjs": "1.9.17" "phantomjs-prebuilt": "2.1.14"
}, },
"scripts": { "scripts": {
"postinstall": "neutron_lbaas_dashboard/post_install.sh", "postinstall": "neutron_lbaas_dashboard/post_install.sh",