Commit a411d463 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix issue #155

parent 3702fe41
......@@ -305,7 +305,7 @@ Check Postcondition VNF Indicator Subscription Is Set
Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
Log Check Response includes VNF Indicators according to filter
@{words} = Split String ${POS_FILTER} ,${SEPERATOR}
@{words} = Split String ${POS_FILTER} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['callbackUri']} @{words}[1]
Create Sessions
......@@ -331,7 +331,7 @@ Post Create subscription - DUPLICATION
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
${body}= Get File jsons/subscriptions.json
${body}= Format String ${template} callback_uri=${callback_uri}:${callback_port} callback_endpoint=${callback_endpoint}
${body}= Format String ${body} callback_uri=${callback_uri}:${callback_port} callback_endpoint=${callback_endpoint}
Log Creating mock request and response to handle GET operation on notification endpoint
&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
&{notification_response}= Create Mock Response status_code=204
......@@ -351,7 +351,7 @@ Post Create subscription - NO-DUPLICATION
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
${body}= Get File jsons/subscriptions.json
${body}= Format String ${template} callback_uri=${callback_uri}:${callback_port} callback_endpoint=${callback_endpoint}
${body}= Format String ${body} callback_uri=${callback_uri}:${callback_port} callback_endpoint=${callback_endpoint}
Log Creating mock request and response to handle GET operation on notification endpoint
&{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
&{notification_response}= Create Mock Response status_code=204
......
......@@ -293,9 +293,9 @@ Check HTTP Response Body Json Schema Is
Check HTTP Response Body vnfIndicators Matches the requested attribute-based filter
Log Check Response includes VNF Indicators according to filter
@{attr} = Split String ${POS_FILTER} ,${VAR_SEPERATOR}
@{var_name} = Split String @{attr}[0] ,${SEPERATOR}
@{var_id} = Split String @{attr}[1] ,${SEPERATOR}
@{attr} = Split String ${POS_FILTER} ${VAR_SEPARATOR}
@{var_name} = Split String @{attr}[0] ${SEPARATOR}
@{var_id} = Split String @{attr}[1] ${SEPARATOR}
Should Be True "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"
Check HTTP Response Header Contain Link
......
......@@ -225,7 +225,7 @@ Check HTTP Response Body Includes Requested VNF Instance ID
Check HTTP Response Body Matches Attribute-Based Filter
Log Check Response includes VNF Indicators according to filter
@{words} = Split String ${POS_FIELDS} ,${SEPERATOR}
@{words} = Split String ${POS_FIELDS} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['name']} @{words}[1]
Check HTTP Response Header Contain Link
......
......@@ -41,7 +41,7 @@ ${POS_FILTER} callbackUri=http://127.0.0.1/subscribe
${NEG_FILTER} callback=http://127.0.0.1/subscribe
${total_polling_time} 2 min
${polling_interval} 10 sec
${SEPERATOR} =
${SEPARATOR} =
${erroneousVnfInstanceId} erroneousVnfInstanceId
${POS_FIELDS} name=vnfIndicator
......@@ -49,6 +49,6 @@ ${NEG_FIELDS} wrongName=any_value
${vnfIndicators} =
${VAR_SEPERATOR} &
${VAR_SEPARATOR} &
${callbackResp} localhost
\ No newline at end of file
......@@ -365,7 +365,7 @@ Check HTTP Response Body Matches all_fields selector
Check HTTP Response Body Matches filter
Log Checking that attribute-based filter is matched
@{words} = Split String ${POS_FILTER} ,${SEPERATOR}
@{words} = Split String ${POS_FILTER} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['objectInstanceIds']} @{words}[1]
Check HTTP Response Status Code Is
......
......@@ -218,7 +218,7 @@ Check Postcondition Threshold Exists
Check HTTP Response Body Thresholds match the requested attribute-based filter
Log Checking that attribute-based filter is matched
@{words} = Split String ${FILTER_OK} ,${SEPERATOR}
@{words} = Split String ${FILTER_OK} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['objectInstanceId']} @{words}[1]
Check HTTP Response Status Code Is
......
......@@ -44,7 +44,7 @@ ${newThresholdId} newThresholdId
${POS_FILTER} objectInstanceIds=${objectInstanceIds}
${NEG_FILTER} criteriaPmJob=erroneousAttributeName
${fields} criteria,reports
${SEPERATOR} =
${SEPARATOR} =
${reportId} 0fb4c875-e07f-46ca-a9dd-13907667a568
${erroneousReportId} erroneousReportId
......
......@@ -325,9 +325,9 @@ Check Postcondition VNF Indicators Exist
Check HTTP Response Body vnfIndicators Matches the requested attribute-based filter
Log Check Response includes VNF Indicators according to filter
@{attr} = Split String ${POS_FIELDS} ,${VAR_SEPERATOR}
@{var_name} = Split String @{attr}[0] ,${SEPERATOR}
@{var_id} = Split String @{attr}[1] ,${SEPERATOR}
@{attr} = Split String ${POS_FIELDS} ${VAR_SEPARATOR}
@{var_name} = Split String @{attr}[0] ${SEPARATOR}
@{var_id} = Split String @{attr}[1] ${SEPARATOR}
Should Be True "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"
Get all indicators for a VNF instance
......
......@@ -57,7 +57,7 @@ ${POS_FIELDS} name=vnfIndicator
${NEG_FIELDS} wrongName=any_value
${SEPERATOR} =
${VAR_SEPERATOR} &
${SEPARATOR} =
${VAR_SEPARATOR} &
${callbackResp} localhost
\ No newline at end of file
......@@ -49,9 +49,9 @@ GET VNF Packages with attribute-based filter
Check HTTP Response Body VnfPkgsInfo Matches the requested Attribute-Based Filter
Log Checking that attribute-based filter is matched
@{attr} = Split String ${POS_FILTER} ,${VAR_SEPERATOR}
@{var_id} = Split String @{attr}[0] ,${SEPERATOR}
@{var_provider} = Split String @{attr}[1] ,${SEPERATOR}
@{attr} = Split String ${POS_FILTER} ${VAR_SEPARATOR}
@{var_id} = Split String @{attr}[0] ${SEPARATOR}
@{var_provider} = Split String @{attr}[1] ${SEPARATOR}
Should Be True "${response['body'][0]['vnfdId']}"=="@{var_id}[1]" and "${response['body'][0]['vnfProvider']}"=="@{var_provider}[1]"
GET VNF Packages with invalid attribute-based filter
......@@ -643,7 +643,7 @@ Check HTTP Response Body Is Empty
Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
Log Check Response includes VNF Package Management according to filter
@{words} = Split String ${filter_ok} ,${SEPERATOR}
@{words} = Split String ${filter_ok} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['callbackUri']} @{words}[1]
Check HTTP Response Body PkgmSubscription Attributes Values Match the Issued Subscription
......
......@@ -57,7 +57,7 @@ ${erroneousVnfdId} erroneousVnfdId
${filter_ok} callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
${filter_ko} nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d # Not existant filter attribute-based
${SEPERATOR} =
${SEPARATOR} =
${ACCEPT_PLAIN} text/plain
......@@ -84,7 +84,7 @@ ${vndEncryptedArtifactID} encryptedId
${POS_FILTER} vnfdId=41fdd38a-3d4c-465c-83e0-f80e014425f8 ,vnfProvider=NXW # 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
${VAR_SEPERATOR} &
${VAR_SEPARATOR} &
${callbackResp} localhost
......
......@@ -374,7 +374,7 @@ Check HTTP Response Body PmJobs Matches the requested all_fields selector
Check HTTP Response Body PmJobs Matches the requested Attribute-Based Filter
Log Checking that attribute-based filter is matched
@{words} = Split String ${POS_FILTER} ,${SEPERATOR}
@{words} = Split String ${POS_FILTER} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['objectInstanceIds']} @{words}[1]
Check HTTP Response Body Does Not Contain reports
......
......@@ -56,7 +56,7 @@ ${notification_response} []
${POS_FILTER} objectInstanceIds=${objectInstanceIds}
${NEG_FILTER} criteriaPmJob=erroneousAttributeName
${fields} criteria,objectInstanceIds
${SEPERATOR} =
${SEPARATOR} =
${reportId} 0fb4c875-e07f-46ca-a9dd-13907667a568
......
......@@ -32,7 +32,7 @@ GET Network Service Descriptors Information with attribute-based filter
Check HTTP Response Body NsdInfos Matches the requested attribute-based filter
Log Checking that attribute-based filter is matched
@{words} = Split String ${NSD_NAME} ,${SEPERATOR}
@{words} = Split String ${NSD_NAME} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['nsdName']} @{words}[1]
GET Network Service Descriptors Information with invalid attribute-based filter
......@@ -453,7 +453,7 @@ GET PNF Descriptors Information with attribute-based filter
Check HTTP Response Body PnfdInfos Matches the requested attribute-based filter
Log Checking that attribute-based filter is matched
@{words} = Split String ${PNFD_NAME} ,${SEPERATOR}
@{words} = Split String ${PNFD_NAME} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['pnfdName']} @{words}[1]
GET PNF Descriptors Information with invalid attribute-based filter
......@@ -878,7 +878,7 @@ Check HTTP Response Body Is Empty
Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
Log Check Response includes NSD Management Management according to filter
@{words} = Split String ${filter_ok} ,${SEPERATOR}
@{words} = Split String ${filter_ok} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['callbackUri']} @{words}[1]
Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription
......
......@@ -76,7 +76,7 @@ ${length} 1024
${createdNsdInfoId} f27200b1-1d8b-48c2-9d98-a993b8ab117f
${NSD_NAME} nsdName=onBoardedNSD
${PNFD_NAME} pnfdName=onBoardedPNFD
${SEPERATOR} =
${SEPARATOR} =
${pnfdInfoId} 40853bda-8a8f-4f63-9130-cef439f65348
......
......@@ -402,7 +402,7 @@ Check Postcondition Threshold Exists
Check HTTP Response Body Thresholds match the requested attribute-based filter
Log Checking that attribute-based filter is matched
@{words} = Split String ${FILTER_OK_Threshold} ,${SEPERATOR}
@{words} = Split String ${FILTER_OK_Threshold} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['objectInstanceId']} @{words}[1]
......
......@@ -63,6 +63,6 @@ ${newReportId} newReportId
${FILTER_OK_Threshold} objectInstanceId=1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
${FILTER_KO} criterias=erroneousFilter
${SEPERATOR} =
${SEPARATOR} =
${callbackResp} 127.0.0.1
\ No newline at end of file
......@@ -56,9 +56,9 @@ GET VNF Packages with attribute-based filter
Check HTTP Response Body VnfPkgsInfo Matches the requested Attribute-Based Filter
Log Checking that attribute-based filter is matched
@{attr} = Split String ${POS_FILTER} ,${VAR_SEPERATOR}
@{var_id} = Split String @{attr}[0] ,${SEPERATOR}
@{var_provider} = Split String @{attr}[1] ,${SEPERATOR}
@{attr} = Split String ${POS_FILTER} ${VAR_SEPARATOR}
@{var_id} = Split String @{attr}[0] ${SEPARATOR}
@{var_provider} = Split String @{attr}[1] ${SEPARATOR}
Should Be True "${response['body'][0]['vnfdId']}"=="@{var_id}[1]" and "${response['body'][0]['vnfProvider']}"=="@{var_provider}[1]"
GET VNF Packages with invalid attribute-based filter
......@@ -926,7 +926,7 @@ Check HTTP Response Body Json Schema Is
Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
Log Check Response includes VNF Package Management according to filter
@{words} = Split String ${filter_ok} ,${SEPERATOR}
@{words} = Split String ${filter_ok} ${SEPARATOR}
Should Be Equal As Strings ${response['body'][0]['callbackUri']} @{words}[1]
Check HTTP Response Body Subscription Identifier matches the requested Subscription
......
......@@ -43,7 +43,7 @@ ${origResponse} httpresponse
${filter_ok} callbackUri=http://172.22.1.7:9091/vnfpkgm/subscriptions
${filter_ko} nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d # Not existant filter attribute-based
${SEPERATOR} =
${SEPARATOR} =
${erroneousVnfPackageId} erroneousVnfPackageId # Given ID for vnfPkg not present in database
${disabledVnfPackageId} 87a2c9d3-00ea-4032-8c67-a5106d001868
......@@ -79,7 +79,7 @@ ${NEG_FILTER} nfvId=41fdd38a-3d4c-465c-83e0-f80e014425f8 # Negative case,
${CAN_FILTER} 1 # NFVO in able to use filters when retrieving VNF Packages
${fields} softwareImages,additionalArtifacts
${BAD_AUTHORIZATION_TOKEN} Bear sometoken
${VAR_SEPERATOR} &
${VAR_SEPARATOR} &
${vnfPkgViaUriId} 788106a2-d692-44f3-a86d-384f0ce35e42
${creatingVnfPkgViaUriId} d246ccdd-71aa-402f-b256-6a80ee54be3d
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment