commit 99ffe43e899b042298d560d7f80b8a164649ddc4
author George Keishing <gkeishin@in.ibm.com> Thu Sep 26 02:33:36 2019 -0500
committer George Keishing <gkeishin@in.ibm.com> Thu Sep 26 18:08:44 2019 +0000
tree 1e43df233d85639b765b1b0daa08d497ca0b91fa
parent e36262fad2878c1d66c19fce325a9a6d645bdc0c

Update ApplyTime Redfish URI and Patch body construct

Change-Id: I323f3a2a5bd250f241d1419c0fa2d78d295d4121
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

redfish/update_service/test_firmware_property.robot

diff --git a/redfish/update_service/test_firmware_property.robot b/redfish/update_service/test_firmware_property.robot
index 8012a53..b2b6474 100644
--- a/redfish/update_service/test_firmware_property.robot
+++ b/redfish/update_service/test_firmware_property.robot
@@ -4,6 +4,7 @@
 Resource         ../../lib/resource.robot
 Resource         ../../lib/bmc_redfish_resource.robot
 Resource         ../../lib/openbmc_ffdc.robot
+Library          ../../lib/gen_robot_valid.py
 
 Suite Setup      Redfish.Login
 Suite Teardown   Redfish.Logout
@@ -17,21 +18,19 @@
     [Tags]  Verify_Firmware_Update_ApplyTime_Immediate
 
     # Example:
-    # /xyz/openbmc_project/software/apply_time
-    # {
-    #   "data": {
-    #       "RequestedApplyTime": "xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.Immediate"
-    #   },
-    #   "message": "200 OK",
-    #   "status": "ok"
+    # /redfish/v1/UpdateService
+    # "HttpPushUriOptions": {
+    #    "HttpPushUriApplyTime": {
+    #        "ApplyTime": "Immediate"
+    #    }
     # }
 
-    Redfish.Patch  ${REDFISH_BASE_URI}UpdateService  body={'ApplyTime' : 'Immediate'}
+    Redfish.Patch  ${REDFISH_BASE_URI}UpdateService
+    ...  body={'HttpPushUriOptions' : {'HttpPushUriApplyTime' : {'ApplyTime' : 'Immediate'}}}
 
-    # TODO: Move to redfish when available.
-    ${apply_time}=  Read Attribute   ${SOFTWARE_VERSION_URI}apply_time  RequestedApplyTime
-    Rprint Vars  apply_time
-    Should Be Equal   ${apply_time}  xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.Immediate
+    ${http_push_uri_options}=  Redfish.Get Attribute  ${REDFISH_BASE_URI}UpdateService  HttpPushUriOptions
+    Rprint Vars  http_push_uri_options
+    Valid Value  http_push_uri_options["HttpPushUriApplyTime"]["ApplyTime"]  ['Immediate']
 
 
 Verify Firmware Update ApplyTime OnReset
@@ -39,25 +38,25 @@
     [Tags]  Verify_Firmware_Update_ApplyTime_OnReset
 
     # Example:
-    # /xyz/openbmc_project/software/apply_time
-    # {
-    #   "data": {
-    #       "RequestedApplyTime": "xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.OnReset"
-    #   },
-    #   "message": "200 OK",
-    #   "status": "ok"
+    # /redfish/v1/UpdateService
+    # "HttpPushUriOptions": {
+    #    "HttpPushUriApplyTime": {
+    #        "ApplyTime": "OnReset"
+    #    }
     # }
 
-    Redfish.Patch  ${REDFISH_BASE_URI}UpdateService  body={'ApplyTime' : 'OnReset'}
+    Redfish.Patch  ${REDFISH_BASE_URI}UpdateService
+    ...  body={'HttpPushUriOptions' : {'HttpPushUriApplyTime' : {'ApplyTime' : 'OnReset'}}}
 
-    # TODO: Move to redfish when available.
-    ${apply_time}=  Read Attribute   ${SOFTWARE_VERSION_URI}apply_time  RequestedApplyTime
-    Rprint Vars  apply_time
-    Should Be Equal   ${apply_time}  xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.OnReset
+    ${http_push_uri_options}=  Redfish.Get Attribute  ${REDFISH_BASE_URI}UpdateService  HttpPushUriOptions
+    Rprint Vars  http_push_uri_options
+    Valid Value  http_push_uri_options["HttpPushUriApplyTime"]["ApplyTime"]  ['OnReset']
 
 
 Verify Firmware Update ApplyTime Invalid
     [Documentation]  Verify supported apply time returns error on invalid value.
     [Tags]  Verify_Firmware_Update_ApplyTime_Invalid
 
-    Redfish.Patch  ${REDFISH_BASE_URI}UpdateService  body={'ApplyTime' : 'Invalid'}  valid_status_codes=[${HTTP_BAD_REQUEST}]
+    Redfish.Patch  ${REDFISH_BASE_URI}UpdateService
+    ...  body={'HttpPushUriOptions' : {'HttpPushUriApplyTime' : {'ApplyTime' : 'Invalid'}}}
+    ...  valid_status_codes=[${HTTP_BAD_REQUEST}]