commit 45dd94f7c220456a5e7d2e09ae288a7d65e51b92
author Naman Navin Hegde <nhegde89@in.ibm.com> Tue Sep 17 22:27:12 2019 -0500
committer George Keishing <gkeishin@in.ibm.com> Tue Oct 15 03:12:59 2019 +0000
tree 4eecd2ae784afb5d36a0afb6be934a4b03563975
parent 3c77d78f6b0b67c9ef7f4a5ab14194ffc5822f02

Add set & get domain name to openbmctool network tests

Resolve openbmc/openbmc-test-automation##1897

Change-Id: I6c6cfd4633aa846223f9b7bfe9b8a8139a7aaef5
Signed-off-by: Naman Navin Hegde <nhegde89@in.ibm.com>

openpower/tests_openbmctool/test_openbmctool_network.robot

diff --git a/openpower/tests_openbmctool/test_openbmctool_network.robot b/openpower/tests_openbmctool/test_openbmctool_network.robot
index 28d4b4e..a046463 100755
--- a/openpower/tests_openbmctool/test_openbmctool_network.robot
+++ b/openpower/tests_openbmctool/test_openbmctool_network.robot
@@ -4,6 +4,7 @@
 
 Library                 String
 Library                 OperatingSystem
+Library                 ../../lib/bmc_network_utils.py
 Library                 ../../lib/gen_print.py
 Library                 ../../lib/gen_robot_print.py
 Library                 ../../lib/openbmctool_utils.py
@@ -27,7 +28,6 @@
 ${mac_address}          76:e2:84:14:87:91
 ${ntp_server}           pool.ntp.org
 ${parser}               |grep "ipv4"|awk -F/ 'NR==1{print$5}'
-${eth0_resource_path}   /xyz/openbmc_project/network/eth0
 ${ignore_err}           ${0}
 
 
@@ -127,10 +127,9 @@
      [Tags]  Verify_SetNTP
 
      Network  setNTP  I=eth0  N=${ntp_server}
-     # Get NTP server details via REST.
-     ${eth0}=  Read Properties  ${eth0_resource_path}  quiet=1
-     Rprint Vars  eth0
-     Valid Value  eth0['NTPServers'][0]  ['${ntp_server}']
+     # Get NTP server details via REDFISH.
+     ${eth0}=  Redfish.Get Properties  ${REDFISH_NW_PROTOCOL_URI}
+     Valid Value  eth0['NTP']['NTPServers'][0]  ['${ntp_server}']
 
 
 Verify GetNTP
@@ -138,11 +137,33 @@
      [Tags]  Verify_GetNTP
 
      Network  setNTP  I=eth0  N=${ntp_server}
-     # Get NTP server details via REST method.
-     ${eth0}=  Read Properties  ${eth0_resource_path}  quiet=1
-     Rprint Vars  eth0
+     # Get NTP server details via REDFISH.
+     ${eth0}=  Redfish.Get Properties  ${REDFISH_NW_PROTOCOL_URI}
      ${tool_ntp}=  Network  getNTP  I=eth0
-     Valid Value  eth0['NTPServers'][0]  ['${tool_ntp}']
+     Valid Value  eth0['NTP']['NTPServers'][0]  ['${tool_ntp}']
+
+
+Verify SetDomainName
+     [Documentation]  Verify set domain name via openbmctool.
+     [Tags]  Verify_SetDomainName
+
+     Network  setDomainName  I=eth0  D=${domain_name}
+     ${eth0}=  Redfish.Get Properties  ${REDFISH_NW_ETH0_URI}
+     ${eth0_domain_name}=  Strip String  ${eth0['FQDN']}
+     ...  characters=${eth0['HostName']}.  mode=left
+     Valid Value  eth0_domain_name  ['${domain_name}']
+
+
+Verify GetDomainName
+     [Documentation]  Verify get domain name via openbmctool.
+     [Tags]  Verify_GetDomainName
+
+     Network  setDomainName  I=eth0  D=${domain_name}
+     ${eth0}=  Redfish.Get Properties  ${REDFISH_NW_ETH0_URI}
+     ${eth0_domain_name}=  Strip String  ${eth0['FQDN']}
+     ...  characters=${eth0['HostName']}.  mode=left
+     ${tool_domain_name}=  Network  getDomainName  I=eth0
+     Valid Value  eth0_domain_name  ['${tool_domain_name}']
 
 
 *** Keywords ***
@@ -153,6 +174,7 @@
     Valid Value  OPENBMC_HOST
     Valid Value  OPENBMC_USERNAME
     Valid Value  OPENBMC_PASSWORD
+    Redfish.Login
 
     # Verify connectivity to the BMC host.
     ${bmc_version}=  Get BMC Version