Moved IPMI network tests in new IPMI bucket

Change-Id: Ia550d83b105b487891a4f86430039403eab4993f
Signed-off-by: Rahul Maheshwari <rahulmaheshwari@in.ibm.com>
diff --git a/ipmi/test_ipmi_network.robot b/ipmi/test_ipmi_network.robot
index 7857fc7..62719dc 100644
--- a/ipmi/test_ipmi_network.robot
+++ b/ipmi/test_ipmi_network.robot
@@ -10,6 +10,7 @@
 
 Force Tags             IPMI_Network
 
+
 *** Variables ***
 
 ${initial_lan_config}   &{EMPTY}
@@ -17,6 +18,53 @@
 
 *** Test Cases ***
 
+Retrieve IP Address Via IPMI And Verify Using Redfish
+    [Documentation]  Retrieve IP address using IPMI and verify using Redfish.
+    [Tags]  Retrieve_IP_Address_Via_IPMI_And_Verify_Using_Redish
+
+    ${lan_print_ipmi}=  Get LAN Print Dict
+
+    # Fetch IP address list using redfish.
+    ${ip_list_redfish}=  Create List
+    Redfish.Login
+    ${resp}=  Redfish.Get  ${REDFISH_NW_ETH0_URI}
+    @{network_config_redfish}=  Get From Dictionary  ${resp.dict}  IPv4StaticAddresses
+    : FOR  ${network_config_redfish}  IN  @{network_config_redfish}
+    \  Append To List  ${ip_list_redfish}  ${network_config_redfish['Address']}
+
+    Valid Value  lan_print_ipmi['IP Address']  ${ip_list_redfish}
+
+
+Retrieve Default Gateway Via IPMI And Verify Using Redfish
+    [Documentation]  Retrieve default gateway via IPMI and verify using Redfish.
+    [Tags]  Retrieve_Default_Gateway_Via_IPMI_And_Verify_Using_Redfish
+
+    ${lan_print_ipmi}=  Get LAN Print Dict
+
+    # Fetch gateway address list using redfish.
+    ${gateway_list_redfish}=  Create List
+    Redfish.Login
+    ${resp}=  Redfish.Get  ${REDFISH_NW_ETH0_URI}
+    @{network_config_redfish}=  Get From Dictionary  ${resp.dict}  IPv4StaticAddresses
+    : FOR  ${network_config_redfish}  IN  @{network_config_redfish}
+    \  Append To List  ${gateway_list_redfish}  ${network_config_redfish['Gateway']}
+
+    Valid Value  lan_print_ipmi['Default Gateway IP']  ${gateway_list_redfish}
+
+
+Retrieve MAC Address Via IPMI And Verify Using Redfish
+    [Documentation]  Retrieve MAC address via IPMI and verify using Redfish.
+    [Tags]  Retrieve_MAC_Address_Via_IPMI_And_Verify_Using_Redfish
+
+    ${lan_print_ipmi}=  Get LAN Print Dict
+
+    Redfish.Login
+    ${resp}=  Redfish.Get  ${REDFISH_NW_ETH0_URI}
+    ${mac_address_redfish}=  Get From Dictionary  ${resp.dict}  MACAddress
+
+    Valid Value  lan_print_ipmi['MAC Address']  ${mac_address_redfish}
+
+
 Verify IPMI Inband Network Configuration
     [Documentation]  Verify BMC network configuration via inband IPMI.
     [Tags]  Verify_IPMI_Inband_Network_Configuration
@@ -59,10 +107,10 @@
 
 Restore Configuration
     [Documentation]  Restore the configuration to its pre-test state
-
     ${length}=  Get Length  ${initial_lan_config}
     Return From Keyword If  ${length} == ${0}
 
     Set IPMI Inband Network Configuration  ${initial_lan_config['IP Address']}
     ...  ${initial_lan_config['Subnet Mask']}
     ...  ${initial_lan_config['Default Gateway IP']}  login=${0}
+
diff --git a/tests/ipmi/test_general_ipmi.robot b/tests/ipmi/test_general_ipmi.robot
index e8e4779..e44181a 100755
--- a/tests/ipmi/test_general_ipmi.robot
+++ b/tests/ipmi/test_general_ipmi.robot
@@ -246,31 +246,6 @@
     ...  msg=Baseboard temperature above allowed threshold ${allowed_temp_diff}.
 
 
-Retrieve Default Gateway Via IPMI And Verify Using REST
-    [Documentation]  Retrieve default gateway from LAN print using IPMI.
-    [Tags]  Retrieve_Default_Gateway_Via_IPMI_And_Verify_Using_REST
-
-    # Fetch "Default Gateway" from IPMI LAN print.
-    ${default_gateway_ipmi}=  Fetch Details From LAN Print  Default Gateway IP
-
-    # Verify "Default Gateway" using REST.
-    Read Attribute  ${NETWORK_MANAGER}config  DefaultGateway
-    ...  expected_value=${default_gateway_ipmi}
-
-
-Retrieve MAC Address Via IPMI And Verify Using REST
-    [Documentation]  Retrieve MAC Address from LAN print using IPMI.
-    [Tags]  Retrieve_MAC_Address_Via_IPMI_And_Verify_Using_REST
-
-    # Fetch "MAC Address" from IPMI LAN print.
-    ${mac_address_ipmi}=  Fetch Details From LAN Print  MAC Address
-
-    # Verify "MAC Address" using REST.
-    ${mac_address_rest}=  Get BMC MAC Address
-    Should Be Equal  ${mac_address_ipmi}  ${mac_address_rest}
-    ...  msg=Verification of MAC address from lan print using IPMI failed.
-
-
 Retrieve Network Mode Via IPMI And Verify Using REST
     [Documentation]  Retrieve network mode from LAN print using IPMI.
     [Tags]  Retrieve_Network_Mode_Via_IPMI_And_Verify_Using_REST
@@ -289,18 +264,6 @@
     ...  msg=Verification of network setting failed.
 
 
-Retrieve IP Address Via IPMI And Verify With BMC Details
-    [Documentation]  Retrieve IP address from LAN print using IPMI.
-    [Tags]  Retrieve_IP_Address_Via_IPMI_And_Verify_With_BMC_Details
-
-    # Fetch "IP Address" from IPMI LAN print.
-    ${ip_addr_ipmi}=  Fetch Details From LAN Print  IP Address
-
-    # Verify the IP address retrieved via IPMI with BMC IPs.
-    ${ip_address_rest}=  Get BMC IP Info
-    Validate IP On BMC  ${ip_addr_ipmi}  ${ip_address_rest}
-
-
 Verify Get Device ID
     [Documentation]  Verify get device ID command output.
     [Tags]  Verify_Get_Device_ID