From aa4166690055224fea5b00089bd3adfa00d4c79d Mon Sep 17 00:00:00 2001
From: Anish Mehta <amehta00@gmail.com>
Date: Tue, 18 Aug 2015 15:21:35 -0700
Subject: [PATCH] To handles UVE key that include "/", we need to re-organize
 the bottle 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: Ic7db32f1ef63a1429316b25a12b839209dfa4575
Partial-Bug: 1484464
---
 .../analyticsnode/api/analyticsnode.api.js     |  2 +-
 .../infra/controlnode/api/controlnode.api.js   | 12 ++++++------
 .../networking/ui/api/network.mon.api.js       | 18 +++++++++---------
 .../networking/ui/api/networking.graph.api.js  |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/webroot/monitor/infra/analyticsnode/api/analyticsnode.api.js b/webroot/monitor/infra/analyticsnode/api/analyticsnode.api.js
index ac1adddc2..cbb1a3efc 100644
--- a/webroot/monitor/infra/analyticsnode/api/analyticsnode.api.js
+++ b/webroot/monitor/infra/analyticsnode/api/analyticsnode.api.js
@@ -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');
diff --git a/webroot/monitor/infra/controlnode/api/controlnode.api.js b/webroot/monitor/infra/controlnode/api/controlnode.api.js
index 3235e7beb..6a9eed90a 100644
--- a/webroot/monitor/infra/controlnode/api/controlnode.api.js
+++ b/webroot/monitor/infra/controlnode/api/controlnode.api.js
@@ -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) {
@@ -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,
@@ -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) {
diff --git a/webroot/monitor/networking/ui/api/network.mon.api.js b/webroot/monitor/networking/ui/api/network.mon.api.js
index d0ff45009..0a57922fc 100644
--- a/webroot/monitor/networking/ui/api/network.mon.api.js
+++ b/webroot/monitor/networking/ui/api/network.mon.api.js
@@ -254,7 +254,7 @@ function getNetworkStats(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) {
@@ -394,7 +394,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) {
@@ -563,9 +563,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),
@@ -752,7 +752,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(':');
@@ -784,7 +784,7 @@ function getVirtualNetworksSummary(req, res, appData) {
 
 function getVirtualMachine(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);
 }
 
@@ -1402,7 +1402,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);
@@ -1717,7 +1717,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];
                     }
@@ -1918,7 +1918,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);
diff --git a/webroot/monitor/networking/ui/api/networking.graph.api.js b/webroot/monitor/networking/ui/api/networking.graph.api.js
index 539e30179..0b5b46085 100644
--- a/webroot/monitor/networking/ui/api/networking.graph.api.js
+++ b/webroot/monitor/networking/ui/api/networking.graph.api.js
@@ -810,10 +810,10 @@ function getNetworkConnectedGraph(req, res, appData) {
     var fqName = req.query['fqName'],
         dataObjArr = [], reqUrl;
 
-    reqUrl = '/analytics/virtual-network/' + fqName + '?cfilt=' + networkFilters.join(',');
+    reqUrl = '/analytics/uves/virtual-network/' + fqName + '?cfilt=' + networkFilters.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';
@@ -900,10 +900,10 @@ function getProjectConnectedGraph(req, res, appData) {
     var fqName = req.query['fqName'],
         dataObjArr = [], reqUrl;
 
-    reqUrl = '/analytics/virtual-network/' + fqName + ':*?cfilt=' + networkFilters.join(',');
+    reqUrl = '/analytics/uves/virtual-network/' + fqName + ':*?cfilt=' + networkFilters.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';