From 01a6bea91158f0160d3ade1115fde1129537d5e7 Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Fri, 11 Dec 2020 15:42:42 +0100
Subject: [PATCH] Fix issue #71

---
 .../ScaleVNFTask.robot                        |  6 ++--
 .../VnfLcmOperationKeywords.robot             | 30 ++++++++++++++++---
 .../environment/variables.txt                 |  3 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index f34e1bf9..e545c237 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -17,7 +17,7 @@ POST Scale a vnfInstance
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance    0
     Check HTTP Response Status Code Is    202
     Check Operation Occurrence Id
 
@@ -30,7 +30,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance  
+    POST Scale vnfInstance    1
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails 
 
@@ -43,7 +43,7 @@ POST Scale a vnfInstance Not Found
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
-    POST Scale vnfInstance
+    POST Scale vnfInstance    2
     Check HTTP Response Status Code Is    404
     Check HTTP Response Body Json Schema Is    ProblemDetails 
    
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index 8cd37ad8..f4dd7974 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -252,16 +252,38 @@ DELETE instantiate individual vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
-POST Scale vnfInstance	
+
+POST Scale vnfInstance
+    [Arguments]    ${vnf_state}
+    [Documentation]    ${vnf_state} differentiate the VNF ID to be used in the different POST requests
+    ...    ${vnf_state} == 0 -> VNF in instantiated state
+    ...    ${vnf_state} == 1 -> VNF in not_instantiated state
+    ...    ${vnf_state} == 2 -> VNF ID not stored
+    ...     
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${template}=    Get File    jsons/scaleVnfRequest.json
-    ${body}=        Format String   ${template}     scaleVnfRequesttype=${scaleVnfRequesttype}    scaleVnfRequestAspect=${scaleVnfRequestAspect} 
+    ${body}=    Get File    jsons/scaleVnfRequest.json
+    Run Keyword If    ${vnf_state} == 0    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${instantiatedVnfInstanceId}/scale    ${body}
+    Run Keyword If    ${vnf_state} == 1    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${notInstantiatedVnfInstanceId}/scale    ${body}
+    Run Keyword If    ${vnf_state} == 2    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${NOT_EXISTANT_VNF_INSTANCE_ID}/scale    ${body}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
-    ${outputResponse}=    Output    response
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+	${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+
+
+# POST Scale vnfInstance	
+    # Log    Trying to Instantiate a vnf Instance
+    # Set Headers  {"Accept":"${ACCEPT}"}  
+    # Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    # ${template}=    Get File    jsons/scaleVnfRequest.json
+    # ${body}=        Format String   ${template}     scaleVnfRequesttype=${scaleVnfRequesttype}    scaleVnfRequestAspect=${scaleVnfRequestAspect} 
+    # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/scale    ${body}
+    # ${outputResponse}=    Output    response
+	# Set Global Variable    ${response}    ${outputResponse} 
 GET Scale vnfInstance				
     Log    Trying to get a scale a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 29e211d2..922dc705 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -38,7 +38,8 @@ ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${VnfLcmOperationOccurrenceNotification}    {}
 ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
-
+${notInstantiatedVnfInstanceId}    NOT_INSTANTIATED_VNF_INSTANCE_ID
+${NOT_EXISTANT_VNF_INSTANCE_ID}    NOT_EXISTANT_VNF_INSTANCE_ID    
 ${SYNC_MODE}    0
 
 ${callback_uri}    http://localhost
-- 
GitLab