Update logic to check requests/limits in containers (#1072)

* Update logic to check requests/limits

Signed-off-by: Luca Giorgi <[email protected]>

* switch protocol

Signed-off-by: Luca Giorgi <[email protected]>

---------

Signed-off-by: Luca Giorgi <[email protected]>

Author: lugi0

ods_ci/tests/Resources/OCP.resource

@@ -138,6 +138,10 @@ Get Pod Hardware Resources And Limits
     RETURN    ${resources}
 
 Container Hardware Resources Should Match Expected
+    [Documentation]    This keyword checks that the requests/limits set in a specific container in a pod contain the
+    ...    requests and limits passed in with `exp_requests` and `exp_limits`. This means that the container might have
+    ...    additional requests/limits set which are not explicitly checked against. If you want to make sure you're
+    ...    checking all attributes you have to explicitly pass them in with `exp_requests/limits`.
     [Arguments]    ${container_name}    ${pod_label_selector}    ${namespace}
     ...            ${exp_requests}=${NONE}    ${exp_limits}=${NONE}
     ${resources_dict}=    Get Pod Hardware Resources And Limits    label_selector=${pod_label_selector}
@@ -146,15 +150,15 @@ Container Hardware Resources Should Match Expected
         Dictionary Should Not Contain Key    ${resources_dict}    requests
     ELSE
         ${requests}=    Set Variable    ${resources_dict}[requests]
-        FOR    ${index}    ${resource}    IN ENUMERATE    @{requests.keys()}
+        FOR    ${index}    ${resource}    IN ENUMERATE    @{exp_requests.keys()}
             Should Be Equal As Strings    ${requests}[${resource}]    ${exp_requests}[${resource}]
         END
     END
     IF    ${exp_limits} == ${NONE}
         Dictionary Should Not Contain Key    ${resources_dict}    limits
     ELSE
         ${limits}=    Set Variable    ${resources_dict}[limits]
-        FOR    ${index}    ${resource}    IN ENUMERATE    @{limits.keys()}
+        FOR    ${index}    ${resource}    IN ENUMERATE    @{exp_limits.keys()}
             Should Be Equal As Strings    ${limits}[${resource}]    ${exp_limits}[${resource}]
         END
     END

ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/422__model_serving_llm_UI.robot

@@ -146,8 +146,7 @@ Verify User Can Set Requests And Limits For A Model Using The UI  # robocop: dis
 Verify Model Can Be Served And Query On A GPU Node Using The UI  # robocop: disable
     [Documentation]    Basic tests for preparing, deploying and querying a LLM model on GPU node
     ...                using Kserve and Caikit+TGIS runtime
-    ...                ProductBug: https://issues.redhat.com/browse/RHOAIENG-146
-    [Tags]    Sanity    Tier1    ODS-2523   Resources-GPU    ProductBug
+    [Tags]    Sanity    Tier1    ODS-2523   Resources-GPU
     [Setup]    Set Up Project    namespace=singlemodel-gpu
     ${test_namespace}=    Set Variable    singlemodel-gpu
     ${model_name}=    Set Variable    flan-t5-small-caikit
@@ -163,7 +162,7 @@ Verify Model Can Be Served And Query On A GPU Node Using The UI  # robocop: disa
     Model Pod Should Be Scheduled On A GPU Node    label_selector=serving.kserve.io/inferenceservice=${model_name}
     ...    namespace=${test_namespace}
     Query Model Multiple Times    model_name=${model_name}    n_times=10
-    ...    namespace=${test_namespace}
+    ...    namespace=${test_namespace}    protocol=http
     Query Model Multiple Times    model_name=${model_name}    n_times=5
     ...    namespace=${test_namespace}    endpoint=${CAIKIT_STREAM_ENDPOINT_HTTP}
     ...    streamed_response=${TRUE}    validate_response=${FALSE}    protocol=http