Fix/consumption reporting changes (#7)

* Minor corrections to consumption reporting endpoint * Increase version number * Add consumption reporting examples * Increase version number to 1.1.0
5G-MAG · Dec 11, 2023 · 4efad62 · 4efad62
1 parent 8c16029
commit 4efad62
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/express-mock-af/package.json b/express-mock-af/package.json
@@ -1,6 +1,6 @@
 {
   "name": "express-mock-af",
-  "version": "0.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "start": "node ./bin/www"

diff --git a/express-mock-af/routes/consumption-reporting.js b/express-mock-af/routes/consumption-reporting.js
@@ -1,15 +1,8 @@
 var express = require('express');
 var router = express.Router();
 
-var querystring = require('querystring');
-var querystring = require('body-parser');
-
-
-router.post('/:provisisioningSessionId', function(req, res, next) {
-  const provisisioningSessionId = req.params.provisisioningSessionId;
-  //res.send("respond a resource for consumption-reporting with post for provisisioningSessionId:" + provisisioningSessionId);
-
+router.post('/:provisioningSessionId', function(req, res, next) {
   res.send(204);
 });
 
-module.exports = router;
+module.exports = router;
diff --git a/express-mock-af/routes/m8.js b/express-mock-af/routes/m8.js
@@ -2,7 +2,8 @@ var express = require('express');
 var router = express.Router();
 
 const m8 = {
-    m5BaseUrl: 'http://10.147.67.179:3003/3gpp-m5/v2/',
+    //m5BaseUrl: 'http://192.168.178.78:3003/3gpp-m5/v2/',
+    m5BaseUrl: 'http://10.147.67.10:3003/3gpp-m5/v2/',
     serviceList: [
         {
             provisioningSessionId: 1,
@@ -47,4 +48,4 @@ router.get('/m8.json', function (req, res, next) {
     res.json(m8)
 });
 
-module.exports = router;
+module.exports = router;
diff --git a/express-mock-af/routes/service-access-information.js b/express-mock-af/routes/service-access-information.js
@@ -1,6 +1,8 @@
 var express = require('express');
 var router = express.Router();
 
+//const baseUrl = 'http://192.168.178.78:3003';
+const baseUrl = 'http://10.147.67.10:3003';
 const sai = {
     3: {
         provisioningSessionId: 3,
@@ -21,9 +23,9 @@ const sai = {
             ]
         },
         clientConsumptionReportingConfiguration: {
-            serverAddresses: ['http://10.64.15.112:3003/3gpp-m5/v2/'],
-            locationReporting: false,
-            samplePercentage: 60.5,
+            serverAddresses: [`${baseUrl}/3gpp-m5/v2/`],
+            locationReporting: true,
+            samplePercentage: 99,
             reportingInterval: 10,
             accessReporting: true
         }
@@ -41,14 +43,23 @@ const sai = {
                     ]
                 }
             ]
+        },
+        clientConsumptionReportingConfiguration: {
+            serverAddresses: [`${baseUrl}/3gpp-m5/v2/`],
+            locationReporting: true,
+            samplePercentage: 100,
+            reportingInterval: 10,
+            accessReporting: true
         }
     }
 }
 
 /* GET users listing. */
 router.get('/:provisioningSessionId', function (req, res, next) {
     const id = req.params.provisioningSessionId;
+    res.setHeader('cache-control', 'max-age=5');
+    res.setHeader('last-modified', Date.now());
     res.json(sai[id])
 });
 
-module.exports = router;
+module.exports = router;