Remove references to oem/ibm
Resolves openbmc/openbmc-test-automation#1628
Change-Id: I6ef1b7a26d673e6a563ae536fbee055d864d8f51
Signed-off-by: Steven Sombar <ssombar@us.ibm.com>
diff --git a/extended/factory_reset.robot b/extended/factory_reset.robot
index c572a1c..f221256 100644
--- a/extended/factory_reset.robot
+++ b/extended/factory_reset.robot
@@ -4,7 +4,7 @@
Resource ../lib/ipmi_client.robot
Resource ../lib/utils.robot
Resource ../lib/connection_client.robot
-Resource ../lib/oem/ibm/serial_console_client.robot
+Resource ../lib/serial_connection/serial_console_client.robot
Library OperatingSystem
Suite Setup Validate Setup
diff --git a/lib/code_update_utils_serial.robot b/lib/code_update_utils_serial.robot
index 1b24f38..83fa77a 100644
--- a/lib/code_update_utils_serial.robot
+++ b/lib/code_update_utils_serial.robot
@@ -2,7 +2,7 @@
Documentation BMC OEM serial update utilities keywords.
Resource code_update_utils.robot
-Resource oem/ibm/serial_console_client.robot
+Resource serial_connection/serial_console_client.robot
*** Keywords ***
@@ -32,7 +32,7 @@
[Documentation] Turn the ethernet network interface off and then on again
... through the serial console.
- Import Resource ${CURDIR}/oem/ibm/serial_console_client.robot
+ Import Resource ${CURDIR}/serial_connection/serial_console_client.robot
Set Library Search Order SSHLibrary Telnet
Execute Command On Serial Console ifconfig eth0 down
Sleep 30s
diff --git a/lib/oem/ibm/serial_console_client.robot b/lib/serial_connection/serial_console_client.robot
similarity index 100%
rename from lib/oem/ibm/serial_console_client.robot
rename to lib/serial_connection/serial_console_client.robot
diff --git a/lib/user_utils.robot b/lib/user_utils.robot
index df39392..3f02ad1 100644
--- a/lib/user_utils.robot
+++ b/lib/user_utils.robot
@@ -45,7 +45,7 @@
# "LDAPBaseDN": "dc=ldap,dc=com",
# "LDAPBindDN": "cn=Administrator,dc=ldap,dc=com",
# "LDAPSearchScope": "xyz.openbmc_project.User.Ldap.Config.SearchScope.sub",
- # "LDAPServerURI": "ldaps://fspldaptest.in.ibm.com/",
+ # "LDAPServerURI": "ldaps://xxx.xxx.xxx.xxx/",
# "LDAPType": "xyz.openbmc_project.User.Ldap.Config.Type.OpenLdap"
# }
#}
diff --git a/syslib/resource.txt b/syslib/resource.robot
similarity index 100%
rename from syslib/resource.txt
rename to syslib/resource.robot
diff --git a/tools/oem/ibm/gen_csv_results.py b/tools/ct_metrics/gen_csv_results.py
similarity index 100%
rename from tools/oem/ibm/gen_csv_results.py
rename to tools/ct_metrics/gen_csv_results.py
diff --git a/tools/oem/ibm/factory_reset_bmc.robot b/tools/factory_reset_bmc.robot
similarity index 91%
rename from tools/oem/ibm/factory_reset_bmc.robot
rename to tools/factory_reset_bmc.robot
index 1ed2b79..abd7ec8 100644
--- a/tools/oem/ibm/factory_reset_bmc.robot
+++ b/tools/factory_reset_bmc.robot
@@ -5,9 +5,9 @@
# -v OPENBMC_SERIAL_HOST:xx.xx.xx.152 -v OPENBMC_SERIAL_PORT:2002
# -v OPENBMC_MODEL:witherspoon factory_reset.robot
-Resource ../../../lib/resource.robot
-Resource ../../../lib/oem/ibm/serial_console_client.robot
-Library ../../../lib/bmc_ssh_utils.py
+Resource ../lib/resource.robot
+Resource ../lib/serial_connection/serial_console_client.robot
+Library ../lib/bmc_ssh_utils.py
Test Setup Test Setup Execution