Mercurial > hg > thermostat-ng > web-client

changeset 205:599c230e22e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up mockapi This patch cleans up the mockapi endpoints. The calls to next() are removed. We don't add any handlers that will be called next so there is no need for these. The jvm-id's are made unique. Previously there were jvm id clashes which don't actually occur in real data. Some small code fixes and cleanup are included. Reviewed-by: aazores Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-September/025069.html
author Jie Kang <jkang@redhat.com>
date Fri, 15 Sep 2017 13:36:13 -0400
parents cb5eb207b5cc
children 8b0dfd9701e1
files mock-api/endpoints/jvm-gc.endpoint.js mock-api/endpoints/jvm-io.endpoint.js mock-api/endpoints/jvm-memory.endpoint.js mock-api/endpoints/jvms.endpoint.js mock-api/endpoints/kill-vm.command.endpoint.js mock-api/endpoints/system-cpu.endpoint.js mock-api/endpoints/system-info.endpoint.js mock-api/endpoints/system-memory.endpoint.js mock-api/endpoints/system-network.endpoint.js
diffstat 9 files changed, 14 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/mock-api/endpoints/jvm-gc.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/jvm-gc.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -2,13 +2,11 @@
   var _ = require('lodash');
   server.init('jvmGc');
   var accumulatedMicros = 1000;
-  server.app.get('/jvm-gc/0.0.3/jvms/:jvmId', function (req, res, next) {
+  server.app.get('/jvm-gc/0.0.3/jvms/:jvmId', function (req, res) {
     server.logRequest('jvm-gc', req);
 
     var jvmId = req.params.jvmId;
 
-    var query = req.query.query;
-    query = _.split(query, '&');
     var limit = req.query.limit || 1;
 
     var response = [];
@@ -38,7 +36,6 @@
         response: response
       }
     ));
-    next();
   });
 }
 
--- a/mock-api/endpoints/jvm-io.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/jvm-io.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -2,7 +2,7 @@
   var _ = require('lodash');
   server.init('jvmIo');
 
-  server.app.get('/jvm-io/0.0.1/jvms/:jvmId', function (req, res, next) {
+  server.app.get('/jvm-io/0.0.1/jvms/:jvmId', function (req, res) {
     server.logRequest('jvm-io', req);
 
     var jvmId = req.params.jvmId;
@@ -25,7 +25,6 @@
         response: response
       }
     ));
-    next();
   });
 }
 
--- a/mock-api/endpoints/jvm-memory.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/jvm-memory.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -1,7 +1,7 @@
 function jvmMemory (server) {
   var _ = require('lodash');
   server.init('jvmMemory');
-  server.app.get('/jvm-memory/0.0.3/jvms/:jvmId', function (req, res, next) {
+  server.app.get('/jvm-memory/0.0.3/jvms/:jvmId', function (req, res) {
     server.logRequest('jvm-memory', req);
 
     var jvmId = req.params.jvmId;
@@ -90,7 +90,6 @@
         ]
       }
     ));
-    next();
   });
 }
 
--- a/mock-api/endpoints/jvms.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/jvms.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -1,7 +1,7 @@
 function jvmList (server) {
   var _ = require('lodash');
   server.init('jvms');
-  server.app.get('/jvms/0.0.1/tree', function (req, res, next) {
+  server.app.get('/jvms/0.0.1/tree', function (req, res) {
     server.logRequest('jvm-list', req);
     res.setHeader('Content-Type', 'application/json');
 
@@ -19,10 +19,10 @@
       var jvms = [];
       for (var j = 0; j < systemLimit - i; j++) {
         jvms.push({
-          'mainClass': 'c.r.t.' + j,
+          'mainClass': 'c.r.t.' + i + '.' + j,
           'startTime': { $numberLong: (Date.now() - 10000000).toString() },
           'stopTime': { $numberLong: '-1' },
-          'jvmId': 'vm-' + j,
+          'jvmId': i + '-vm-' + j,
           'isAlive': true
         });
       }
@@ -31,7 +31,7 @@
           'mainClass': 'c.r.t.DeadVM',
           'startTime': { $numberLong: (Date.now() - 350000000).toString() },
           'stopTime': { $numberLong: Date.now().toString() },
-          'jvmId': 'vm-dead',
+          'jvmId': i + '-vm-dead-',
           'isAlive': false
         });
       }
@@ -42,7 +42,6 @@
       resp.push(system);
     }
     res.send(JSON.stringify({ response: resp }));
-    next();
   });
 
   server.app.get('/jvms/0.0.1/systems/:systemId/jvms/:jvmId', function (req, res, next) {
--- a/mock-api/endpoints/kill-vm.command.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/kill-vm.command.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -9,7 +9,7 @@
             respType: 'OK'
           }
         }
-      ))
+      ));
     });
   });
 }
--- a/mock-api/endpoints/system-cpu.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/system-cpu.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -1,7 +1,7 @@
 function systemCpu (server) {
   var _ = require('lodash');
   server.init('systemCpu');
-  server.app.get('/system-cpu/0.0.1/systems/:systemId', function (req, res, next) {
+  server.app.get('/system-cpu/0.0.1/systems/:systemId', function (req, res) {
     server.logRequest('system-info', req);
     res.setHeader('Content-Type', 'application/json');
     var randomUsage = function () {
@@ -14,7 +14,6 @@
         }]
       }
     ));
-    next();
   });
 }
 
--- a/mock-api/endpoints/system-info.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/system-info.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -1,6 +1,6 @@
 function systemInfo (server) {
   server.init('systemInfo');
-  server.app.get('/systems/0.0.1/systems/:systemId', function (req, res, next) {
+  server.app.get('/systems/0.0.1/systems/:systemId', function (req, res) {
     server.logRequest('system-info', req);
     res.setHeader('Content-Type', 'application/json');
     res.send(JSON.stringify(
@@ -17,7 +17,6 @@
         }]
       }
     ));
-    next();
   });
 }
 
--- a/mock-api/endpoints/system-memory.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/system-memory.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -1,7 +1,7 @@
 function systemMemory (server) {
   let _ = require('lodash');
   server.init('systemMemory');
-  server.app.get('/system-memory/0.0.1/systems/:systemId', function (req, res, next) {
+  server.app.get('/system-memory/0.0.1/systems/:systemId', function (req, res) {
     server.logRequest('system-info', req);
 
     let query = req.query;
@@ -19,7 +19,7 @@
     for (let i = 0; i < limit; i++) {
       var data = {
         systemId: systemId,
-        agentId: 'mock-agentId',
+        agentId: 'foo-agentId',
         timeStamp: new Date().getTime(),
         total: 16384,
         free: _.round(Math.random() * (16384 / 4)),
@@ -38,7 +38,6 @@
         response: response
       }
     ));
-    next();
   });
 }
 
--- a/mock-api/endpoints/system-network.endpoint.js	Fri Sep 15 12:17:08 2017 -0400
+++ b/mock-api/endpoints/system-network.endpoint.js	Fri Sep 15 13:36:13 2017 -0400
@@ -1,7 +1,7 @@
 function systemNetwork (server) {
   let _ = require('lodash');
   server.init('systemNetwork');
-  server.app.get('/system-network/0.0.1/systems/:systemId', function (req, res, next) {
+  server.app.get('/system-network/0.0.1/systems/:systemId', function (req, res) {
     server.logRequest('system-network', req);
 
     var data = {
@@ -18,7 +18,7 @@
           'interfaceName': 'docker0',
           'displayName': 'docker0',
           'ip4Addr': '172.17.0.1',
-          'ip6Addr': 'fe80:0:0:0:42:17ff:feff:83f%docker0'         
+          'ip6Addr': 'fe80:0:0:0:42:17ff:feff:83f%docker0'
         }
       ],
       systemId: req.params.systemId
@@ -30,7 +30,6 @@
         response: [data]
       }
     ));
-    next();
   });
 }