diff --git a/extended/test_network.robot b/extended/test_network.robot
deleted file mode 100755
index fbcf7ab..0000000
--- a/extended/test_network.robot
+++ /dev/null
@@ -1,211 +0,0 @@
-*** Settings ***
-Documentation      This suite will verifiy the Network Configuration Rest Interfaces
-...                Details of valid interfaces can be found here...
-...                https://github.com/openbmc/docs/blob/master/rest-api.md
-
-Resource            ../lib/rest_client.robot
-Resource            ../lib/connection_client.robot
-Resource            ../lib/utils.robot
-Resource            ../lib/openbmc_ffdc.robot
-Library             ../lib/pythonutil.py
-
-Suite Setup         Open Connection And Log In
-Suite Teardown      Close All Connections
-Test Teardown       FFDC On Test Case Fail
-
-Force Tags  NetworkManager
-
-*** Variables ***
-
-${NW_MANAGER}    ${NETWORK_MANAGER_URI}Interface
-
-*** Test Cases ***
-
-Get the Mac address
-
-    [Documentation]   This test case is to get the mac address
-    [Tags]   network_test
-    @{arglist}=   Create List   eth0
-    ${args}=     Create Dictionary   data=@{arglist}
-    ${resp}=   Call Method    ${NW_MANAGER}   GetHwAddress    data=${args}
-    should not be empty    ${resp.content}
-    ${json}=   to json         ${resp.content}
-    should be equal as strings      ${json['status']}      ok
-    set suite variable   ${OLD_MAC_ADDRESS}  ${json['data']}
-
-
-Get IP Address with invalid interface
-
-    [Documentation]   This test case tries to get the ip addrees with the invalid
-    ...               interface,Expectation is it should get error.
-    [Tags]   network_test
-
-    @{arglist}=   Create List   lo01
-    ${args}=     Create Dictionary   data=@{arglist}
-    ${resp}=    Call Method   ${NW_MANAGER}  GetAddress4    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']}       error
-
-Get IP Address with valid interface
-
-    [Documentation]   This test case tries to get the ip addrees with the invalid
-    ...               interface,Expectation is it should get error.
-    [Tags]   network_test
-
-    @{arglist}=   Create List   eth0
-    ${args}=     Create Dictionary   data=@{arglist}
-    ${resp}=    Call Method   ${NW_MANAGER}  GetAddress4    data=${args}
-    should be equal as strings      ${resp.status_code}     ${HTTP_OK}
-    ${json}=   to json         ${resp.content}
-    should be equal as strings      ${json['status']}      ok
-
-
-Set the IP address on invalid Interface            lo01     1.1.1.1        255.255.255.0     1.1.1.1     error
-
-   [Tags]   network_test
-   [Template]    AddNetworkInfo
-   [Documentation]    This test case tries to set the ip addrees with the invalid
-    ...               interface,Expectation is it should get error
-
-Set invalid IP address on the valid interface      eth0     ab.cd.ef.gh    255.255.255.0     1.1.1.1     error
-
-   [Tags]   network_test
-   [Template]    AddNetworkInfo
-   [Documentation]    This test case tries to set the invalid ip addrees on  the interface
-    ...               Expectation is it should get error.
-
-
-Set IP address with invalid subnet mask            eth0       2.2.2.2        av.ih.jk.lm       1.1.1.1     error
-
-   [Tags]   network_test
-   [Template]    AddNetworkInfo
-   [Documentation]   This test case tries to set the ip addrees on  the interface
-   ...               with invalid subnet mask,Expectation is it should get error.
-
-Set empty IP address                              eth0     ${EMPTY}       255.255.255.0     1.1.1.1     error
-
-   [Tags]   network_test
-   [Template]    AddNetworkInfo
-   [Documentation]   This test case tries to set the NULL ip addrees on  the interface
-   ...               Expectation is it should get error.
-
-Set empty subnet mask                             eth0       2.2.2.2        ${EMPTY}          1.1.1.1     error
-
-   [Tags]   network_test
-   [Template]    AddNetworkInfo
-   [Documentation]   This test case tries to set the ip addrees on  the interface
-   ...               with empty subnet mask,Expectation is it should get error.
-
-Set empty gateway                                 eth0       2.2.2.2        255.255.255.0     ${EMPTY}    error
-
-   [Tags]   network_test
-   [Template]    AddNetworkInfo
-   [Documentation]   This test case tries to set the ip addrees on  the interface
-   ...               with empty gateway,Expectation is it should get error.
-
-
-Get IP Address type
-    [Tags]   GOOD-PATH
-    [Documentation]   This test case tries to set existing ipaddress address and
-    ...               later tries to verify that ip address type is set to static
-    ...               due to the operation.
-
-    ${networkInfo}=    Get networkInfo from the interface    eth0
-    ${result}=  convert to integer     ${networkInfo['data'][1]}
-
-    ${CURRENT_MASK}=    calcDottedNetmask     ${result}
-    ${CURRENT_IP}=      set variable    ${networkInfo['data'][2]}
-    ${CURRENT_GATEWAY}=   set variable    ${networkInfo['data'][3]}
-
-    ${arglist}=    Create List    eth0    ${CURRENT_IP}   ${CURRENT_MASK}   ${CURRENT_GATEWAY}
-    ${args}=     Create Dictionary   data=@{arglist}
-    run keyword and ignore error   Call Method  ${NW_MANAGER}  SetAddress4  data=${args}
-
-    Wait For Host To Ping       ${CURRENT_IP}
-
-    Wait Until Keyword Succeeds    30 sec    5 sec    Initialize OpenBMC
-
-    @{arglist}=   Create List   eth0
-    ${args}=     Create Dictionary   data=@{arglist}
-    ${resp}=    Call Method   ${NW_MANAGER}   GetAddressType    data=${args}
-    ${json}=   to json         ${resp.content}
-    Should Be Equal    ${json['data']}    STATIC
-    should be equal as strings      ${json['status']}      ok
-
-### IP ADDRESS OCTET VALIDATION ###
-
-Set Broadcast IP address  eth0  6.6.6.255  255.255.255.0  1.1.1.1  error
-
-    [Documentation]  Configure broadcast IP address.
-    [Tags]  Set_Broadcast_IP_address
-    [Template]  AddNetworkInfo
-
-Set Network ID address  eth0  6.6.6.0  255.255.255.0  1.1.1.1  error
-
-    [Documentation]  Configure network ID address.
-    [Tags]  Set_Network_ID_address
-    [Template]  AddNetworkInfo
-
-Set Multicast IP address eth0  224.6.6.23  255.255.255.0  1.1.1.1  error
-
-    [Documentation]  Configure multicast IP address.
-    [Tags]  Set_Multicast_IP_address
-    [Template]  AddNetworkInfo
-
-Set Loopback IP address  eth0  127.6.6.23  255.255.255.0  1.1.1.1  error
-
-    [Documentation]  Configure loopback IP address.
-    [Tags]  Set_Loopback_IP_address
-    [Template]  AddNetworkInfo
-
-Set Wrong First Octet IP  eth0  0.6.6.23  255.255.255.0  1.1.1.1  error
-
-    [Documentation]  Configure wrong first octet IP address.
-    [Tags]  Set_Wrong_First_Octet_IP
-    [Template]  AddNetworkInfo
-
-Set Wrong Second Octet IP  eth0  6.256.6.23  255.255.255.0  1.1.1.1  error
-
-    [Documentation]  Configure wrong second octet IP address.
-    [Tags]  Set_Wrong_Second_Octet_IP
-    [Template]  AddNetworkInfo
-
-Set Wrong Third Octet IP  eth0  6.6.256.23  255.255.255.0  1.1.1.1  error
-
-    [Documentation]  Configure wrong third octet IP address.
-    [Tags]  Set_Wrong_Third_Octet_IP
-    [Template]  AddNetworkInfo
-
-
-*** Keywords ***
-
-Get networkInfo from the interface
-
-    [Documentation]   This keyword is used to match the given ip with the configured one.
-    ...               returns true if match successfull else false
-    ...               eg:- Outout of getAddress4
-    ...               NewFormat:-{"data": [ 2,25,"9.3.164.147","9.3.164.129"],"message": "200 OK","status": "ok"}
-    ...               OldFormat:-
-    ...               {"data": [[[2,25,0,128,"9.3.164.177"],[2,8,254,128,"127.0.0.1"]],"9.3.164.129"],
-    ...                "message": "200 OK", "status": "ok"}
-
-    [Arguments]    ${intf}
-    @{arglist}=    Create List   ${intf}
-    ${args}=       Create Dictionary   data=@{arglist}
-    ${resp}=       Call Method   ${NW_MANAGER}  GetAddress4    data=${args}
-    should be equal as strings      ${resp.status_code}     ${HTTP_OK}
-    ${json}=   to json         ${resp.content}
-    log to console   ${json['data'][2]}
-    log to console   ${json['data'][3]}
-    [Return]    ${json}
-
-AddNetworkInfo
-    [Arguments]    ${intf}      ${address}    ${mask}   ${gateway}  ${result}
-
-    ${arglist}=    Create List    ${intf}    ${address}  ${mask}   ${gateway}
-    ${args}=       Create Dictionary   data=@{arglist}
-    ${resp}=       Call Method   ${NW_MANAGER}  SetAddress4    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}
diff --git a/extended/test_networkd_ext.robot b/extended/test_networkd_ext.robot
deleted file mode 100755
index b228aa4..0000000
--- a/extended/test_networkd_ext.robot
+++ /dev/null
@@ -1,200 +0,0 @@
-*** Settings ***
-Documentation       This suite will test extended Network Configuration Rest Interfaces
-
-Resource            ../lib/rest_client.robot
-Resource            ../lib/connection_client.robot
-Resource            ../lib/utils.robot
-Resource            ../lib/openbmc_ffdc.robot
-Library             ../lib/pythonutil.py
-
-Suite Setup         Open Connection And Log In
-Suite Teardown      Close All Connections
-Test Teardown       FFDC On Test Case Fail
-
-Force Tags  Networkd_Ext
-
-*** Test Cases ***
-
-Set IP address on valid Interface
-    [Tags]   network_test
-    [Documentation]   This test case sets the ip on the interface and validates
-    ...               that ip address has been set or not.
-    ...               Expectation is the ip address should get added.
-
-    validateEnvVariables
-
-
-    ${networkInfo}=    Get networkInfo from the interface    eth0
-    ${result}=  convert to integer     ${networkInfo['data'][1]}
-
-    ${MASK}=    calcDottedNetmask     ${result}
-    set suite variable   ${OLD_MASK}   ${MASK}
-    Log  ${OLD_MASK}
-    set suite variable   ${OLD_IP}          ${networkInfo['data'][2]}
-    set suite variable   ${OLD_GATEWAY}     ${networkInfo['data'][3]}
-
-    Log    ${OLD_IP}
-    Log    ${OLD_GATEWAY}
-
-
-    ${NEW_IP}=        Get Environment Variable    NEW_BMC_IP
-    ${NEW_MASK}=   Get Environment Variable    NEW_SUBNET_MASK
-    ${NEW_GATEWAY}=       Get Environment Variable    NEW_GATEWAY
-
-    ${arglist}=    Create List    eth0    ${NEW_IP}   ${NEW_MASK}   ${NEW_GATEWAY}
-    ${args}=     Create Dictionary   data=@{arglist}
-    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}
-    Log    ${AUTH_URI}
-
-    ${networkInfo}=    Get networkInfo from the interface    eth0
-    ${ipaddress}=      set variable    ${networkInfo['data'][2]}
-    ${gateway}=        set variable    ${networkInfo['data'][3]}
-
-    ${isgatewayfound}=    Set Variable If   '${gateway}'=='${NEW_GATEWAY}'  true    false
-    Log   ${isgatewayfound}
-    ${isIPfound}=    Set Variable if    '${ipaddress}' == '${NEW_IP}'    true   false
-    should be true   '${isIPfound}' == 'true' and '${isgatewayfound}' == 'true'
-
-
-Revert the last ip address change
-    [Tags]   network_test
-    [Documentation]   This test case sets the ip  on the interface and validates
-    ...               that ip address has been set or not.
-    ...               Expectation is the ip address should get added.
-
-
-    ${arglist}=    Create List    eth0       ${OLD_IP}    ${OLD_MASK}   ${OLD_GATEWAY}
-    ${args}=     Create Dictionary   data=@{arglist}
-    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}
-    Log    ${AUTH_URI}
-
-
-    ${networkInfo}=    Get networkInfo from the interface    eth0
-    ${ipaddress}=      set variable    ${networkInfo['data'][2]}
-    ${gateway}=        set variable    ${networkInfo['data'][3]}
-
-    ${isgatewayfound}=    Set Variable If   '${gateway}'=='${OLD_GATEWAY}'  true    false
-    Log   ${isgatewayfound}
-    ${isIPfound}=    Set Variable if    '${ipaddress}' == '${OLD_IP}'    true   false
-    should be true   '${isIPfound}' == 'true' and '${isgatewayfound}' == 'true'
-
-
-Persistency check for ip address
-    [Tags]   reboot_test
-    [Documentation]   we reboot the service processor and after reboot
-    ...               will request for the ip address to check the persistency
-    ...               of the ip address.
-    ...               Expectation is the ip address should persist.
-
-    Open Connection And Log In
-    Execute Command    reboot
-    Log    "System is getting rebooted wait for few seconds"
-    ${networkInfo}=    Get networkInfo from the interface    eth0
-    ${ipaddress}=      set variable    ${networkInfo['data'][2]}
-    ${gateway}=        set variable    ${networkInfo['data'][3]}
-
-    ${isgatewayfound}=    Set Variable If   '${gateway}'=='${OLD_GATEWAY}'  true    false
-    Log   ${isgatewayfound}
-    ${isIPfound}=    Set Variable if    '${ipaddress}' == '${OLD_IP}'    true   false
-    should be true   '${isIPfound}' == 'true' and '${isgatewayfound}' == 'true'
-
-
-Set invalid Mac address     eth0     gg:hh:jj:kk:ll:mm    error
-    [Tags]   network_test  Set_invalid_Mac_address
-    [Template]  SetMacAddress_bad
-    [Documentation]   This test case tries to set the invalid mac address
-    ...               on the eth0 interface.
-    ...               Expectation is that it should throw error.
-
-
-Set valid Mac address     eth0     00:21:cc:73:91:dd   ok
-    [Tags]   network_test  Set_valid_Mac_address
-    [Template]  SetMacAddress_good
-    [Documentation]   ***GOOD PATH***
-    ...               This test case add the ip addresson the  interface and validates
-    ...               that ip address has been added or not.
-    ...               Expectation is the ip address should get added.
-
-Revert old Mac address     eth0     ${OLD_MAC_ADDRESS}   ok
-    [Tags]   network_test  Revert_old_Mac_address
-    [Template]  SetMacAddress_good
-    [Documentation]   ***GOOD PATH***
-    ...               This test case add the ip addresson the  interface and validates
-    ...               that ip address has been added or not.
-    ...               Expectation is the ip address should get added.
-
-*** Keywords ***
-
-Get networkInfo from the interface
-
-    [Documentation]   This keyword is used to match the given ip with the configured one.
-    ...               returns true if match successfull else false
-    ...               eg:- Outout of getAddress4
-    ...               NewFormat:-{"data": [ 2,25,"9.3.164.147","9.3.164.129"],"message": "200 OK","status": "ok"}
-    ...               OldFormat:-
-    ...               {"data": [[[2,25,0,128,"9.3.164.177"],[2,8,254,128,"127.0.0.1"]],"9.3.164.129"],
-    ...                "message": "200 OK", "status": "ok"}
-
-    [Arguments]    ${intf}
-    @{arglist}=    Create List   ${intf}
-    ${args}=       Create Dictionary   data=@{arglist}
-    ${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]}
-    Log   ${json['data'][3]}
-    [Return]    ${json}
-
-
-validateEnvVariables
-
-    ${NEW_BMC_IP}=        Get Environment Variable    NEW_BMC_IP
-    ${NEW_SUBNET_MASK}=   Get Environment Variable    NEW_SUBNET_MASK
-    ${NEW_GATEWAY}=       Get Environment Variable    NEW_GATEWAY
-
-
-    should not be empty  ${NEW_BMC_IP}
-    should not be empty  ${NEW_GATEWAY}
-    should not be empty  ${NEW_SUBNET_MASK}
-
-SetMacAddress_bad
-    [Arguments]    ${intf}      ${address}    ${result}
-    ${arglist}=    Create List    ${intf}    ${address}
-    ${args}=       Create Dictionary   data=@{arglist}
-    ${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}
-
-
-SetMacAddress_good
-    [Arguments]    ${intf}      ${address}   ${result}
-    ${arglist}=    Create List    ${intf}    ${address}
-    ${args}=       Create Dictionary   data=@{arglist}
-    ${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}
-    Wait For Host To Ping      ${OPENBMC_HOST}
-
-    Wait Until Keyword Succeeds    30 sec    5 sec    Initialize OpenBMC
-
-    @{arglist}=   Create List   ${intf}
-    ${args}=     Create Dictionary   data=@{arglist}
-    ${resp}=   Call Method
-    ...    ${OPENBMC_BASE_URI}NetworkManager/Interface/    GetHwAddress    data=${args}
-    ${json}=   to json         ${resp.content}
-    should be equal as strings   ${json['data']}    ${address}