Skip to content

Commit

Permalink
To handles UVE key that include "/", we need to re-organize the bottl…
Browse files Browse the repository at this point in the history 
…e match rules.

bottle matches rules according to a priority order.

As part of re-organizing these rules, url that have "/analytics/<uve-type" are
being deprecated in favour of "/analytics/uves/<uve-type"

Change-Id: I6df5211d60e16f2a84c7ecc06bb84396435ad29b
Partial-Bug: 1484464
  • Loading branch information
@anishmehta
anishmehta committed Aug 18, 2015
1 parent e5c39be commit df7269c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion webroot/monitor/infra/analyticsnode/api/analyticsnode.api.js
View file
Expand Up @@ -145,7 +145,7 @@ function getAnalyticsNodeGenerators (req, res, appData)
var resultJSON = [];
var ip = req.param('ip');
var hostName = req.param('hostname');
var url = '/analytics/generator/*';
var url = '/analytics/uves/generator/*';

var count = req.param('count');
var lastKey = req.param('lastKey');
Expand Down
12 changes: 6 additions & 6 deletions webroot/monitor/infra/controlnode/api/controlnode.api.js
View file
Expand Up @@ -125,8 +125,8 @@ function getControlNodePeerInfo (req, res, appData)
var hostName = req.param('hostname');
var urlLists = [];

urlLists[0] = '/analytics/bgp-peer/*:' + hostName + ':*';
urlLists[1] = '/analytics/xmpp-peer/' + hostName + ':*?flat';
urlLists[0] = '/analytics/uves/bgp-peer/*:' + hostName + ':*';
urlLists[1] = '/analytics/uves/xmpp-peer/' + hostName + ':*?flat';

async.map(urlLists, commonUtils.getJsonViaInternalApi(opServer.api, true),
function(err, results) {
Expand All @@ -149,8 +149,8 @@ function getControlNodePeerDetails (req, res, appData)
}
var len = configData.length;
for (var i = 0; i < len; i++) {
urlLists[i] = '/analytics/bgp-peer/*' + configData[i]['name'] + '*';
urlLists[i + len] = '/analytics/xmpp-peer/' + configData[i]['name']
urlLists[i] = '/analytics/uves/bgp-peer/*' + configData[i]['name'] + '*';
urlLists[i + len] = '/analytics/uves/xmpp-peer/' + configData[i]['name']
+ ':*?flat';
}
async.map(urlLists,
Expand Down Expand Up @@ -184,8 +184,8 @@ function getControlNodePeerPagedInfo (req, res, appData)
} else {
count = parseInt(count);
}
urlLists[0] = '/analytics/bgp-peers';
urlLists[1] = '/analytics/xmpp-peers';
urlLists[0] = '/analytics/uves/bgp-peers';
urlLists[1] = '/analytics/uves/xmpp-peers';

async.map(urlLists, commonUtils.getJsonViaInternalApi(opServer.api, true),
function(err, results) {
Expand Down
8 changes: 4 additions & 4 deletions webroot/monitor/networking/ui/api/networking.graph.api.js
View file
Expand Up @@ -856,10 +856,10 @@ function getNetworkConnectedGraph(req, res, appData) {
'UveVirtualNetworkConfig'
];

reqUrl = '/analytics/virtual-network/' + fqName + '?cfilt=' + cFilters.join(',');
reqUrl = '/analytics/uves/virtual-network/' + fqName + '?cfilt=' + cFilters.join(',');
commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/analytics/service-chain/*';
reqUrl = '/analytics/uves/service-chain/*';
commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/virtual-networks';
Expand Down Expand Up @@ -961,10 +961,10 @@ function getProjectConnectedGraph(req, res, appData) {
'UveVirtualNetworkConfig'
];

reqUrl = '/analytics/virtual-network/' + fqName + ':*?cfilt=' + cFilters.join(',');
reqUrl = '/analytics/uves/virtual-network/' + fqName + ':*?cfilt=' + cFilters.join(',');
commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/analytics/service-chain/*';
reqUrl = '/analytics/uves/service-chain/*';
commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/virtual-networks';
Expand Down
30 changes: 15 additions & 15 deletions webroot/monitor/tenant-network/api/network.mon.api.js
View file
Expand Up @@ -334,7 +334,7 @@ function getVNVMData (vmJSON, vmName)
function getVMFloatingIPList (req, res)
{
var vmName = req.param('vmName');
var url = '/analytics/virtual-machine/' + vmName + '?flat';
var url = '/analytics/uves/virtual-machine/' + vmName + '?flat';
opServer.authorize(function () {
opServer.api.get(url, function (error, vmJSON) {
if(!error && (vmJSON)) {
Expand All @@ -350,7 +350,7 @@ function getVMFloatingIPList (req, res)
function getVNStatsSummary (req, res)
{
var vnName = req.param('fqName');
var url = '/analytics/virtual-network/' + vnName;
var url = '/analytics/uves/virtual-network/' + vnName;
var json = {};
opServer.authorize(function () {
opServer.api.get(url, function (error, vnJSON) {
Expand Down Expand Up @@ -499,7 +499,7 @@ function getVMStatsSummary (req, res)
}

initVmStatResultData(resultJSON, vmVnName);
url = '/analytics/virtual-machine/' + vmName;
url = '/analytics/uves/virtual-machine/' + vmName;

opServer.authorize(function () {
opServer.api.get(url, function (err, data) {
Expand Down Expand Up @@ -748,9 +748,9 @@ function getNetworkInGressEgressTrafficStat (srcVN, destVN, callback)
var urlLists = [];
var resultJSON = [];

var url = '/analytics/virtual-network/' + srcVN + '?flat';
var url = '/analytics/uves/virtual-network/' + srcVN + '?flat';
urlLists[0] = [url];
url = '/analytics/virtual-network/' + destVN + '?flat';
url = '/analytics/uves/virtual-network/' + destVN + '?flat';
urlLists[1] = [url];

async.map(urlLists, commonUtils.getJsonViaInternalApi(opServer.api, true),
Expand Down Expand Up @@ -867,9 +867,9 @@ function getVNAllStatsJSONSummary (srcVN, inputJSON, callback)
statCnt = outStatCnt;
}
for (var i = 0; i < statCnt; i++) {
url = '/analytics/virtual-network/' + srcVN;
url = '/analytics/uves/virtual-network/' + srcVN;
urlLists[index++] = [url];
url = '/analytics/virtual-network/' + statData[i]['other_vn'];
url = '/analytics/uves/virtual-network/' + statData[i]['other_vn'];
otherVNList[i] = statData[i]['other_vn'];
urlLists[index++] = [url];
}
Expand Down Expand Up @@ -909,7 +909,7 @@ function parseVNAllStatSummary (resultJSON, srcVN, otherVNList, data)
function getAllConnNetStatDetails (req, res)
{
var fqName = req.query['fqName'];
var url = '/analytics/virtual-network/' + fqName;
var url = '/analytics/uves/virtual-network/' + fqName;
var resultJSON = [];

opServer.api.get(url, function(err, data) {
Expand Down Expand Up @@ -1065,7 +1065,7 @@ function getVNSummary (fqName, data)
function getVirtualNetworksSummary (req, res, appData)
{
var fqNameRegExp = req.query['fqNameRegExp'];
var url = '/analytics/virtual-network/';
var url = '/analytics/uves/virtual-network/';
var fqn = fqNameRegExp;

var fqNameArr = fqNameRegExp.split(':');
Expand Down Expand Up @@ -1098,7 +1098,7 @@ function getVirtualNetworksSummary (req, res, appData)
function getVirtualMachinesSummary (req, res, appData)
{
var fqNameRegExp = req.query['fqNameRegExp'];
var url = '/analytics/virtual-machine/' + fqNameRegExp;
var url = '/analytics/uves/virtual-machine/' + fqNameRegExp;
sendOpServerResponseByURL(url, req, res, appData);
}

Expand Down Expand Up @@ -2213,11 +2213,11 @@ function getNetworkTreeTopology (req, res, appData)
'UveVirtualNetworkConfig'
];

reqUrl = '/analytics/virtual-network/' + fqName + '?cfilt=' + cFilters.join(',');
reqUrl = '/analytics/uves/virtual-network/' + fqName + '?cfilt=' + cFilters.join(',');

commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/analytics/service-chain/*';
reqUrl = '/analytics/uves/service-chain/*';
commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/virtual-networks';
Expand Down Expand Up @@ -2254,11 +2254,11 @@ function getProjectTreeTopology (req, res, appData)
'UveVirtualNetworkConfig'
];

reqUrl = '/analytics/virtual-network/' + fqName + ':*?cfilt=' + cFilters.join(',');
reqUrl = '/analytics/uves/virtual-network/' + fqName + ':*?cfilt=' + cFilters.join(',');

commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/analytics/service-chain/*';
reqUrl = '/analytics/uves/service-chain/*';
commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, opApiServer, null, appData);

reqUrl = '/virtual-networks';
Expand Down Expand Up @@ -2864,7 +2864,7 @@ function getInstanceDetailsForAdmin(req,appData,callback) {
var lastUUID = req.query['lastKey'];
var count = req.query['count'];
var type = req.query['type'];
var url = '/analytics/virtual-machines';
var url = '/analytics/uves/virtual-machines';
var filtUrl = null;
var resultJSON = createEmptyPaginatedData();
var filtData = nwMonUtils.buildBulkUVEUrls(req.body, appData);
Expand Down
14 changes: 7 additions & 7 deletions webroot/monitor/tenant-network/api/tenant.api.js
View file
Expand Up @@ -72,7 +72,7 @@ function getVNOutStats(vnJSON)
function getVNState (req, res)
{
var vn_name = req.param('vn'),
url = '/analytics/virtual-network/' + vn_name;
url = '/analytics/uves/virtual-network/' + vn_name;
opServer.authorize(function () {
opServer.api.get(url, function (error, jsonData) {
if (error) {
Expand Down Expand Up @@ -165,7 +165,7 @@ function parseVNDetails(data,vnName)
function getVNDetails (req, res)
{
var vn_name = req.param('vn'),
url = '/analytics/virtual-network/' + vn_name;
url = '/analytics/uves/virtual-network/' + vn_name;
logutils.logger.debug('VN connected networks URL', url);
opServer.authorize(function () {
opServer.api.get(url, function (error, jsonData) {
Expand Down Expand Up @@ -239,7 +239,7 @@ function parseFlowData(data)
function getVMState (req, res)
{
var vm_name = req.param('vm');
var url = '/analytics/virtual-machine/' + vm_name;
var url = '/analytics/uves/virtual-machine/' + vm_name;
opServer.authorize(function () {
opServer.api.get(url, function (error, projectsJSON) {
commonUtils.handleJSONResponse(error, res, projectsJSON);
Expand Down Expand Up @@ -347,7 +347,7 @@ function populateVNVMData (resultJSON, vmInsJSON, vnvm)
function getVNVM (req, res)
{
var url, vnm = req.param('vnvm');
url = '/analytics/virtual-machine/' + vnm;
url = '/analytics/uves/virtual-machine/' + vnm;
opServer.authorize(function () {
opServer.api.get(url, function (error, vmInsJSON) {
var resultJSON = {};
Expand Down Expand Up @@ -432,7 +432,7 @@ function getProjectVNs(url, callback) {
if(vnCount != 0) {
for (j = 0; j < vnCount; j += 1) {
fq_name = vnsJSON['virtual-networks'][j].fq_name;
url = '/analytics/virtual-machine/' + fq_name.join(':');
url = '/analytics/uves/virtual-machine/' + fq_name.join(':');
instanceUrls[j] = url;
}
async.map(instanceUrls, commonUtils.getJsonViaInternalApi(opServer.api, true), function (err, results) {
Expand Down Expand Up @@ -608,7 +608,7 @@ function getProjectData (configObj, callback)
for (i = 0; i < vnCount; i += 1) {
uuid = vnJSON["virtual-networks"][i].uuid;
fq_name = vnJSON['virtual-networks'][i].fq_name;
url = '/analytics/virtual-network/' + fq_name.join(':');
url = '/analytics/uves/virtual-network/' + fq_name.join(':');
logutils.logger.debug('getProjectDetails URL:', url);
uveUrls[i] = [url];
}
Expand Down Expand Up @@ -851,7 +851,7 @@ function parseNetworkDetails (resultJSON, appData, jsonData, callback)
resultJSON['policyList'][i]['uuid'] = nwPolicyRefs[i]['uuid'];
}
/* Now get the rest of the data from UVE */
var url = '/analytics/virtual-network/' + resultJSON['fq-name'];
var url = '/analytics/uves/virtual-network/' + resultJSON['fq-name'];
opServer.api.get(url, function(err, vnUve) {
parseVNUveData(resultJSON, vnUve);
callback(resultJSON);
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/tenant-network/jobs/topoCache.api.js
View file
Expand Up @@ -97,7 +97,7 @@ function getProjectVNs (url, callback)
if (vnCount != 0) {
for (j = 0; j < vnCount; j += 1) {
fq_name = vnsJSON['virtual-networks'][j].fq_name;
url = '/analytics/virtual-machine/' + fq_name.join(':');
url = '/analytics/uves/virtual-machine/' + fq_name.join(':');
instanceUrls[j] = url;
}
async.map(instanceUrls, commonUtils.getJsonViaInternalApi(anC.api, true), function (err, results) {
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/tenant-network/jobs/tpoCache.api.js
View file
Expand Up @@ -108,7 +108,7 @@ function getProjectVNs (dataObj, callback)
if (null == fq_name) {
continue;
}
url = '/analytics/virtual-network/' + fq_name.join(':');
url = '/analytics/uves/virtual-network/' + fq_name.join(':');
instanceUrls[index++] = url;
}
async.map(instanceUrls, commonUtils.getJsonViaInternalApi(opServer.api, true), function (err, results) {
Expand Down

0 comments on commit df7269c

Please sign in to comment.