MON Packaging Changes
Signed-off-by: prithiv <prithiv.mohan@intel.com>
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:
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 kafkad build/
- cp -r core build/
- cp -r plugins build/
- cp -r devops_stages build/
- cp -r test build/
- cp -r scripts build/
cp setup.py build/
+ cp kafkad build/
+ cp -r osm-mon build/
+ cp -r devops-stages build/
+ cp -r scripts 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 @@
[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 @@
_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 @@
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/stdeb.cfg b/stage-archive.sh
old mode 100644
new mode 100755
similarity index 67%
copy from stdeb.cfg
copy to stage-archive.sh
index 3f50292..8f6e11d
--- a/stdeb.cfg
+++ b/stage-archive.sh
@@ -19,7 +19,15 @@
# 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
+#__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/stdeb.cfg b/stage-build.sh
old mode 100644
new mode 100755
similarity index 67%
copy from stdeb.cfg
copy to stage-build.sh
index 3f50292..e78acc0
--- a/stdeb.cfg
+++ b/stage-build.sh
@@ -19,7 +19,9 @@
# 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
+#__author__ = "Prithiv Mohan"
+#__date__ = "14/Sep/2017"
+
+#!/bin/bash
+make clean all BRANCH=master
+make package
diff --git a/stdeb.cfg b/stage-test.sh
old mode 100644
new mode 100755
similarity index 67%
rename from stdeb.cfg
rename to stage-test.sh
index 3f50292..c647565
--- a/stdeb.cfg
+++ b/stage-test.sh
@@ -19,7 +19,8 @@
# 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
+#__author__ = "Prithiv Mohan"
+#__date__ = "14/Sep/2017"
+
+#!/bin/bash
+echo "UNITTEST"