kavishka
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing adding new policy not shown error

Browse Source
application-manager-new
Rasika Perera 9 years ago
parent dadf913a83
commit 6ea6551ada
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
modules/distribution/src/repository/jaggeryapps/iotserver/api/policy-api.jag
Unescape View File

@ -32,7 +32,7 @@ if (uriMatcher.match("/{context}/api/policies/update")) {
policyModule.updatePolicyPriorities(payload);
} else if (uriMatcher.match("/{context}/api/policies/add")) {
var content = request.getContent();
var id = content.policyName;
var policyName = content.policyName;
var policyDefinition = content.profile.policyDefinition;
var policyDescription = content.profile.policyDescription;
var deviceType = content.profile.deviceType.name;
@ -40,7 +40,7 @@ if (uriMatcher.match("/{context}/api/policies/update")) {
log.info("@@@@@ Policy Declaration : " + stringify(content));
try {
result = policyModule.addPolicy(id, deviceType, policyDefinition, policyDescription);
result = policyModule.addPolicy(policyName, deviceType, policyDefinition, policyDescription);
} catch (e) {
log.error("Exception occurred while trying to add new policy under name:" + id, e);
// http status code 500 refers to - Internal Server Error.

65
modules/distribution/src/repository/jaggeryapps/iotserver/modules/policy.js
Unescape View File

@ -27,39 +27,42 @@ policyModule = function () {
var privateMethods = {};
publicMethods.addPolicy = function (policyName, deviceType, policyDefinition, policyDescription) {
if(policyName && deviceType){
return false;
}
if (policyName && deviceType) {
var carbonModule = require("carbon");
var carbonServer = application.get("carbonServer");
var options = {system: true};
var carbonUser = session.get(constants.USER_SESSION_KEY);
var resource = {
name: policyName,
mediaType: 'text/plain',
content: policyDefinition,
description: policyDescription
};
if (carbonUser) {
options.tenantId = carbonUser.tenantId;
var registry = new carbonModule.registry.Registry(carbonServer, options);
log.info("########### Policy name : " + policyName);
log.info("########### Policy type : " + deviceType);
log.info("########### Policy Declaration : " + policyDefinition);
log.info("########### Policy policyDescription: " + policyDescription);
registry.put(constants.POLICY_REGISTRY_PATH + deviceType + "/" + policyName, resource);
}
var carbonModule = require("carbon");
var carbonServer = application.get("carbonServer");
var options = {system: true};
var carbonUser = session.get(constants.USER_SESSION_KEY);
var mqttsenderClass = Packages.org.wso2.device.mgt.mqtt.policy.push.MqttPush;
var mqttsender = new mqttsenderClass();
var resource = {
name: policyName,
mediaType: 'text/plain',
content: policyDefinition,
description: policyDescription
};
var result = mqttsender.pushToMQTT("/iot/policymgt/govern", policyDefinition, "tcp://10.100.0.104:1883", "Raspberry-Policy-sender");
if (carbonUser) {
options.tenantId = carbonUser.tenantId;
var registry = new carbonModule.registry.Registry(carbonServer, options);
log.info("########### Policy name : " + policyName);
log.info("########### Policy type : " + deviceType);
log.info("########### Policy Declaration : " + policyDefinition);
log.info("########### Policy policyDescription: " + policyDescription);
registry.put(constants.POLICY_REGISTRY_PATH + deviceType + "/" + policyName, resource);
}
mqttsender = null;
var mqttsenderClass = Packages.org.wso2.device.mgt.mqtt.policy.push.MqttPush;
var mqttsender = new mqttsenderClass();
return true;
var result = mqttsender.pushToMQTT("/iot/policymgt/govern", policyDefinition, "tcp://10.100.0.104:1883", "Raspberry-Policy-sender");
mqttsender = null;
return true;
} else {
return false;
}
};
publicMethods.getPolicies = function () {
@ -82,7 +85,7 @@ policyModule = function () {
log.info("Policies for device types: " + allPolicies.content);
log.info("");
var deviceType = allPolicies.content[i].replace(constants.POLICY_REGISTRY_PATH, "");
log.info("##### deviceType:"+deviceType);
log.info("##### deviceType:" + deviceType);
var deviceTypePolicies = registry.get(allPolicies.content[i]);
//loop through policies
@ -96,7 +99,7 @@ policyModule = function () {
//"profile": {}, // Profile
"policyName": deviceTypePolicy.name, // Name of the policy.
"updated": deviceTypePolicy.updated.time,
"deviceType":deviceType
"deviceType": deviceType
//"generic": true, // If true, this should be applied to all related device.
//"roles": {}, // Roles which this policy should be applied.
//"ownershipType": {}, // Ownership type (COPE, BYOD, CPE)
@ -139,7 +142,7 @@ policyModule = function () {
try {
registry.remove(constants.POLICY_REGISTRY_PATH + deviceType + "/" + name);
bool = true;
}catch(err){
} catch (err) {
log.error("Error while trying to remove policy :" + name);
}
}

Write Preview
Loading…
Cancel
Save