CLMC service resources structure refactoring

scripts/clmc-service/install-tick-stack.sh

@@ -58,7 +58,7 @@ done
 
 # define the TICK script templates within Kapacitor
 echo "----> Creating alert templates in Kapacitor"
-cd ${REPO_ROOT}/src/service/clmcservice/resources/TICKscript
+cd ${REPO_ROOT}/src/service/resources/TICKscript
 for template_file in *.tick; do
     template_id=$(basename ${template_file} .tick)
     echo ${template_id} ${template_file}

src/service/MANIFEST.in

-include clmcservice/resources/tosca/flame_clmc_alerts_definitions.yaml
-include clmcservice/VERSION
-recursive-include clmcservice/resources/TICKscript *_template.tick
\ No newline at end of file
+include VERSION
+include .coveragerc
+include network_config.json
+include *.ini
+include clmcservice/flame_clmc_alerts_definitions.yaml
+recursive-include resources/TICKscript *_template.tick
\ No newline at end of file

src/service/clmcservice/alertsapi/tests.py

@@ -25,7 +25,7 @@
 
 # Python standard libs
 from os import listdir
-from os.path import isfile, join
+from os.path import isfile, join, dirname
 from urllib.parse import urlparse
 
 # PIP installed libs
@@ -74,7 +74,7 @@ class TestAlertsConfigurationAPI(object):
         """
 
         for path_suffix, valid_expected in (("valid", True), ("invalid", False)):
-            test_data_path = join(ROOT_DIR, *["resources", "tosca", "test-data", "tosca-parser", path_suffix])
+            test_data_path = join(dirname(ROOT_DIR), *["resources", "tosca", "test-data", "tosca-parser", path_suffix])
 
             for test_file_path in listdir(test_data_path):
                 alert_config_abs_path = join(test_data_path, test_file_path)
@@ -105,7 +105,7 @@ class TestAlertsConfigurationAPI(object):
         """
 
         for path_suffix, valid_expected in (("valid", True), ("invalid", False)):
-            test_data_path = join(ROOT_DIR, *["resources", "tosca", "test-data", "clmc-validator", path_suffix])
+            test_data_path = join(dirname(ROOT_DIR), *["resources", "tosca", "test-data", "clmc-validator", path_suffix])
 
             for test_file_path in listdir(test_data_path):
                 alert_config_abs_path = join(test_data_path, test_file_path)
@@ -141,7 +141,7 @@ class TestAlertsConfigurationAPI(object):
         """
 
         for test_folder in ("clmc-validator", "tosca-parser"):
-            test_data_path = join(ROOT_DIR, *["resources", "tosca", "test-data", test_folder, "valid"])
+            test_data_path = join(dirname(ROOT_DIR), *["resources", "tosca", "test-data", test_folder, "valid"])
 
             for test_file_path in listdir(test_data_path):
                 alert_spec_abs_path = join(test_data_path, test_file_path)

src/service/clmcservice/alertsapi/utilities.py

@@ -30,7 +30,7 @@ from os.path import join
 from clmcservice import ROOT_DIR
 
 
-CLMC_ALERTS_TOSCA_DEFINITIONS_REL_PATH = ["resources", "tosca", "flame_clmc_alerts_definitions.yaml"]
+CLMC_ALERTS_TOSCA_DEFINITIONS_REL_PATH = ["flame_clmc_alerts_definitions.yaml"]
 
 CLMC_ALERTS_TOSCA_DEFINITIONS_ABS_PATH = join(ROOT_DIR, *CLMC_ALERTS_TOSCA_DEFINITIONS_REL_PATH)