Extended Tests URI changes
This need to go in post https://gerrit.openbmc-project.xyz/#/c/1294/
are merged. In the near future, the OpenBMC URI will start with
"/xyz/openbmc_project" instead of "/org/openbmc".
Change-Id: I9d8a12b788f63de66f0dba91dea6ec05ba841857
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/extended/code_update/code_update_utils.robot b/extended/code_update/code_update_utils.robot
index a762c03..3316b18 100644
--- a/extended/code_update/code_update_utils.robot
+++ b/extended/code_update/code_update_utils.robot
@@ -8,10 +8,10 @@
*** Variables ***
-${BMC_UPD_METHOD} /org/openbmc/control/flash/bmc/action/update
-${BMC_PREP_METHOD} /org/openbmc/control/flash/bmc/action/PrepareForUpdate
-${BMC_UPD_ATTR} /org/openbmc/control/flash/bmc
-${HOST_SETTING} /org/openbmc/settings/host0
+${BMC_UPD_METHOD} ${OPENBMC_BASE_URI}control/flash/bmc/action/update
+${BMC_PREP_METHOD} ${OPENBMC_BASE_URI}control/flash/bmc/action/PrepareForUpdate
+${BMC_UPD_ATTR} ${OPENBMC_BASE_URI}control/flash/bmc
+${HOST_SETTING} ${OPENBMC_BASE_URI}settings/host0
*** Keywords ***
diff --git a/extended/test_journal.robot b/extended/test_journal.robot
index cc5802c..d16cfc5 100644
--- a/extended/test_journal.robot
+++ b/extended/test_journal.robot
@@ -22,10 +22,10 @@
Start Journal Log
- openbmc get request /org/openbmc/
+ openbmc get request ${OPENBMC_BASE_URI}
${output}= Stop Journal Log
- Should Contain ${output} GET /org/openbmc/ HTTP/1.1
+ Should Contain ${output} GET ${OPENBMC_BASE_URI} HTTP/1.1
Post Request Journal Log
[Documentation] This testcase is to verify that proper log is logged in
@@ -34,10 +34,10 @@
Start Journal Log
- openbmc post request /org/openbmc/records/events/action/clear data=${NIL}
+ openbmc post request ${OPENBMC_BASE_URI}records/events/action/clear data=${NIL}
${output}= Stop Journal Log
- Should Contain ${output} POST /org/openbmc/records/events/action/clear HTTP/1.1
+ Should Contain ${output} POST ${OPENBMC_BASE_URI}records/events/action/clear HTTP/1.1
Put Request Journal Log
[Documentation] This testcase is to verify that proper log is logged in
@@ -48,10 +48,10 @@
${bootpolicy} = Set Variable ONETIME
${valueDict} = create dictionary data=${bootpolicy}
- openbmc put request /org/openbmc/settings/host0/attr/boot_policy data=${valueDict}
+ openbmc put request ${OPENBMC_BASE_URI}settings/host0/attr/boot_policy data=${valueDict}
${output}= Stop Journal Log
- Should Contain ${output} PUT /org/openbmc/settings/host0/attr/boot_policy HTTP/1.1
+ Should Contain ${output} PUT ${OPENBMC_BASE_URI}settings/host0/attr/boot_policy HTTP/1.1
*** Keywords ***
diff --git a/extended/test_networkd_ext.robot b/extended/test_networkd_ext.robot
index d966976..3f41da8 100755
--- a/extended/test_networkd_ext.robot
+++ b/extended/test_networkd_ext.robot
@@ -41,7 +41,9 @@
${arglist}= Create List eth0 ${NEW_IP} ${NEW_MASK} ${NEW_GATEWAY}
${args}= Create Dictionary data=@{arglist}
- run keyword and ignore error Call Method /org/openbmc/NetworkManager/Interface/ SetAddress4 data=${args}
+ run keyword and ignore error
+ ... Call Method
+ ... ${OPENBMC_BASE_URI}NetworkManager/Interface/ SetAddress4 data=${args}
Wait For Host To Ping ${NEW_IP}
Set Suite Variable ${AUTH_URI} https://${NEW_IP}
@@ -66,7 +68,9 @@
${arglist}= Create List eth0 ${OLD_IP} ${OLD_MASK} ${OLD_GATEWAY}
${args}= Create Dictionary data=@{arglist}
- run keyword and ignore error Call Method /org/openbmc/NetworkManager/Interface/ SetAddress4 data=${args}
+ run keyword and ignore error
+ ... Call Method
+ ... ${OPENBMC_BASE_URI}NetworkManager/Interface/ SetAddress4 data=${args}
Wait For Host To Ping ${OLD_IP}
Set Suite Variable ${AUTH_URI} https://${OLD_IP}
@@ -142,7 +146,8 @@
[arguments] ${intf}
@{arglist}= Create List ${intf}
${args}= Create Dictionary data=@{arglist}
- ${resp}= Call Method /org/openbmc/NetworkManager/Interface/ GetAddress4 data=${args}
+ ${resp}= Call Method
+ ... ${OPENBMC_BASE_URI}NetworkManager/Interface/ GetAddress4 data=${args}
should be equal as strings ${resp.status_code} ${HTTP_OK}
${json} = to json ${resp.content}
Log ${json['data'][2]}
@@ -165,7 +170,8 @@
[Arguments] ${intf} ${address} ${result}
${arglist}= Create List ${intf} ${address}
${args}= Create Dictionary data=@{arglist}
- ${resp}= Call Method /org/openbmc/NetworkManager/Interface/ SetHwAddress data=${args}
+ ${resp}= Call Method
+ ... ${OPENBMC_BASE_URI}NetworkManager/Interface/ SetHwAddress data=${args}
should not be equal as strings ${resp.status_code} ${HTTP_OK}
${json} = to json ${resp.content}
should be equal as strings ${json['status']} ${result}
@@ -175,7 +181,8 @@
[Arguments] ${intf} ${address} ${result}
${arglist}= Create List ${intf} ${address}
${args}= Create Dictionary data=@{arglist}
- ${resp}= Call Method /org/openbmc/NetworkManager/Interface/ SetHwAddress data=${args}
+ ${resp}= Call Method
+ ... ${OPENBMC_BASE_URI}NetworkManager/Interface/ SetHwAddress data=${args}
should be equal as strings ${resp.status_code} ${HTTP_OK}
${json} = to json ${resp.content}
should be equal as strings ${json['status']} ${result}
@@ -185,6 +192,7 @@
@{arglist}= Create List ${intf}
${args}= Create Dictionary data=@{arglist}
- ${resp}= Call Method /org/openbmc/NetworkManager/Interface/ GetHwAddress data=${args}
+ ${resp}= Call Method
+ ... ${OPENBMC_BASE_URI}NetworkManager/Interface/ GetHwAddress data=${args}
${json} = to json ${resp.content}
should be equal as strings ${json['data']} ${address}
diff --git a/extended/test_power_restore.robot b/extended/test_power_restore.robot
index e6d90c4..8fc150e 100644
--- a/extended/test_power_restore.robot
+++ b/extended/test_power_restore.robot
@@ -17,7 +17,7 @@
Force Tags chassisboot bmcreboot
*** Variables ***
-${HOST_SETTING} /org/openbmc/settings/host0
+${HOST_SETTING} ${OPENBMC_BASE_URI}settings/host0
*** Test Cases ***
diff --git a/extended/test_syslog.robot b/extended/test_syslog.robot
index 8be14a9..c8dab97 100755
--- a/extended/test_syslog.robot
+++ b/extended/test_syslog.robot
@@ -25,13 +25,16 @@
... This testcase is to get all syslog settings from
... open bmc system.\n
- ${ip_address} = Read Attribute /org/openbmc/LogManager/rsyslog ipaddr
+ ${ip_address} = Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog ipaddr
Should Not Be Empty ${ip_address}
- ${port} = Read Attribute /org/openbmc/LogManager/rsyslog port
+ ${port} = Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog port
Should Not Be Empty ${port}
- ${status} = Read Attribute /org/openbmc/LogManager/rsyslog status
+ ${status} = Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
Should Not Be Empty ${status}
Enable syslog with port number and IP address
@@ -41,9 +44,11 @@
${resp} = Enable Syslog Setting ${SYSLOG_IP_ADDRESS} ${SYSLOG_PORT}
Should Be Equal ${resp} ok
- ${ip}= Read Attribute /org/openbmc/LogManager/rsyslog ipaddr
+ ${ip}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog ipaddr
Should Be Equal ${ip} ${SYSLOG_IP_ADDRESS}
- ${port}= Read Attribute /org/openbmc/LogManager/rsyslog port
+ ${port}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog port
Should Be Equal ${port} ${SYSLOG_PORT}
Enable syslog without IP address and port number
@@ -53,7 +58,8 @@
${resp} = Enable Syslog Setting ${EMPTY} ${EMPTY}
Should Be Equal ${resp} ok
- ${status}= Read Attribute /org/openbmc/LogManager/rsyslog status
+ ${status}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
Should Be Equal ${status} Enabled
Enable syslog with only IP address
@@ -62,22 +68,27 @@
${resp} = Enable Syslog Setting ${SYSLOG_IP_ADDRESS} ${EMPTY}
Should Be Equal ${resp} ok
- ${ip}= Read Attribute /org/openbmc/LogManager/rsyslog ipaddr
+ ${ip}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog ipaddr
Should Be Equal ${ip} ${SYSLOG_IP_ADDRESS}
- ${status}= Read Attribute /org/openbmc/LogManager/rsyslog status
+ ${status}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
Should Be Equal ${status} Enabled
Enable Syslog with only port number
[Documentation] ***GOOD PATH***
... This testcase is to enable syslog with only port number.\n
- ${status}= Read Attribute /org/openbmc/LogManager/rsyslog status
+ ${status}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
Should Be Equal ${status} Enabled
${resp} = Enable Syslog Setting ${EMPTY} ${SYSLOG_PORT}
Should Be Equal ${resp} ok
- ${port}= Read Attribute /org/openbmc/LogManager/rsyslog port
+ ${port}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog port
Should Be Equal ${port} ${SYSLOG_PORT}
- ${status}= Read Attribute /org/openbmc/LogManager/rsyslog status
+ ${status}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
Should Be Equal ${status} Enabled
Disable Syslog
@@ -86,7 +97,8 @@
${resp} = Disable Syslog Setting ${EMPTY}
Should Be Equal ${resp} ok
- ${status}= Read Attribute /org/openbmc/LogManager/rsyslog status
+ ${status}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
Should Be Equal Disable ${status}
Enable invalid ip for Syslog remote server
@@ -111,18 +123,24 @@
... after service processor reboot.
[Tags] bmcreboot
- ${old_ip}= Read Attribute /org/openbmc/LogManager/rsyslog ipaddr
- ${old_port}= Read Attribute /org/openbmc/LogManager/rsyslog port
- ${old_status} = Read Attribute /org/openbmc/LogManager/rsyslog status
-
+ ${old_ip}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog ipaddr
+ ${old_port}= Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog port
+ ${old_status} = Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
+
${output}= Execute Command /sbin/reboot
Sleep ${SYSTEM_SHUTDOWN_TIME}
Wait For Host To Ping ${OPENBMC_HOST}
Sleep ${WAIT_FOR_SERVICES_UP}
- ${ip_address} = Read Attribute /org/openbmc/LogManager/rsyslog ipaddr
- ${port} = Read Attribute /org/openbmc/LogManager/rsyslog port
- ${status} = Read Attribute /org/openbmc/LogManager/rsyslog status
+ ${ip_address} = Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog ipaddr
+ ${port} = Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog port
+ ${status} = Read Attribute
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog status
Should Be Equal ${old_ip} ${ip_address}
Should Be Equal ${old_port} ${port}
@@ -135,7 +153,8 @@
${MYDICT}= create Dictionary ipaddr=${ipaddr} port=${port}
@{rsyslog} = Create List ${MYDICT}
${data} = create dictionary data=@{rsyslog}
- ${resp} = openbmc post request /org/openbmc/LogManager/rsyslog/action/Enable data=${data}
+ ${resp} = openbmc post request
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog/action/Enable data=${data}
${jsondata} = to json ${resp.content}
[return] ${jsondata['status']}
@@ -143,6 +162,7 @@
[Arguments] ${args}
@{setting_list} = Create List ${args}
${data} = create dictionary data=@{setting_list}
- ${resp} = OpenBMC Post Request /org/openbmc/LogManager/rsyslog/action/Disable data=${data}
+ ${resp} = OpenBMC Post Request
+ ... ${OPENBMC_BASE_URI}LogManager/rsyslog/action/Disable data=${data}
${jsondata} = to json ${resp.content}
[return] ${jsondata['status']}