Enhance UETAG test cases

SRV/UETAG/PlatUeIdentity.robot

@@ -72,20 +72,21 @@ Unregister an UE Identity Tag already in unregistered state
 
 *** Keywords ***
 Get UE Identity Tag information
-    Should Be True    ${PIC_MEC_PLAT} == '1'
-    Should Be True    ${PIC_SERVICES} == '1'      
+    Should Be True    ${PIC_MEC_PLAT} == 1
+    Should Be True    ${PIC_SERVICES} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     Set Headers    {"Content-Length":"0"}
     Get    /exampleAPI/ui/v1/${APP_INSTANCE_ID}/ue_identity_tag_info?ueIdentityTag=${UE_IDENTITY_TAG}
     ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 
 
 Get UE Identity Tag information using bad parameters
 # FIXME Which IE protocol should be invalid?
-    Should Be True    ${PIC_MEC_PLAT} == '1'
-    Should Be True    ${PIC_SERVICES} == '1'      
+    Should Be True    ${PIC_MEC_PLAT} == 1
+    Should Be True    ${PIC_SERVICES} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -96,8 +97,8 @@ Get UE Identity Tag information using bad parameters
 
 
 Get UE Identity Tag information using non-existent application instance
-    Should Be True    ${PIC_MEC_PLAT} == '1'
-    Should Be True    ${PIC_SERVICES} == '1'      
+    Should Be True    ${PIC_MEC_PLAT} == 1
+    Should Be True    ${PIC_SERVICES} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -109,14 +110,15 @@ Get UE Identity Tag information using non-existent application instance
 
 Update an UE Identity Tag
     [Arguments]    ${content}
-    Should Be True    ${PIC_MEC_PLAT} == '1'
-    Should Be True    ${PIC_SERVICES} == '1'      
+    Should Be True    ${PIC_MEC_PLAT} == 1
+    Should Be True    ${PIC_SERVICES} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     ## As far as I understood, we are not checking preconditions.
     # Preamble: Check that the user tag is not registered
     ## Check User Identity Tag state    ${UE_IDENTITY_TAG}    UNREGISTERED
+    log    ${content}
     Put    /exampleAPI/ui/v1/${APP_INSTANCE_ID}/ue_identity_tag_info    ${content}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -124,8 +126,8 @@ Update an UE Identity Tag
 
 Update an UE Identity Tag using invalid state
     [Arguments]    ${content}
-    Should Be True    ${PIC_MEC_PLAT} == '1'
-    Should Be True    ${PIC_SERVICES} == '1'
+    Should Be True    ${PIC_MEC_PLAT} == 1
+    Should Be True    ${PIC_SERVICES} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -137,8 +139,8 @@ Update an UE Identity Tag using invalid state
 
 Update an UE Identity Tag using a not applicable valid state
     [Arguments]    ${content}
-    Should Be True    ${PIC_MEC_PLAT} == '1'
-    Should Be True    ${PIC_SERVICES} == '1'
+    Should Be True    ${PIC_MEC_PLAT} == 1
+    Should Be True    ${PIC_SERVICES} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -148,4 +150,3 @@ Update an UE Identity Tag using a not applicable valid state
     Set Suite Variable    ${response}    ${output}
 
     # TODO Check ProblemDetails
-    
\ No newline at end of file

SRV/UETAG/environment/variables.txt

@@ -2,7 +2,7 @@
 ${MEC-APP_SCHEMA}                   http
 #${MEC-APP_HOST}                     172.28.4.87
 #${MEC-APP_HOST}                     127.0.0.1
-${MEC-APP_HOST}                     10.192.2.172
+${MEC-APP_HOST}                     192.168.56.1
 ${MEC-APP_PORT}                     8081
 ${ZONE_ID}                          zone01
 ${APP_INSTANCE_ID}                  appInst01

SRV/UETAG/resources/GenericKeywords.robot

@@ -33,7 +33,6 @@ Should Be Present In Json List
     Log    Item found ${item}
     [return]    ${item}
 
-
 Check Result Contains
     [Arguments]    ${source}    ${parameter}    ${value}
     Should Be Present In Json List    ${source}    ${parameter}    ${value}

SRV/UETAG/resources/UEidentityAPI.robot

@@ -9,8 +9,8 @@ Library    JSONSchemaLibrary    schemas/
 *** Keywords ***
 Check User Identity Tag state
     [Arguments]    ${ue_identity_tag}    ${state}
-    Should Be True    ${PIC_MEC_PLAT} == '1'
-    Should Be True    ${PIC_SERVICES} == '1'
+    Should Be True    ${PIC_MEC_PLAT}    1
+    Should Be True    ${PIC_SERVICES}    1
     Log    Check ueIdentityTag state ${state}
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}