openstack/octavia-dashboard
Code Issues Proposed changes

Merge "Handle a resource delete race condition"

Browse Source
This commit is contained in:
Zuul 2018-01-22 18:19:19 +00:00 committed by Gerrit Code Review
commit 245bbd0c06
10 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/details/detail.controller.js
View File

@ -93,6 +93,10 @@
// and failed item.
// Currently just refreshes the display each time.
if (result) {
if (result.failed.length === 0 && result.deleted.length > 0) {
// handle a race condition where the resource is already deleted
return;
}
spinnerService.showModalSpinner(gettext('Please Wait'));
ctrl.showDetails = false;
ctrl.context.loadPromise = ctrl.resourceType.load(ctrl.context.identifier);

14
octavia_dashboard/static/dashboard/project/lbaasv2/healthmonitors/details/detail.controller.spec.js
View File

@ -74,7 +74,7 @@
it('handles empty results', function() {
var result = $q.defer();
result.resolve({});
result.resolve({failed: [], deleted: []});
ctrl.resultHandler(result.promise);
$timeout.flush();
expect(ctrl.showDetails).not.toBe(true);
@ -91,13 +91,23 @@
it('handles matched results', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing'});
result.resolve({some: 'thing', failed: [], deleted: []});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(true);
});
it('handles delete race condition', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing', failed: [], deleted: [{id: 1}]});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(undefined);
});
});
});

4
octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.controller.js
View File

@ -89,6 +89,10 @@
// and failed item.
// Currently just refreshes the display each time.
if (result) {
if (result.failed.length === 0 && result.deleted.length > 0) {
// handle a race condition where the resource is already deleted
return;
}
spinnerService.showModalSpinner(gettext('Please Wait'));
ctrl.showDetails = false;
ctrl.context.loadPromise = ctrl.resourceType.load(ctrl.context.identifier);

14
octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.controller.spec.js
View File

@ -70,7 +70,7 @@
it('handles empty results', function() {
var result = $q.defer();
result.resolve({});
result.resolve({failed: [], deleted: []});
ctrl.resultHandler(result.promise);
$timeout.flush();
expect(ctrl.showDetails).not.toBe(true);
@ -87,13 +87,23 @@
it('handles matched results', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing'});
result.resolve({some: 'thing', failed: [], deleted: []});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(true);
});
it('handles delete race condition', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing', failed: [], deleted: [{id: 1}]});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(undefined);
});
});
});

4
octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/details/detail.controller.js
View File

@ -85,6 +85,10 @@
// and failed item.
// Currently just refreshes the display each time.
if (result) {
if (result.failed.length === 0 && result.deleted.length > 0) {
// handle a race condition where the resource is already deleted
return;
}
spinnerService.showModalSpinner(gettext('Please Wait'));
ctrl.showDetails = false;
ctrl.context.loadPromise = ctrl.resourceType.load(ctrl.context.identifier);

14
octavia_dashboard/static/dashboard/project/lbaasv2/loadbalancers/details/detail.controller.spec.js
View File

@ -68,7 +68,7 @@
it('handles empty results', function() {
var result = $q.defer();
result.resolve({});
result.resolve({failed: [], deleted: []});
ctrl.resultHandler(result.promise);
$timeout.flush();
expect(ctrl.showDetails).not.toBe(true);
@ -85,13 +85,23 @@
it('handles matched results', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing'});
result.resolve({some: 'thing', failed: [], deleted: []});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data', floating_ip: {}}});
$timeout.flush();
expect(ctrl.showDetails).toBe(true);
});
it('handles delete race condition', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing', failed: [], deleted: [{id: 1}]});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(undefined);
});
});
});

4
octavia_dashboard/static/dashboard/project/lbaasv2/members/details/detail.controller.js
View File

@ -94,6 +94,10 @@
// and failed item.
// Currently just refreshes the display each time.
if (result) {
if (result.failed.length === 0 && result.deleted.length > 0) {
// handle a race condition where the resource is already deleted
return;
}
spinnerService.showModalSpinner(gettext('Please Wait'));
ctrl.showDetails = false;
ctrl.context.loadPromise = ctrl.resourceType.load(

14
octavia_dashboard/static/dashboard/project/lbaasv2/members/details/detail.controller.spec.js
View File

@ -74,7 +74,7 @@
it('handles empty results', function() {
var result = $q.defer();
result.resolve({});
result.resolve({failed: [], deleted: []});
ctrl.resultHandler(result.promise);
$timeout.flush();
expect(ctrl.showDetails).not.toBe(true);
@ -91,13 +91,23 @@
it('handles matched results', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing'});
result.resolve({some: 'thing', failed: [], deleted: []});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(true);
});
it('handles delete race condition', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing', failed: [], deleted: [{id: 1}]});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(undefined);
});
});
});

4
octavia_dashboard/static/dashboard/project/lbaasv2/pools/details/detail.controller.js
View File

@ -95,6 +95,10 @@
// and failed item.
// Currently just refreshes the display each time.
if (result) {
if (result.failed.length === 0 && result.deleted.length > 0) {
// handle a race condition where the resource is already deleted
return;
}
spinnerService.showModalSpinner(gettext('Please Wait'));
ctrl.showDetails = false;
ctrl.context.loadPromise = ctrl.resourceType.load(ctrl.context.identifier);

14
octavia_dashboard/static/dashboard/project/lbaasv2/pools/details/detail.controller.spec.js
View File

@ -72,7 +72,7 @@
it('handles empty results', function() {
var result = $q.defer();
result.resolve({});
result.resolve({failed: [], deleted: []});
ctrl.resultHandler(result.promise);
$timeout.flush();
expect(ctrl.showDetails).not.toBe(true);
@ -89,13 +89,23 @@
it('handles matched results', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing'});
result.resolve({some: 'thing', failed: [], deleted: []});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(true);
});
it('handles delete race condition', function() {
spyOn(actionResultService, 'getIdsOfType').and.returnValue([1, 2, 3]);
var result = $q.defer();
result.resolve({some: 'thing', failed: [], deleted: [{id: 1}]});
ctrl.resultHandler(result.promise);
deferred.resolve({data: {some: 'data'}});
$timeout.flush();
expect(ctrl.showDetails).toBe(undefined);
});
});
});