Skip to content
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

Jump to bottom

Removed the code which updates bgp_router_refs in nodejs side #70

Open
wants to merge 2 commits into
base: R1.06
Choose a base branch
from
Open

Removed the code which updates bgp_router_refs in nodejs side #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e76e841
Removed the code which updates bgp_router_refs in nodejs side
sbavanasi Jun 10, 2014
b018343
used block comment instead of line comment.
sbavanasi Jun 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions webroot/config/bgp/api/admin.api.js
View file
Open in desktop
Expand Up @@ -286,7 +286,7 @@ adminapi.createBGPRouter = function (req, res, appData) {
logutils.logger.debug("createBGPRouter JSON: " + JSON.stringify(content));
delete content["bgp-router"]["bgp_router_refs"];
configApiServer.apiPost(url, content, appData, function (error, data) {
if (!error) {
/*if (!error) {
data["bgp-router"]["bgp_router_refs"] = bgpRefs ? bgpRefs : [];
data["bgp-router"]["_type"] = type;
data["bgp-router"]["parent_name"] = parentName;
Expand All @@ -297,7 +297,12 @@ adminapi.createBGPRouter = function (req, res, appData) {
} else {
error = new appErrors.RESTServerError(messages.error.create_bgpr);
commonUtils.handleJSONResponse(error, res, null);
}
}*/
if (error) {
commonUtils.handleJSONResponse(error, res, null);
} else {
commonUtils.handleJSONResponse(error, res, data);
}
}, bgpHeader);
};

Expand Down Expand Up @@ -369,7 +374,7 @@ function updateBGPJSON(bgpJSON, bgpUpdates) {
bgpJSON["bgp-router"]["bgp_router_parameters"].vendor = bgpUpdates["bgp-router"]["bgp_router_parameters"].vendor;
bgpJSON["bgp-router"]["bgp_router_parameters"].port = bgpUpdates["bgp-router"]["bgp_router_parameters"].port;
bgpJSON["bgp-router"]["bgp_router_parameters"]["hold-time"] = bgpUpdates["bgp-router"]["bgp_router_parameters"]["hold-time"];
var bgpRefs = bgpJSON["bgp-router"]["bgp_router_refs"],
/*var bgpRefs = bgpJSON["bgp-router"]["bgp_router_refs"],
newBGPRefs = bgpUpdates["bgp-router"]["bgp_router_refs"];
if (!newBGPRefs || newBGPRefs.length == 0) {
bgpJSON["bgp-router"]["bgp_router_refs"] = [];
Expand Down Expand Up @@ -423,7 +428,7 @@ function updateBGPJSON(bgpJSON, bgpUpdates) {
bgpJSON["bgp-router"]["bgp_router_refs"][length] = newPeers[i];
}
}
}
}*/
}

/**
Expand All @@ -447,7 +452,7 @@ function updateBGPRouterInternal(req, res, id, bgpUpdates, appData) {
error = new appErrors.RESTServerError(messages.error.update_bgpr);
commonUtils.handleJSONResponse(error, res, null);
} else {
try {
/*try {
var bgpPeers = bgpUpdates["bgp-router"]["bgp_router_refs"];
if (bgpPeers) {
var bgpPeerObj = {};
Expand All @@ -463,7 +468,7 @@ function updateBGPRouterInternal(req, res, id, bgpUpdates, appData) {
} catch (e) {
logutils.logger.error(e.stack);
// TODO: On error all changes should be rolled back.s
}
}*/
commonUtils.handleJSONResponse(null, res, data);
}
}, bgpHeader);
Expand Down