featuregroup_name added.

Issue-Id: AIMLFW-58

Change-Id: I8225e192f45d5c501e824510a6d8e0d719660c98
Signed-off-by: rajdeep11 <rajdeep.sin@samsung.com>

diff --git a/tests/test_tm_apis.py b/tests/test_tm_apis.py
index 39b1564..4d465a4 100644 (file)
--- a/tests/test_tm_apis.py
+++ b/tests/test_tm_apis.py
@@ -325,7 +325,7 @@ class Test_training_main:
                     "trainingjob_name":"usecase1",
                     "pipeline_name":"qoe Pipeline lat v2",
                     "experiment_name":"Default",
-                    "feature_list":"*",
+                    "featureGroup_name":"group",
                     "query_filter":"",
                     "arguments":{
                         "epochs":"1",
@@ -362,7 +362,7 @@ class Test_training_main:
                     "trainingjob_name":"usecase1",
                     "pipeline_name":"qoe Pipeline lat v2",
                     "experiment_name":"Default",
-                    "feature_list":"*",
+                    "featureGroup_name":"group",
                     "query_filter":"",
                     "arguments":{
                         "epochs":"1",
@@ -391,7 +391,7 @@ class Test_training_main:
                     "trainingjob_name":"usecase1",
                     "pipeline_name":"qoe Pipeline lat v2",
                     "experiment_name":"Default",
-                    "feature_list":"*",
+                    "featureGroup_name":"group",
                     "query_filter":"",
                     "arguments":{
                         "epochs":"1",

diff --git a/tests/test_trainingmgr_util.py b/tests/test_trainingmgr_util.py
index 3c33253..1c6e9fb 100644 (file)
--- a/tests/test_trainingmgr_util.py
+++ b/tests/test_trainingmgr_util.py
@@ -279,16 +279,16 @@ class Test_check_trainingjob_data:
     @patch('trainingmgr.common.trainingmgr_util.isinstance',return_value=True)  
     def test_check_trainingjob_data(self,mock1,mock2):
         usecase_name = "usecase8"
-        json_data = { "description":"unittest", "feature_list": ["apple", "banana", "cherry"] , "pipeline_name":"qoe" , "experiment_name":"experiment1" , "arguments":"arguments1" , "query_filter":"query1" , "enable_versioning":True , "target_deployment":"Near RT RIC" , "pipeline_version":1 , "datalake_source":"cassandra db" , "incremental_training":True , "model":"usecase7" , "model_version":1 , "_measurement":2 , "bucket":"bucket1"}
+        json_data = { "description":"unittest", "featureGroup_name": "group1" , "pipeline_name":"qoe" , "experiment_name":"experiment1" , "arguments":"arguments1" , "query_filter":"query1" , "enable_versioning":True , "target_deployment":"Near RT RIC" , "pipeline_version":1 , "datalake_source":"cassandra db" , "incremental_training":True , "model":"usecase7" , "model_version":1 , "_measurement":2 , "bucket":"bucket1"}
     
-        expected_data = (['apple', 'banana', 'cherry'], 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
+        expected_data = ("group1", 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
         assert check_trainingjob_data(usecase_name, json_data) == expected_data,"data not equal"
     
     def test_negative_check_trainingjob_data_1(self):
         usecase_name = "usecase8"
-        json_data = { "description":"unittest", "feature_list": ["apple", "banana", "cherry"] , "pipeline_name":"qoe" , "experiment_name":"experiment1" , "arguments":"arguments1" , "query_filter":"query1" , "enable_versioning":True , "target_deployment":"Near RT RIC" , "pipeline_version":1 , "datalake_source":"cassandra db" , "incremental_training":True , "model":"usecase7" , "model_version":1 , "_measurement":2 , "bucket":"bucket1"}
+        json_data = { "description":"unittest", "featureGroup_name": "group1" , "pipeline_name":"qoe" , "experiment_name":"experiment1" , "arguments":"arguments1" , "query_filter":"query1" , "enable_versioning":True , "target_deployment":"Near RT RIC" , "pipeline_version":1 , "datalake_source":"cassandra db" , "incremental_training":True , "model":"usecase7" , "model_version":1 , "_measurement":2 , "bucket":"bucket1"}
     
-        expected_data = (['apple', 'banana', 'cherry'], 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
+        expected_data = ("group1", 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
         try:
             assert check_trainingjob_data(usecase_name, json_data) == expected_data,"data not equal"
             assert False
@@ -298,9 +298,9 @@ class Test_check_trainingjob_data:
     @patch('trainingmgr.common.trainingmgr_util.check_key_in_dictionary',return_value=True)
     def test_negative_check_trainingjob_data_2(self,mock1):
         usecase_name = "usecase8"
-        json_data = { "description":"unittest", "feature_list": ["apple", "banana", "cherry"] , "pipeline_name":"qoe" , "experiment_name":"experiment1" , "arguments":"arguments1" , "query_filter":"query1" , "enable_versioning":True , "target_deployment":"Near RT RIC" , "pipeline_version":1 , "datalake_source":"cassandra db" , "incremental_training":True , "model":"usecase7" , "model_version":1 , "_measurement":2 , "bucket":"bucket1"}
+        json_data = { "description":"unittest", "featureGroup_name": "group1" , "pipeline_name":"qoe" , "experiment_name":"experiment1" , "arguments":"arguments1" , "query_filter":"query1" , "enable_versioning":True , "target_deployment":"Near RT RIC" , "pipeline_version":1 , "datalake_source":"cassandra db" , "incremental_training":True , "model":"usecase7" , "model_version":1 , "_measurement":2 , "bucket":"bucket1"}
     
-        expected_data = (['apple', 'banana', 'cherry'], 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
+        expected_data = ("group1", 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
         try:
             assert check_trainingjob_data(usecase_name, json_data) == expected_data,"data not equal"
             assert False
@@ -311,7 +311,7 @@ class Test_check_trainingjob_data:
     def test_negative_check_trainingjob_data_3(self,mock1):
         usecase_name = "usecase8"
         json_data = None
-        expected_data = (['apple', 'banana', 'cherry'], 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
+        expected_data = ("group1", 'unittest', 'qoe', 'experiment1', 'arguments1', 'query1', True, 1, 'cassandra db', 2, 'bucket1')
         try:
             assert check_trainingjob_data(usecase_name, json_data) == expected_data,"data not equal"
             assert False

diff --git a/trainingmgr/common/trainingmgr_util.py b/trainingmgr/common/trainingmgr_util.py
index cdf62b7..ed1a16c 100644 (file)
--- a/trainingmgr/common/trainingmgr_util.py
+++ b/trainingmgr/common/trainingmgr_util.py
@@ -128,7 +128,7 @@ def check_trainingjob_data(trainingjob_name, json_data):
     values of different keys in jsn_data.
     """
     try:
-        if check_key_in_dictionary(["feature_list", "pipeline_version", \
+        if check_key_in_dictionary(["featureGroup_name", "pipeline_version", \
                                  "pipeline_name", "experiment_name",
                                  "arguments", "enable_versioning",
                                  "datalake_source", "description",
@@ -136,7 +136,7 @@ def check_trainingjob_data(trainingjob_name, json_data):
                                  "bucket"], json_data):
 
             description = json_data["description"]
-            feature_list = json_data["feature_list"]
+            feature_list = json_data["featureGroup_name"]
             pipeline_name = json_data["pipeline_name"]
             experiment_name = json_data["experiment_name"]
             arguments = json_data["arguments"]

diff --git a/trainingmgr/trainingmgr_main.py b/trainingmgr/trainingmgr_main.py
index 0a64850..2278d94 100644 (file)
--- a/trainingmgr/trainingmgr_main.py
+++ b/trainingmgr/trainingmgr_main.py
@@ -848,8 +848,8 @@ def trainingjob_operations(trainingjob_name):
             json with below fields are given:
                 description: str
                     description
-                feature_list: str
-                    feature names
+                featuregroup_name: str
+                    feature group name
                 pipeline_name: str
                     name of pipeline
                 experiment_name: str
@@ -902,11 +902,11 @@ def trainingjob_operations(trainingjob_name):
                 response_code = status.HTTP_409_CONFLICT
                 raise TMException("trainingjob name(" + trainingjob_name + ") is already present in database")
             else:
-                (feature_list, description, pipeline_name, experiment_name,
+                (featuregroup_name, description, pipeline_name, experiment_name,
                 arguments, query_filter, enable_versioning, pipeline_version,
                 datalake_source, _measurement, bucket) = \
                 check_trainingjob_data(trainingjob_name, json_data)
-                add_update_trainingjob(description, pipeline_name, experiment_name, feature_list,
+                add_update_trainingjob(description, pipeline_name, experiment_name, featuregroup_name,
                                     arguments, query_filter, True, enable_versioning,
                                     pipeline_version, datalake_source, trainingjob_name, 
                                     PS_DB_OBJ, _measurement=_measurement,
@@ -930,11 +930,11 @@ def trainingjob_operations(trainingjob_name):
                             not in [States.FAILED.name, States.FINISHED.name]):
                         raise TMException("Trainingjob(" + trainingjob_name + ") is not in finished or failed status")
 
-                (feature_list, description, pipeline_name, experiment_name,
+                (featuregroup_name, description, pipeline_name, experiment_name,
                 arguments, query_filter, enable_versioning, pipeline_version,
                 datalake_source, _measurement, bucket) = check_trainingjob_data(trainingjob_name, json_data)
 
-                add_update_trainingjob(description, pipeline_name, experiment_name, feature_list,
+                add_update_trainingjob(description, pipeline_name, experiment_name, featuregroup_name,
                                         arguments, query_filter, False, enable_versioning,
                                         pipeline_version, datalake_source, trainingjob_name, PS_DB_OBJ, _measurement=_measurement,
                                         bucket=bucket)
@@ -1024,7 +1024,7 @@ def retraining():
             description = results[0][1]
             pipeline_name = results[0][3]
             experiment_name = results[0][4]
-            feature_list = results[0][2]
+            featuregroup_name = results[0][2]
             arguments = json.loads(results[0][5])['arguments']
             query_filter = results[0][6]
             datalake_source = get_one_key(json.loads(results[0][14])["datalake_source"])
@@ -1040,7 +1040,7 @@ def retraining():
 
             try:
                 add_update_trainingjob(description, pipeline_name, experiment_name,
-                                      feature_list, arguments, query_filter, False,
+                                      featuregroup_name, arguments, query_filter, False,
                                       enable_versioning, pipeline_version,
                                       datalake_source, trainingjob_name, PS_DB_OBJ,
                                       notification_url, _measurement, bucket)