Commit 33b77cd7 authored by Frank Bryden's avatar Frank Bryden Committed by Frank Bryden
Browse files

New JS files. Merge with remote changes.

parent ea60d8f7
*** Variables ***
${POS_FIELDS} name=nsdOnboardingState
${NEG_FIELDS} wrongName=any_value
${nsdInfoId} 030b1c34-116a-4cfe-9226-19732c3a7b28
${nsdInfoId} 7abbe544-6a51-4c86-af55-3a345f80e7cc
${nsdInfoIdPlain} 20734bbb-abf6-4cd8-a35d-f416f95dc180
${nsdInfoIdZip} 5548bf85-8580-4c52-90d1-13c1a7a1dcb0
${nsdInfoIdZip} 352fac1d-ddce-454b-b072-184cf5ed94f5
${nsdDownloadableZip} f3ce866a-a935-49db-9f39-8b14b662cedc
${erroneous_nsdInfoId} erroneous_nsdInfoId
${disabledNsdInfoId} 5a569e1d-4ffe-4e9a-8cf6-c24226651e56
......
......@@ -3,7 +3,7 @@ ${NFVO_HOST} 172.21.248.145 # Hostname of the NFVO
${NFVO_PORT} 9999 # Listening port of the NFVO
${NFVO_SCHEMA} https
#auth token for OSM Access
${AUTHORIZATION} Bearer FJMG15bVJeJb4Y1t1fSKXFaCFUh0e8LD
${AUTHORIZATION} Bearer YguA4klaSzOxwE65MJ7aAWZvkOj2gAup
${CONTENT_TYPE_JSON} application/json
${ACCEPT_JSON} application/json
${apiRoot} /osm/
......
*** Settings ***
Resource environment/variables.txt
Resource NSFMOperationKeywords.robot
<<<<<<< Updated upstream
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
=======
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
>>>>>>> Stashed changes
Library OperatingSystem
Library DependencyLibrary
Library JSONLibrary
......
*** Variables ***
${NFVO_HOST} localhost # Hostname of the VNFM
${NFVO_PORT} 8080 # Listening port of the VNFM
${NFVO_HOST} 172.21.248.145 # Hostname of the VNFM
${NFVO_PORT} 9999 # Listening port of the VNFM
${NFVO_SCHEMA} https
${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==
${AUTHORIZATION} Bearer 3mT1BuYgMFj3UDqGGtj4ZTfKH74LUCLU
${ACCEPT} application/json
${ACCEPT_JSON} application/json
${AUTH_USAGE} 1
${alarm_filter} nsInstanceId
${nsInstanceId} 007c111c-38a1-42c0-a666-7475ecb1567c
${invalid_alarm_filter} badFilter
${apiRoot} /
${apiRoot} /osm
${apiName} nsfm
${apiVersion} v1
${CONTENT_TYPE} application/json
......
......@@ -20,4 +20,4 @@ NS Instance Deletion
DELETE IndividualNSInstance
Check HTTP Response Status Code Is 204
Check HTTP Response Body Json Schema Is NsIdentifierDeletionNotification
Check Instance Deleted
\ No newline at end of file
Check Instance Deleted
*** Settings ***
Resource environment/variables.txt
Resource NSLCMOperationKeywords.robot
<<<<<<< Updated upstream
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
=======
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
>>>>>>> Stashed changes
Library OperatingSystem
Library JSONLibrary
Library JSONSchemaLibrary schemas/
......
......@@ -214,7 +214,8 @@ POST New nsInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
${body}= Get File jsons/CreateNsRequest.json
#changed CreateNsRequest to CreateNs
${body}= Get File jsons/CreateNs.json
Post ${apiRoot}/${apiName}/${apiVersion}/ns_instances ${body}
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
......@@ -396,7 +397,7 @@ GET Instantiate NSInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
${body}= Get File jsons/InstantiateNsRequest.json
${body}= Get File jsons/InstantiateNs.json
Post ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/instantiate ${body}
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
......@@ -440,7 +441,7 @@ POST scale nsInstance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
${body}= Get File jsons/ScaleNsRequest.json
${body}= Get File jsons/ScaleNs.json
Post ${apiRoot}/${apiName}/${apiVersion}/ns_instances/${nsInstanceId}/scale ${body}
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
......@@ -699,7 +700,7 @@ GET Individual NS LCM OP Occurrence
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
Log Execute Query and validate response
Get ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
Get ${apiRoot}/${apiName}/${apiVersion}/ns_lcm_op_occs/${nsLcmOpOccId}
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
......
......@@ -20,6 +20,7 @@ POST Terminate a NSInstance
Check HTTP Response Status Code Is 202
Check HTTP Response Header Contains Location
Check resource not_instantiated
Sleep 15s
POST Terminate a NSInstance Conflict
[Documentation] Test ID: 5.3.2.7.2
......
*** Variables ***
${VNFM_HOST} localhost # Hostname of the VNFM
${VNFM_PORT} 8080 # Listening port of the VNFM
${NFVO_HOST} localhost # Hostname of the NFVO
${NFVO_PORT} 8081 # Listening port of the NFVO
${NFVO_HOST} 172.21.248.145 # Hostname of the NFVO
${NFVO_PORT} 9999 # Listening port of the NFVO
${VNFM_SCHEMA} https
${NFVO_SCHEMA} https
${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==
${AUTHORIZATION} Bearer kn6jROAkSsHj0Bw70j5jyJiLN8KO6xKI
${CONTENT_TYPE} application/json
${CONTENT_TYPE_PATCH} application/merge-patch+json
${ACCEPT_JSON} application/json
${ACCEPT} application/json
${apiRoot} /
${apiRoot} /osm/
${apiName} nslcm
${apiVersion} v1
${AUTH_USAGE} 1
${WRONG_AUTHORIZATION} Bearer XXXXXWRONGXXXXX
${nsInstanceId} 6fc3539c-e602-4afa-8e13-962fb5a7d81f
${nsInstanceId} 66f27112-8b6b-4e70-91a8-b8625a20fc8f
${ConflictNsInstanceId} 007c111c-e602-4afa-8e13-962fb5a7d81d
${nsInstanceName} Test-nsInstance
${nsInstanceDescription} description ns
......@@ -28,7 +28,7 @@ ${nsPkgId_processing} 007c111c-38a1-42c0-a666-7475ecb1567c
${ARTIFACT_TYPE} application/octet-stream
${ARTIFACT_ID} artifactId
${WRONG_ACCEPT} application/json
${nsLcmOpOccId} 6fc3539c-e602-4afa-8e13-962fb5a7d81d
${nsLcmOpOccId} 4f704476-6a4f-4473-be24-2868b94ac214
${CancelMode} GRACEFUL
${NFVO_DUPLICATION} 0
${sub_filter} filter
......
{
"nsdId": "20734bbb-abf6-4cd8-a35d-f416f95dc180",
"nsName": "myNS",
"vimAccountId": "46baa285-994b-4615-8fd1-84fff6e90832",
"nsDescription": "fancy router and firewall combo"
}
\ No newline at end of file
{
"nsFlavourId": 0
}
\ No newline at end of file
{
"scaleType": "SCALE_VNF",
"timeout_ns_scale": 1,
"scaleVnfData": {
"scaleVnfType": "SCALE_IN",
"scaleByStepData": {
"scaling-group-descriptor": "myScalingGroup",
"member-vnf-index": "1"
}
}
}
\ No newline at end of file
{
"terminationTime": "2021-04-12T23:20:50.52Z"
}
\ No newline at end of file
"timeout_ns_terminate": 1,
"autoremove": false
}
......@@ -273,7 +273,7 @@ Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
Get Individual Performance Report
Log Trying to get a performance report present in the NFVO
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -281,21 +281,21 @@ Get Individual Performance Report
Get Individual Performance Report with invalid resource endpoint
Log Trying to get a performance report with invalid resource endpoint
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Post request for Individual Performance Report
Log Trying to create new performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
POST ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Put request for Individual Performance Report
Log Trying to update performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
......@@ -305,7 +305,7 @@ Send Put request for Individual Performance Report
Send Patch request for Individual Performance Report
Log Trying to update performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
......@@ -315,7 +315,7 @@ Send Patch request for Individual Performance Report
Send Delete request for Individual Performance Report
Log Trying to delete performance report
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
DELETE ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${reportId}
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -343,7 +343,7 @@ Check Postcondition NS Individual Performance Report is Unmodified (Implicit)
GET all Performance Thresholds
Log Trying to get all thresholds present in the NFVO
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/thresholds
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -359,7 +359,7 @@ GET Performance Thresholds with attribute-based filter
GET Performance Thresholds with invalid attribute-based filter
Log Trying to get thresholds present in the NFVO with invalid filter
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/thresholds?${FILTER_KO}
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -367,14 +367,14 @@ GET Performance Thresholds with invalid attribute-based filter
GET NS performance Thresholds with invalid resource endpoint
Log Trying to get thresholds present in the NFVO with invalid resource endpoint
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/threshold
${output}= Output response
Set Suite Variable ${response} ${output}
Send Post Request Create new Performance Threshold
Log Creating a new THreshold
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
${request}= Get File jsons/CreateThresholdRequest.json
......@@ -384,7 +384,7 @@ Send Post Request Create new Performance Threshold
Send PUT Request for all Performance Thresholds
Log PUT THresholds
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
PUT ${apiRoot}/${apiName}/${apiVersion}/thresholds
......@@ -393,7 +393,7 @@ Send PUT Request for all Performance Thresholds
Send PATCH Request for all Performance Thresholds
Log PUT THresholds
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
PATCH ${apiRoot}/${apiName}/${apiVersion}/thresholds
......@@ -402,7 +402,7 @@ Send PATCH Request for all Performance Thresholds
Send DELETE Request for all Performance Thresholds
Log DELETE THresholds
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -430,7 +430,7 @@ Check HTTP Response Body Thresholds match the requested attribute-based filter
GET Individual NS performance Threshold
Log Trying to get a Threhsold present in the NFVO
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -438,28 +438,28 @@ GET Individual NS performance Threshold
GET individual NS performance Threshold with invalid resource identifier
Log Trying to get a Threhsold with invalid resource endpoint
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Delete request for individual NS performance Threshold
Log Trying to delete a Threhsold in the NFVO
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Delete request for individual NS performance Threshold with invalid resource identifier
Log Trying to delete a Threhsold in the NFVO with invalid id
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
DELETE ${apiRoot}/${apiName}/${apiVersion}/thresholds/${erroneousThresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Post request for individual NS performance Threshold
Log Trying to create new threshold
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
POST ${apiRoot}/${apiName}/${apiVersion}/thresholds/${newThresholdId}
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -467,7 +467,7 @@ Send Post request for individual NS performance Threshold
Send Put request for individual NS performance Threshold
Log Trying to PUT threshold
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
......@@ -478,7 +478,7 @@ Send Put request for individual NS performance Threshold
Send Patch request for individual NS performance Threshold
Log Trying to PUT threshold
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
......
*** Variables ***
${NFVO_HOST} localhost # Hostname of the NFVO
${NFVO_PORT} 8081 # Listening port of the NFVO
${NFVO_HOST} 172.21.248.145 # Hostname of the NFVO
${NFVO_PORT} 9999 # Listening port of the NFVO
${NFVO_SCHEMA} https
${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
${AUTHORIZATION} Bearer ivwDluws6XVhdFqGznZiw8cK1wP67S9b
${CONTENT_TYPE_JSON} application/json
${ACCEPT_JSON} application/json
${apiRoot} /
${apiRoot} /osm
${AUTH_USAGE} 1
${NEG_AUTHORIZATION} Bearer negativetoken
${apiVersion} v1
......
......@@ -173,7 +173,7 @@ GET all VNF Packages with invalid resource endpoint
Log Trying to perform a GET on a erroneous URI
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
GET ${apiRoot}/${apiName}/${apiVersion}/vnf_package
GET ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}
${output}= Output response
Set Suite Variable ${response} ${output}
......@@ -387,7 +387,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
Send POST Request for VNFD in individual VNF Package
Log Trying to perform a POST. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_ZIP}"}
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
POST ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPackageId}/vnfd
${output}= Output response
......
*** Variables ***
${NFVO_HOST} localhost # Hostname of the NFVO
${NFVO_PORT} 8081 # Listening port of the NFVO
${NFVO_HOST} 172.21.248.145 # Hostname of the NFVO
${NFVO_PORT} 9999 # Listening port of the NFVO
${NFVO_SCHEMA} https
${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
${AUTHORIZATION} Bearer Vr37Kbwr4eWZUNoSpWwy49mkxVmpmPWG
${CONTENT_TYPE_JSON} application/json
${ACCEPT_JSON} application/json
${apiRoot} /
${apiRoot} /osm
${AUTH_USAGE} 1
${NEG_AUTHORIZATION} Bearer negativetoken
${apiVersion} v1
......
Supports Markdown
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