WIP: Add ModelMesh test for CVE-2024-7557

ods_ci/tests/Resources/Common.robot

@@ -437,7 +437,7 @@ Extract URLs From Text
     RETURN    ${urls}
 
 Run And Verify Command
-    [Documentation]    Run and verify shell command 
+    [Documentation]    Run and verify shell command
     [Arguments]    ${command}    ${print_to_log}=${TRUE}
     ${result}=    Run Process    ${command}    shell=yes    stderr=STDOUT
     IF    ${print_to_log}    Log    ${result.stdout}     console=True

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/ModelServer.resource

@@ -31,9 +31,15 @@
 *** Keywords ***
 Create Model Server
     [Documentation]    Keyword to create a Model Server in a Data Science Project
-    [Arguments]    ${no_replicas}=1    ${server_size}=Small    ${ext_route}=${TRUE}
-    ...    ${token}=${TRUE}    ${runtime}=OpenVINO Model Server    ${server_name}=Model Serving Test
-    ...    ${no_gpus}=0    ${existing_server}=${FALSE}
+    [Arguments]    ${no_replicas}=1
+    ...    ${server_size}=Small
+    ...    ${ext_route}=${TRUE}
+    ...    ${token}=${TRUE}
+    ...    ${runtime}=OpenVINO Model Server
+    ...    ${server_name}=Model Serving Test
+    ...    ${no_gpus}=0
+    ...    ${existing_server}=${FALSE}
+    ...    ${service_account_name}=${NONE}
     Move To Tab    Models
     IF    ${existing_server}
         ${existing_server}=  Run Keyword And Return Status     Wait Until Page Contains Element    //button[.="${server_name}"]
@@ -63,8 +69,9 @@
             Log    message=Token Auth should be enabled by default..(from v2.5)
             SeleniumLibrary.Checkbox Should Be Selected    ${TOKEN_AUTH_CHECKBOX_XP}
         END
-    ELSE IF    ${token}==${TRUE}
-        Enable Token Authentication
+    END
+    IF    ${token}
+        Enable Token Authentication     service_account_name=${service_account_name}
     END
     SeleniumLibrary.Wait Until Element Is Enabled   //button[contains(text(),"Add")]
     SeleniumLibrary.Click Button    Add
@@ -181,9 +188,10 @@
     [Documentation]    Enables Token authentication to serving route
     [Arguments]    ${service_account_name}=${NONE}
     SeleniumLibrary.Select Checkbox    ${TOKEN_AUTH_CHECKBOX_XP}
-    IF    "${service_account_name}" != "${NONE}"
-        Input Service Account Name    ${service_account_name}
+    IF    "${service_account_name}" == "${NONE}"
+        ${service_account_name}=    Set Variable    default-name
     END
+    Input Service Account Name    ${service_account_name}
 
 Disable Token Authentication
     [Documentation]    Disable Token authentication to serving route
@@ -211,14 +219,30 @@
 Get Model Serving Access Token via UI
     [Documentation]    Returns the token used for authentication to the serving route
     ...    TODO: There can be multiple tokens defined for each model server, handle this case as well
-    [Arguments]    ${service_account_name}=default-name    ${single_model}=${FALSE}    ${model_name}=${NONE}
+    [Arguments]    ${service_account_name}=default-name    ${single_model}=${FALSE}
+    ...    ${model_name}=${NONE}    ${multi_model_servers}=${FALSE}
     IF    ${single_model}
         # Expand the model
         SeleniumLibrary.Click Button    xpath: //a[text()='${model_name}']/parent::div/parent::td[@data-label='Name']/preceding-sibling::td/button  # robocop: off=line-too-long
         ${token}=    Get Single Model Token    ${service_account_name}
     ELSE
         SeleniumLibrary.Wait Until Page Contains Element    xpath://td[@data-label="Tokens"]/button
-        SeleniumLibrary.Click Element    xpath://td[@data-label="Tokens"]/button
+        # TODO: ModelMesh requires passing model server name and not model name;
+        # in particular when there are multiple model servers
+        # in the same project.
+        # This is a temporary workaround until the issue is fixed.
+        # With one model server, the model name is not required.
+        IF    ${multi_model_servers}
+            SeleniumLibrary.Click Button
+        ...    xpath://*[@id="expand-table-row-${model_name}-1-undefined-1"]/../../td[@data-label='Tokens']//button
+        ELSE
+            SeleniumLibrary.Click Element    xpath://td[@data-label="Tokens"]/button
+        END
+        # TODO: service account name is required; remove from all places that pass `None`
+        IF    "${service_account_name}" == "${NONE}"
+            ${service_account_name}=    Set Variable    default-name
+        END
+
         ${token}=    SeleniumLibrary.Get Element Attribute
         ...    xpath://div[.="${service_account_name} "]/../../td[@data-label="Token Secret"]//input    value
     END

ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource

@@ -1,4 +1,4 @@
-# robocop: off=wrong-case-in-keyword-name,too-many-arguments,too-long-keyword
+# robocop: off=wrong-case-in-keyword-name,too-many-arguments,too-long-keyword,line-too-long
 *** Settings ***
 Documentation    Collection of keywords to interact with Model Serving
 Resource       ../../../Page/Components/Components.resource
@@ -75,26 +75,10 @@
         SeleniumLibrary.Click Button    ${DEPLOY_MODEL_BTN}
     END
     SeleniumLibrary.Wait Until Page Contains Element    //div[@role="dialog"]
-    Set Model Name    ${model_name}
-    Select Model Server    ${model_server}
-    IF    "${serving_runtime}" != "${NONE}"    Set Model Server Runtime    ${serving_runtime}
-    SeleniumLibrary.Wait Until Page Contains Element    xpath://span[.="Model framework (name - version)"]
-    Select Framework    ${framework}
-    IF    ${existing_data_connection}==${TRUE}
-        # Select Radio Button    group_name=radiogroup    value=existing-data-connection-radio
-        # Selected by default, let's skip for now
-        Select Existing Data Connection    ${data_connection_name}
-        Set Folder Path    ${model_path}
-    ELSE
-        # Existing connection radio is selected by default; for now blindly click on new connection radio
-        SeleniumLibrary.Click Element    //input[@id="new-data-connection-radio"]
-        # Select Radio Button    group_name=radiogroup    value=new-data-connection-radio
-        Set Up New Data Connection    dc_name=${data_connection_name}
-        Set Folder Path    ${model_path}
-    END
-    SeleniumLibrary.Wait Until Element Is Enabled   //button[contains(text(),"Deploy")]
-    SeleniumLibrary.Click Button    Deploy
-    SeleniumLibrary.Wait Until Page Does Not Contain    xpath://h1[.="Deploy model"]
+    Fill Deploy Model Form    model_name=${model_name}    model_server=${model_server}
+    ...    serving_runtime=${serving_runtime}    framework=${framework}
+    ...    data_connection_name=${data_connection_name}    existing_data_connection=${existing_data_connection}
+    ...    model_path=${model_path}
 
 Select Project
     [Documentation]    Selects a project in the "deploy model" modal.
@@ -244,10 +228,12 @@
 Get Access Token Via UI
     [Documentation]    Returns the access token for models deployed in a specific project
     ...    by using the UI of DSP
-    [Arguments]    ${project_name}    ${service_account_name}=default-name    ${single_model}=${FALSE}
-    ...            ${model_name}=${NONE}
+    [Arguments]    ${project_name}    ${service_account_name}=default-name
+    ...    ${single_model}=${FALSE}    ${model_name}=${NONE}
+    ...    ${multi_model_servers}=${FALSE}
     Open Data Science Project Details Page    ${project_name}    tab_id=model-server
     ${token}=    Get Model Serving Access Token via UI    ${service_account_name}    ${single_model}    ${model_name}
+    ...    ${multi_model_servers}
     RETURN    ${token}
 
 Get Model Project
@@ -387,18 +373,11 @@
     [Documentation]    Deletes all currently deployed models, if any are present.
     # Returns an empty list if no matching elements found
     Switch Model Serving Project    project_name=All projects
-    ${projects}=    Get WebElements    xpath://table/tbody/tr/td[@data-label="Project"]
-    FOR    ${project}    IN    @{projects}
-        ${project}=    Get Text   ${project}
-        @{project description}=  Split String    ${project}
-        Switch Model Serving Project    ${project description}[0]
-        ${models}=    Get WebElements    xpath://table/tbody/tr/td[@data-label="Name"]/div/a
-        FOR    ${model}    IN    @{models}
-            ${model}=    Get Text   ${model}
-            Delete Model Via UI    ${model}
-            Sleep    1s
-        END
-        Switch Model Serving Project    project_name=All projects
+    ${models}=    Get WebElements    xpath://table/tbody/tr/td[@data-label="Name"]/div/a
+    FOR    ${model}    IN    @{models}
+        ${model}=    Get Text   ${model}
+        Delete Model Via UI    ${model}
+        Sleep    1s
     END
 
 Add Namespace To ServiceMeshMemberRoll
@@ -643,3 +622,53 @@
     ELSE
         Log    message=Skipping UserWorkloadMonitoring enablement.
     END
+
+Deploy Model From Models Tab
+    [Documentation]    Deploys a model from the project's Models tab
+    [Arguments]    ${project_name}
+    ...    ${data_connection_name}
+    ...    ${model_name}
+    ...    ${framework}
+    ...    ${existing_data_connection}
+    ...    ${model_path}
+    ...    ${model_server}
+    ...    ${serving_runtime}=${NONE}
+    Open Data Science Project Details Page    ${project_name}    tab_id=model-server
+    SeleniumLibrary.Click Button
+    ...    xpath://*[@id="expand-table-row-${model_name}-1-undefined-1"]/../../td[@class='pf-v5-c-table__td']//button
+    SeleniumLibrary.Wait Until Page Contains Element    //div[@role="dialog"]
+    Fill Deploy Model Form    model_name=${model_name}    model_server=${model_server}
+    ...    serving_runtime=${serving_runtime}    framework=${framework}
+    ...    data_connection_name=${data_connection_name}    existing_data_connection=${existing_data_connection}
+    ...    model_path=${model_path}
+
+Fill Deploy Model Form    # robocop: off=too-many-calls-in-keyword
+    [Documentation]    Fills the deploy model form
+    [Arguments]    ${model_name}
+    ...    ${model_server}
+    ...    ${serving_runtime}
+    ...    ${framework}
+    ...    ${data_connection_name}
+    ...    ${existing_data_connection}
+    ...    ${model_path}
+    Set Model Name    ${model_name}
+    Select Model Server    ${model_server}
+    IF    "${serving_runtime}" != "${NONE}"    Set Model Server Runtime    ${serving_runtime}
+    SeleniumLibrary.Wait Until Page Contains Element
+    ...    xpath://span[.="Model framework (name - version)"]
+    Select Framework    ${framework}
+    IF    ${existing_data_connection}
+        # Select Radio Button    group_name=radiogroup    value=existing-data-connection-radio
+        # Selected by default, let's skip for now
+        Select Existing Data Connection    ${data_connection_name}
+        Set Folder Path    ${model_path}
+    ELSE
+        # Existing connection radio is selected by default; for now blindly click on new connection radio
+        SeleniumLibrary.Click Element    //input[@id="new-data-connection-radio"]
+        # Select Radio Button    group_name=radiogroup    value=new-data-connection-radio
+        Set Up New Data Connection    dc_name=${data_connection_name}
+        Set Folder Path    ${model_path}
+    END
+    SeleniumLibrary.Wait Until Element Is Enabled   //button[contains(text(),"Deploy")]
+    SeleniumLibrary.Click Button    Deploy
+    SeleniumLibrary.Wait Until Page Does Not Contain    xpath://h1[.="Deploy model"]