Skip to content

test(core) unit tests for microservices & registry controllers (EWC-382) #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2018
Merged

test(core) unit tests for microservices & registry controllers (EWC-382) #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/controllers/iofog-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,62 +16,62 @@ const AuthDecorator = require('../decorators/authorization-decorator');
const FogService = require('../services/iofog-service');
const qs = require('qs');

async function _createFog(req, user) {
async function createFogEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.body));
const newFog = req.body;
return await FogService.createFog(newFog, user, false)
}

async function _updateFog(req, user) {
async function updateFogEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.body));
const updateFog = req.body;
updateFog.uuid = req.params.uuid;
return await FogService.updateFog(updateFog, user, false)
}

async function _deleteFog(req, user) {
async function deleteFogEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.body));
const deleteFog = {};
deleteFog.uuid = req.params.uuid;
return await FogService.deleteFog(deleteFog, user, false)
}

async function _getFog(req, user) {
async function getFogEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.body));
const getFog = {};
getFog.uuid = req.params.uuid;
return await FogService.getFogWithTransaction(getFog, user, false)
}

async function _getFogList(req, user) {
async function getFogListEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.query));
const query = qs.parse(req.query)
const query = qs.parse(req.query);
return await FogService.getFogList(query.filters, user, false)
}

async function _generateProvisioningKey(req, user) {
async function generateProvisionKeyEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.body));
const fog = {};
fog.uuid = req.params.uuid;
return await FogService.generateProvisioningKey(fog, user, false)
}

async function _setFogVersionCommand(req, user) {
async function setFogVersionCommandEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.body));
const fogVersionCommand = {};
fogVersionCommand.uuid = req.params.uuid;
fogVersionCommand.versionCommand = req.params.versionCommand;
return await FogService.setFogVersionCommand(fogVersionCommand, user, false)
}

async function _setFogRebootCommand(req, user) {
async function setFogRebootCommandEndPoint(req, user) {
logger.info("Parameters:" + JSON.stringify(req.body));
const fog = {};
fog.uuid = req.params.uuid;
return await FogService.setFogRebootCommand(fog, user, false)
}

async function _getHalHardwareInfo(req, user) {
async function getHalHardwareInfoEndPoint(req, user) {
const uuidObj = {
uuid: req.params.uuid
};
Expand All @@ -82,7 +82,7 @@ async function _getHalHardwareInfo(req, user) {
}


async function _getHalUsbInfo(req, user) {
async function getHalUsbInfoEndPoint(req, user) {
const uuidObj = {
uuid: req.params.uuid
};
Expand All @@ -93,14 +93,14 @@ async function _getHalUsbInfo(req, user) {
}

module.exports = {
createFog: AuthDecorator.checkAuthToken(_createFog),
updateFog: AuthDecorator.checkAuthToken(_updateFog),
deleteFog: AuthDecorator.checkAuthToken(_deleteFog),
getFog: AuthDecorator.checkAuthToken(_getFog),
getFogList: AuthDecorator.checkAuthToken(_getFogList),
generateProvisioningKey: AuthDecorator.checkAuthToken(_generateProvisioningKey),
setFogVersionCommand: AuthDecorator.checkAuthToken(_setFogVersionCommand),
setFogRebootCommand: AuthDecorator.checkAuthToken(_setFogRebootCommand),
getHalHardwareInfo: AuthDecorator.checkAuthToken(_getHalHardwareInfo),
getHalUsbInfo: AuthDecorator.checkAuthToken(_getHalUsbInfo)
createFogEndPoint: AuthDecorator.checkAuthToken(createFogEndPoint),
updateFogEndPoint: AuthDecorator.checkAuthToken(updateFogEndPoint),
deleteFogEndPoint: AuthDecorator.checkAuthToken(deleteFogEndPoint),
getFogEndPoint: AuthDecorator.checkAuthToken(getFogEndPoint),
getFogListEndPoint: AuthDecorator.checkAuthToken(getFogListEndPoint),
generateProvisioningKeyEndPoint: AuthDecorator.checkAuthToken(generateProvisionKeyEndPoint),
setFogVersionCommandEndPoint: AuthDecorator.checkAuthToken(setFogVersionCommandEndPoint),
setFogRebootCommandEndPoint: AuthDecorator.checkAuthToken(setFogRebootCommandEndPoint),
getHalHardwareInfoEndPoint: AuthDecorator.checkAuthToken(getHalHardwareInfoEndPoint),
getHalUsbInfoEndPoint: AuthDecorator.checkAuthToken(getHalUsbInfoEndPoint)
};
72 changes: 36 additions & 36 deletions src/controllers/microservices-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ const logger = require('../logger');
const AuthDecorator = require('./../decorators/authorization-decorator');
const MicroservicesService = require('../services/microservices-service');

const _createMicroservicesOnFogEndPoint = async function (req, user) {
const createMicroserviceOnFogEndPoint = async function (req, user) {
const microservice = req.body;

logger.info("Parameters:" + JSON.stringify(microservice));

return await MicroservicesService.createMicroserviceOnFog(microservice, user, false)
};

const _getMicroserviceEndPoint = async function (req, user) {
const getMicroserviceEndPoint = async function (req, user) {
const microserviceUuid = req.params.uuid;

logger.info("Microservice uuid:" + JSON.stringify(microserviceUuid));

return await MicroservicesService.getMicroservice(microserviceUuid, user, false)
};

const _updateMicroserviceEndPoint = async function (req, user) {
const updateMicroserviceEndPoint = async function (req, user) {
const microservice = req.body;
const microserviceUuid = req.params.uuid;

Expand All @@ -41,7 +41,7 @@ const _updateMicroserviceEndPoint = async function (req, user) {
return await MicroservicesService.updateMicroservice(microserviceUuid, microservice, user, false)
};

const _deleteMicroserviceEndPoint = async function (req, user) {
const deleteMicroserviceEndPoint = async function (req, user) {
const microserviceUuid = req.params.uuid;
const microserviceData = req.body || {};
logger.info("Microservice uuid:" + JSON.stringify(microserviceUuid));
Expand All @@ -50,43 +50,43 @@ const _deleteMicroserviceEndPoint = async function (req, user) {
return await MicroservicesService.deleteMicroservice(microserviceUuid, microserviceData, user, false)
};

const _getMicroservicesByFlowEndPoint = async function (req, user) {
const getMicroservicesByFlowEndPoint = async function (req, user) {
const flowId = req.query.flowId;

logger.info("Flow id:" + flowId);

return await MicroservicesService.listMicroservices(flowId, user, false)
};

const _createMicroserviceRouteEndPoint = async function (req, user) {
const createMicroserviceRouteEndPoint = async function (req, user) {
const sourceUuid = req.params.uuid;
const distUuid = req.params.receiverUuid;
logger.info(`Creating route from ${sourceUuid} to ${distUuid}`);
return await MicroservicesService.createRoute(sourceUuid, distUuid, user, false)
}
const destUuid = req.params.receiverUuid;
logger.info(`Creating route from ${sourceUuid} to ${destUuid}`);
return await MicroservicesService.createRoute(sourceUuid, destUuid, user, false)
};

const _deleteMicroserviceRouteEndPoint = async function (req, user) {
const deleteMicroserviceRouteEndPoint = async function (req, user) {
const sourceUuid = req.params.uuid;
const distUuid = req.params.receiverUuid;
logger.info(`Creating route from ${sourceUuid} to ${distUuid}`);
return await MicroservicesService.deleteRoute(sourceUuid, distUuid, user, false)
}
const destUuid = req.params.receiverUuid;
logger.info(`Creating route from ${sourceUuid} to ${destUuid}`);
return await MicroservicesService.deleteRoute(sourceUuid, destUuid, user, false)
};

const _createMicroservicePortMappingEndPoint = async function (req, user) {
const createMicroservicePortMappingEndPoint = async function (req, user) {
const uuid = req.params.uuid;
const portMappingData = req.body;
logger.info(`Creating port mapping for ${uuid}`);
return await MicroservicesService.createPortMapping(uuid, portMappingData, user, false)
}
};

const _deleteMicroservicePortMappingEndPoint = async function (req, user) {
const deleteMicroservicePortMappingEndPoint = async function (req, user) {
const uuid = req.params.uuid;
const internalPort = req.params.internalPort;
logger.info(`Deleting port mapping for ${uuid}`);
return await MicroservicesService.deletePortMapping(uuid, internalPort, user, false)
}
};

const _listMicroservicePortMappingsEndPoint = async function (req, user) {
const listMicroservicePortMappingsEndPoint = async function (req, user) {
const uuid = req.params.uuid;
logger.info(`Getting all port mappings for ${uuid}`);
const ports = await MicroservicesService.listMicroservicePortMappings(uuid, user, false);
Expand All @@ -95,7 +95,7 @@ const _listMicroservicePortMappingsEndPoint = async function (req, user) {
}
};

const _createMicroserviceVolumeMappingEndPoint = async function (req, user) {
const createMicroserviceVolumeMappingEndPoint = async function (req, user) {
const microserviceUuid = req.params.uuid;
const volumeMappingData = req.body;
logger.info(`Creating volume mapping for ${microserviceUuid}`);
Expand All @@ -105,7 +105,7 @@ const _createMicroserviceVolumeMappingEndPoint = async function (req, user) {
}
};

const _listMicroserviceVolumeMappingsEndPoint = async function (req, user) {
const listMicroserviceVolumeMappingsEndPoint = async function (req, user) {
const uuid = req.params.uuid;
logger.info(`Getting all volume mappings for ${uuid}`);
const volumeMappings = await MicroservicesService.listVolumeMappings(uuid, user, false);
Expand All @@ -114,25 +114,25 @@ const _listMicroserviceVolumeMappingsEndPoint = async function (req, user) {
}
};

const _deleteMicroserviceVolumeMappingEndPoint = async function (req, user) {
const deleteMicroserviceVolumeMappingEndPoint = async function (req, user) {
const uuid = req.params.uuid;
const id = req.params.id;
logger.info(`Deleting volume mapping ${id} for ${uuid}`);
return await MicroservicesService.deleteVolumeMapping(uuid, id, user, false);
};

module.exports = {
createMicroservicesOnFogEndPoint: AuthDecorator.checkAuthToken(_createMicroservicesOnFogEndPoint),
getMicroserviceEndPoint: AuthDecorator.checkAuthToken(_getMicroserviceEndPoint),
updateMicroserviceEndPoint: AuthDecorator.checkAuthToken(_updateMicroserviceEndPoint),
deleteMicroserviceEndPoint: AuthDecorator.checkAuthToken(_deleteMicroserviceEndPoint),
getMicroservicesByFlowEndPoint: AuthDecorator.checkAuthToken(_getMicroservicesByFlowEndPoint),
createMicroserviceRouteEndPoint: AuthDecorator.checkAuthToken(_createMicroserviceRouteEndPoint),
deleteMicroserviceRouteEndPoint: AuthDecorator.checkAuthToken(_deleteMicroserviceRouteEndPoint),
createMicroservicePortMappingEndPoint: AuthDecorator.checkAuthToken(_createMicroservicePortMappingEndPoint),
deleteMicroservicePortMappingEndPoint: AuthDecorator.checkAuthToken(_deleteMicroservicePortMappingEndPoint),
getMicroservicePortMappingListEndPoint: AuthDecorator.checkAuthToken(_listMicroservicePortMappingsEndPoint),
createMicroserviceVolumeMappingEndPoint: AuthDecorator.checkAuthToken(_createMicroserviceVolumeMappingEndPoint),
listMicroserviceVolumeMappingsEndPoint: AuthDecorator.checkAuthToken(_listMicroserviceVolumeMappingsEndPoint),
deleteMicroserviceVolumeMappingEndPoint: AuthDecorator.checkAuthToken(_deleteMicroserviceVolumeMappingEndPoint)
createMicroserviceOnFogEndPoint: AuthDecorator.checkAuthToken(createMicroserviceOnFogEndPoint),
getMicroserviceEndPoint: AuthDecorator.checkAuthToken(getMicroserviceEndPoint),
updateMicroserviceEndPoint: AuthDecorator.checkAuthToken(updateMicroserviceEndPoint),
deleteMicroserviceEndPoint: AuthDecorator.checkAuthToken(deleteMicroserviceEndPoint),
getMicroservicesByFlowEndPoint: AuthDecorator.checkAuthToken(getMicroservicesByFlowEndPoint),
createMicroserviceRouteEndPoint: AuthDecorator.checkAuthToken(createMicroserviceRouteEndPoint),
deleteMicroserviceRouteEndPoint: AuthDecorator.checkAuthToken(deleteMicroserviceRouteEndPoint),
createMicroservicePortMappingEndPoint: AuthDecorator.checkAuthToken(createMicroservicePortMappingEndPoint),
deleteMicroservicePortMappingEndPoint: AuthDecorator.checkAuthToken(deleteMicroservicePortMappingEndPoint),
getMicroservicePortMappingListEndPoint: AuthDecorator.checkAuthToken(listMicroservicePortMappingsEndPoint),
createMicroserviceVolumeMappingEndPoint: AuthDecorator.checkAuthToken(createMicroserviceVolumeMappingEndPoint),
listMicroserviceVolumeMappingsEndPoint: AuthDecorator.checkAuthToken(listMicroserviceVolumeMappingsEndPoint),
deleteMicroserviceVolumeMappingEndPoint: AuthDecorator.checkAuthToken(deleteMicroserviceVolumeMappingEndPoint)
};
20 changes: 10 additions & 10 deletions src/routes/iofog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = [
}
];

const getFogList = ResponseDecorator.handleErrors(FogController.getFogList, successCode, errCodes);
const getFogList = ResponseDecorator.handleErrors(FogController.getFogListEndPoint, successCode, errCodes);
const responseObject = await getFogList(req);

res
Expand All @@ -56,7 +56,7 @@ module.exports = [
}
];

const createFog = ResponseDecorator.handleErrors(FogController.createFog, successCode, errCodes);
const createFog = ResponseDecorator.handleErrors(FogController.createFogEndPoint, successCode, errCodes);
const responseObject = await createFog(req);

res
Expand Down Expand Up @@ -84,7 +84,7 @@ module.exports = [
}
];

const updateFog = ResponseDecorator.handleErrors(FogController.updateFog, successCode, errCodes);
const updateFog = ResponseDecorator.handleErrors(FogController.updateFogEndPoint, successCode, errCodes);
const responseObject = await updateFog(req);

res
Expand All @@ -108,7 +108,7 @@ module.exports = [
}
];

const deleteFog = ResponseDecorator.handleErrors(FogController.deleteFog, successCode, errCodes);
const deleteFog = ResponseDecorator.handleErrors(FogController.deleteFogEndPoint, successCode, errCodes);
const responseObject = await deleteFog(req);

res
Expand All @@ -132,7 +132,7 @@ module.exports = [
}
];

const getFog = ResponseDecorator.handleErrors(FogController.getFog, successCode, errCodes);
const getFog = ResponseDecorator.handleErrors(FogController.getFogEndPoint, successCode, errCodes);
const responseObject = await getFog(req);

res
Expand All @@ -156,7 +156,7 @@ module.exports = [
}
];

const generateFogProvisioningKey = ResponseDecorator.handleErrors(FogController.generateProvisioningKey, successCode, errCodes);
const generateFogProvisioningKey = ResponseDecorator.handleErrors(FogController.generateProvisioningKeyEndPoint, successCode, errCodes);
const responseObject = await generateFogProvisioningKey(req);

res
Expand Down Expand Up @@ -184,7 +184,7 @@ module.exports = [
}
];

const setFogVersionCommand = ResponseDecorator.handleErrors(FogController.setFogVersionCommand, successCode, errCodes);
const setFogVersionCommand = ResponseDecorator.handleErrors(FogController.setFogVersionCommandEndPoint, successCode, errCodes);
const responseObject = await setFogVersionCommand(req);

res
Expand Down Expand Up @@ -213,7 +213,7 @@ module.exports = [
];


const setFogRebootCommand = ResponseDecorator.handleErrors(FogController.setFogRebootCommand, successCode, errCodes);
const setFogRebootCommand = ResponseDecorator.handleErrors(FogController.setFogRebootCommandEndPoint, successCode, errCodes);
const responseObject = await setFogRebootCommand(req);

res
Expand All @@ -237,7 +237,7 @@ module.exports = [
}
];

const getHalHardwareInfo = ResponseDecorator.handleErrors(FogController.getHalHardwareInfo, successCode, errCodes);
const getHalHardwareInfo = ResponseDecorator.handleErrors(FogController.getHalHardwareInfoEndPoint, successCode, errCodes);
const responseObject = await getHalHardwareInfo(req);

res
Expand All @@ -261,7 +261,7 @@ module.exports = [
}
];

const getHalUsbInfo = ResponseDecorator.handleErrors(FogController.getHalUsbInfo, successCode, errCodes);
const getHalUsbInfo = ResponseDecorator.handleErrors(FogController.getHalUsbInfoEndPoint, successCode, errCodes);
const responseObject = await getHalUsbInfo(req);

res
Expand Down
2 changes: 1 addition & 1 deletion src/routes/microservices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = [
}
];

const createMicroservicesOnFogEndPoint = ResponseDecorator.handleErrors(MicroservicesController.createMicroservicesOnFogEndPoint, successCode, errorCodes);
const createMicroservicesOnFogEndPoint = ResponseDecorator.handleErrors(MicroservicesController.createMicroserviceOnFogEndPoint, successCode, errorCodes);
const responseObject = await createMicroservicesOnFogEndPoint(req);

res
Expand Down
Loading