openstack
/
neutron-lbaas-dashboard
Code Issues Proposed changes

Merge "Handle missing key-manager service in workflow"

This commit is contained in:
Jenkins 2016-03-07 23:04:25 +00:00 committed by Gerrit Code Review
parent d3c75ce034 f44671ca0e
commit 48ae48f04f
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,9 @@
neutronAPI.getSubnets().then(onGetSubnets),
neutronAPI.getPorts().then(onGetPorts),
novaAPI.getServers().then(onGetServers),
keymanagerPromise.then(prepareCertificates)
// The noop errback prevents this from tripping up $q.all since this is a case
// where we don't care if it fails, i.e. key-manager service doesn't exist.
keymanagerPromise.then(prepareCertificates, angular.noop)
]).then(initMemberAddresses);
model.context.submit = createLoadBalancer;
break;
@ -200,7 +202,7 @@
neutronAPI.getSubnets().then(onGetSubnets),
neutronAPI.getPorts().then(onGetPorts),
novaAPI.getServers().then(onGetServers),
keymanagerPromise.then(prepareCertificates)
keymanagerPromise.then(prepareCertificates, angular.noop)
]).then(initMemberAddresses);
model.context.submit = createListener;
break;
@ -419,11 +421,14 @@
model.members.length = 0;
var members = [];
angular.forEach(response.data.items, function addMember(server) {
members.push({
id: server.id,
name: server.name,
weight: 1
});
// If the server is in a state where it does not have an IP address then we can't use it
if (server.addresses && !angular.equals({}, server.addresses)) {
members.push({
id: server.id,
name: server.name,
weight: 1
});
}
});
push.apply(model.members, members);
}

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

@ -258,8 +258,9 @@
$provide.value('horizon.app.core.openstack-service-api.nova', {
getServers: function() {
var servers = [ { id: '1', name: 'server-1' },
{ id: '2', name: 'server-2' } ];
var servers = [ { id: '1', name: 'server-1', addresses: { foo: 'bar' } },
{ id: '2', name: 'server-2', addresses: { foo: 'bar' } },
{ id: '3', name: 'server-3' }];
var deferred = $q.defer();
deferred.resolve({ data: { items: servers } });