Merge remote-tracking branch 'origin/development'

# Conflicts:
#	Readme.md

.gitignore

@@ -0,0 +1,4 @@
+.idea
+express-mock-af/node_modules
+express-mock-af/public/content
+express-mock-af/public/reports

Readme.md

@@ -1,15 +1,23 @@
-# 5GMS Examples
+<h1 align="center">5GMS Examples</h1>
+<p align="center">
+  <img src="https://img.shields.io/badge/Status-Under_Development-yellow" alt="Under Development">
+  <img src="https://img.shields.io/github/v/tag/5G-MAG/rt-5gms-examples?label=version" alt="Version">
+  <img src="https://img.shields.io/badge/License-5G--MAG%20Public%20License%20(v1.0)-blue" alt="License">
+</p>
 
 ## Introduction
 
 Example projects that make use of other 5G-MAG repositories or provide additional functionality to test and implement
 new features for 5GMS.
 
+Additional information can be found at: https://5g-mag.github.io/Getting-Started/pages/5g-media-streaming/
+
 ## Express Mock AF
 
 This project provides a very simple HTTP server that implements two routes.
 
-The first route `m8.js` is used to return information about the available services and the available base URL to the 5GMS Application Function. The 5GMS-Aware
+The first route `m8.js` is used to return
+information about the available services and the available base URL to the 5GMS Application Function. The 5GMS-Aware
 Application uses this route as M8 interface.
 
 The second route `service-access-information.js` provides the corresponding Service Access Information to the data that

express-mock-af/app.js

@@ -3,11 +3,15 @@ var path = require('path');
 var cookieParser = require('cookie-parser');
 var logger = require('morgan');
 var cors = require('cors');
+const bodyParser = require('body-parser');
+require('body-parser-xml')(bodyParser);
 
 var indexRouter = require('./routes/index');
 var usersRouter = require('./routes/users');
 var saiRouter = require('./routes/service-access-information');
 var m8Router = require('./routes/m8');
+var consumptionReportingRouter = require('./routes/consumption-reporting');
+var metricsReportingRouter = require('./routes/metrics-reporting');
 
 var app = express();
 
@@ -17,11 +21,15 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(cors());
+//app.use(bodyParser.xml());
+app.use(bodyParser.text({ type: 'application/xml' }));
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
 app.use('/3gpp-m5/v2/service-access-information', saiRouter )
 app.use('/m8/', m8Router )
+app.use('/3gpp-m5/v2/consumption-reporting', consumptionReportingRouter )
+app.use('/3gpp-m5/v2/metrics-reporting', metricsReportingRouter )
 
 module.exports = app;