Update release notes and remove ONS demo tree
This patch removes the ONS 2019 demo subtree and provides an initial
skeletal release-notes file.
signed-off-by: dave kormann <dk3239@att.com>
Change-Id: I6efc52aaa3284baa066abcec4c291e208d77a392
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 694d2d9..45465bd 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -1,171 +1,12 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-..
+.. SPDX-License-Identifier: CC-BY-4.0
.. Copyright (C) 2019 AT&T Intellectual Property
-
-Release-Notes
-=============
+RIC E2E Testing Repo Release Notes
+==================================
-This document provides the release notes for <RELEASE> of <COMPONENT>.
-
-.. contents::
- :depth: 3
- :local:
-
-
-Version history
----------------
-
-+--------------------+--------------------+--------------------+--------------------+
-| **Date** | **Ver.** | **Author** | **Comment** |
-| | | | |
-+--------------------+--------------------+--------------------+--------------------+
-| 20XX-XX-XX | 0.1.0 | | First draft |
-| | | | |
-+--------------------+--------------------+--------------------+--------------------+
-| | 0.1.1 | | |
-| | | | |
-+--------------------+--------------------+--------------------+--------------------+
-| | 1.0 | | |
-| | | | |
-+--------------------+--------------------+--------------------+--------------------+
-
-
-Summary
--------
-
-<SUMMARIZE THE RELEASE - THE CONTENT - AND OTHER IMPORTANT HIGH LEVEL PROPERTIES>
-
-
-
-
-Release Data
-------------
-<STATE RELEVANT RELEASE DATA/RECORDS>
-
-<EXAMPLE>:
-
-+--------------------------------------+--------------------------------------+
-| **Project** | E.g. project |
-| | |
-+--------------------------------------+--------------------------------------+
-| **Repo/commit-ID** | E.g. genesis/adf634a0d4..... |
-| | |
-+--------------------------------------+--------------------------------------+
-| **Release designation** | E.g. Arno RC2 |
-| | |
-+--------------------------------------+--------------------------------------+
-| **Release date** | E.g. 2015-04-16 |
-| | |
-+--------------------------------------+--------------------------------------+
-| **Purpose of the delivery** | |
-| | |
-+--------------------------------------+--------------------------------------+
-
-
-
-
-Feature Additions
-^^^^^^^^^^^^^^^^^
-<STATE ADDED FEATURES BY REFERENCE TO JIRA>
-
-<EXAMPLE>:
-
-**JIRA BACK-LOG:**
-
-+--------------------------------------+--------------------------------------+
-| **JIRA REFERENCE** | **SLOGAN** |
-| | |
-+--------------------------------------+--------------------------------------+
-| | |
-| | |
-| | |
-+--------------------------------------+--------------------------------------+
-| | |
-| | |
-| | |
-+--------------------------------------+--------------------------------------+
-
-Bug Corrections
-^^^^^^^^^^^^^^^
-
-**JIRA TICKETS:**
-
-+--------------------------------------+--------------------------------------+
-| **JIRA REFERENCE** | **SLOGAN** |
-| | |
-+--------------------------------------+--------------------------------------+
-| | |
-| | |
-| | |
-+--------------------------------------+--------------------------------------+
-| | |
-| | |
-| | |
-+--------------------------------------+--------------------------------------+
-
-Deliverables
-^^^^^^^^^^^^
-
-Software Deliverables
-+++++++++++++++++++++
-
-<STATE WHAT SOFTWARE DELIVERABLES THAT ARE RELATED TO THIS VERSION, AND WHERE THOSE CAN BE RETRIEVED>
-
-
-
-Documentation Deliverables
-++++++++++++++++++++++++++
-
-<STATE WHAT DOCUMENTATION DELIVERABLES THAT ARE RELATED TO THIS VERSION, AND WHERE THOSE CAN BE RETRIEVED>
-
-
-
-
-Known Limitations, Issues and Workarounds
------------------------------------------
-
-System Limitations
-^^^^^^^^^^^^^^^^^^
-<STATE ALL RELEVANT SYSTEM LIMITATIONS, IF THERE IS ANY>
-
-
-
-Known Issues
-^^^^^^^^^^^^
-<STATE ALL KNOWN ISSUES WITH JIRA REFERENCE>
-
-<EXAMPLE>:
-
-**JIRA TICKETS:**
-
-+--------------------------------------+--------------------------------------+
-| **JIRA REFERENCE** | **SLOGAN** |
-| | |
-+--------------------------------------+--------------------------------------+
-| | |
-| | |
-| | |
-+--------------------------------------+--------------------------------------+
-| | |
-| | |
-| | |
-+--------------------------------------+--------------------------------------+
-
-Workarounds
-^^^^^^^^^^^
-
-<STATE ALL KNOWN WORKAROUNDS TO THE ISSUES STATED ABOVE, IF THERE IS ANY>
-
-
-
-
-References
-----------
-<STATE RELEVANT REFERENCES FOR THIS RELEASE/VERSION>
-
-
-
+Version 1.0.0, 12 Nov 2019
+--------------------------
+* Initial version
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/a1med.py b/ons_2019_demo/a1_med/a1_med_http_server/a1med.py
deleted file mode 100755
index 74b11a5..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/a1med.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!flask/bin/python
-#
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from flask import Flask, jsonify, request
-from datetime import timedelta
-from flask import make_response, request, current_app
-from flask_cors import CORS, cross_origin
-from functools import update_wrapper
-import json
-
-def crossdomain(origin=None, methods=None, headers=None, max_age=21600,
- attach_to_all=True, automatic_options=True):
- """Decorator function that allows crossdomain requests.
- Courtesy of
- https://blog.skyred.fi/articles/better-crossdomain-snippet-for-flask.html
- """
- if methods is not None:
- methods = ', '.join(sorted(x.upper() for x in methods))
- if headers is not None and not isinstance(headers, list):
- headers = ', '.join(x.upper() for x in headers)
- if not isinstance(origin, list):
- origin = ', '.join(origin)
- if isinstance(max_age, timedelta):
- max_age = max_age.total_seconds()
-
- def get_methods():
- """ Determines which methods are allowed
- """
- if methods is not None:
- return methods
-
- options_resp = current_app.make_default_options_response()
- return options_resp.headers['allow']
-
- def decorator(f):
- """The decorator function
- """
- def wrapped_function(*args, **kwargs):
- """Caries out the actual cross domain code
- """
- if automatic_options and request.method == 'OPTIONS':
- resp = current_app.make_default_options_response()
- else:
- resp = make_response(f(*args, **kwargs))
- if not attach_to_all and request.method != 'OPTIONS':
- return resp
-
- h = resp.headers
- h['Access-Control-Allow-Origin'] = origin
- h['Access-Control-Allow-Methods'] = get_methods()
- h['Access-Control-Max-Age'] = str(max_age)
- h['Access-Control-Allow-Credentials'] = 'true'
- h['Access-Control-Allow-Headers'] = \
- "Origin, X-Requested-With, Content-Type, Accept, Authorization"
- if headers is not None:
- h['Access-Control-Allow-Headers'] = headers
- return resp
-
- f.provide_automatic_options = False
- return update_wrapper(wrapped_function, f)
- return decorator
-
-app = Flask(__name__)
-cors = CORS(app)
-
-@app.route('/a1ric/metrics', methods=['GET'])
-def get_metrics():
- with open('metrics.json') as json_file:
- metrics = json.load(json_file)
- return jsonify(metrics)
-
-@app.route('/a1ric/delay', methods=['GET'])
-def get_delay():
- with open('delay.json') as json_file:
- delay = json.load(json_file)
- return jsonify(delay)
-
-@app.route('/a1ric/load', methods=['GET'])
-def get_load():
- with open('load.json') as json_file:
- load = json.load(json_file)
- return jsonify(load)
-
-@app.route('/a1ric/delay', methods=['PUT'])
-def write_delay_file():
- if not request.json or not 'delay' in request.json:
- abort(400)
- delay = {
- 'delay': request.json['delay'],
- }
- delay_json = json.dumps(delay)
- f = open("delay.json","w")
- f.write(delay_json)
-
- f = open("delay.txt","w")
- print (request.json['delay'])
- f.write(str(request.json['delay']))
-
- return jsonify(delay), 201
-
-@app.route('/a1ric/load', methods=['PUT'])
-def write_load_file():
- if not request.json or not 'load' in request.json:
- abort(400)
- load = {
- 'load': request.json['load'],
- }
- load_json = json.dumps(load)
- f = open("load.json","w")
- f.write(load_json)
-
- f = open("load.txt","w")
- print (request.json['load'])
- #f.write(str(request.json['load']*80000))
- f.write(str(request.json['load']*(8/1000)))
-
- return jsonify(load), 201
-
-if __name__ == '__main__':
- app.run(debug=True, host='0.0.0.0', port=10080)
- #app.run(debug=True, host='0.0.0.0', port=3000)
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/delay.json b/ons_2019_demo/a1_med/a1_med_http_server/delay.json
deleted file mode 100644
index 6d20400..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/delay.json
+++ /dev/null
@@ -1 +0,0 @@
-{"delay": 146655}
\ No newline at end of file
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/delay.txt b/ons_2019_demo/a1_med/a1_med_http_server/delay.txt
deleted file mode 100644
index 22c0945..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/delay.txt
+++ /dev/null
@@ -1 +0,0 @@
-146655
\ No newline at end of file
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/Dockerfile b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/Dockerfile
deleted file mode 100644
index ba292d4..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y \
- python-pip \
- virtualenv
-
-COPY . /a1_server
-
-CMD /a1_server/run_server
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/a1med.py b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/a1med.py
deleted file mode 100755
index 4b3fca5..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/a1med.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!flask/bin/python
-#
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from flask import Flask, jsonify, request
-import json
-
-app = Flask(__name__)
-
-
-
-@app.route('/a1ric/metrics', methods=['GET'])
-def get_metrics():
- with open('metrics.json') as json_file:
- metrics = json.load(json_file)
- return jsonify(metrics)
-
-@app.route('/a1ric/delay', methods=['GET'])
-def get_delay():
- with open('delay.json') as json_file:
- delay = json.load(json_file)
- return jsonify(delay)
-
-@app.route('/a1ric/load', methods=['GET'])
-def get_load():
- with open('load.json') as json_file:
- load = json.load(json_file)
- return jsonify(load)
-
-@app.route('/a1ric/delay', methods=['PUT'])
-def write_delay_file():
- if not request.json or not 'delay' in request.json:
- abort(400)
- delay = {
- 'delay': request.json['delay'],
- }
- delay_json = json.dumps(delay)
- f = open("delay.json","w")
- f.write(delay_json)
- return jsonify(delay), 201
-
-@app.route('/a1ric/load', methods=['PUT'])
-def write_load_file():
- if not request.json or not 'load' in request.json:
- abort(400)
- load = {
- 'load': request.json['load'],
- }
- load_json = json.dumps(load)
- f = open("load.json","w")
- f.write(load_json)
- return jsonify(load), 201
-
-if __name__ == '__main__':
- app.run(debug=True, host='0.0.0.0', port=10080)
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/build_docker_image b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/build_docker_image
deleted file mode 100755
index 1a1ea26..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/build_docker_image
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t a1-med:0.0.1 .
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/delay.json b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/delay.json
deleted file mode 100644
index 3f0465a..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/delay.json
+++ /dev/null
@@ -1 +0,0 @@
-{"delay": 150}
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/load.json b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/load.json
deleted file mode 100644
index 8759a65..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/load.json
+++ /dev/null
@@ -1 +0,0 @@
-{"load": 130}
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/metrics.json b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/metrics.json
deleted file mode 100644
index 5d7a572..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/metrics.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "latency": 10,
- "load": 100,
- "time": 123
-}
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/run_container b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/run_container
deleted file mode 100755
index 3c7c0a6..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/run_container
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run -d -p 10080:10080 --name a1-med -v /a1_server/delay.json:$1 -v /a1_server/load.json:$2 -v /a1_server/metrics.json:$3 a1-med:0.0.1
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/run_server b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/run_server
deleted file mode 100755
index 04ee38a..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/run_server
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-virtualenv flask
-
-flask/bin/pip install flask
-
-./a1med.py
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getdelay b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getdelay
deleted file mode 100755
index 815a1df..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getdelay
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-curl http://localhost:10080/a1ric/delay
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getload b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getload
deleted file mode 100755
index 150c7ba..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getload
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-curl http://localhost:10080/a1ric/load
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getmetrics b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getmetrics
deleted file mode 100755
index 5566401..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/getmetrics
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-curl http://localhost:10080/a1ric/metrics
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/putdelay b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/putdelay
deleted file mode 100755
index 0e47be8..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/putdelay
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-curl --header "Content-Type: application/json" \
- --request PUT \
- --data '{"delay": 150}' \
- http://localhost:10080/a1ric/delay
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/putload b/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/putload
deleted file mode 100755
index d06f248..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/dockerized_version/tests/putload
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-curl --header "Content-Type: application/json" \
- --request PUT \
- --data '{"load": 130}' \
- http://localhost:10080/a1ric/load
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/load.json b/ons_2019_demo/a1_med/a1_med_http_server/load.json
deleted file mode 100644
index 2828afc..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/load.json
+++ /dev/null
@@ -1 +0,0 @@
-{"load": 93251172}
\ No newline at end of file
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/load.txt b/ons_2019_demo/a1_med/a1_med_http_server/load.txt
deleted file mode 100644
index f0e294b..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/load.txt
+++ /dev/null
@@ -1 +0,0 @@
-746009.376
\ No newline at end of file
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/metrics.json b/ons_2019_demo/a1_med/a1_med_http_server/metrics.json
deleted file mode 100644
index 78618bb..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/metrics.json
+++ /dev/null
@@ -1 +0,0 @@
-{"latency":7, "ricload":12329, "load":114, "time":1554072669}
\ No newline at end of file
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/nohup.out b/ons_2019_demo/a1_med/a1_med_http_server/nohup.out
deleted file mode 100644
index fc3bc97..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/nohup.out
+++ /dev/null
@@ -1,182 +0,0 @@
-Using base prefix '/usr'
-New python executable in /home/demo/felix/old/a1mediator/flask/bin/python3
-Not overwriting existing python script /home/demo/felix/old/a1mediator/flask/bin/python (you must use /home/demo/felix/old/a1mediator/flask/bin/python3)
-Installing setuptools, pip, wheel...
-done.
-Requirement already satisfied: flask in ./flask/lib/python3.5/site-packages (1.0.2)
-Requirement already satisfied: Jinja2>=2.10 in ./flask/lib/python3.5/site-packages (from flask) (2.10)
-Requirement already satisfied: click>=5.1 in ./flask/lib/python3.5/site-packages (from flask) (7.0)
-Requirement already satisfied: itsdangerous>=0.24 in ./flask/lib/python3.5/site-packages (from flask) (1.1.0)
-Requirement already satisfied: Werkzeug>=0.14 in ./flask/lib/python3.5/site-packages (from flask) (0.15.1)
-Requirement already satisfied: MarkupSafe>=0.23 in ./flask/lib/python3.5/site-packages (from Jinja2>=2.10->flask) (1.1.1)
-Requirement already satisfied: flask_cors in ./flask/lib/python3.5/site-packages (3.0.7)
-Requirement already satisfied: Six in ./flask/lib/python3.5/site-packages (from flask_cors) (1.12.0)
-Requirement already satisfied: Flask>=0.9 in ./flask/lib/python3.5/site-packages (from flask_cors) (1.0.2)
-Requirement already satisfied: Jinja2>=2.10 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (2.10)
-Requirement already satisfied: Werkzeug>=0.14 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (0.15.1)
-Requirement already satisfied: click>=5.1 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (7.0)
-Requirement already satisfied: itsdangerous>=0.24 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (1.1.0)
-Requirement already satisfied: MarkupSafe>=0.23 in ./flask/lib/python3.5/site-packages (from Jinja2>=2.10->Flask>=0.9->flask_cors) (1.1.1)
- * Serving Flask app "a1med" (lazy loading)
- * Environment: production
- WARNING: Do not use the development server in a production environment.
- Use a production WSGI server instead.
- * Debug mode: on
- * Running on http://0.0.0.0:10080/ (Press CTRL+C to quit)
- * Restarting with stat
- * Debugger is active!
- * Debugger PIN: 339-081-054
-135.197.228.156 - - [23/Mar/2019 19:40:35] "GET / HTTP/1.1" 404 -
-135.197.228.156 - - [23/Mar/2019 19:40:48] "GET /a1ric/latency HTTP/1.1" 404 -
-135.197.228.156 - - [23/Mar/2019 19:40:51] "GET /a1ric/latency HTTP/1.1" 404 -
-135.197.228.156 - - [23/Mar/2019 19:41:01] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 19:41:06] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 19:57:30] "OPTIONS /a1ric/delay HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:57:30] "OPTIONS /a1ric/load HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:57:30] "OPTIONS /a1ric/metrics HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:58:11] "OPTIONS /a1ric/delay HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:58:11] "OPTIONS /a1ric/load HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:58:11] "OPTIONS /a1ric/metrics HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:59:23] "OPTIONS /a1ric/load HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:59:23] "OPTIONS /a1ric/delay HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:59:23] "OPTIONS /a1ric/metrics HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:59:25] "OPTIONS /a1ric/load HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:59:25] "OPTIONS /a1ric/delay HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 19:59:25] "OPTIONS /a1ric/metrics HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 20:05:10] "OPTIONS /a1ric/load HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 20:05:10] "OPTIONS /a1ric/metrics HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 20:05:10] "OPTIONS /a1ric/delay HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 20:08:27] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:08:29] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:12:21] "OPTIONS /a1ric/metrics HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 20:12:21] "OPTIONS /a1ric/load HTTP/1.1" 405 -
-135.197.228.156 - - [23/Mar/2019 20:12:21] "OPTIONS /a1ric/delay HTTP/1.1" 405 -
- * Detected change in '/home/demo/felix/old/a1mediator/a1med.py', reloading
- * Restarting with stat
- * Debugger is active!
- * Debugger PIN: 339-081-054
-Using base prefix '/usr'
-New python executable in /home/demo/felix/old/a1mediator/flask/bin/python3
-Not overwriting existing python script /home/demo/felix/old/a1mediator/flask/bin/python (you must use /home/demo/felix/old/a1mediator/flask/bin/python3)
-Installing setuptools, pip, wheel...
-done.
-Requirement already satisfied: flask in ./flask/lib/python3.5/site-packages (1.0.2)
-Requirement already satisfied: Werkzeug>=0.14 in ./flask/lib/python3.5/site-packages (from flask) (0.15.1)
-Requirement already satisfied: Jinja2>=2.10 in ./flask/lib/python3.5/site-packages (from flask) (2.10)
-Requirement already satisfied: click>=5.1 in ./flask/lib/python3.5/site-packages (from flask) (7.0)
-Requirement already satisfied: itsdangerous>=0.24 in ./flask/lib/python3.5/site-packages (from flask) (1.1.0)
-Requirement already satisfied: MarkupSafe>=0.23 in ./flask/lib/python3.5/site-packages (from Jinja2>=2.10->flask) (1.1.1)
-Requirement already satisfied: flask_cors in ./flask/lib/python3.5/site-packages (3.0.7)
-Requirement already satisfied: Six in ./flask/lib/python3.5/site-packages (from flask_cors) (1.12.0)
-Requirement already satisfied: Flask>=0.9 in ./flask/lib/python3.5/site-packages (from flask_cors) (1.0.2)
-Requirement already satisfied: click>=5.1 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (7.0)
-Requirement already satisfied: Werkzeug>=0.14 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (0.15.1)
-Requirement already satisfied: Jinja2>=2.10 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (2.10)
-Requirement already satisfied: itsdangerous>=0.24 in ./flask/lib/python3.5/site-packages (from Flask>=0.9->flask_cors) (1.1.0)
-Requirement already satisfied: MarkupSafe>=0.23 in ./flask/lib/python3.5/site-packages (from Jinja2>=2.10->Flask>=0.9->flask_cors) (1.1.1)
- * Serving Flask app "a1med" (lazy loading)
- * Environment: production
- WARNING: Do not use the development server in a production environment.
- Use a production WSGI server instead.
- * Debug mode: on
- * Running on http://0.0.0.0:10080/ (Press CTRL+C to quit)
- * Restarting with stat
- * Debugger is active!
- * Debugger PIN: 339-081-054
-135.197.228.156 - - [23/Mar/2019 20:19:49] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:19:49] "GET /favicon.ico HTTP/1.1" 404 -
-135.197.228.156 - - [23/Mar/2019 20:20:17] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:17] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:17] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:17] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:17] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:17] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:29] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:29] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:29] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:29] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:29] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:29] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:33] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:33] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:33] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:40] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:40] "PUT /a1ric/delay HTTP/1.1" 201 -
-135.197.228.156 - - [23/Mar/2019 20:20:42] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:43] "PUT /a1ric/load HTTP/1.1" 201 -
-135.197.228.156 - - [23/Mar/2019 20:20:53] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:53] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:53] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:53] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:53] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:20:53] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:02] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:02] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:03] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:04] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:05] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:06] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:07] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:08] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:08] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:09] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:10] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:11] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:12] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:13] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:30] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:30] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:30] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:30] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:30] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:21:30] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:25] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:25] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:25] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:25] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:25] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:25] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:31] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:31] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:31] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:31] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:31] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:31] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:33] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:33] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:33] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:36] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:36] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:36] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:36] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:36] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:22:36] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:39] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:39] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:39] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:39] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:39] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:39] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:57] "OPTIONS /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:57] "OPTIONS /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:57] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:57] "GET /a1ric/delay HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:57] "GET /a1ric/load HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:24:57] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:25:58] "OPTIONS /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:25:58] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.197.228.156 - - [23/Mar/2019 20:25:59] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.207.230.61 - - [23/Mar/2019 21:36:09] "GET / HTTP/1.1" 404 -
-135.207.230.61 - - [23/Mar/2019 21:36:09] "GET /favicon.ico HTTP/1.1" 404 -
-135.207.230.61 - - [23/Mar/2019 21:36:15] "GET /a1ric/load HTTP/1.1" 200 -
-135.207.230.61 - - [23/Mar/2019 21:36:15] "GET /favicon.ico HTTP/1.1" 404 -
-135.207.230.61 - - [23/Mar/2019 21:36:24] "GET /a1ric/load HTTP/1.1" 200 -
-135.207.230.69 - - [24/Mar/2019 11:58:53] "GET / HTTP/1.1" 404 -
-135.207.230.69 - - [24/Mar/2019 11:59:07] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.207.230.69 - - [24/Mar/2019 11:59:07] "GET /favicon.ico HTTP/1.1" 404 -
-135.207.230.69 - - [24/Mar/2019 11:59:26] "GET / HTTP/1.1" 404 -
-135.207.230.69 - - [24/Mar/2019 11:59:32] "GET / HTTP/1.1" 404 -
-135.207.230.69 - - [24/Mar/2019 11:59:33] "GET /favicon.ico HTTP/1.1" 404 -
-135.207.230.69 - - [24/Mar/2019 12:02:50] "GET /a1ric/metrics HTTP/1.1" 200 -
-135.207.230.69 - - [24/Mar/2019 12:02:53] "GET /a1ric/metrics HTTP/1.1" 200 -
-./run_server: line 8: 31643 Killed ./a1med.py
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/run_server b/ons_2019_demo/a1_med/a1_med_http_server/run_server
deleted file mode 100755
index 3cf55e2..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/run_server
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-virtualenv flask
-
-flask/bin/pip install flask
-flask/bin/pip install flask_cors
-
-./a1med.py
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/tests/getdelay b/ons_2019_demo/a1_med/a1_med_http_server/tests/getdelay
deleted file mode 100755
index 815a1df..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/tests/getdelay
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-curl http://localhost:10080/a1ric/delay
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/tests/getload b/ons_2019_demo/a1_med/a1_med_http_server/tests/getload
deleted file mode 100755
index 150c7ba..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/tests/getload
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-curl http://localhost:10080/a1ric/load
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/tests/getmetrics b/ons_2019_demo/a1_med/a1_med_http_server/tests/getmetrics
deleted file mode 100755
index 5566401..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/tests/getmetrics
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-curl http://localhost:10080/a1ric/metrics
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/tests/putdelay b/ons_2019_demo/a1_med/a1_med_http_server/tests/putdelay
deleted file mode 100755
index 0e47be8..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/tests/putdelay
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-curl --header "Content-Type: application/json" \
- --request PUT \
- --data '{"delay": 150}' \
- http://localhost:10080/a1ric/delay
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/tests/putload b/ons_2019_demo/a1_med/a1_med_http_server/tests/putload
deleted file mode 100755
index d06f248..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/tests/putload
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-curl --header "Content-Type: application/json" \
- --request PUT \
- --data '{"load": 130}' \
- http://localhost:10080/a1ric/load
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/unused/delay.json b/ons_2019_demo/a1_med/a1_med_http_server/unused/delay.json
deleted file mode 100644
index d8bd0f4..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/unused/delay.json
+++ /dev/null
@@ -1 +0,0 @@
-{"delay": 1145}
\ No newline at end of file
diff --git a/ons_2019_demo/a1_med/a1_med_http_server/unused/load.json b/ons_2019_demo/a1_med/a1_med_http_server/unused/load.json
deleted file mode 100644
index ea6d824..0000000
--- a/ons_2019_demo/a1_med/a1_med_http_server/unused/load.json
+++ /dev/null
@@ -1 +0,0 @@
-{"load": 1}
\ No newline at end of file
diff --git a/ons_2019_demo/a1_med/build_and_run_dummy_a1_med.sh b/ons_2019_demo/a1_med/build_and_run_dummy_a1_med.sh
deleted file mode 100644
index 900657d..0000000
--- a/ons_2019_demo/a1_med/build_and_run_dummy_a1_med.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -eu
-#
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-export C_INCLUDE_PATH=$HOME/usr/include
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/usr/lib
-export RMR_SEED_RT=$HOME/global_rmr_files/global_rmr_routes.rt
-gcc dummy_a1_med.c -g -o dummy_a1_med -L $HOME/usr/lib -lrmr_nng -lnng -lpthread -lm
-
-export DUMMY_SENDER_RMR_RCV_PORT=38086
-export DEMO_SENDER_PTO=1 # poll timeout listening for replies
-export DEMO_MAX_PAYLOAD_BYTES=240 # max_size of payload
-export DELAY_FILE_PATH="./a1_med_http_server/delay.txt" # max_size of payload
-export METRICS_FILE_PATH="./a1_med_http_server/metrics.json" # max_size of payload
-
-./dummy_a1_med;
diff --git a/ons_2019_demo/a1_med/dummy_a1_med.c b/ons_2019_demo/a1_med/dummy_a1_med.c
deleted file mode 100644
index 3e5f7cb..0000000
--- a/ons_2019_demo/a1_med/dummy_a1_med.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *
- * Copyright 2019 AT&T Intellectual Property
- * Copyright 2019 Nokia
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// :vim ts=4 sw=4 noet:
-
-/*
- Mnemonic: rmr_sender2.c
- Abstract: Very simple test sender that polls and deals with responses
- in between sends (from a single process).
-
- Date: 18 February 2018
- Author: E. Scott Daniels
-
- Modified: 18 Mar 2019 - changes to support demo
-*/
-
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/epoll.h>
-#include <time.h>
-#include <rmr/rmr.h>
-#include "dummy_a1_rmr_wrapper.h"
-
-
-void usage( char* argv0 ) {
- fprintf( stderr, "usage: %s [mtype-max]\n", argv0 );
- fprintf( stderr, "Sender will send messages with rotating msg types from 0 through mtype-max (if supplied)\n" );
- fprintf( stderr, "if not supplied, only mtype 0 is sent\n" );
- fprintf( stderr, "The default listen port for return messages is 43086; this can be changed by setting DUMMY_SENDER_RMR_RCV_PORT in the environment.\n" );
- fprintf( stderr, "The sender will send forever unless DEMO_SENDER_MAX is set in the environment which causes termination after max messages.\n" );
- fprintf( stderr, "The sender will poll for received messages after each send. The amount of time waited is controlled with DEMO_SENDER_PTO (ms) in the env. Use 0 for non-blocking poll.\n" );
-}
-
-void send_delay_message(struct rmr_context *rmr_c, char* delay_file_path){
- FILE *fp;
- char delay[255];
-
- fp = fopen(delay_file_path, "r");
- fscanf(fp, "%s", delay);
- int mtype = 100;
- rmr_pure_send(rmr_c, mtype, delay);
- fprintf( stderr, "Sent delay insert message of type:%d (delay insert) to pendulum control xApp, with content:%s\n",mtype,delay);
- fclose(fp);
-}
-
-void send_and_rec_metrics(struct rmr_context *rmr_c, char* metrics_file_path){
- int mtype=102;
- char* message="--give metrics--";
- rmr_pure_send(rmr_c, mtype, message );
- printf("Sent message of type:%d to E2 terminator with content:%s\n",mtype,message);
- int got_metrics=0;
- while (got_metrics == 0){
- if(rmr_poll_for_message(rmr_c) == 1) {
- if(rmr_c->rbuf->mtype == 103)
- got_metrics=1;
- }
- }
- printf("Recieved metrics from E2 terminator with content:%s\n",rmr_c->rbuf->payload);
-
- FILE *fp;
- fp = fopen(metrics_file_path, "w+");
- fprintf(fp,"%s",rmr_c->rbuf->payload);
- fclose(fp);
-
-}
-int main( int argc, char** argv ) {
- struct rmr_context *rmr_c; //obtain our enhanced rmr_context
- char* lport = "43086"; // default listen port
- char* delay_file_path ="";
- char* metrics_file_path ="";
- if( (eparm = getenv( "DUMMY_SENDER_RMR_RCV_PORT" )) != NULL ) {
- lport = strdup( eparm );
- }
-
- if( (eparm = getenv( "DELAY_FILE_PATH" )) != NULL ) {
- delay_file_path = eparm ;
- }
-
- if( (eparm = getenv( "METRICS_FILE_PATH" )) != NULL ) {
- metrics_file_path = eparm ;
- }
-
- rmr_c = rmr_init_wrapper(lport);
-
- while( ! rmr_ready( rmr_c->mrc ) ) {
- fprintf( stderr, "<TEST> waiting for RMr to indicate ready\n" );
- sleep( 1 );
- }
- fprintf( stderr, "[OK] initialisation complete\n" );
- fprintf( stderr, "======================================\n[OK] A1 mediator is up and running!\n==================================\n" );
-
- while( 1 ) {
- sleep (2);
-
- send_delay_message(rmr_c, delay_file_path);
-
- send_and_rec_metrics(rmr_c, metrics_file_path);
- fprintf( stderr, "-------------------------------------------\n");
- }
-
-
-
- fprintf( stderr, "[INFO] sender is terminating\n");
- rmr_close_wrapper(rmr_c);
-
- return 0;
-}
diff --git a/ons_2019_demo/a1_med/dummy_a1_rmr_wrapper.h b/ons_2019_demo/a1_med/dummy_a1_rmr_wrapper.h
deleted file mode 100644
index 999342c..0000000
--- a/ons_2019_demo/a1_med/dummy_a1_rmr_wrapper.h
+++ /dev/null
@@ -1,121 +0,0 @@
-int epoll_to = 1;// global default epoll timout -- 1ms
-char* eparm; // generic env pointer
-
-struct rmr_context {
- void* mrc;
- int rcv_fd; // pollable fd
- struct epoll_event epe; // event definition for event to listen to
- struct epoll_event events[10]; // wait on 10 possible events
- int ep_fd;
- int max_payload_size; // ++SCOTT
- rmr_mbuf_t* sbuf; // send buffer
- rmr_mbuf_t* rbuf; // received buffer
-};
-
-
-struct rmr_context * rmr_init_wrapper(char* lport){
-
- struct rmr_context *rmr_c = malloc(sizeof (struct rmr_context));
- fprintf( stderr, "[INFO] glistening for replies on %s\n", lport );
-
-
- rmr_c->mrc = rmr_init(lport, RMR_MAX_RCV_BYTES, RMRFL_NONE ); // setup RMr and get a context (rmr_c.mrc)
- rmr_c->ep_fd=-1;
-
- //polling related initializations
- rmr_c->rcv_fd = rmr_get_rcvfd( rmr_c->mrc );// get the fd to poll for messages received
- if( rmr_c->rcv_fd < 0 ) {
- fprintf( stderr, "[FAIL] unable to set up polling fd\n" );
- exit( 1 );
- }
-
- if( (rmr_c->ep_fd = epoll_create1( 0 )) < 0 ) {
- fprintf( stderr, "[FAIL] unable to create epoll fd: %d\n", errno );
- exit( 1 );
- }
- rmr_c->epe.events = EPOLLIN;
- rmr_c->epe.data.fd = rmr_c->rcv_fd;
-
- if( epoll_ctl( rmr_c->ep_fd, EPOLL_CTL_ADD, rmr_c->rcv_fd, &rmr_c->epe ) != 0 ) {
- fprintf( stderr, "[FAIL] epoll_ctl status not 0 : %s\n", strerror( errno ) );
- exit( 1 );
- }
- //end of polling related initializations
-
- //++SCOTT------ next lines until !!SCOTT
- rmr_c->max_payload_size = 240; //default
- if( (eparm = getenv( "DEMO_MAX_PAYLOAD_BYTES" )) != NULL ) {
- rmr_c->max_payload_size = atoi(eparm); // override with env
- }
- //!!SCOTT
-
- //~~SCOTT next line
- rmr_c->sbuf = rmr_alloc_msg( rmr_c->mrc, rmr_c->max_payload_size ); // allocate largest payload to send
- rmr_c->rbuf = NULL;
-
- return rmr_c;
-}
-
-void rmr_pure_send (struct rmr_context *rmr_c, int mtype, char* message) {
- //--SCOTT int max_payload_size = 240; //default
- //--SCOTT if( (eparm = getenv( "DEMO_MAX_PAYLOAD_BYTES" )) != NULL ) {
- //--SCOTT max_payload_size = atoi(eparm);
- //--SCOTT }
-
- //~~SCOTT next line
- snprintf( rmr_c->sbuf->payload, rmr_c->max_payload_size, "%s", message); // simple send message -- replace with real content
-
- rmr_c->sbuf->mtype = mtype; // fill in message meta data
- rmr_c->sbuf->len = strlen( rmr_c->sbuf->payload ) + 1; // actual length of payload (count the nil end of string)
- rmr_c->sbuf->state = 0;
- rmr_send_msg( rmr_c->mrc, rmr_c->sbuf );
-// //retry send for a few times before giving up
-// long natter = 0; // natter on for errors only once in a while
-// if( (rmr_c->sbuf = rmr_send_msg( rmr_c->mrc, rmr_c->sbuf )) != NULL ) {// unlikely, but might get a null pointer back if NNG really is buggered
-// if( rmr_c->sbuf->state != RMR_OK ) {
-// if( errno == EAGAIN ) {
-// while( rmr_c->sbuf->state != RMR_OK && errno == EAGAIN ) {// NNG likes to refuse sends, just keep trying on eagain
-// rmr_send_msg( rmr_c->mrc, rmr_c->sbuf );
-// }
-// } else {// most likely connection refused, don't natter on
-// if( time( NULL ) > natter ) {
-// fprintf( stderr, "[WARN] send failed, pausing (%s)\n", strerror( errno ) );
-// natter = time( NULL ) + 2;
-// }
-// sleep( 1 );
-// }
-// }
-// } else {
-// if( time( NULL ) > natter ) {
-// fprintf( stderr, "[WARN] send failed, pausing (%s)\n", strerror( errno ) );
-// natter = time( NULL ) + 2;
-// }
-// sleep( 1 );
-// }
-}
-
-int rmr_poll_for_message (struct rmr_context *rmr_c) {
- //start polling the channel to read the acknowledgment
- //~~SCOTT next line
- int nready;
- int i;
- int return_type =0;
-
- nready = epoll_wait( rmr_c->ep_fd, rmr_c->events, 10, epoll_to ); // wait up to epoll_to ms for a response
- for( i = 0; i < nready && i < 10; i++ ) { // loop through to find what is ready
- if( rmr_c->events[i].data.fd == rmr_c->rcv_fd ) { // RMr has something
- errno = 0;
- rmr_c->rbuf = rmr_rcv_msg( rmr_c->mrc, rmr_c->rbuf ); // something ready; this should not block
- if( rmr_c->rbuf ) {
- //fprintf( stderr, "<TEST> acknowledgment received:%s\n",rmr_c->rbuf->payload);
- return_type = 1; //the message has been acknowledged
- }
- }
- }
- return return_type;
-}
-void rmr_close_wrapper (struct rmr_context *rmr_c){
-
- rmr_close( rmr_c->mrc );
- free(rmr_c);
-}
diff --git a/ons_2019_demo/dashboard/docker-compose.yml b/ons_2019_demo/dashboard/docker-compose.yml
deleted file mode 100644
index 2804e45..0000000
--- a/ons_2019_demo/dashboard/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-version: '2'
-
-services:
-
- ric-dashboard:
- image: snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/ric-dash-app-be:1.0.2-SNAPSHOT
- ports:
- - 9080:8080
-
- ric-jsonserver:
- image: snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/ric/json-server:latest
- ports:
- - 3000:3000
diff --git a/ons_2019_demo/dashboard/docker-compose_v3.yml b/ons_2019_demo/dashboard/docker-compose_v3.yml
deleted file mode 100644
index 993ba86..0000000
--- a/ons_2019_demo/dashboard/docker-compose_v3.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-version: '2'
-
-services:
-
- ric-dashboard:
- image: snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/ric-dash-app-be:1.0.3-SNAPSHOT
- ports:
- - 9080:8080
-
- ric-jsonserver:
- image: snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/ric/json-server:1.0.3-SNAPSHOT
- ports:
- - 3000:3000
diff --git a/ons_2019_demo/global_rmr_routes.rt b/ons_2019_demo/global_rmr_routes.rt
deleted file mode 100644
index 9c8d6a7..0000000
--- a/ons_2019_demo/global_rmr_routes.rt
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-newrt|start
-#pendulum_xapp RMR port is 5560
-#RIC_PENDULUM_XAPP_ANGLE_MESSAGE is 0
-#RIC_PENDULUM_XAPP_ANGLE_RESPONSE is 33 for the rts type for the pendulum control ack. Not sure this is good practice
-#RIC_E2_TERMINATION_METRIC_REQUEST = 102
-#RIC_PENDULUM_XAPP_CONFIG_REQUEST = 100 (delay)
-#RIC_LOAD_GENERATOR_CONFIG_REQUEST = 101
-#RIC_E2_TERMINATION_METRIC_REQUEST = 102
-#RIC_E2_TERMINATION_METRIC_RESPONSE = 103
-#RIC_E2_TERMINATION_LOAD = 104
-#RIC_LOAD_CONSUMER = 105
-rte|0|localhost:5560
-rte|100|localhost:5560
-rte|102|localhost:48886
-rte|103|localhost:38086
-rte|104|localhost:48886
-rte|105|localhost:19289
-rte|33|localhost:48886
-# this is needed so that receiver acks can be sent via rmr_rts_msg() calls
-#rte|99|localhost:48886
-newrt|end
-
-
-# This is infact a global route file that every container is referring to
-# 38086 - a1_med
-# 19289 - load_consumer, hardcoded
-# - load_gen, not needed
-# 5560 - pendulum_xapp
-# 48886 - e2term
diff --git a/ons_2019_demo/load_consumer/Dockerfile b/ons_2019_demo/load_consumer/Dockerfile
deleted file mode 100644
index 2ca8440..0000000
--- a/ons_2019_demo/load_consumer/Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# sudo docker build -t load_consumer .
-# sudo docker run --rm -it load_consumer
-
-FROM ubuntu:16.04
-
-# Install necessary packages
-RUN apt-get update
-RUN apt-get update && apt-get install -y gcc git make bash vim cmake g++ ksh
-RUN apt-get install -y iputils-ping
-
-# Install rmr in /usr/local
-WORKDIR /home
-RUN git clone https://gerrit.oran-osc.org/r/ric-plt/lib/rmr
-RUN date; ls -al /usr/local/lib
-RUN cd rmr; git checkout 6735f136906ce2; mkdir .build; cd .build; cmake ..; make install
-
-# COPY code
-RUN mkdir /home/load_consumer
-COPY ./ /home/load_consumer
-WORKDIR /home/load_consumer
-
-# Configure the receiver
-RUN mkdir /usr/local/route
-ENV C_INCLUDE_PATH=/usr/local/include
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-
-# local.rt should be in the /usr/local/route directory mounted from the outside world.
-# example for command line: -v /demo/test/route:/usr/local/route
-ENV RMR_SEED_RT=/usr/local/route/local.rt
-# export RMR_SEED_RT=$HOME/global_rmr_files/global_rmr_routes.rt
-
-RUN gcc dummy_rcvr.c -g -o dummy_rcvr -L /usr/local/lib -lrmr_nng -lnng -lpthread -lm
-
-CMD ./dummy_rcvr
diff --git a/ons_2019_demo/load_consumer/build b/ons_2019_demo/load_consumer/build
deleted file mode 100755
index 743768c..0000000
--- a/ons_2019_demo/load_consumer/build
+++ /dev/null
@@ -1,5 +0,0 @@
-export C_INCLUDE_PATH=$HOME/usr/include
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/usr/lib
-export RMR_SEED_RT=$HOME/global_rmr_files/global_rmr_routes.rt
-gcc dummy_rcvr.c -g -o dummy_rcvr -L $HOME/usr/lib -lrmr_nng -lnng -lpthread -lm
-./dummy_rcvr
diff --git a/ons_2019_demo/load_consumer/dummy_rcvr.c b/ons_2019_demo/load_consumer/dummy_rcvr.c
deleted file mode 100644
index fb5484b..0000000
--- a/ons_2019_demo/load_consumer/dummy_rcvr.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *
- * Copyright 2019 AT&T Intellectual Property
- * Copyright 2019 Nokia
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// :vim ts=4 sw=4 noet:
-/*
- Mnemonic: dummy_rcvr.c
- Abstract: RMr receiver that discards everything.
-
- Define these environment variables to have some control:
- RMR_SEED_RT -- path to the static routing table
- RMR_RTG_SVC -- host:port of the route table generator
-
- Date: 24 March 2019
- Author: E. Scott Daniels
-
- Mods:
-*/
-
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include <rmr/rmr.h>
-
-int main( int argc, char** argv ) {
- void* mrc; // msg router context
- rmr_mbuf_t* msg = NULL; // message received
- int i;
- char* listen_port;
- int count = 0;
-
- if( (listen_port = getenv( "DUMMY_RCVR_PORT" )) == NULL ) {
- listen_port = "19289";
- }
-
- mrc = rmr_init( listen_port, RMR_MAX_RCV_BYTES, RMRFL_NONE ); // start your engines!
- if( mrc == NULL ) {
- fprintf( stderr, "<RCVR> ABORT: unable to initialise RMr\n" );
- exit( 1 );
- }
-
- while( ! rmr_ready( mrc ) ) {
- fprintf( stderr, "<RCVR> waiting for RMr to show ready\n" );
- sleep( 1 );
- }
- fprintf( stderr, "<RCVR> RMr now shows ready\n" );
-
- fprintf( stderr, "<RCVR> listening on %s build=%s @ %s\n", listen_port, __DATE__, __TIME__ );
-
- while( 1 ) {
- msg = rmr_rcv_msg( mrc, msg ); // block until one arrives
- count++;
- //if( count % 1000 == 0 ) {
- fprintf( stderr, "receiver received: %d\n", count );
- //}
- }
-}
diff --git a/ons_2019_demo/load_gen/Dockerfile b/ons_2019_demo/load_gen/Dockerfile
deleted file mode 100644
index f88686b..0000000
--- a/ons_2019_demo/load_gen/Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright 2019 AT&T Intellectual Property
-# Copyright 2019 Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# sudo docker build -t load_gen .
-# sudo docker run --rm -it load_gen
-
-FROM ubuntu:16.04
-
-# Install necessary packages
-RUN apt-get update
-RUN apt-get update && apt-get install -y gcc git make bash vim cmake g++ ksh
-RUN apt-get install -y iputils-ping
-
-# Install rmr in /usr/local
-WORKDIR /home
-RUN git clone https://gerrit.oran-osc.org/r/ric-plt/lib/rmr
-RUN date; ls -al /usr/local/lib
-RUN cd rmr; git checkout 6735f136906ce2; mkdir .build; cd .build; cmake ..; make install
-
-# COPY code
-RUN mkdir /home/load_gen
-COPY ./ /home/load_gen
-WORKDIR /home/load_gen
-
-# Configure the receiver
-RUN mkdir /usr/local/route
-ENV C_INCLUDE_PATH=/usr/local/include
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-
-# local.rt should be in the /usr/local/route directory mounted from the outside world.
-# example for command line: -v /demo/test/route:/usr/local/route
-ENV RMR_SEED_RT=/usr/local/route/local.rt
-# export RMR_SEED_RT=$HOME/global_rmr_files/global_rmr_routes.rt
-
-RUN gcc load_gen.c -g -o load_gen -L /usr/local/lib -lrmr_nng -lnng -lpthread -lm
-
-CMD ./load_gen
diff --git a/ons_2019_demo/load_gen/build b/ons_2019_demo/load_gen/build
deleted file mode 100755
index 707ba6d..0000000
--- a/ons_2019_demo/load_gen/build
+++ /dev/null
@@ -1,6 +0,0 @@
-export C_INCLUDE_PATH=$HOME/usr/include
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/usr/lib
-export RMR_SEED_RT=$HOME/global_rmr_files/global_rmr_routes.rt
-gcc load_gen.c -g -o load_gen -L $HOME/usr/lib -lrmr_nng -lnng -lpthread -lm
-./load_gen ../a1_med/a1_med_http_server/load.txt
-
diff --git a/ons_2019_demo/load_gen/load_gen.c b/ons_2019_demo/load_gen/load_gen.c
deleted file mode 100644
index f356c41..0000000
--- a/ons_2019_demo/load_gen/load_gen.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- *
- * Copyright 2019 AT&T Intellectual Property
- * Copyright 2019 Nokia
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// :vim ts=4 sw=4 noet:
-
-/*
- Mnemonic: load_gen.c
- Abstract: Very simple load generator. Reads the message rate from a
- file (argv[1]) which is expected to be between 0 and 100000.
- Messages are sent with a fixed mtype of 104.
-
- Date: 24 March 2019
- Author: E. Scott Daniels
-*/
-
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/epoll.h>
-#include <time.h>
-
-#include <rmr/rmr.h>
-
-/*
- Rewinds, reads and converts the value in the file to the number of microseconds (usleep units)
- that the caller should sleep between messages. If the effective mps is 0, then we block here
- until the rate goes up. We'll check 1/sec if blocked.
-*/
-int mps = 1; // msg/sec rate from file (sloppy, but global helps prevent time calls)
-static inline int read_delay( int fd ) {
- char rbuf[128]; // read buffer
- int n; // bytes read
- int mus = 0; // mu sec delay
- double v;
-
- if( fd < 0 ) {
- return 0;
- }
-
- do {
- lseek( fd, 0, SEEK_SET );
- if( (n = read( fd, rbuf, sizeof( rbuf ) )) >0 ) {
- mps = atoi( rbuf );
- v = 1.0 / ((double) mps / 1000000.0); // msg/microsec
-
- mus = (int) v;
- }
-
- if( mus <= 0 ) {
- //fprintf( stderr, "<LGEN> sending blocked\n" );
- sleep( 1 );
- }
- } while( mus <= 0 );
-
- return mus;
-}
-
-int main( int argc, char** argv ) {
- int delay_fd; // file des of the delay file
- int rcv_fd; // pollable fd
- void* mrc; //msg router context
- struct epoll_event events[10]; // wait on 10 possible events
- struct epoll_event epe; // event definition for event to listen to
- int ep_fd = -1;
- int nready;
- int i;
- int mtype = 104; // we loop through several message types
- rmr_mbuf_t* sbuf; // send buffer
- rmr_mbuf_t* rbuf; // received buffer
- int epoll_to = 1; // epoll timout -- 0 don't call
- char wbuf[2048];
- char* lport = "12036"; // default listen port
- int delay = 2000000; // microsecond delay between messages; default to very slow
- int next_read = 0; // counter for next read of delay
- char* eparm;
- char* rate_file = "rate_file";
-
-
- if( (eparm = getenv( "DEMO_LOAD_GEN_PORT" )) != NULL ) {
- lport = strdup( eparm );
- }
-
- mrc = rmr_init( lport, 1400, RMRFL_NONE );
- rcv_fd = rmr_get_rcvfd( mrc );
- if( rcv_fd < 0 ) {
- fprintf( stderr, "[FAIL] unable to set up polling fd\n" );
- exit( 1 );
- }
-
- if( argc > 1 ) {
- rate_file = argv[1];
- }
-
- if( (delay_fd = open( rate_file, O_RDONLY )) < 0 ) {
- fprintf( stderr, "abort: unable to open delay file: %s: %d\n", rate_file, errno );
- exit( 1 );
- }
-
- if( (ep_fd = epoll_create1( 0 )) < 0 ) {
- fprintf( stderr, "[FAIL] unable to create epoll fd: %d\n", errno );
- exit( 1 );
- }
- epe.events = EPOLLIN;
- epe.data.fd = rcv_fd;
-
- if( epoll_ctl( ep_fd, EPOLL_CTL_ADD, rcv_fd, &epe ) != 0 ) {
- fprintf( stderr, "[FAIL] epoll_ctl status not 0 : %s\n", strerror( errno ) );
- exit( 1 );
- }
-
- sbuf = rmr_alloc_msg( mrc, 256 );
- rbuf = NULL;
-
- while( ! rmr_ready( mrc ) ) {
- fprintf( stderr, "waiting for RMr to show ready\n" );
- sleep( 1 );
- }
- fprintf( stderr, "<LGEN> rmr shows ready\n" );
-
-
- mps = 1;
- while( 1 ) {
- if( next_read <= 0 ) {
- delay = read_delay( delay_fd );
- next_read = mps;
- //fprintf( stderr, "<LGEN> next_read=%d delay=%d\n", next_read, delay );
- }
-
- snprintf( sbuf->payload, 200, "msg from load generator %d\n", next_read );
-
- sbuf->mtype = mtype;
- sbuf->len = strlen( sbuf->payload );
- sbuf->state = 0;
- sbuf = rmr_send_msg( mrc, sbuf ); // we send, we dont care about success or failure, but on failure, have a break
- if( sbuf->state != RMR_OK ) {
- sleep( 1 );
- next_read = 0; // mostly for testing
- }
-
- nready = epoll_wait( ep_fd, events, 10, 0 ); // we shouldn't have anything, but prevent queue full issues
- for( i = 0; i < nready && i < 10; i++ ) { // loop through to find what is ready
- if( events[i].data.fd == rcv_fd ) { // RMr has something
- errno = 0;
- rbuf = rmr_rcv_msg( mrc, rbuf );
- }
- }
-
- next_read--;
- usleep( delay );
- }
-}
diff --git a/ons_2019_demo/pendulum_scripts/1_start_serial_listener.sh b/ons_2019_demo/pendulum_scripts/1_start_serial_listener.sh
deleted file mode 100755
index e123834..0000000
--- a/ons_2019_demo/pendulum_scripts/1_start_serial_listener.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-E2SIM_DIR=$HOME/test/simulators/e2sim
-echo "Initialize conduit file to zero.."
-echo "\$0#" > $E2SIM_DIR/arduino_delay.txt
-cd $E2SIM_DIR && ./build/serial_listener &
-sleep 5
diff --git a/ons_2019_demo/pendulum_scripts/2_start_web_portal.sh b/ons_2019_demo/pendulum_scripts/2_start_web_portal.sh
deleted file mode 100755
index 61f5288..0000000
--- a/ons_2019_demo/pendulum_scripts/2_start_web_portal.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-
-E2SIM_DIR=$HOME/test/simulators/e2sim
-ONS_DIR=$HOME/test/ons_2019_demo
-
-echo "Initializing display variables.."
- echo 0 > $ONS_DIR/a1_med/a1_med_http_server/delay.txt
- echo 0 > $ONS_DIR/a1_med/a1_med_http_server/load.txt
- echo "{\"latency\":0, \"ricload\":0, \"load\":0, \"time\":0}" > $ONS_DIR/a1_med/a1_med_http_server/metrics.json
-
- #7. a1 med http server
- cd $HOME/test/ons_2019_demo/a1_med/a1_med_http_server && ./a1med.py &
- sleep 5
-
- #6. dash_board
- # cd $HOME/test/ons_2019_demo/dashboard && docker-compose -f docker-compose_v3.yml up &
-
- cd $HOME/test/ons_2019_demo/dashboard && docker-compose -f docker-compose.yml up &
-
-
- sleep 5
-
-
-
diff --git a/ons_2019_demo/pendulum_scripts/3_start_ric.sh b/ons_2019_demo/pendulum_scripts/3_start_ric.sh
deleted file mode 100755
index 87ceaa3..0000000
--- a/ons_2019_demo/pendulum_scripts/3_start_ric.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#Bring up all components for ONS demo
-clear
-
-echo "Starting up all components for ONS 2019 Pendulum-control Demo"
-
-E2SIM_DIR=$HOME/test/simulators/e2sim
-ONS_DIR=$HOME/test/ons_2019_demo
-
-#clean variables
-
-
-function main()
-{
- #Kill all running process
- #pkill -f start_demo
- pkill -f e2sim
- pkill -f pendulum_xapp
-
- #1. e2agent
- cd $E2SIM_DIR && ./build/e2sim_closedloop &
-
- #2. pendulum xapp
- cd $HOME/test/ons_2019_demo/pendulum_xapp/ && bash build_and_run_pendulum_xapp.sh &
- sleep 2
-
- #3. e2 termination
- cd $HOME/test/simulators/e2sim && bash run_e2_term &
- sleep 2
-
- # #4. load consumer
- cd $HOME/test/ons_2019_demo/load_consumer && bash build &
- sleep 2
-
-
- # #5. load_gen
- cd $HOME/test/ons_2019_demo/load_gen && bash build &
-
- #7. a1 med http server
-# cd $HOME/test/ons_2019_demo/a1_med/a1_med_http_server && ./a1med.py &
-# sleep 3
-
- #6. dash_board
-# cd $HOME/test/ons_2019_demo/dashboard && docker-compose up &
-# sleep 5
-
-
- #8. a1 med
- cd $HOME/test/ons_2019_demo/a1_med && bash build_and_run_dummy_a1_med.sh
-
-}
-
-main "$@"
-echo "DEMO IS NOW UP AND RUNNING!!!!"
diff --git a/ons_2019_demo/pendulum_scripts/kill_scripts/kill_ric_and_dashboard.sh b/ons_2019_demo/pendulum_scripts/kill_scripts/kill_ric_and_dashboard.sh
deleted file mode 100755
index b6afa98..0000000
--- a/ons_2019_demo/pendulum_scripts/kill_scripts/kill_ric_and_dashboard.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-pkill -f pendulum_xapp
-pkill -f e2sim #kills both agent and term
-pkill -f dummy #kills a1 med C code and load consumer
-pkill -f load_gen
-pkill -f a1med #kills a1 mediator http server
-docker kill $(docker ps -q) #kills dashboard
diff --git a/ons_2019_demo/pendulum_scripts/kill_scripts/kill_serial_listener.sh b/ons_2019_demo/pendulum_scripts/kill_scripts/kill_serial_listener.sh
deleted file mode 100755
index 712fb6d..0000000
--- a/ons_2019_demo/pendulum_scripts/kill_scripts/kill_serial_listener.sh
+++ /dev/null
@@ -1 +0,0 @@
-pkill -f serial_listener
diff --git a/ons_2019_demo/pendulum_xapp/build_and_run_pendulum_xapp.sh b/ons_2019_demo/pendulum_xapp/build_and_run_pendulum_xapp.sh
deleted file mode 100755
index f49dc54..0000000
--- a/ons_2019_demo/pendulum_xapp/build_and_run_pendulum_xapp.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-export C_INCLUDE_PATH=$HOME/usr/include
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/usr/lib
-export RMR_SEED_RT=$HOME/global_rmr_files/global_rmr_routes.rt
-gcc pendulum_xapp.c -g -o pendulum_xapp -L $HOME/usr/lib -lrmr_nng -lnng -lpthread -lm
-
-export PENDULUM_XAPP_RMR_RCV_PORT=5560
-export DEMO_SENDER_PTO=1 # poll timeout listening for replies
-
-export PRINT_FREQ=1000 #frequency at which test stats will be printed
-
-RMR_RCV_ACK=1 ./pendulum_xapp $PRINT_FREQ; # receiver that will ack every sender message
diff --git a/ons_2019_demo/pendulum_xapp/pendulum_xapp.c b/ons_2019_demo/pendulum_xapp/pendulum_xapp.c
deleted file mode 100644
index c55b86d..0000000
--- a/ons_2019_demo/pendulum_xapp/pendulum_xapp.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *
- * Copyright 2019 AT&T Intellectual Property
- * Copyright 2019 Nokia
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// :vim ts=4 sw=4 noet:
-/*
-Mnemonic: rmr_rcvr2.c
-Abstract: Very simple test listener built on RMr libraries. It does nothing
-but return the message it recevied back to the sender.
-
-Define these environment variables to have some control:
-RMR_SEED_RT -- path to the static routing table
-RMR_RTG_SVC -- host:port of the route table generator
-
-One command line parm is accepted: stats frequency. This is a number, n,
-which causes stats to be generated after every n messages. If set to 0
-each message is written when received and no stats (msg rate) is generated.
-
-Date: 11 February 2018
-Author: E. Scott Daniels
-
-Mods: 18 Mar 2019 -- simplified for demo base.
- */
-
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include <rmr/rmr.h>
-#include <sys/time.h>
-
-long current_timestamp_in_us(){
- struct timeval currentTime;
- gettimeofday(¤tTime, NULL);
- return currentTime.tv_sec * (int)1e6 + currentTime.tv_usec;
-}
-
-long delay=0; //sent from the a1 med in milliseconds
-void handle_pendulum_angle_message(void* mrc,rmr_mbuf_t* msg){
- fprintf(stderr, "Sleeping for %ld microseconds", delay);
- // usleep(delay/20000.0); //sleep for <delay> us
- usleep(delay/20); //ms
- int max_rt=2;
- fprintf( stderr, "Received message from E2 termination of type:%d (pendulum control), with content:%s\n",msg->mtype,msg->payload);
- msg->len = snprintf( msg->payload, 1024, "$%d#\n",(int)delay/20000);
- msg->mtype=33;
- msg = rmr_rts_msg( mrc, msg ); // this is a retur to sender; preferred
- if( (msg = rmr_rts_msg( mrc, msg )) != NULL ) {
- max_rt = 2;//should be small to prevent rmr issues
- while( max_rt > 0 && msg->state != RMR_OK && errno == EAGAIN ) { // just keep trying
- max_rt--;
- rmr_rts_msg( mrc, msg );
- //rmr_send_msg (mrc, msg);
- }
- }
-}
-
-
-//void handle_pendulum_angle_message(){
-// int mtype=33;
-// char* message="Reply hello back to Arduino!";
-// rmr_pure_send(rmr_c, mtype, message );
-// printf("Sent message of type:%d to E2 terminator with content:%s\n",mtype,message);
-//}
-
-void handle_delay_insertion_message(void* mrc,rmr_mbuf_t* msg){
- fprintf( stderr, "Received message from A1 mediator of type:%d (delay insert), with content:%s\n",msg->mtype,msg->payload);
- delay = atol(msg->payload);//payload is being sent in microseconds
-}
-
-
-
-int main( int argc, char** argv ) {
- void* mrc; // msg router context
- rmr_mbuf_t* msg = NULL; // message received
- char* listen_port;
- int stat_freq = 20000; // write stats after reciving this many messages
-
-
- if( (listen_port = getenv( "PENDULUM_XAPP_RMR_RCV_PORT" )) == NULL ) {
- listen_port = "4560";
- }
-
- if( argc > 1 ) {
- stat_freq = atoi( argv[1] );
- }
- fprintf( stderr, "<TEST> stats will be reported every %d messages\n", stat_freq );
-
- mrc = rmr_init( listen_port, RMR_MAX_RCV_BYTES, RMRFL_NONE ); // start your engines!
- if( mrc == NULL ) {
- fprintf( stderr, "<TEST> ABORT: unable to initialise RMr\n" );
- exit( 1 );
- }
-
- while( ! rmr_ready( mrc ) ) {
- fprintf( stderr, "<TEST> waiting for RMr to show ready\n" );
- sleep( 1 );
- }
- fprintf( stderr, "<TEST> RMr now shows ready\n" );
-
- fprintf( stderr, "<TEST> listening on %s\n", listen_port);
-
- fprintf( stderr, "======================================\n Pendulum Control xApp Running\n======================================\n");
- long received_angle_message_time =0;
- while( 1 ) {
- msg = rmr_rcv_msg( mrc, msg ); // block until one arrives
- if( msg == NULL ) {
- continue; // shouldn't happen, but don't crash if we get nothing
- }
- if( msg->mtype < 0 || msg->state != RMR_OK ) {
- fprintf( stderr, "[WRN] bad msg: state=%d errno=%d\n", msg->state, errno );
- continue; // just loop to receive another
- }
-
- switch (msg->mtype){
- case 0:
- received_angle_message_time = current_timestamp_in_us();
- handle_pendulum_angle_message(mrc,msg);
- fprintf(stderr, "Time taken to reply to E2 term:%ld micro seconds \n",current_timestamp_in_us()-received_angle_message_time);
- break;
- case 100: handle_delay_insertion_message(mrc,msg);
- break;
- default: fprintf( stdout, "[WRN] bad msg: =%d\n", msg->mtype);
- }
- }
-}
diff --git a/ons_2019_demo/segway_scripts/1_start_web_portal.sh b/ons_2019_demo/segway_scripts/1_start_web_portal.sh
deleted file mode 100755
index 61f5288..0000000
--- a/ons_2019_demo/segway_scripts/1_start_web_portal.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-
-E2SIM_DIR=$HOME/test/simulators/e2sim
-ONS_DIR=$HOME/test/ons_2019_demo
-
-echo "Initializing display variables.."
- echo 0 > $ONS_DIR/a1_med/a1_med_http_server/delay.txt
- echo 0 > $ONS_DIR/a1_med/a1_med_http_server/load.txt
- echo "{\"latency\":0, \"ricload\":0, \"load\":0, \"time\":0}" > $ONS_DIR/a1_med/a1_med_http_server/metrics.json
-
- #7. a1 med http server
- cd $HOME/test/ons_2019_demo/a1_med/a1_med_http_server && ./a1med.py &
- sleep 5
-
- #6. dash_board
- # cd $HOME/test/ons_2019_demo/dashboard && docker-compose -f docker-compose_v3.yml up &
-
- cd $HOME/test/ons_2019_demo/dashboard && docker-compose -f docker-compose.yml up &
-
-
- sleep 5
-
-
-
diff --git a/ons_2019_demo/segway_scripts/2_start_ric.sh b/ons_2019_demo/segway_scripts/2_start_ric.sh
deleted file mode 100755
index a7de023..0000000
--- a/ons_2019_demo/segway_scripts/2_start_ric.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#Bring up all components for ONS demo
-clear
-
-echo "Starting up all components for ONS 2019 Pendulum-control Demo"
-
-E2SIM_DIR=$HOME/test/simulators/e2sim
-ONS_DIR=$HOME/test/ons_2019_demo
-
-#clean variables
-
-
-function main()
-{
- #Kill all running process
- #pkill -f start_demo
- pkill -f e2sim
- pkill -f pendulum_xapp
-
- #1. e2agent
- cd $E2SIM_DIR && ./build/e2sim &
-
- #2. pendulum xapp
- cd $HOME/test/ons_2019_demo/pendulum_xapp/ && bash build_and_run_pendulum_xapp.sh &
- sleep 2
-
- #3. e2 termination
- cd $HOME/test/simulators/e2sim && bash run_e2_term &
- sleep 2
-
- # #4. load consumer
- cd $HOME/test/ons_2019_demo/load_consumer && bash build &
- sleep 2
-
-
- # #5. load_gen
- cd $HOME/test/ons_2019_demo/load_gen && bash build &
-
- #7. a1 med http server
-# cd $HOME/test/ons_2019_demo/a1_med/a1_med_http_server && ./a1med.py &
-# sleep 3
-
- #6. dash_board
-# cd $HOME/test/ons_2019_demo/dashboard && docker-compose up &
-# sleep 5
-
-
- #8. a1 med
- cd $HOME/test/ons_2019_demo/a1_med && bash build_and_run_dummy_a1_med.sh
-
-}
-
-main "$@"
-echo "DEMO IS NOW UP AND RUNNING!!!!"
diff --git a/ons_2019_demo/segway_scripts/kill_scripts/kill_ric_and_dashboard.sh b/ons_2019_demo/segway_scripts/kill_scripts/kill_ric_and_dashboard.sh
deleted file mode 100755
index b6afa98..0000000
--- a/ons_2019_demo/segway_scripts/kill_scripts/kill_ric_and_dashboard.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-pkill -f pendulum_xapp
-pkill -f e2sim #kills both agent and term
-pkill -f dummy #kills a1 med C code and load consumer
-pkill -f load_gen
-pkill -f a1med #kills a1 mediator http server
-docker kill $(docker ps -q) #kills dashboard
diff --git a/ons_2019_demo/segway_scripts/kill_scripts/kill_serial_listener.sh b/ons_2019_demo/segway_scripts/kill_scripts/kill_serial_listener.sh
deleted file mode 100755
index 712fb6d..0000000
--- a/ons_2019_demo/segway_scripts/kill_scripts/kill_serial_listener.sh
+++ /dev/null
@@ -1 +0,0 @@
-pkill -f serial_listener