From 7698216ca25dd184aed1e16c100bf092f15f8bda Mon Sep 17 00:00:00 2001
From: mxzhao <mengxuan.zhao@eglobalmark.com>
Date: Tue, 8 Jan 2019 11:36:53 +0100
Subject: [PATCH] bug fix in SOL003 VNF lc mngt scaleout workflow

---
 .../ScaleVNFTaskWorkflow.robot                       |  1 +
 .../VnfLcmMntOperationKeywords.robot                 | 12 ++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
index 45293ded..baa9ecce 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
@@ -38,6 +38,7 @@ Scale out a VNF Instance
 *** Keywords ***
 
 Initialize System
+    Create Sessions
     ${scaleInfo}=    Get Vnf Scale Info    ${vnfInstanceId}
     
 Precondition Checks
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index df94b404..32243250 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -39,12 +39,9 @@ Check HTTP Response Body Json Schema Is
     Log    Json Schema Validation OK
 
 Check resource Instantiated
-    Set Headers    {"Accept":"${ACCEPT}"}  
-    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId} 
-    Integer    response status    200
-    String    response body instantiationState    INSTANTIATED
+    Check VNF Instance    ${vnfInstanceId}
+    Check HTTP Response Status Code Is    200
+    Check VNF Status    ${response.body.instantiationState}    INSTANTIATED
 
 Check VNF Instance
     [Arguments]    ${vnfId}
@@ -77,8 +74,7 @@ Send VNF Scale Out Request
     ${body}=    Get File    json/scaleVnfOutRequest.json
     ${json}=    evaluate    json.loads('''${body}''')    json
     ${aspectId}=    Set Variable    ${json.aspectId}  
-    ${scaleOutResponse}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    [Return]    ${scaleOutResponse}
+    ${response}=    Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
   
 Create a new Grant - Synchronous mode
     [Arguments]    ${vnfInstanceId}    ${vnfLcmOpOccId}    ${operation}
-- 
GitLab