mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed several problems in uci revealed by unit testing

Browse source
This commit is contained in:
Martin Schröder 2015-05-15 16:57:31 +02:00 • committed by Martin Schröder
parent 1b8877dced
commit 556e87a266
3 changed files with 244 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
luciexpress/htdocs/js/uci.js
View file

@ -80,6 +80,11 @@
"themes": { dvalue: [], type: Array },
"plugins": { dvalue: [], type: Array },
"languages": { dvalue: [], type: Array }
},
"test": { // used for unit testing!
"str": { dvalue: "", type: String },
"num": { dvalue: 0, type: Number },
"bool": { dvalue: false, type: Boolean }
}
},
"easybox": {
@ -101,7 +106,7 @@
"firewall": {
"defaults": {
"syn_flood": { dvalue: true, type: Boolean },
"intput": { dvalue: "ACCEPT", type: String },
"input": { dvalue: "ACCEPT", type: String },
"output": { dvalue: "ACCEPT", type: String },
"forward": { dvalue: "REJECT", type: String },
},
@ -134,7 +139,8 @@
"family": { dvalue: "ipv4", type: String },
"icmp_type": { dvalue: [], type: Array },
"enabled": { dvalue: true, type: Boolean },
"hidden": { dvalue: true, type: Boolean }
"hidden": { dvalue: true, type: Boolean },
"limit": { dvalue: "", type: String }
},
"settings": {
"disabled": { dvalue: false, type: Boolean },
@ -230,7 +236,7 @@
if(!(".type" in data)) throw new Error("Supplied object does not have required '.type' field!");
// try either <config>-<type> or just <type>
var sconfig = section_types[this[".config"][".name"]];
if((typeof sconfig) == "undefined") throw new Error("Type for config "+this[".config"][".name"]+" is undefined!");
if((typeof sconfig) == "undefined") throw new Error("Missing type definition for config "+this[".config"][".name"]+"!");
var type = sconfig[data[".type"]];
if(!type) {
console.error("Section.$update: unrecognized section type "+this[".config"][".name"]+"-"+data[".type"]);
@ -304,7 +310,10 @@
UCISection.prototype.$delete = function(){
var self = this;
if(self[".config"]) return self[".config"].$deleteSection(self);
var def = $.Deferred(); def.reject();
var def = $.Deferred();
setTimeout(function(){
def.reject();
}, 0);
return def.promise();
}
@ -341,6 +350,8 @@
self.uci = uci;
self[".name"] = name;
self["@all"] = [];
if(!name in section_types) throw new Error("Missing type definition for config "+name);
// set up slots for all known types of objects so we can reference them in widgets
Object.keys(section_types[name]||{}).map(function(type){
self["@"+type] = [];
@ -367,7 +378,7 @@
function _unlinkSection(self, section){
// NOTE: can not use filter() because we must edit the list in place
// in order to play well with controls that reference the list!
console.log("Removing local section: "+self[".name"]+"."+section[".name"]+" - "+section[".type"]);
console.log("Removing local section: "+self[".name"]+"."+section[".name"]+" of type "+section[".type"]);
var all = self["@all"];
for(var i = 0; i < all.length; i++){
if(all[i][".name"] === section[".name"]) {
@ -388,18 +399,42 @@
UCIConfig.prototype.$sync = function(){
var deferred = $.Deferred();
var self = this;
$rpc.uci.state({
config: self[".name"]
}).done(function(data){
var vals = data.values;
Object.keys(vals).map(function(k){
if(!(k in self)) _insertSection(self, vals[k]);
else _updateSection(self, vals[k]);
var to_delete = {};
Object.keys(self).map(function(x){
if(self[x].constructor == UCI.Section) to_delete[x] = self[x];
});
//console.log("To delete: "+Object.keys(to_delete));
$rpc.uci.rollback({
config: self[".name"],
ubus_rpc_session: $rpc.$sid()
}).done(function(){
$rpc.uci.state({
config: self[".name"]
}).done(function(data){
var vals = data.values;
Object.keys(vals).filter(function(x){
return vals[x][".type"] in section_types[self[".name"]];
}).map(function(k){
if(!(k in self)) _insertSection(self, vals[k]);
else _updateSection(self, vals[k]);
delete to_delete[k];
});
// now delete any section that no longer exists in our local cache
async.eachSeries(Object.keys(to_delete), function(x, next){
var section = to_delete[x];
//console.log("Would delete section "+section[".name"]+" of type "+section[".type"]);
_unlinkSection(self, section);
next();
}, function(){
deferred.resolve();
});
}).fail(function(){
deferred.reject();
});
deferred.resolve();
}).fail(function(){
deferred.reject();
deferred.reject("Could not revert config before sync!");
});
return deferred.promise();
}
@ -463,6 +498,14 @@
}
});
var deferred = $.Deferred();
if((".name" in item) && (item[".name"] in self)){ // section with specified name already exists
setTimeout(function(){
deferred.reject("Section with name "+item[".name"]+" already exists in config "+self[".name"]);
}, 0);
return deferred.promise();
}
console.log("Adding: "+item[".type"]+": "+JSON.stringify(values));
$rpc.uci.add({
"config": self[".name"],
@ -511,6 +554,10 @@
var cfigs = response.configs;
if(!cfigs) { next("could not retrieve list of configs!"); return; }
cfigs.map(function(k){
if(!(k in section_types)) {
console.log("Missing type definition for config "+k);
return;
}
if(!(k in self)){
//console.log("Adding new config "+k);
self[k] = new UCI.Config(self, k);
@ -528,19 +575,35 @@
if(!(name in this)) this[name] = new UCI.Config(this, name);
}
UCI.prototype.$eachConfig = function(cb){
var self = this;
Object.keys(self).filter(function(x){
return self[x].constructor == UCI.Config;
}).map(function(x){
cb(self[x]);
});
}
UCI.prototype.sync = function(configs){
var deferred = $.Deferred();
var self = this;
async.series([
function(next){
if(!(configs instanceof Array)) configs = [configs];
if(!configs || configs.length == 0) { next(); return; };
if(configs == undefined || configs.length == 0) {
// if no argument provided then we sync all configs
configs = Object.keys(self).filter(function(x){
return self[x].constructor == UCI.Config;
});
//next(); return;
} else if(!(configs instanceof Array)) {
configs = [configs];
}
async.eachSeries(configs, function(cf, next){
if(!(cf in self)) {
console.error("invalid config name "+cf);
next();
return;
throw new Error("invalid config name "+cf);
//next();
//return;
};
self[cf].$sync().done(function(){
console.log("Synched config "+cf);

3
luciexpress/share/acl.d/luci2.json
View file

@ -165,7 +165,8 @@
"dropbear",
"easybox",
"hosts",
"voice_client"
"voice_client",
"juci"
]
}
},

159
luciexpress/tests/test-uci.js Normal file
View file

@ -0,0 +1,159 @@
#!javascript
require("./lib-juci");
describe("UCI", function(){
beforeEach(function(done){
$uci.sync().done(function(){
done();
});
});
it("should have schema definition for each data field found in each defined uci config", function(done){
//$uci.sync().done(function(){
// get all configs that have been successfully loaded
var configs_map = {} ;
$uci.$eachConfig(function(cf){
configs_map[cf[".name"]] = cf;
});
// for each config, retreive the raw data using rpc and compare that all fields in rpc data are present in the uci data
async.eachSeries(Object.keys(configs_map), function(k, next){
console.log("Testing config "+k);
var cf = configs_map[k];
$rpc.uci.state({config: k}).done(function(result){
Object.keys(result.values).filter(function(x){
return x in cf;
}).map(function(name){
var values = result.values[name];
var section = cf[name];
console.log(".. testing section "+name+" of type "+section[".type"]);
expect(section).to.be.ok();
var type = section[".section_type"];
expect(type).to.be.ok();
Object.keys(values).filter(function(x){
return x.indexOf(".") != 0; // filter out hidden values
}).map(function(x){
expect(type).to.have.property(x);
});
});
next();
}).fail(function(){
throw new Error("Have not been able to retreive state for config "+k);
});
}, function(){
done();
});
//});
});
// deletes all sections that have type "test" from juci config and commits the changes
it("should be able to delete unused test sections in juci config", function(done){ // this is just to get to a known state, but we can do it as a test :)
$uci.sync("juci").done(function(){
expect($uci.juci["@test"]).to.be.an(Array);
var to_delete = $uci.juci["@test"].map(function(x){
return x;
});
// have to use a copy of the array because deletion modifies the array
async.eachSeries(to_delete, function(section, next){
expect(section).to.be.ok();
section.$delete().done(function(){
next();
}).fail(function(){
throw new Error("Was unable to delete section "+section[".name"]+" from config juci!");
});
}, function(){
expect($uci.juci["@test"]).to.be.empty();
$uci.save().done(function(){
done();
});
});
});
});
// will create an anonymous 'test' section and then delete it, commiting the changes
it("should be able to add and delete an anonymous section", function(done){
expect($uci.juci["@test"]).to.be.empty();
$uci.juci.create({".type": "test"}).done(function(section){
expect($uci.juci["@test"]).to.be.ok();
expect($uci.juci["@test"].length).not.to.be(0);
expect($uci.juci["@test"]).to.contain(section);
section.str.value = "test";
$uci.save().done(function(){
$uci.sync("juci").done(function(){
expect($uci.juci["@test"]).to.contain(section);
expect($uci.juci[section[".name"]]).to.be.ok();
expect($uci.juci[section[".name"]].str.value).to.eql("test");
section.$delete().done(function(){
expect(section[".name"]).to.be.ok();
expect($uci.juci[section[".name"]]).not.to.be.ok();
expect($uci.juci["@test"]).to.be.empty();
$uci.save().done(function(){
done();
}).fail(function(){
throw new Error("Was unable to save uci config after deleting section!");
});
}).fail(function(){
throw new Error("Deleting section has failed!");
});
}).fail(function(){
throw new Error("Was unable to sync config juci. Check that acl list on the server allows access to juci config!");
});
}).fail(function(){
throw new Error("Was unable to save newly created section in juci config!");
});
}).fail(function(){
throw new Error("Was unable to create section 'test' in config juci");
});
});
// will try to resync (old changes should be reverted also on the server)
it("should remove previously created section if resync is done without saving", function(done){
expect($uci.juci["@test"]).to.be.empty();
$uci.juci.create({".type": "test"}).done(function(section){
expect($uci.juci["@test"]).to.contain(section);
expect($uci.juci["@test"].length).to.be(1);
$uci.sync("juci").done(function(){
expect($uci.juci["@test"]).to.be.empty();
expect($uci.juci["@test"]).not.to.contain(section);
$uci.save().done(function(){ // this should not commit previulsy added section!
$uci.sync("juci").done(function(){
expect($uci.juci["@test"]).to.be.empty();
expect($uci.juci["@test"]).not.to.contain(section);
done();
});
});
}).fail(function(){
throw new Error("Was unable to sync config juci. Check that acl list on the server allows access to juci config!");
});
}).fail(function(){
throw new Error("Was unable to create section 'test' in config juci");
});
});
it("should be able to add a named section", function(done){
expect($uci.juci["@test"]).to.be.empty();
$uci.juci.create({".type": "test", ".name": "testname"}).done(function(section){
expect($uci.juci.testname).to.be.ok();
$uci.save().done(function(){
$uci.sync("juci").done(function(){
expect($uci.juci.testname).to.be.ok();
expect($uci.juci["@test"]).to.contain(section);
expect($uci.juci["@test"].length).to.be(1);
section.$delete().done(function(){
$uci.save().done(function(){
done();
});
});
});
});
}).fail(function(){
throw new Error("Could not create named section in juci config!");
});
});
it("should not be able to add a section that already exists", function(done){
expect($uci.juci["@test"]).to.be.empty();
$uci.juci.create({".type": "test", ".name": "testname"}).done(function(section){
$uci.juci.create({".type": "test", ".name": "testname"}).done(function(section){
throw new Error("Creating a section that already exists returned success when it should fail!");
}).fail(function(){
done();
});
}).fail(function(){
throw new Error("Failed to create section testname when it was supposed to work fine!");
});
});
});