added majorApiVersion

SOL002/VNFConfiguration-API/ApiVersion.robot

@@ -167,35 +167,35 @@ DELETE API Version
 POST API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/v1/api_version
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Get    ${apiRoot}/${apiName}/v1/api_version
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/v1/api_version
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Patch    ${apiRoot}/${apiName}/v1/api_version
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
     Set Headers    {"Accept":"${ACCEPT}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/v1/api_version
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 

SOL002/VNFConfiguration-API/Configuration.robot

@@ -110,7 +110,7 @@ Get VNF configuration
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -120,7 +120,7 @@ Send VNF configuration
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/vnfConfigModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/configuration    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -165,7 +165,7 @@ Send Duplicated VNF configuration
     Set Headers    {"If-Match": "${etag}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${body}=    Get File    jsons/vnfConfigModifications.json
-    Patch    ${apiRoot}/${apiName}/${apiVersion}/configuration    ${body}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -173,7 +173,7 @@ Send POST Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Post    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -181,7 +181,7 @@ Send PUT Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Put    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -189,6 +189,6 @@ Send DELETE Request for VNF Configuration
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Delete    ${apiRoot}/${apiName}/${apiVersion}/configuration
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
\ No newline at end of file

SOL002/VNFConfiguration-API/environment/variables.txt

@@ -16,7 +16,7 @@ ${CONTENT_TYPE}    application/json
 
 ${apiRoot}        /
 ${apiName}        vnfconfig
-${apiVersion}     v1
+${apiMajorVersion}     v1
 
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX