openstack
/
deb-horizon
Code Issues Proposed changes

Merge "Prevent getServerGroups if the policy disallows it"

This commit is contained in:
Jenkins 2017-07-11 12:44:14 +00:00 committed by Gerrit Code Review
parent 73480118dc f93c546c14
commit 3d18b3f174
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
View File

@ -448,9 +448,9 @@
// Server Groups
function getServerGroups() {
if (policy.check(stepPolicy.serverGroups)) {
return novaAPI.getServerGroups().then(onGetServerGroups, noop);
}
policy.ifAllowed(stepPolicy.serverGroups).then(function() {
novaAPI.getServerGroups().then(onGetServerGroups, noop);
}, noop);
}
function onGetServerGroups(data) {

22
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
View File

@ -23,6 +23,7 @@
var cinderEnabled = false;
var neutronEnabled = false;
var novaExtensionsEnabled = false;
var ifAllowedResolve = true;
var novaApi = {
createServer: function(finalSpec) {
@ -268,8 +269,11 @@
ifAllowed: function() {
var deferred = $q.defer();
deferred.resolve();
if (ifAllowedResolve) {
deferred.resolve();
} else {
deferred.reject();
}
return deferred.promise;
},
check: function() {
@ -337,6 +341,7 @@
scope = $injector.get('$rootScope').$new();
glance = $injector.get('horizon.app.core.openstack-service-api.glance');
spyOn(glance, 'getNamespaces').and.callThrough();
spyOn(novaApi, 'getServerGroups').and.callThrough();
}));
describe('Initial object (pre-initialize)', function() {
@ -770,6 +775,19 @@
expect(model.cinderLimits.maxTotalVolumeGigabytes).toBe(1000);
});
it('should not fetch server groups if the policy does not allow it', function () {
ifAllowedResolve = false;
model.initialize(true);
scope.$apply();
expect(novaApi.getServerGroups.calls.count()).toBe(0);
});
it('should fetch server groups if the policy allows it', function () {
ifAllowedResolve = true;
model.initialize(true);
scope.$apply();
expect(novaApi.getServerGroups.calls.count()).toBe(1);
});
});
describe('Post Initialization Model - Initializing', function() {