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

Extension for jsonlibrary in case of python3. Small fixies. SOL005 completed

parent f8cc3de1

SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

  "changeStateTo": "STOPPED",

  "changeStateTo": "STOPPED",

  "stopType": "FORCEFUL"

  "stopType": "FORCEFUL",

  "additionalParams": {}

  "additionalParams": {}

}
 
}
 
 No newline at end of file

SOL002/VNFPerformanceManagementNotification-API/jsons/ThresholdCrossedNotification.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
	"crossingDirection": "UP",

	"crossingDirection": "UP",

	"objectInstanceId": "vnfID",

	"objectInstanceId": "vnfID",

	"performanceMetric": "performanceMetric",

	"performanceMetric": "performanceMetric",

	"performanceValue": 7

	"performanceValue": 7,

	"_links": {

	"_links": {

			"subscription": "link to subscription",

			"subscription": "link to subscription",

			"threshold": "link to threshold"

			"threshold": "link to threshold"

SOL003/VNFLifecycleManagement-API/jsons/operateVnfRequest.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

  "changeStateTo": "STOPPED",

  "changeStateTo": "STOPPED",

  "stopType": "FORCEFUL"

  "stopType": "FORCEFUL",

  "additionalParams": {}

  "additionalParams": {}

}
 
}
 
 No newline at end of file

SOL003/VNFPackageManagement-API/VNFPackageArtifacts.robot

+10 −10
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} 
GET VNF Package Artifact

GET VNF Package Artifact

    Log    Trying to get a VNF Package Artifact

    Log    Trying to get a VNF Package Artifact

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    200

    Integer    response status    200

    Log    Received a 200 OK as expected

    Log    Received a 200 OK as expected

    ${contentType}=    Output    response headers Content-Type

    ${contentType}=    Output    response headers Content-Type
@@ -20,7 +20,7 @@ GET VNF Package Artifact - Range 
    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.

    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.

    Set Headers    {"Range": "${range}"}

    Set Headers    {"Range": "${range}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    206

    Integer    response status    206

    Log    Received 206 Partial Content as expected.

    Log    Received 206 Partial Content as expected.

    ${headers}=    Output    response headers

    ${headers}=    Output    response headers
@@ -32,7 +32,7 @@ GET VNF Package Artifact - NFVO No RANGE 
    Pass Execution If    ${NFVO_RANGE_OK} == 1    Skipping this test as NFVO is able to handle partial Requests.

    Pass Execution If    ${NFVO_RANGE_OK} == 1    Skipping this test as NFVO is able to handle partial Requests.

    Set Headers    {"Range": "${range}"}

    Set Headers    {"Range": "${range}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    200

    Integer    response status    200

    Log    Received 200 OK as expected. The content is all available on this request. RANGE request has been ignored.

    Log    Received 200 OK as expected. The content is all available on this request. RANGE request has been ignored.
@@ -41,7 +41,7 @@ GET VNF Package Artifact - Negative Range 
    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.

    Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.

    Set Headers    {"Range": "${range}"}

    Set Headers    {"Range": "${range}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    416

    Integer    response status    416

    Log    Received 416 Range not satisfiable as expected.

    Log    Received 416 Range not satisfiable as expected.

    ${contentType}=    Output    response headers Content-Type

    ${contentType}=    Output    response headers Content-Type
@@ -55,7 +55,7 @@ GET VNF Package Artifact - Negative Range 
GET VNF Package Artifact- Negative (Not Found)

GET VNF Package Artifact- Negative (Not Found)

    Log    Trying to perform a negative get, using an erroneous package ID

    Log    Trying to perform a negative get, using an erroneous package ID

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/{artifactPath}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}

    Integer    response status    404

    Integer    response status    404

    Log    Received 404 Not Found as expected

    Log    Received 404 Not Found as expected

    ${contentType}=    Output    response headers Content-Type

    ${contentType}=    Output    response headers Content-Type
@@ -69,7 +69,7 @@ GET VNF Package Artifact- Negative (Not Found) 
GET VNF Package Artifact - Negative (onboardingState issue)

GET VNF Package Artifact - Negative (onboardingState issue)

    Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus

    Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/{artifactPath}

    GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}

    Integer    response status    409

    Integer    response status    409

    Log    Received 409 Conflict as expected

    Log    Received 409 Conflict as expected

    ${contentType}=    Output    response headers Content-Type

    ${contentType}=    Output    response headers Content-Type
@@ -83,27 +83,27 @@ GET VNF Package Artifact - Negative (onboardingState issue) 
POST VNF Package Artifact - (Method not implemented)

POST VNF Package Artifact - (Method not implemented)

    Log    Trying to perform a POST (method should not be implemented)

    Log    Trying to perform a POST (method should not be implemented)

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    POST    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    405

    Integer    response status    405

    Log    Received 405 Method not implemented as expected

    Log    Received 405 Method not implemented as expected





PUT VNF Package Artifact - (Method not implemented)

PUT VNF Package Artifact - (Method not implemented)

    Log    Trying to perform a PUT. This method should not be implemented

    Log    Trying to perform a PUT. This method should not be implemented

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    405

    Integer    response status    405

    Log    Received 405 Method not implemented as expected

    Log    Received 405 Method not implemented as expected





PATCH VNF Package Artifact - (Method not implemented)

PATCH VNF Package Artifact - (Method not implemented)

    Log    Trying to perform a PATCH. This method should not be implemented

    Log    Trying to perform a PATCH. This method should not be implemented

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    PATCH    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    405

    Integer    response status    405

    Log    Received 405 Method not implemented as expected

    Log    Received 405 Method not implemented as expected





DELETE VNF Package Artifact - (Method not implemented)

DELETE VNF Package Artifact - (Method not implemented)

    Log    Trying to perform a DELETE. This method should not be implemented

    Log    Trying to perform a DELETE. This method should not be implemented

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/{artifactPath}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/vnf_packages/${vnfPkgId}/artifacts/${artifactPath}

    Integer    response status    405

    Integer    response status    405

    Log    Received 405 Method not implemented as expected
 
    Log    Received 405 Method not implemented as expected