Skip to content

Commit

Permalink
fix (azure-iothub): Added the property moduleContent #675. (#676)
Browse files Browse the repository at this point in the history 
Add property moduleContent to ConfigurationContent interface.
  • Loading branch information
@anthonyvercolano
anthonyvercolano authored Jan 16, 2020
1 parent 445d19f commit 26063a3
Show file tree
Hide file tree
Showing 3 changed files with 198 additions and 189 deletions.
376 changes: 189 additions & 187 deletions e2etests/test/configurations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,207 +19,209 @@ var registry = Registry.fromConnectionString(hubConnectionString);
// 1) Test of applyConfigurationContentToDevice (because we can't create an edgeHub device)
// 2) Test to verify that config applies to device based on targetCondition (because the test hasn't been written)
//
describe('device configuration', function() {
var deviceConfig;
['module', 'device'].forEach((entity) => {
describe(entity + ' configuration', function() {
var config;

this.timeout(46000);
this.timeout(46000);

beforeEach(function() {
deviceConfig = {
id: 'node_e2e_' + uuid.v4(),
content: {
deviceContent: {
'properties.desired': {
prop1: 'foo'
beforeEach(function() {
let propertyName = entity + 'Content';
config = {
id: 'node_e2e_' + entity + '_' + uuid.v4(),
content: {
[propertyName]: {
'properties.desired': {
prop1: 'foo'
}
}
}
},
targetCondition: '',
priority: 20
};
debug('using configuration id ' + deviceConfig.id + ' for this test');
});

afterEach(function(done) {
if (deviceConfig && deviceConfig.id) {
var id = deviceConfig.id;
deviceConfig = null;
debug('(afterEach) removing configuration with id ' + id);
registry.removeConfiguration(id, function(err) {
debug(getErrorDetailString('(afterEach: ignoring error) removeConfiguration', err));
// ignore errors. Test may not have created the config, or it may already be deleted
done();
});
}
});
},
targetCondition: '',
priority: 20
};
debug('using configuration id ' + config.id + ' for this test');
});

it ('can add and find it by id', function(done) {
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + deviceConfig.id);
registry.addConfiguration(deviceConfig, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
});
},
function findConfig(callback) {
debug('getting configuration with id ' + deviceConfig.id);
registry.getConfiguration(deviceConfig.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
callback(err);
} else {
assert.strictEqual(foundConfig.id, deviceConfig.id);
assert.deepEqual(foundConfig.content, deviceConfig.content);
callback();
}
afterEach(function(done) {
if (config && config.id) {
var id = config.id;
config = null;
debug('(afterEach) removing configuration with id ' + id);
registry.removeConfiguration(id, function(err) {
debug(getErrorDetailString('(afterEach: ignoring error) removeConfiguration', err));
// ignore errors. Test may not have created the config, or it may already be deleted
done();
});
}
], done);
});
});

it ('can add a config and see it in the list of all configs', function(done) {
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + deviceConfig.id);
registry.addConfiguration(deviceConfig, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
});
},
function findConfig(callback) {
debug('getting all configurations');
registry.getConfigurations(function(err, foundConfigs) {
debug(getErrorDetailString('getConfigurations', err));
if (err) {
it ('can add and find it by id', function(done) {
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + config.id);
registry.addConfiguration(config, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
} else {
debug(foundConfigs.length.toString() + ' configurations on hub');
debug(JSON.stringify(foundConfigs, null, ' '));
var found = false;
foundConfigs.forEach(function(foundConfig) {
if (foundConfig.id === deviceConfig.id) {
assert.strictEqual(foundConfig.id, deviceConfig.id);
assert.deepEqual(foundConfig.content, deviceConfig.content);
found = true;
}
});
assert(found, 'config was not found');
callback();
}
});
}
], done);
});
});
},
function findConfig(callback) {
debug('getting configuration with id ' + config.id);
registry.getConfiguration(config.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
callback(err);
} else {
assert.strictEqual(foundConfig.id, config.id);
assert.deepEqual(foundConfig.content, config.content);
callback();
}
});
}
], done);
});

it ('can add and update a config', function(done) {
var newPriority = 99;
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + deviceConfig.id);
registry.addConfiguration(deviceConfig, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
});
},
function updateConfig(callback) {
debug('Preparing for update. Getting configuration with id ' + deviceConfig.id);
registry.getConfiguration(deviceConfig.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
it ('can add a config and see it in the list of all configs', function(done) {
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + config.id);
registry.addConfiguration(config, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
} else {
debug('Updating configuration with id ' + deviceConfig.id + ' to priority ' + newPriority);
foundConfig.priority = newPriority;
registry.updateConfiguration(foundConfig, function(err) {
debug(getErrorDetailString('updateConfiguration', err));
});
},
function findConfig(callback) {
debug('getting all configurations');
registry.getConfigurations(function(err, foundConfigs) {
debug(getErrorDetailString('getConfigurations', err));
if (err) {
callback(err);
});
}
});
},
function verifyUpdate(callback) {
debug('Verifying update. Getting configuration with id ' + deviceConfig.id);
registry.getConfiguration(deviceConfig.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
} else {
debug(foundConfigs.length.toString() + ' configurations on hub');
debug(JSON.stringify(foundConfigs, null, ' '));
var found = false;
foundConfigs.forEach(function(foundConfig) {
if (foundConfig.id === config.id) {
assert.strictEqual(foundConfig.id, config.id);
assert.deepEqual(foundConfig.content, config.content);
found = true;
}
});
assert(found, 'config was not found');
callback();
}
});
}
], done);
});

it ('can add and update a config', function(done) {
var newPriority = 99;
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + config.id);
registry.addConfiguration(config, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
} else {
assert.strictEqual(foundConfig.priority, newPriority);
callback();
}
});
}
], done);
});
});
},
function updateConfig(callback) {
debug('Preparing for update. Getting configuration with id ' + config.id);
registry.getConfiguration(config.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
callback(err);
} else {
debug('Updating configuration with id ' + config.id + ' to priority ' + newPriority);
foundConfig.priority = newPriority;
registry.updateConfiguration(foundConfig, function(err) {
debug(getErrorDetailString('updateConfiguration', err));
callback(err);
});
}
});
},
function verifyUpdate(callback) {
debug('Verifying update. Getting configuration with id ' + config.id);
registry.getConfiguration(config.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
callback(err);
} else {
assert.strictEqual(foundConfig.priority, newPriority);
callback();
}
});
}
], done);
});

it ('can add and force-update a config', function(done) {
var newPriority = 99;
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + deviceConfig.id);
registry.addConfiguration(deviceConfig, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
});
},
function updateConfig(callback) {
deviceConfig.priority = newPriority;
debug('Updating configuration with id ' + deviceConfig.id + ' to priority ' + newPriority);
registry.updateConfiguration(deviceConfig, true, function(err) {
debug(getErrorDetailString('updateConfiguration', err));
callback(err);
});
},
function verifyUpdate(callback) {
debug('Verifying update. Getting configuration with id ' + deviceConfig.id);
registry.getConfiguration(deviceConfig.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
it ('can add and force-update a config', function(done) {
var newPriority = 99;
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + config.id);
registry.addConfiguration(config, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
} else {
assert.strictEqual(foundConfig.priority, newPriority);
callback();
}
});
}
], done);
});
});
},
function updateConfig(callback) {
config.priority = newPriority;
debug('Updating configuration with id ' + config.id + ' to priority ' + newPriority);
registry.updateConfiguration(config, true, function(err) {
debug(getErrorDetailString('updateConfiguration', err));
callback(err);
});
},
function verifyUpdate(callback) {
debug('Verifying update. Getting configuration with id ' + config.id);
registry.getConfiguration(config.id, function(err, foundConfig) {
debug(getErrorDetailString('getConfiguration', err));
if (err) {
callback(err);
} else {
assert.strictEqual(foundConfig.priority, newPriority);
callback();
}
});
}
], done);
});

it ('can add and delete a config', function(done) {
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + deviceConfig.id);
registry.addConfiguration(deviceConfig, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
});
},
function verifyConfigWasAdded(callback) {
debug('verifying existence of config with id ' + deviceConfig.id);
registry.getConfiguration(deviceConfig.id, function(err) {
debug(getErrorDetailString('getConfiguration', err));
callback(err);
});
},
function removeConfig(callback) {
debug('removing configuration with id ' + deviceConfig.id);
registry.removeConfiguration(deviceConfig.id, function(err) {
debug(getErrorDetailString('removeConfiguration', err));
callback(err);
});
},
function verifyConfigWasRemoved(callback) {
debug('verifying removal of configuration with id ' + deviceConfig.id);
registry.getConfiguration(deviceConfig.id, function(err) {
debug(getErrorDetailString('(expecting failure) getConfiguration', err));
if (!err) {
assert.fail('getConfig should fail after config was removed');
}
callback();
});
}
], done);
it ('can add and delete a config', function(done) {
async.series([
function addConfig(callback) {
debug('adding configuration with id ' + config.id);
registry.addConfiguration(config, function(err) {
debug(getErrorDetailString('addConfiguration', err));
callback(err);
});
},
function verifyConfigWasAdded(callback) {
debug('verifying existence of config with id ' + config.id);
registry.getConfiguration(config.id, function(err) {
debug(getErrorDetailString('getConfiguration', err));
callback(err);
});
},
function removeConfig(callback) {
debug('removing configuration with id ' + config.id);
registry.removeConfiguration(config.id, function(err) {
debug(getErrorDetailString('removeConfiguration', err));
callback(err);
});
},
function verifyConfigWasRemoved(callback) {
debug('verifying removal of configuration with id ' + config.id);
registry.getConfiguration(config.id, function(err) {
debug(getErrorDetailString('(expecting failure) getConfiguration', err));
if (!err) {
assert.fail('getConfig should fail after config was removed');
}
callback();
});
}
], done);
});
});
});

Loading

0 comments on commit 26063a3

Please sign in to comment.