tests: update libraries and use new software type syntax

Signed-off-by: Reuben Miller <reuben.d.miller@gmail.com>
thin-edge · Feb 7, 2024 · defa501 · defa501
1 parent 967f720
commit defa501
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/tests/alpine-s6/children/operations.robot b/tests/alpine-s6/children/operations.robot
@@ -34,14 +34,14 @@ It Should List the Installed Software
     Device Should Have Installed Software    tedge    tedge-agent
 
 Install software (apk package)
-    ${operation}=    Install Software    jq,latest::apk
+    ${operation}=    Install Software    {"name": "jq", "version": "latest", "softwareType": "apk"}
     Operation Should Be SUCCESSFUL    ${operation}
-    Device Should Have Installed Software    jq
+    Device Should Have Installed Software    {"name": "jq", "softwareType": "apk"}
 
 Uninstall software (apk package)
-    ${operation}=     Uninstall Software    jq,latest::apk
+    ${operation}=     Uninstall Software    {"name": "jq", "version": "latest", "softwareType": "apk"}
     Operation Should Be SUCCESSFUL    ${operation}
-    Device Should Not Have Installed Software    jq
+    Device Should Not Have Installed Software    {"name": "jq", "softwareType": "apk"}
 
 *** Keywords ***
 

diff --git a/tests/debian-systemd/main/operations.robot b/tests/debian-systemd/main/operations.robot
@@ -16,12 +16,12 @@ Restart device
     Cumulocity.Device Should Have Event/s    expected_text=tedge started up.+    minimum=1    maximum=1    type=startup    after=${date_from}
 
 Install software package
-    ${operation}=    Cumulocity.Install Software    vim-tiny,latest::apt
+    ${operation}=    Cumulocity.Install Software    {"name": "vim-tiny", "version": "latest", "softwareType": "apt"}
     Operation Should Be SUCCESSFUL    ${operation}    timeout=90
     Cumulocity.Device Should Have Installed Software    vim-tiny
 
 Uninstall software package
-    ${operation}=    Cumulocity.Uninstall Software    vim-tiny,::apt    timeout=90
+    ${operation}=    Cumulocity.Uninstall Software    {"name": "vim-tiny", "softwareType": "apt"}    timeout=90
     Operation Should Be SUCCESSFUL    ${operation}
     Cumulocity.Device Should Not Have Installed Software    vim-tiny
 

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,3 +1,3 @@
 robotframework~=6.0.0
-robotframework-c8y @ git+https://github.com/reubenmiller/robotframework-c8y.git@0.26.0
-robotframework-devicelibrary[docker] @ git+https://github.com/reubenmiller/robotframework-devicelibrary.git@1.10.2
+robotframework-c8y @ git+https://github.com/reubenmiller/robotframework-c8y.git@0.31.3
+robotframework-devicelibrary[docker] @ git+https://github.com/reubenmiller/robotframework-devicelibrary.git@1.13.0
diff --git a/tests/tedge-containermgmt/operations.robot b/tests/tedge-containermgmt/operations.robot
@@ -13,28 +13,28 @@ Get Configuration
 
 Install container-group package
     ${binary_url}=    Cumulocity.Create Inventory Binary    nginx    container-group    file=${CURDIR}/data/docker-compose.nginx.yaml
-    ${operation}=    Cumulocity.Install Software    nginx,1.0.0::container-group,${binary_url}
+    ${operation}=    Cumulocity.Install Software    {"name": "nginx", "version": "1.0.0", "softwareType": "container-group", "url": "${binary_url}"}
     Operation Should Be SUCCESSFUL    ${operation}
-    Device Should Have Installed Software    nginx,1.0.0
+    Device Should Have Installed Software    {"name": "nginx", "version": "1.0.0", "softwareType": "container-group"}
     ${operation}=    Cumulocity.Execute Shell Command    wget -O- nginx:80
     Operation Should Be SUCCESSFUL    ${operation}
     Should Contain    ${operation.to_json()["c8y_Command"]["result"]}    Welcome to nginx
 
 Uninstall container-group
-    ${operation}=     Cumulocity.Uninstall Software    nginx,1.0.0::container-group
+    ${operation}=     Cumulocity.Uninstall Software    {"name": "nginx", "version": "1.0.0", "softwareType": "container-group"}
     Operation Should Be SUCCESSFUL    ${operation}
     Device Should Not Have Installed Software    nginx
 
 Install container package
-    ${operation}=    Cumulocity.Install Software    webserver,httpd:2.4::container
+    ${operation}=    Cumulocity.Install Software    {"name": "webserver", "version": "httpd:2.4", "softwareType": "container"}
     Operation Should Be SUCCESSFUL    ${operation}
-    Device Should Have Installed Software    webserver,httpd:2.4
+    Device Should Have Installed Software    {"name": "webserver", "version": "httpd:2.4", "softwareType": "container"}
     ${operation}=    Cumulocity.Execute Shell Command    wget -O- webserver:80
     Operation Should Be SUCCESSFUL    ${operation}
     Should Contain    ${operation.to_json()["c8y_Command"]["result"]}    It works!
 
 Uninstall container package
-    ${operation}=     Cumulocity.Uninstall Software    webserver,httpd:2.4::container
+    ${operation}=     Cumulocity.Uninstall Software    {"name": "webserver", "version": "httpd:2.4", "softwareType": "container"}
     Operation Should Be SUCCESSFUL    ${operation}
     Device Should Not Have Installed Software    webserver
 

diff --git a/tests/tedge/operations.robot b/tests/tedge/operations.robot
@@ -98,14 +98,14 @@ Check Software List
 Install software
     [Arguments]    ${device}
     Cumulocity.Set Device    ${device}
-    ${operation}=    Cumulocity.Install Software    jq,latest::apk
+    ${operation}=    Cumulocity.Install Software    {"name": "jq", "version": "latest", "softwareType": "apk"}
     Operation Should Be SUCCESSFUL    ${operation}
     Device Should Have Installed Software    jq
 
 Uninstall software
     [Arguments]    ${device}
     Cumulocity.Set Device    ${device}
-    ${operation}=     Cumulocity.Uninstall Software    jq,latest::apk
+    ${operation}=     Cumulocity.Uninstall Software    {"name": "jq", "version": "latest", "softwareType": "apk"}
     Operation Should Be SUCCESSFUL    ${operation}
     Device Should Not Have Installed Software    jq