From deb0087890ea60e4346d0d1bec0eeec4532e9403 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 10 Apr 2020 11:37:12 +0200
Subject: [PATCH] added missing robot library string
---
SOL002/VNFIndicator-API/Subscriptions.robot | 3 ++-
SOL002/VNFIndicator-API/VNFIndicators.robot | 5 +++--
SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot | 1 +
SOL002/VNFIndicator-API/environment/vnfIndicators.txt | 5 +++--
SOL002/VNFPerformanceManagement-API/PMJobs.robot | 1 +
SOL002/VNFPerformanceManagement-API/Thresholds.robot | 1 +
.../FaultManagement-APIKeyword.robot | 3 +--
SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot | 5 +++--
SOL003/VNFPerformanceManagement-API/PMJobs.robot | 1 +
SOL005/NSDManagement-API/NSDManagementKeywords.robot | 7 +++----
SOL005/NSLifecycleManagement-API/NSInstances.robot | 2 +-
.../NSPerformanceManagementKeywords.robot | 3 ++-
.../VNFPackageManagementKeywords.robot | 7 ++++---
13 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 323810ca..f0c3ed2b 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -5,7 +5,8 @@ Resource environment/subscriptions.txt
Library OperatingSystem
Library JSONLibrary
Library Process
-Library MockServerLibrary
+Library MockServerLibrary
+Library String
Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index 96731625..d4f7aadd 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -3,6 +3,7 @@ Documentation This clause defines all the resources and methods provided by
Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
Library JSONLibrary
+Library String
Resource environment/vnfIndicators.txt
Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
@@ -270,6 +271,6 @@ 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_FILTER} ,${VAR_SEPERATOR}
- @{var_name} = Split String @{attr}[0] ,${SEPERATOR}
- @{var_id} = Split String @{attr}[1] ,${SEPERATOR}
+ @{var_name} = Split String @{attr}[0] ,${SEPERATOR}
+ @{var_id} = Split String @{attr}[1] ,${SEPERATOR}
Should Be True "${response['body'][0]['name']}"=="@{var_name}[1]" and "${response['body'][0]['vnfInstanceId']}"=="@{var_id}[1]"
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 00bbffa1..ffc1d081 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -4,6 +4,7 @@ Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
Resource environment/vnfIndicatorinVnfInstance.txt
Library JSONLibrary
+Library String
Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
*** Test Cases ***
diff --git a/SOL002/VNFIndicator-API/environment/vnfIndicators.txt b/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
index 3613a999..84765907 100644
--- a/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
+++ b/SOL002/VNFIndicator-API/environment/vnfIndicators.txt
@@ -2,6 +2,7 @@
${POS_FIELDS} name=vnfIndicator&vnfInstanceId=80b0deba-c398-445b-bef0-ac0fe733e3d0
${NEG_FIELDS} wrongName=wrongValue
${response} some_response_object
-${vnfIndicators}
+${vnfIndicators} =
${SEPERATOR} =
-${VAR_SEPERATOR} &
\ No newline at end of file
+${VAR_SEPERATOR} &
+${POS_FILTER} =
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index b9c9991b..859e67ab 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -3,6 +3,7 @@ Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
Library JSONLibrary
Library OperatingSystem
+Library String
Resource environment/pmJobs.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ssl_verify=false
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 606c0bb6..419bcf8e 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -2,6 +2,7 @@
Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
Library JSONLibrary
+Library String
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ssl_verify=false
Resource environment/thresholds.txt
Library OperatingSystem
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index a82a0a9c..e049bbe1 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -13,10 +13,9 @@ ${original_etag} 1234
*** Keywords ***
Check created Subscription existence
- ${subscriptionId} = ${response['body']['id']}
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+ Get ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
Integer response status 200
Check Postcondition FaultManagement Subscription Is Set
Log Check Postcondition subscription exist
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index f58c7a08..fbdd736c 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -13,6 +13,7 @@ Library JSONLibrary
Library Collections
Library JSONSchemaLibrary schemas/
Library Process
+Library String
*** Keywords ***
Get All VNF Indicators Subscriptions
@@ -330,8 +331,8 @@ 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}
+ @{var_name} = Split String @{attr}[0] ,${SEPERATOR}
+ @{var_id} = Split String @{attr}[1] ,${SEPERATOR}
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
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index d3cac1bf..e47a3ac9 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -3,6 +3,7 @@ Library JSONSchemaLibrary schemas/
Resource environment/variables.txt # Generic Parameters
Library JSONLibrary
Library OperatingSystem
+Library String
Resource environment/pmJobs.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} ssl_verify=false
Library MockServerLibrary
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 4c8d1061..96abb791 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -12,6 +12,7 @@ Library JSONLibrary
Library Collections
Library JSONSchemaLibrary schemas/
Library Process
+Library String
*** Keywords ***
GET all Network Service Descriptors Information
@@ -32,7 +33,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} ,${SEPERATOR}
Should Be Equal As Strings ${response['body'][0]['nsdName']} @{words}[1]
GET Network Service Descriptors Information with invalid attribute-based filter
@@ -422,8 +423,6 @@ Send PUT Request to upload NSD Content as plain text file in asynchronous mode
${output}= Output response
Set Suite Variable ${response} ${output}
-==== BASE ====
-==== BASE ====
Send PUT Request to upload NSD Content as zip file in synchronous mode
Log Trying to perform a PUT. This method upload the content of a NSD
Set Headers {"Accept": "${ACCEPT_ZIP}"}
@@ -504,7 +503,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} ,${SEPERATOR}
Should Be Equal As Strings ${response['body'][0]['pnfdName']} @{words}[1]
GET PNF Descriptors Information with invalid attribute-based filter
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index eb83646a..72121da4 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -50,7 +50,7 @@ GET information about multiple NS instances Bad Request Invalid attribute-based
GET information about multiple NS instances Bad Request Invalid attribute selector
[Documentation] Test ID: 5.3.2.1.4
... Test title: GET information about multiple NS instances Bad Request Invalid attribute selector
- ... Test objective: The objective is to query information about multiple NS instances with Invalid attribute selector
+ ... Test objective: The objective is to query information about multiple NS instances with Invalid attribute selector
... Pre-conditions: A Ns instance is instantiated, a bad attribute selector parameter is either malformed or syntactically incorrect (filter parameters are listed in Table 6.4.2.3.2-1 - SOL005 v2.4.1)
... Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
... Config ID: Config_prod_NFVO
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 66031086..eaa4fb63 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -15,6 +15,7 @@ Library JSONLibrary
Library Collections
Library JSONSchemaLibrary schemas/
Library Process
+Library String
*** Keywords ***
GET all NS Performance Monitoring Jobs
@@ -422,7 +423,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} ,${SEPERATOR}
Should Be Equal As Strings ${response['body'][0]['objectInstanceId']} @{words}[1]
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 67cfbe57..eb8c08db 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -14,6 +14,7 @@ Library JSONLibrary
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
Library Process
Library MockServerLibrary
+Library String
*** Keywords ***
@@ -59,9 +60,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_SEPERATOR}
+ @{var_id} = Split String @{attr}[0] ,${SEPERATOR}
+ @{var_provider} = Split String @{attr}[1] ,${SEPERATOR}
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
--
GitLab