From 71ce7eca516321aff84332df56702e718968735b Mon Sep 17 00:00:00 2001 From: prithiv Date: Wed, 22 Nov 2017 16:46:11 +0000 Subject: [PATCH] MON Packaging Changes Signed-off-by: prithiv --- MANIFEST.in | 5 +-- Makefile | 40 ++++++++--------- {core => osm-mon/core}/__init__.py | 0 .../core}/message_bus/__init__.py | 0 .../core/message_bus/common_consumer | 0 .../core}/message_bus/consumer.py | 0 .../core}/message_bus/producer.py | 0 {core => osm-mon/core}/models/.gitkeep | 0 .../core}/models/access_cred_CloudWatch.json | 0 .../core}/models/access_cred_OpenStack.json | 0 .../core}/models/access_cred_vROPs.json | 0 .../core}/models/acknowledge_alarm.json | 0 .../core}/models/create_alarm.json | 0 .../core}/models/create_alarm_resp.json | 0 .../core}/models/create_metric_req.json | 0 .../core}/models/create_metric_resp.json | 0 .../core}/models/delete_alarm_req.json | 0 .../core}/models/delete_alarm_resp.json | 0 .../core}/models/delete_metric_req.json | 0 .../core}/models/delete_metric_resp.json | 0 .../core}/models/list_alarm_req.json | 0 .../core}/models/list_alarm_resp.json | 0 .../core}/models/list_metric_req.json | 0 .../core}/models/list_metric_resp.json | 0 .../core}/models/notify_alarm.json | 0 .../core}/models/read_metric_data_req.json | 0 .../core}/models/read_metric_data_resp.json | 0 .../core}/models/update_alarm_req.json | 0 .../core}/models/update_alarm_resp.json | 0 .../core}/models/update_metric_req.json | 0 .../core}/models/update_metric_resp.json | 0 .../plugins}/CloudWatch/.gitkeep | 0 .../plugins}/CloudWatch/connection.py | 0 .../plugins}/CloudWatch/metric_alarms.py | 0 .../plugins}/CloudWatch/metrics.py | 0 .../plugins}/CloudWatch/plugin_alarm.py | 0 .../plugins}/CloudWatch/plugin_metrics.py | 0 .../plugins}/OpenStack/Aodh/__init__.py | 0 .../plugins}/OpenStack/Aodh/alarming.py | 0 .../plugins}/OpenStack/Aodh/notifier.py | 0 .../plugins}/OpenStack/Gnocchi/.gitkeep | 0 .../plugins}/OpenStack/Gnocchi/__init__.py | 0 .../plugins}/OpenStack/Gnocchi/metrics.py | 0 .../plugins}/OpenStack/__init__.py | 0 .../plugins}/OpenStack/common.py | 0 .../plugins}/OpenStack/response.py | 0 .../plugins}/OpenStack/settings.py | 0 .../plugins}/OpenStack/singleton.py | 0 {plugins => osm-mon/plugins}/__init__.py | 0 .../plugins}/vRealiseOps/.gitkeep | 0 .../plugins}/vRealiseOps/__init__.py | 0 .../vRealiseOps/kafka_consumer_vrops.py | 0 .../plugins}/vRealiseOps/mon_plugin_vrops.py | 0 .../plugins}/vRealiseOps/plugin_receiver.py | 0 .../vRealiseOps/vROPs_Webservice/__init__.py | 0 .../vRealiseOps/vROPs_Webservice/install.sh | 0 .../vROPs_Webservice/vrops_webservice | 0 .../plugins}/vRealiseOps/vrops_config.xml | 0 {test => osm-mon/test}/.gitkeep | 0 .../alarm_details/acknowledge_alarm.json | 0 ...alarm_differentName_differentInstance.json | 0 ...eate_alarm_differentName_sameInstance.json | 0 ...eate_alarm_sameName_differentInstance.json | 0 .../create_alarm_sameName_sameInstance.json | 0 .../create_alarm/operation_invalid.json | 0 .../create_alarm/operation_valid.json | 0 .../create_alarm/statistic_invalid.json | 0 .../create_alarm/statistic_valid.json | 0 .../create_metric_req_invalid.json | 0 .../create_metric_req_valid.json | 0 .../delete_alarm/name_invalid.json | 0 .../test_schemas/delete_alarm/name_valid.json | 0 .../delete_alarm/name_valid_delete1.json | 0 .../delete_alarm/name_valid_delete2.json | 0 .../delete_alarm/name_valid_delete3.json | 0 .../delete_alarm/name_valid_delete4.json | 0 .../delete_metric_req_invalid.json | 0 .../delete_metric_req_valid.json | 0 .../list_alarm_valid_no_arguments.json | 0 .../list_alarm_valid_one_argument.json | 0 .../list_alarm_valid_two_arguments.json | 0 .../list_metrics/list_metric_req_invalid.json | 0 .../list_metrics/list_metric_req_valid.json | 0 .../read_coll_period_req_invalid.json | 0 .../read_coll_period_req_valid.json | 0 .../read_metric_name_req_invalid.json | 0 .../read_metric_name_req_valid.json | 0 .../update_alarm/name_invalid.json | 0 .../test_schemas/update_alarm/name_valid.json | 0 .../update_alarm/operation_invalid.json | 0 .../update_alarm/operation_valid.json | 0 .../update_alarm/statistic_invalid.json | 0 .../update_alarm/statistic_valid.json | 0 .../update_alarm/update_alarm_new_alarm.json | 0 .../update_metric_req_invalid.json | 0 .../update_metric_req_valid.json | 0 .../test}/CloudWatch/unit_tests_alarms.py | 0 .../test}/CloudWatch/unit_tests_metrics.py | 0 {test => osm-mon/test}/OpenStack/__init__.py | 0 .../test}/OpenStack/test_alarm_req.py | 0 .../test}/OpenStack/test_alarming.py | 0 .../test}/OpenStack/test_common.py | 0 .../test}/OpenStack/test_metric_calls.py | 0 .../test}/OpenStack/test_metric_req.py | 0 .../test}/OpenStack/test_responses.py | 0 .../test}/OpenStack/test_settings.py | 0 {test => osm-mon/test}/__init__.py | 0 {test => osm-mon/test}/core/__init__.py | 0 {test => osm-mon/test}/core/kafka_test.py | 0 {test => osm-mon/test}/core/test_producer.py | 0 requirements.txt | 1 + setup.cfg | 3 +- setup.py | 45 +++---------------- stage-archive.sh | 33 ++++++++++++++ stage-build.sh | 27 +++++++++++ stage-test.sh | 26 +++++++++++ stdeb.cfg | 25 ----------- 117 files changed, 117 insertions(+), 88 deletions(-) rename {core => osm-mon/core}/__init__.py (100%) rename {core => osm-mon/core}/message_bus/__init__.py (100%) mode change 100644 => 100755 rename core/message_bus/common_consumer.py => osm-mon/core/message_bus/common_consumer (100%) mode change 100644 => 100755 rename {core => osm-mon/core}/message_bus/consumer.py (100%) mode change 100644 => 100755 rename {core => osm-mon/core}/message_bus/producer.py (100%) mode change 100644 => 100755 rename {core => osm-mon/core}/models/.gitkeep (100%) rename {core => osm-mon/core}/models/access_cred_CloudWatch.json (100%) rename {core => osm-mon/core}/models/access_cred_OpenStack.json (100%) rename {core => osm-mon/core}/models/access_cred_vROPs.json (100%) rename {core => osm-mon/core}/models/acknowledge_alarm.json (100%) rename {core => osm-mon/core}/models/create_alarm.json (100%) rename {core => osm-mon/core}/models/create_alarm_resp.json (100%) rename {core => osm-mon/core}/models/create_metric_req.json (100%) rename {core => osm-mon/core}/models/create_metric_resp.json (100%) rename {core => osm-mon/core}/models/delete_alarm_req.json (100%) rename {core => osm-mon/core}/models/delete_alarm_resp.json (100%) rename {core => osm-mon/core}/models/delete_metric_req.json (100%) rename {core => osm-mon/core}/models/delete_metric_resp.json (100%) rename {core => osm-mon/core}/models/list_alarm_req.json (100%) rename {core => osm-mon/core}/models/list_alarm_resp.json (100%) rename {core => osm-mon/core}/models/list_metric_req.json (100%) rename {core => osm-mon/core}/models/list_metric_resp.json (100%) rename {core => osm-mon/core}/models/notify_alarm.json (100%) rename {core => osm-mon/core}/models/read_metric_data_req.json (100%) rename {core => osm-mon/core}/models/read_metric_data_resp.json (100%) rename {core => osm-mon/core}/models/update_alarm_req.json (100%) rename {core => osm-mon/core}/models/update_alarm_resp.json (100%) rename {core => osm-mon/core}/models/update_metric_req.json (100%) rename {core => osm-mon/core}/models/update_metric_resp.json (100%) rename {plugins => osm-mon/plugins}/CloudWatch/.gitkeep (100%) rename {plugins => osm-mon/plugins}/CloudWatch/connection.py (100%) rename {plugins => osm-mon/plugins}/CloudWatch/metric_alarms.py (100%) rename {plugins => osm-mon/plugins}/CloudWatch/metrics.py (100%) rename {plugins => osm-mon/plugins}/CloudWatch/plugin_alarm.py (100%) rename {plugins => osm-mon/plugins}/CloudWatch/plugin_metrics.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/Aodh/__init__.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/Aodh/alarming.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/Aodh/notifier.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/Gnocchi/.gitkeep (100%) rename {plugins => osm-mon/plugins}/OpenStack/Gnocchi/__init__.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/Gnocchi/metrics.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/__init__.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/common.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/response.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/settings.py (100%) rename {plugins => osm-mon/plugins}/OpenStack/singleton.py (100%) rename {plugins => osm-mon/plugins}/__init__.py (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/.gitkeep (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/__init__.py (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/kafka_consumer_vrops.py (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/mon_plugin_vrops.py (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/plugin_receiver.py (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/vROPs_Webservice/__init__.py (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/vROPs_Webservice/install.sh (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/vROPs_Webservice/vrops_webservice (100%) rename {plugins => osm-mon/plugins}/vRealiseOps/vrops_config.xml (100%) rename {test => osm-mon/test}/.gitkeep (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/operation_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/operation_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/statistic_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_alarm/statistic_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_alarm/name_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_alarm/name_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_alarm/name_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_alarm/name_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_alarm/operation_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_alarm/operation_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_alarm/statistic_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_alarm/statistic_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json (100%) rename {test => osm-mon/test}/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json (100%) rename {test => osm-mon/test}/CloudWatch/unit_tests_alarms.py (100%) rename {test => osm-mon/test}/CloudWatch/unit_tests_metrics.py (100%) rename {test => osm-mon/test}/OpenStack/__init__.py (100%) rename {test => osm-mon/test}/OpenStack/test_alarm_req.py (100%) rename {test => osm-mon/test}/OpenStack/test_alarming.py (100%) rename {test => osm-mon/test}/OpenStack/test_common.py (100%) rename {test => osm-mon/test}/OpenStack/test_metric_calls.py (100%) rename {test => osm-mon/test}/OpenStack/test_metric_req.py (100%) rename {test => osm-mon/test}/OpenStack/test_responses.py (100%) rename {test => osm-mon/test}/OpenStack/test_settings.py (100%) rename {test => osm-mon/test}/__init__.py (100%) rename {test => osm-mon/test}/core/__init__.py (100%) rename {test => osm-mon/test}/core/kafka_test.py (100%) rename {test => osm-mon/test}/core/test_producer.py (100%) create mode 100755 stage-archive.sh create mode 100755 stage-build.sh create mode 100755 stage-test.sh delete mode 100644 stdeb.cfg diff --git a/MANIFEST.in b/MANIFEST.in index 0a4928c..34f1ff1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -22,7 +22,6 @@ include requirements.txt include README.rst include kafkad -recursive-include core * -recursive-include devops_stages * -recursive-include plugins * +recursive-include osm-mon * +recursive-include devops-stages * recursive-include test * diff --git a/Makefile b/Makefile index 491a83d..08d03f9 100644 --- a/Makefile +++ b/Makefile @@ -30,53 +30,53 @@ clean_deb: clean: rm -rf build + rm -rf .build prepare: - pip install --upgrade setuptools + #apt-get --yes install python-stdeb python-pip libmysqlclient-dev debhelper + #pip install --upgrade setuptools mkdir -p build/ + cp tox.ini build/ cp MANIFEST.in build/ cp requirements.txt build/ + cp test-requirements.txt build/ cp README.rst build/ - cp stdeb.cfg build/ + cp setup.py build/ cp kafkad build/ - cp -r core build/ - cp -r plugins build/ - cp -r devops_stages build/ - cp -r test build/ + cp -r osm-mon build/ + cp -r devops-stages build/ cp -r scripts build/ - cp setup.py build/ + #pip install -r requirements.txt + #pip install -r test-requirements.txt build: clean openstack_plugins prepare - python -m py_compile build/plugins/OpenStack/*.py + python -m py_compile build/osm-mon/plugins/OpenStack/*.py build: clean vrops_plugins prepare - python -m py_compile build/plugins/vRealiseOps/*.py + python -m py_compile build/osm-mon/plugins/vRealiseOps/*.py build: clean cloudwatch_plugins prepare - python -m py_compile build/plugins/CloudWatch/*.py + python -m py_compile build/osm-mon/plugins/CloudWatch/*.py build: clean core prepare - python -m py_compile build/core/message_bus/*.py + python -m py_compile build/osm-mon/core/message_bus/*.py pip: prepare cd build ./setup.py sdist - cd build ./plugin_setup.py sdist package: clean clean_deb prepare - cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True - cd build/deb_dist/* && dpkg-buildpackage -rfakeroot -uc -us + cd build && python setup.py --command-packages=stdeb.command sdist_dsc --with-python2=True --with-python3=False bdist_deb mkdir -p .build cp build/deb_dist/python-*.deb .build/ +develop: prepare + cd build && ./setup.py develop + install: DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes python-pip && \ pip install --upgrade pip - #dpkg -i build/deb_dist/*.deb - -develop: prepare - pip install -r requirements.txt - cd build && ./setup.py develop + dpkg -i build/deb_dist/*.deb build-docker-from-source: - docker build -t osm:MON -f docker/Dockerfile \ No newline at end of file + docker build -t osm:MON -f docker/Dockerfile diff --git a/core/__init__.py b/osm-mon/core/__init__.py similarity index 100% rename from core/__init__.py rename to osm-mon/core/__init__.py diff --git a/core/message_bus/__init__.py b/osm-mon/core/message_bus/__init__.py old mode 100644 new mode 100755 similarity index 100% rename from core/message_bus/__init__.py rename to osm-mon/core/message_bus/__init__.py diff --git a/core/message_bus/common_consumer.py b/osm-mon/core/message_bus/common_consumer old mode 100644 new mode 100755 similarity index 100% rename from core/message_bus/common_consumer.py rename to osm-mon/core/message_bus/common_consumer diff --git a/core/message_bus/consumer.py b/osm-mon/core/message_bus/consumer.py old mode 100644 new mode 100755 similarity index 100% rename from core/message_bus/consumer.py rename to osm-mon/core/message_bus/consumer.py diff --git a/core/message_bus/producer.py b/osm-mon/core/message_bus/producer.py old mode 100644 new mode 100755 similarity index 100% rename from core/message_bus/producer.py rename to osm-mon/core/message_bus/producer.py diff --git a/core/models/.gitkeep b/osm-mon/core/models/.gitkeep similarity index 100% rename from core/models/.gitkeep rename to osm-mon/core/models/.gitkeep diff --git a/core/models/access_cred_CloudWatch.json b/osm-mon/core/models/access_cred_CloudWatch.json similarity index 100% rename from core/models/access_cred_CloudWatch.json rename to osm-mon/core/models/access_cred_CloudWatch.json diff --git a/core/models/access_cred_OpenStack.json b/osm-mon/core/models/access_cred_OpenStack.json similarity index 100% rename from core/models/access_cred_OpenStack.json rename to osm-mon/core/models/access_cred_OpenStack.json diff --git a/core/models/access_cred_vROPs.json b/osm-mon/core/models/access_cred_vROPs.json similarity index 100% rename from core/models/access_cred_vROPs.json rename to osm-mon/core/models/access_cred_vROPs.json diff --git a/core/models/acknowledge_alarm.json b/osm-mon/core/models/acknowledge_alarm.json similarity index 100% rename from core/models/acknowledge_alarm.json rename to osm-mon/core/models/acknowledge_alarm.json diff --git a/core/models/create_alarm.json b/osm-mon/core/models/create_alarm.json similarity index 100% rename from core/models/create_alarm.json rename to osm-mon/core/models/create_alarm.json diff --git a/core/models/create_alarm_resp.json b/osm-mon/core/models/create_alarm_resp.json similarity index 100% rename from core/models/create_alarm_resp.json rename to osm-mon/core/models/create_alarm_resp.json diff --git a/core/models/create_metric_req.json b/osm-mon/core/models/create_metric_req.json similarity index 100% rename from core/models/create_metric_req.json rename to osm-mon/core/models/create_metric_req.json diff --git a/core/models/create_metric_resp.json b/osm-mon/core/models/create_metric_resp.json similarity index 100% rename from core/models/create_metric_resp.json rename to osm-mon/core/models/create_metric_resp.json diff --git a/core/models/delete_alarm_req.json b/osm-mon/core/models/delete_alarm_req.json similarity index 100% rename from core/models/delete_alarm_req.json rename to osm-mon/core/models/delete_alarm_req.json diff --git a/core/models/delete_alarm_resp.json b/osm-mon/core/models/delete_alarm_resp.json similarity index 100% rename from core/models/delete_alarm_resp.json rename to osm-mon/core/models/delete_alarm_resp.json diff --git a/core/models/delete_metric_req.json b/osm-mon/core/models/delete_metric_req.json similarity index 100% rename from core/models/delete_metric_req.json rename to osm-mon/core/models/delete_metric_req.json diff --git a/core/models/delete_metric_resp.json b/osm-mon/core/models/delete_metric_resp.json similarity index 100% rename from core/models/delete_metric_resp.json rename to osm-mon/core/models/delete_metric_resp.json diff --git a/core/models/list_alarm_req.json b/osm-mon/core/models/list_alarm_req.json similarity index 100% rename from core/models/list_alarm_req.json rename to osm-mon/core/models/list_alarm_req.json diff --git a/core/models/list_alarm_resp.json b/osm-mon/core/models/list_alarm_resp.json similarity index 100% rename from core/models/list_alarm_resp.json rename to osm-mon/core/models/list_alarm_resp.json diff --git a/core/models/list_metric_req.json b/osm-mon/core/models/list_metric_req.json similarity index 100% rename from core/models/list_metric_req.json rename to osm-mon/core/models/list_metric_req.json diff --git a/core/models/list_metric_resp.json b/osm-mon/core/models/list_metric_resp.json similarity index 100% rename from core/models/list_metric_resp.json rename to osm-mon/core/models/list_metric_resp.json diff --git a/core/models/notify_alarm.json b/osm-mon/core/models/notify_alarm.json similarity index 100% rename from core/models/notify_alarm.json rename to osm-mon/core/models/notify_alarm.json diff --git a/core/models/read_metric_data_req.json b/osm-mon/core/models/read_metric_data_req.json similarity index 100% rename from core/models/read_metric_data_req.json rename to osm-mon/core/models/read_metric_data_req.json diff --git a/core/models/read_metric_data_resp.json b/osm-mon/core/models/read_metric_data_resp.json similarity index 100% rename from core/models/read_metric_data_resp.json rename to osm-mon/core/models/read_metric_data_resp.json diff --git a/core/models/update_alarm_req.json b/osm-mon/core/models/update_alarm_req.json similarity index 100% rename from core/models/update_alarm_req.json rename to osm-mon/core/models/update_alarm_req.json diff --git a/core/models/update_alarm_resp.json b/osm-mon/core/models/update_alarm_resp.json similarity index 100% rename from core/models/update_alarm_resp.json rename to osm-mon/core/models/update_alarm_resp.json diff --git a/core/models/update_metric_req.json b/osm-mon/core/models/update_metric_req.json similarity index 100% rename from core/models/update_metric_req.json rename to osm-mon/core/models/update_metric_req.json diff --git a/core/models/update_metric_resp.json b/osm-mon/core/models/update_metric_resp.json similarity index 100% rename from core/models/update_metric_resp.json rename to osm-mon/core/models/update_metric_resp.json diff --git a/plugins/CloudWatch/.gitkeep b/osm-mon/plugins/CloudWatch/.gitkeep similarity index 100% rename from plugins/CloudWatch/.gitkeep rename to osm-mon/plugins/CloudWatch/.gitkeep diff --git a/plugins/CloudWatch/connection.py b/osm-mon/plugins/CloudWatch/connection.py similarity index 100% rename from plugins/CloudWatch/connection.py rename to osm-mon/plugins/CloudWatch/connection.py diff --git a/plugins/CloudWatch/metric_alarms.py b/osm-mon/plugins/CloudWatch/metric_alarms.py similarity index 100% rename from plugins/CloudWatch/metric_alarms.py rename to osm-mon/plugins/CloudWatch/metric_alarms.py diff --git a/plugins/CloudWatch/metrics.py b/osm-mon/plugins/CloudWatch/metrics.py similarity index 100% rename from plugins/CloudWatch/metrics.py rename to osm-mon/plugins/CloudWatch/metrics.py diff --git a/plugins/CloudWatch/plugin_alarm.py b/osm-mon/plugins/CloudWatch/plugin_alarm.py similarity index 100% rename from plugins/CloudWatch/plugin_alarm.py rename to osm-mon/plugins/CloudWatch/plugin_alarm.py diff --git a/plugins/CloudWatch/plugin_metrics.py b/osm-mon/plugins/CloudWatch/plugin_metrics.py similarity index 100% rename from plugins/CloudWatch/plugin_metrics.py rename to osm-mon/plugins/CloudWatch/plugin_metrics.py diff --git a/plugins/OpenStack/Aodh/__init__.py b/osm-mon/plugins/OpenStack/Aodh/__init__.py similarity index 100% rename from plugins/OpenStack/Aodh/__init__.py rename to osm-mon/plugins/OpenStack/Aodh/__init__.py diff --git a/plugins/OpenStack/Aodh/alarming.py b/osm-mon/plugins/OpenStack/Aodh/alarming.py similarity index 100% rename from plugins/OpenStack/Aodh/alarming.py rename to osm-mon/plugins/OpenStack/Aodh/alarming.py diff --git a/plugins/OpenStack/Aodh/notifier.py b/osm-mon/plugins/OpenStack/Aodh/notifier.py similarity index 100% rename from plugins/OpenStack/Aodh/notifier.py rename to osm-mon/plugins/OpenStack/Aodh/notifier.py diff --git a/plugins/OpenStack/Gnocchi/.gitkeep b/osm-mon/plugins/OpenStack/Gnocchi/.gitkeep similarity index 100% rename from plugins/OpenStack/Gnocchi/.gitkeep rename to osm-mon/plugins/OpenStack/Gnocchi/.gitkeep diff --git a/plugins/OpenStack/Gnocchi/__init__.py b/osm-mon/plugins/OpenStack/Gnocchi/__init__.py similarity index 100% rename from plugins/OpenStack/Gnocchi/__init__.py rename to osm-mon/plugins/OpenStack/Gnocchi/__init__.py diff --git a/plugins/OpenStack/Gnocchi/metrics.py b/osm-mon/plugins/OpenStack/Gnocchi/metrics.py similarity index 100% rename from plugins/OpenStack/Gnocchi/metrics.py rename to osm-mon/plugins/OpenStack/Gnocchi/metrics.py diff --git a/plugins/OpenStack/__init__.py b/osm-mon/plugins/OpenStack/__init__.py similarity index 100% rename from plugins/OpenStack/__init__.py rename to osm-mon/plugins/OpenStack/__init__.py diff --git a/plugins/OpenStack/common.py b/osm-mon/plugins/OpenStack/common.py similarity index 100% rename from plugins/OpenStack/common.py rename to osm-mon/plugins/OpenStack/common.py diff --git a/plugins/OpenStack/response.py b/osm-mon/plugins/OpenStack/response.py similarity index 100% rename from plugins/OpenStack/response.py rename to osm-mon/plugins/OpenStack/response.py diff --git a/plugins/OpenStack/settings.py b/osm-mon/plugins/OpenStack/settings.py similarity index 100% rename from plugins/OpenStack/settings.py rename to osm-mon/plugins/OpenStack/settings.py diff --git a/plugins/OpenStack/singleton.py b/osm-mon/plugins/OpenStack/singleton.py similarity index 100% rename from plugins/OpenStack/singleton.py rename to osm-mon/plugins/OpenStack/singleton.py diff --git a/plugins/__init__.py b/osm-mon/plugins/__init__.py similarity index 100% rename from plugins/__init__.py rename to osm-mon/plugins/__init__.py diff --git a/plugins/vRealiseOps/.gitkeep b/osm-mon/plugins/vRealiseOps/.gitkeep similarity index 100% rename from plugins/vRealiseOps/.gitkeep rename to osm-mon/plugins/vRealiseOps/.gitkeep diff --git a/plugins/vRealiseOps/__init__.py b/osm-mon/plugins/vRealiseOps/__init__.py similarity index 100% rename from plugins/vRealiseOps/__init__.py rename to osm-mon/plugins/vRealiseOps/__init__.py diff --git a/plugins/vRealiseOps/kafka_consumer_vrops.py b/osm-mon/plugins/vRealiseOps/kafka_consumer_vrops.py similarity index 100% rename from plugins/vRealiseOps/kafka_consumer_vrops.py rename to osm-mon/plugins/vRealiseOps/kafka_consumer_vrops.py diff --git a/plugins/vRealiseOps/mon_plugin_vrops.py b/osm-mon/plugins/vRealiseOps/mon_plugin_vrops.py similarity index 100% rename from plugins/vRealiseOps/mon_plugin_vrops.py rename to osm-mon/plugins/vRealiseOps/mon_plugin_vrops.py diff --git a/plugins/vRealiseOps/plugin_receiver.py b/osm-mon/plugins/vRealiseOps/plugin_receiver.py similarity index 100% rename from plugins/vRealiseOps/plugin_receiver.py rename to osm-mon/plugins/vRealiseOps/plugin_receiver.py diff --git a/plugins/vRealiseOps/vROPs_Webservice/__init__.py b/osm-mon/plugins/vRealiseOps/vROPs_Webservice/__init__.py similarity index 100% rename from plugins/vRealiseOps/vROPs_Webservice/__init__.py rename to osm-mon/plugins/vRealiseOps/vROPs_Webservice/__init__.py diff --git a/plugins/vRealiseOps/vROPs_Webservice/install.sh b/osm-mon/plugins/vRealiseOps/vROPs_Webservice/install.sh similarity index 100% rename from plugins/vRealiseOps/vROPs_Webservice/install.sh rename to osm-mon/plugins/vRealiseOps/vROPs_Webservice/install.sh diff --git a/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice b/osm-mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice similarity index 100% rename from plugins/vRealiseOps/vROPs_Webservice/vrops_webservice rename to osm-mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice diff --git a/plugins/vRealiseOps/vrops_config.xml b/osm-mon/plugins/vRealiseOps/vrops_config.xml similarity index 100% rename from plugins/vRealiseOps/vrops_config.xml rename to osm-mon/plugins/vRealiseOps/vrops_config.xml diff --git a/test/.gitkeep b/osm-mon/test/.gitkeep similarity index 100% rename from test/.gitkeep rename to osm-mon/test/.gitkeep diff --git a/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json b/osm-mon/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json similarity index 100% rename from test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json rename to osm-mon/test/CloudWatch/test_schemas/alarm_details/acknowledge_alarm.json diff --git a/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_differentInstance.json diff --git a/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_differentName_sameInstance.json diff --git a/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_differentInstance.json diff --git a/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/create_alarm_sameName_sameInstance.json diff --git a/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/operation_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_invalid.json diff --git a/test/CloudWatch/test_schemas/create_alarm/operation_valid.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/operation_valid.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/operation_valid.json diff --git a/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_invalid.json diff --git a/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json b/osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/create_alarm/statistic_valid.json rename to osm-mon/test/CloudWatch/test_schemas/create_alarm/statistic_valid.json diff --git a/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json b/osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_invalid.json diff --git a/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json b/osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json rename to osm-mon/test/CloudWatch/test_schemas/create_metrics/create_metric_req_valid.json diff --git a/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json b/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_alarm/name_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_invalid.json diff --git a/test/CloudWatch/test_schemas/delete_alarm/name_valid.json b/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_alarm/name_valid.json rename to osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid.json diff --git a/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json b/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json rename to osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete1.json diff --git a/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json b/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json rename to osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete2.json diff --git a/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json b/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json rename to osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete3.json diff --git a/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json b/osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json rename to osm-mon/test/CloudWatch/test_schemas/delete_alarm/name_valid_delete4.json diff --git a/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json b/osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_invalid.json diff --git a/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json b/osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json rename to osm-mon/test/CloudWatch/test_schemas/delete_metrics/delete_metric_req_valid.json diff --git a/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json b/osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json similarity index 100% rename from test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json rename to osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_no_arguments.json diff --git a/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json b/osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json similarity index 100% rename from test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json rename to osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_one_argument.json diff --git a/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json b/osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json similarity index 100% rename from test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json rename to osm-mon/test/CloudWatch/test_schemas/list_alarm/list_alarm_valid_two_arguments.json diff --git a/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json b/osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_invalid.json diff --git a/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json b/osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json rename to osm-mon/test/CloudWatch/test_schemas/list_metrics/list_metric_req_valid.json diff --git a/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json b/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_invalid.json diff --git a/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json b/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json rename to osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_coll_period_req_valid.json diff --git a/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json b/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_invalid.json diff --git a/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json b/osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json rename to osm-mon/test/CloudWatch/test_schemas/read_metrics_data/read_metric_name_req_valid.json diff --git a/test/CloudWatch/test_schemas/update_alarm/name_invalid.json b/osm-mon/test/CloudWatch/test_schemas/update_alarm/name_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_alarm/name_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/update_alarm/name_invalid.json diff --git a/test/CloudWatch/test_schemas/update_alarm/name_valid.json b/osm-mon/test/CloudWatch/test_schemas/update_alarm/name_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_alarm/name_valid.json rename to osm-mon/test/CloudWatch/test_schemas/update_alarm/name_valid.json diff --git a/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json b/osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_alarm/operation_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_invalid.json diff --git a/test/CloudWatch/test_schemas/update_alarm/operation_valid.json b/osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_alarm/operation_valid.json rename to osm-mon/test/CloudWatch/test_schemas/update_alarm/operation_valid.json diff --git a/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json b/osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_invalid.json diff --git a/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json b/osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_alarm/statistic_valid.json rename to osm-mon/test/CloudWatch/test_schemas/update_alarm/statistic_valid.json diff --git a/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json b/osm-mon/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json similarity index 100% rename from test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json rename to osm-mon/test/CloudWatch/test_schemas/update_alarm/update_alarm_new_alarm.json diff --git a/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json b/osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json rename to osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_invalid.json diff --git a/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json b/osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json similarity index 100% rename from test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json rename to osm-mon/test/CloudWatch/test_schemas/update_metrics/update_metric_req_valid.json diff --git a/test/CloudWatch/unit_tests_alarms.py b/osm-mon/test/CloudWatch/unit_tests_alarms.py similarity index 100% rename from test/CloudWatch/unit_tests_alarms.py rename to osm-mon/test/CloudWatch/unit_tests_alarms.py diff --git a/test/CloudWatch/unit_tests_metrics.py b/osm-mon/test/CloudWatch/unit_tests_metrics.py similarity index 100% rename from test/CloudWatch/unit_tests_metrics.py rename to osm-mon/test/CloudWatch/unit_tests_metrics.py diff --git a/test/OpenStack/__init__.py b/osm-mon/test/OpenStack/__init__.py similarity index 100% rename from test/OpenStack/__init__.py rename to osm-mon/test/OpenStack/__init__.py diff --git a/test/OpenStack/test_alarm_req.py b/osm-mon/test/OpenStack/test_alarm_req.py similarity index 100% rename from test/OpenStack/test_alarm_req.py rename to osm-mon/test/OpenStack/test_alarm_req.py diff --git a/test/OpenStack/test_alarming.py b/osm-mon/test/OpenStack/test_alarming.py similarity index 100% rename from test/OpenStack/test_alarming.py rename to osm-mon/test/OpenStack/test_alarming.py diff --git a/test/OpenStack/test_common.py b/osm-mon/test/OpenStack/test_common.py similarity index 100% rename from test/OpenStack/test_common.py rename to osm-mon/test/OpenStack/test_common.py diff --git a/test/OpenStack/test_metric_calls.py b/osm-mon/test/OpenStack/test_metric_calls.py similarity index 100% rename from test/OpenStack/test_metric_calls.py rename to osm-mon/test/OpenStack/test_metric_calls.py diff --git a/test/OpenStack/test_metric_req.py b/osm-mon/test/OpenStack/test_metric_req.py similarity index 100% rename from test/OpenStack/test_metric_req.py rename to osm-mon/test/OpenStack/test_metric_req.py diff --git a/test/OpenStack/test_responses.py b/osm-mon/test/OpenStack/test_responses.py similarity index 100% rename from test/OpenStack/test_responses.py rename to osm-mon/test/OpenStack/test_responses.py diff --git a/test/OpenStack/test_settings.py b/osm-mon/test/OpenStack/test_settings.py similarity index 100% rename from test/OpenStack/test_settings.py rename to osm-mon/test/OpenStack/test_settings.py diff --git a/test/__init__.py b/osm-mon/test/__init__.py similarity index 100% rename from test/__init__.py rename to osm-mon/test/__init__.py diff --git a/test/core/__init__.py b/osm-mon/test/core/__init__.py similarity index 100% rename from test/core/__init__.py rename to osm-mon/test/core/__init__.py diff --git a/test/core/kafka_test.py b/osm-mon/test/core/kafka_test.py similarity index 100% rename from test/core/kafka_test.py rename to osm-mon/test/core/kafka_test.py diff --git a/test/core/test_producer.py b/osm-mon/test/core/test_producer.py similarity index 100% rename from test/core/test_producer.py rename to osm-mon/test/core/test_producer.py diff --git a/requirements.txt b/requirements.txt index d701122..92faf90 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,7 @@ stdeb MySQL-python +kafka lxml requests logutils diff --git a/setup.cfg b/setup.cfg index 56c44cd..5e76eca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,5 +44,4 @@ test_suite=test [files] packages = - Aodh - Gnocchi + pbr diff --git a/setup.py b/setup.py index f0e8f43..6b1faab 100644 --- a/setup.py +++ b/setup.py @@ -21,13 +21,9 @@ __author__ = "Prithiv Mohan" __date__ = "14/Sep/2017" - -#!/usr/bin/env python - from setuptools import setup from os import system - -_name = 'core' +_name = 'osm-mon' _version = '1.0' _description = 'OSM Monitoring Module' _author = 'Prithiv Mohan' @@ -35,33 +31,8 @@ _author_email = 'prithiv.mohan@intel.com' _maintainer = 'Adrian Hoban' _maintainer_email = 'adrian.hoban@intel.com' _license = 'Apache 2.0' -_copyright = 'Intel Research and Development Ireland' _url = 'https://osm.etsi.org/gitweb/?p=osm/MON.git;a=tree' -_requirements = [ - "stdeb", - "MySQL-python", - "requests", - "logutils", - "cherrypy", - "jsmin", - "jsonschema", - "python-openstackclient", - "python-novaclient", - "python-keystoneclient", - "python-neutronclient", - "aodhclient", - "gnocchiclient", - "boto==2.48", - "python-cloudwatchlogs-logging", - "py-cloudwatch", - "pyvcloud", - "pyopenssl", - "cherrypy", - "bottle", - "six", -] - -setup(name="mon_core", +setup(name="osm_mon", version = _version, description = _description, long_description = open('README.rst').read(), @@ -71,16 +42,14 @@ setup(name="mon_core", maintainer_email = _maintainer_email, url = _url, license = _license, - copyright = _copyright, packages = [_name], package_dir = {_name: _name}, - package_data = {_name: ['core/message_bus/*.py', 'core/models/*.json', - 'plugins/OpenStack/Aodh/*.py', 'plugins/OpenStack/Gnocchi/*.py', - 'plugins/vRealiseOps/*', 'plugins/CloudWatch/*']}, + package_data = {_name: ['osm-mon/core/message_bus/*.py', 'osm-mon/core/models/*.json', + 'osm-mon/plugins/OpenStack/Aodh/*.py', 'osm-mon/plugins/OpenStack/Gnocchi/*.py', + 'osm-mon/plugins/vRealiseOps/*', 'osm-mon/plugins/CloudWatch/*']}, data_files = [('/etc/systemd/system/', ['scripts/kafka.sh']), ], - scripts=['plugins/vRealiseOps/vROPs_Webservice/vrops_webservice', - 'kafkad'], - install_requires = _requirements, + scripts=['osm-mon/plugins/vRealiseOps/vROPs_Webservice/vrops_webservice', + 'kafkad', 'osm-mon/core/message_bus/common_consumer'], include_package_data=True, ) diff --git a/stage-archive.sh b/stage-archive.sh new file mode 100755 index 0000000..8f6e11d --- /dev/null +++ b/stage-archive.sh @@ -0,0 +1,33 @@ +# Copyright 2017 Intel Research and Development Ireland Limited +# ************************************************************* + +# This file is part of OSM Monitoring module +# All Rights Reserved to Intel Corporation + +# 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. + +# For those usages not covered by the Apache License, Version 2.0 please +# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com + +#__author__ = "Prithiv Mohan" +#__date__ = "25/Sep/2017" + + +#!/bin/sh +rm -rf pool +rm -rf dists +mkdir -p pool/MON +mv .build/*.deb pool/MON/ +mkdir -p dists/unstable/MON/binary-amd64/ +apt-ftparchive packages pool/MON > dists/unstable/MON/binary-amd64/Packages +gzip -9fk dists/unstable/MON/binary-amd64/Packages diff --git a/stage-build.sh b/stage-build.sh new file mode 100755 index 0000000..e78acc0 --- /dev/null +++ b/stage-build.sh @@ -0,0 +1,27 @@ +# Copyright 2017 Intel Research and Development Ireland Limited +# ************************************************************* + +# This file is part of OSM Monitoring module +# All Rights Reserved to Intel Corporation + +# 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. + +# For those usages not covered by the Apache License, Version 2.0 please +# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com + +#__author__ = "Prithiv Mohan" +#__date__ = "14/Sep/2017" + +#!/bin/bash +make clean all BRANCH=master +make package diff --git a/stage-test.sh b/stage-test.sh new file mode 100755 index 0000000..c647565 --- /dev/null +++ b/stage-test.sh @@ -0,0 +1,26 @@ +# Copyright 2017 Intel Research and Development Ireland Limited +# ************************************************************* + +# This file is part of OSM Monitoring module +# All Rights Reserved to Intel Corporation + +# 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. + +# For those usages not covered by the Apache License, Version 2.0 please +# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com + +#__author__ = "Prithiv Mohan" +#__date__ = "14/Sep/2017" + +#!/bin/bash +echo "UNITTEST" diff --git a/stdeb.cfg b/stdeb.cfg deleted file mode 100644 index 3f50292..0000000 --- a/stdeb.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2017 Intel Research and Development Ireland Limited -# ************************************************************* - -# This file is part of OSM Monitoring module -# All Rights Reserved to Intel Corporation - -# 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. - -# For those usages not covered by the Apache License, Version 2.0 please -# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com - -[DEFAULT] -Suite: xenial -XS-Python-Version: >= 2.7 -Depends: python-pip, libmysqlclient-dev, libssl-dev, libffi-dev, python-argcomplete, python-boto, python-bottle, python-jsonschema, python-logutils,python-openstackclient, python-mysqldb, aodhclient, gnocchiclient, python-cloudwatchlogs-logging, py-cloudwatch, pyvcloud, pyopenssl, cherrypy, python-bottle, boto2.8, python-neutronclient, python-keystoneclient, python-novaclient -- 2.25.1