minor fix for filter and fields query parameters in GET keywords

SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot

@@ -113,7 +113,7 @@ GET NFVI Capacity Information with filter
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?${POS_FILTER}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?${POS_FILTER_info}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 		
 
@@ -131,7 +131,7 @@ GET NFVI Capacity Information with bad filter
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?fields=wrong_field
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?${NEG_FILTER}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
@@ -155,7 +155,7 @@ GET NFVI Capacity Information with fields attribute selector
     Log    Query status information about NFVI Capacity Information, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?fields=${fields_capacityInfo}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}	    
     
@@ -163,7 +163,7 @@ GET NFVI Capacity Information with exclude_default and fields attribute selector
     Log    Query status information about NFVI Capacity Information, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?fields=${fields}&exclude_default
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?fields=${fields_capacityInfo}&exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -171,7 +171,7 @@ GET NFVI Capacity Information with exclude_fields attribute selector
     Log    Query status information about NFVI Capacity Information, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?exclude_fields=${fields}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos?exclude_fields=${fields_capacityInfo}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 	
 
@@ -232,7 +232,7 @@ GET Individual VIMs NFVI Capacity Information using filter
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/${vimId}?${POS_FILTER}		
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/nfvi_capacity_infos/${vimId}?${POS_FILTER_info}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}      
 
@@ -311,7 +311,7 @@ GET Capacity Thresholds using filter
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/capacity_thresholds?${POS_FILTER}		
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/capacity_thresholds?${POS_FILTER_threshold}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}    
 

SOL005/NFVICapacityInformation-API/environment/variables.txt

@@ -82,9 +82,11 @@ ${vndEncryptedArtifactID}    encryptedId
 
 ${length}          1024
 
-${POS_FILTER}     vimId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,resourceType=VR_COMPUTE    # Positive case, suing compiant fields name for filtering get request
+${POS_FILTER_info}     vimId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,resourceType=VR_COMPUTE    # Positive case, suing compiant fields name for filtering get request
+${POS_FILTER_threshold}     id=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Positive case, suing compiant fields name for filtering get request
 ${NEG_FILTER}     nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8    # Negative case, using wrong name of field
-${fields}         softwareImages,additionalArtifacts
+${fields_capacityInfo}         timeInterval
+${fields_capacityThreshold}         subObjectInstanceIds
 ${VAR_SEPERATOR}    &
 
 ${callbackResp}    localhost