changes in the get_feature_group

Issue-id: AIMLFW-76

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

diff --git a/tests/test_tm_apis.py b/tests/test_tm_apis.py
index 816014e..f87b209 100644 (file)
--- a/tests/test_tm_apis.py
+++ b/tests/test_tm_apis.py
@@ -1154,7 +1154,7 @@ class Test_get_feature_group:
         self.client = trainingmgr_main.APP.test_client(self)
         self.logger = trainingmgr_main.LOGGER
 
-    result=[('testing', '', 'InfluxSource', '', '', '', '', '', True, '', '', '')]
+    result=[('testing', '', 'InfluxSource', '', '', '', '', '', '',True, '', '', '')]
     @patch('trainingmgr.trainingmgr_main.get_feature_groups_db', return_value=result)
     def test_get_feature_group(self,mock1):
         expected_data=b'{"featuregroups": [{"featuregroup_name": "testing", "features": "", "datalake": "InfluxSource", "dme": true}]}'
@@ -1174,10 +1174,10 @@ class Test_get_feature_group_by_name:
         self.client = trainingmgr_main.APP.test_client(self)
         self.logger = trainingmgr_main.LOGGER
 
-    result=[('testing', '', 'InfluxSource', '127.0.0.21', '8080', '', '', '', '', '', '', '')]
+    result=[('testing', '', 'InfluxSource', '127.0.0.21', '8080', '', '', '', '', '', '', '','')]
     @patch('trainingmgr.trainingmgr_main.get_feature_group_by_name_db', return_value=result)
     def test_get_feature_group_by_name(self, mock1):
-        expected_data=b'{"featuregroup": [{"featuregroup_name": "testing", "features": "", "datalake": "InfluxSource", "dme": "", "host": "127.0.0.21", "measured_obj_class": "", "port": "8080", "dme_port": "", "bucket": "", "token": "", "source_name": "", "db_org": ""}]}'
+        expected_data=b'{"featuregroup": [{"featuregroup_name": "testing", "features": "", "datalake": "InfluxSource", "host": "127.0.0.21", "port": "8080", "bucket": "", "token": "", "db_org": "", "measurement": "", "dme": "", "measured_obj_class": "", "dme_port": "", "source_name": ""}]}'
         fg_name='testing'
         response=self.client.get('/featureGroup/{}'.format(fg_name))
         assert response.status_code == 200 , "status code is not equal"

diff --git a/trainingmgr/trainingmgr_main.py b/trainingmgr/trainingmgr_main.py
index 5ee1375..cd7c5bd 100644 (file)
--- a/trainingmgr/trainingmgr_main.py
+++ b/trainingmgr/trainingmgr_main.py
@@ -1461,7 +1461,7 @@ def get_feature_group():
                 "featuregroup_name": res[0],
                 "features": res[1],
                 "datalake": res[2],
-                "dme": res[8]                
+                "dme": res[9]
                 }
             feature_groups.append(dict_data)
         api_response={"featuregroups":feature_groups}
@@ -1503,14 +1503,16 @@ def get_feature_group_by_name(featuregroup_name):
                              token for the bucket
                          db_org: str
                              db org
+                         measurement: str
+                             measurement of the influxdb
                          dme: str
                              whether dme enabled or not
+                         measured_obj_class: str
+                             obj class for dme
                          dme_port: str
                              dme_port
                          source_name: dict
                              source name
-                         measured_obj_class: str
-                             obj class for dme
         status code:
             HTTP status code 200
 
@@ -1532,15 +1534,16 @@ def get_feature_group_by_name(featuregroup_name):
                     "featuregroup_name": res[0],
                     "features": res[1],
                     "datalake": res[2],
-                    "dme": res[8],
                     "host": res[3],
-                    "measured_obj_class":res[9],
                     "port": res[4],
-                    "dme_port":res[10],
                     "bucket":res[5],
                     "token":res[6],
-                    "source_name":res[11],
-                    "db_org":res[7]
+                    "db_org":res[7],
+                    "measurement":res[8],
+                    "dme": res[9],
+                    "measured_obj_class":res[10],
+                    "dme_port":res[11],
+                    "source_name":res[12]
                 }
                 feature_group.append(dict_data)
             api_response={"featuregroup":feature_group}