Update 'get_model_info' code in tm

- update 'get_model_info' code to reflect 'modelmgmtservice' changes(AIMLFW-128)
- update test code and test input data as well

Issue-ID: AIMLFW-136

Change-Id: I7a3f8772ef94c82b8e53c594da1fd295886f47b0
Signed-off-by: gyuyoung <gyoue200125@gmail.com>

diff --git a/tests/test_trainingmgr_operations.py b/tests/test_trainingmgr_operations.py
index 66d3688..fd0e16b 100644 (file)
--- a/tests/test_trainingmgr_operations.py
+++ b/tests/test_trainingmgr_operations.py
@@ -196,22 +196,46 @@ class Test_get_model_info:
     @patch('trainingmgr.common.trainingmgr_operations.requests.get')
     def test_get_model_info(self,mock_requests_get):
         training_config_obj = DummyVariable()
-        model_name="abc"
+        model_name="qoe"
+        rapp_id = "rapp_1"
+        meta_info = {
+            "test": "test"
+        }
+        
+        model_data = {
+            "model-name": model_name,
+            "rapp-id": rapp_id,
+            "meta-info": meta_info
+        }
         mock_response=MagicMock(spec=Response)
         mock_response.status_code=200
-        mock_response.json.return_value={'message':'{"abc":"bca"}'}
+        mock_response.json.return_value={'message': {"name": model_name, "data": json.dumps(model_data)}}
         mock_requests_get.return_value= mock_response
         model_info=trainingmgr_operations.get_model_info(training_config_obj, model_name)
-        expected_model_info={'abc': 'bca'}
+        expected_model_info={
+            "model-name": model_name,
+            "rapp-id": rapp_id,
+            "meta-info": meta_info
+        }
         assert model_info==expected_model_info, "get model info failed"
 
     @patch('trainingmgr.common.trainingmgr_operations.requests.get')
     def test_negative_get_model_info(self,mock_requests_get):
         training_config_obj = DummyVariable()
-        model_name="abc"
+        model_name="qoe"
+        rapp_id = "rapp_1"
+        meta_info = {
+            "test": "test"
+        }
+        
+        model_data = {
+            "model-name": model_name,
+            "rapp-id": rapp_id,
+            "meta-info": meta_info
+        }
         mock_response=MagicMock(spec=Response)
         mock_response.status_code=500
-        mock_response.json.return_value={'message':'{"abc":"bca"}'}
+        mock_response.json.return_value={'message': {"name": model_name, "data": json.dumps(model_data)}}
         mock_requests_get.return_value= mock_response
         try:
             model_info=trainingmgr_operations.get_model_info(training_config_obj, model_name)

diff --git a/trainingmgr/common/trainingmgr_operations.py b/trainingmgr/common/trainingmgr_operations.py
index a0a976c..23321f3 100644 (file)
--- a/trainingmgr/common/trainingmgr_operations.py
+++ b/trainingmgr/common/trainingmgr_operations.py
@@ -176,7 +176,7 @@ def get_model_info(training_config_obj, model_name):
     url ="http://"+str(model_management_service_ip)+":"+str(model_management_service_port)+"/getModelInfo/{}".format(model_name)
     response = requests.get(url)
     if(response.status_code==status.HTTP_200_OK):
-        model_info=json.loads(response.json()['message'])
+        model_info=json.loads(response.json()['message']["data"])
         return model_info
     else:
         errMsg="model info can't be fetched, model_name: {} , err: {}".format(model_name, response.text)