diff --git a/SOL002/VNFIndicator-API/ApiVersion.robot b/SOL002/VNFIndicator-API/ApiVersion.robot
index 934cc24efd409f39edd48acb21ab69758bdabfea..fce69405cbb0b1fd92083ae17045bd52a7b612e1 100644
--- a/SOL002/VNFIndicator-API/ApiVersion.robot
+++ b/SOL002/VNFIndicator-API/ApiVersion.robot
@@ -169,35 +169,35 @@ DELETE API Version
POST API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+ Post ${apiRoot}/${apiName}/v1/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
GET API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+ Get ${apiRoot}/${apiName}/v1/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
PUT API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Put ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+ Put ${apiRoot}/${apiName}/v1/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
PATCH API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Patch ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+ Patch ${apiRoot}/${apiName}/v1/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
DELETE API Version with apiMajorVersion
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Delete ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
+ Delete ${apiRoot}/${apiName}/v1/api_version
${outputResponse}= Output response
Set Global Variable ${response} ${outputResponse}
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 01eb68eff94ae725483e54a5b7f693a320039fb6..16de0847ec14eb829f19f6739d85df8782aeb71f 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -102,7 +102,7 @@ Get Individual VNF Indicator Subscription
Log Trying to get a given subscription identified by subscriptionId
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -110,7 +110,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
Log Trying to perform a request on a subscriptionID which doesn't exist
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -118,7 +118,7 @@ Send Delete Request for Individual VNF Indicator Subscription
Log Trying to perform a DELETE on a subscriptionId
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -126,14 +126,14 @@ Send Delete Request for Individual VNF Indicator Subscription with invalid resou
Log Trying to perform a DELETE on a subscriptionId which doesn't exist
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Post Request for Individual VNF Indicator Subscription
Log Trying to create a new subscription
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+ POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -141,20 +141,20 @@ Send Put Request for Individual VNF Indicator Subscription
Log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+ PUT ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
Send Patch Request for Individual VNF Indicator Subscription
Log Trying to create a new subscription
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
${origOutput}= Output response
Set Suite Variable ${origResponse} ${origOutput}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+ PATCH ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
${output}= Output response
Set Suite Variable ${response} ${output}
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 87ff57f434df063a6a72f457f71c2881a5120279..f4cecd7135da72dae4981d4ce3ecaaf85b086885 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -163,7 +163,7 @@ Get Individual Indicator for a VNF instance
Log This resource represents a VNF indicator related to a VNF instance.
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -171,7 +171,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier
Log Trying to perform a negative get, using wrong identifier
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -179,7 +179,7 @@ Send POST Request for individual indicator in VNF instance
Log Trying to perform a POST (method should not be implemented)
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+ POST ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -187,7 +187,7 @@ Send PUT Request for individual indicator in VNF instance
Log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+ PUT ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -195,7 +195,7 @@ Send PATCH Request for individual indicator in VNF instance
Log Trying to perform a PATCH. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+ PATCH ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -203,7 +203,7 @@ Send DELETE Request for individual indicator in VNF instance
Log Trying to perform a DELETE. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -244,7 +244,7 @@ Get Individual Indicator
Log This resource represents a VNF indicator related to a VNF instance.
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -252,7 +252,7 @@ Get Individual Indicator with invalid indicator identifier
Log Trying to perform a negative get, using wrong identifier
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousIndicatorId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousIndicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -260,7 +260,7 @@ Send POST Request for individual indicator
Log Trying to perform a POST (method should not be implemented)
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
+ POST ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -268,7 +268,7 @@ Send PUT Request for individual indicator
Log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+ PUT ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -276,7 +276,7 @@ Send PATCH Request for individual indicator
Log Trying to perform a PATCH. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+ PATCH ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -284,7 +284,7 @@ Send DELETE Request for individual indicator
Log Trying to perform a DELETE. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -292,5 +292,5 @@ Check PostCondition Individual Indicator exist
Log This resource represents a VNF indicator related to a VNF instance.
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}
Integer response status 200
\ No newline at end of file
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 1ed6013301fa8ee5aec004947ed180bc22d3326c..fd458fbb6c015e00fe4d96b3a0736c26ffa964d0 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -146,7 +146,7 @@ Get VNF Indicators Subscriptions
Log Trying to get the list of subscriptions
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -154,7 +154,7 @@ Get VNF Indicators Subscriptions with filter
Log Trying to get the list of subscriptions using filters
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${POS_FILTER}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${POS_FILTER}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -162,7 +162,7 @@ Get VNF Indicators Subscriptions with invalid filter
Log Trying to get the list of subscriptions using filters with wrong attribute name
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${NEG_FILTER}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${NEG_FILTER}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -170,7 +170,7 @@ Get VNF Indicators Subscriptions with invalid resource endpoint
Log Trying to perform a request on a Uri which doesn't exist
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscription
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -180,7 +180,7 @@ Send Post Request for VNF Indicator Subscription
Set Headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
${body}= Get File jsons/subscriptions.json
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body}
+ POST ${apiRoot}/${apiName}/${apiVersion}/subscriptions ${body}
${output}= Output response
Set Suite Variable ${response} ${output}
Run Keyword If ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -190,7 +190,7 @@ Send Put Request for VNF Indicator Subscriptions
Log Trying to create a new subscription
${body}= Get File jsons/subscriptions.json
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+ PUT ${apiRoot}/${apiName}/${apiVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -198,7 +198,7 @@ Send Patch Request for VNF Indicator Subscriptions
Log Trying to create a new subscription
${body}= Get File jsons/subscriptions.json
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+ PATCH ${apiRoot}/${apiName}/${apiVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -206,7 +206,7 @@ Send Delete Request for VNF Indicator Subscriptions
Log Trying to create a new subscription
${body}= Get File jsons/subscriptions.json
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/subscriptions
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -240,7 +240,7 @@ Check Postcondition VNF Indicator Subscription Is Set
Log Trying to get the subscription
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
+ GET ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
${output}= Output response
Set Suite Variable ${response} ${output}
Check HTTP Response Status Code Is 200
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index 0b05ea62710e8f16b4a975ea11a4c2a7fd852ce6..bc6dbd9c9c56621a23963fa2646f9618e752a435 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -177,7 +177,7 @@ Get all VNF indicators
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
Log Execute Query and validate response
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Get ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -186,7 +186,7 @@ Get VNF indicators with filter
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
Log Execute Query and validate response
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}
+ Get ${apiRoot}/${apiName}/${apiVersion}/indicators?${POS_FIELDS}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -195,7 +195,7 @@ Get VNF indicators with invalid filter
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
Log Execute Query and validate response
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}
+ Get ${apiRoot}/${apiName}/${apiVersion}/indicators?${NEG_FIELDS}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -205,7 +205,7 @@ Get all VNF indicators with malformed authorization token
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Authorization": "${BAD_AUTHORIZATION}"}
Log Execute Query and validate response
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Get ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -215,7 +215,7 @@ Get all VNF indicators with expired or revoked authorization token
Set Headers {"Accept": "${ACCEPT_JSON}"}
Set Headers {"Authorization": "${NEG_AUTHORIZATION}"}
Log Execute Query and validate response
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Get ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -224,7 +224,7 @@ Get all VNF indicators without authorization token
Log The GET method queries multiple VNF indicators omitting token
Set Headers {"Accept": "${ACCEPT_JSON}"}
Log Execute Query and validate response
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Get ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -233,7 +233,7 @@ Get all VNF indicators with invalid resource endpoint
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
Log Execute Query and validate response
- Get ${apiRoot}/${apiName}/${apiMajorVersion}/indicator
+ Get ${apiRoot}/${apiName}/${apiVersion}/indicator
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -241,7 +241,7 @@ Send POST Request for all VNF indicators
log Trying to perform a POST. This method should not be implemented
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Post ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -249,7 +249,7 @@ Send PUT Request for all VNF indicators
log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Post ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -257,7 +257,7 @@ Send PATCH Request for all VNF indicators
log Trying to perform a PATCH. This method should not be implemented
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Post ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -265,7 +265,7 @@ Send DELETE Request for all VNF indicators
log Trying to perform a DELETE. This method should not be implemented
Set Headers {"Accept":"${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/${apiMajorVersion}/indicators
+ Post ${apiRoot}/${apiName}/${apiVersion}/indicators
${output}= Output response
Set Suite Variable ${response} ${output}
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index df5458c1615d48dadd9d5cdc5fc1a1bf9e648bba..11f83e45bbbcf2a68de2f9040650f1df20b52ce3 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -142,7 +142,7 @@ Get all indicators for a VNF instance
Log This resource represents VNF indicators related to a VNF instance.
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -150,7 +150,7 @@ Get all indicators for a VNF instance with filter
Log This resource represents VNF indicators related to a VNF instance.
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${POS_FIELDS}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -158,7 +158,7 @@ Get all indicators for a VNF instance with invalid filter
Log This resource represents VNF indicators related to a VNF instance.
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}?${NEG_FIELDS}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -166,7 +166,7 @@ Get all indicators for a VNF instance with invalid resource identifier
Log Trying to perform a negative get, using wrong identifier
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousVnfInstanceId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousVnfInstanceId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -174,7 +174,7 @@ Send POST Request for indicators in VNF instance
Log Trying to perform a POST (method should not be implemented)
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+ POST ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -182,7 +182,7 @@ Send PUT Request for indicators in VNF instance
Log Trying to perform a PUT. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+ PUT ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -190,7 +190,7 @@ Send PATCH Request for indicators in VNF instance
Log Trying to perform a PATCH. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+ PATCH ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -198,7 +198,7 @@ Send DELETE Request for indicators in VNF instance
Log Trying to perform a DELETE. This method should not be implemented
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+ DELETE ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
${output}= Output response
Set Suite Variable ${response} ${output}
@@ -234,7 +234,7 @@ Check Postcondition Indicators for VNF instance Exist
Log Check Postcondition Indicators for VNF instance Exist
Set Headers {"Accept": "${ACCEPT_JSON}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}
+ GET ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}
Should Be Equal ${response['status']} 200
Check LINK in Header
diff --git a/SOL002/VNFIndicator-API/environment/variables.txt b/SOL002/VNFIndicator-API/environment/variables.txt
index 22f32a1fbe4b357b20e4682dc5cc0825e5a7c26e..58dff1e612c0bc623913e0dee9f69dea4b414152 100644
--- a/SOL002/VNFIndicator-API/environment/variables.txt
+++ b/SOL002/VNFIndicator-API/environment/variables.txt
@@ -12,7 +12,7 @@ ${EM-VNF_SCHEMA} https
${ACCEPT_JSON} application/json
${AUTH_USAGE} 1
${apiRoot} /
-${apiMajorVersion} v1
+${apiVersion} v1
${apiName} vnfind