Merge pull request avocado-framework-tests#1431 from vaishnavibhat/ne…

…twork_test

Bug fix for network_test

io/net/network_test.py

@@ -65,8 +65,6 @@ def setUp(self):
         self.peer = self.params.get("peer_ip")
         if not self.peer:
             self.cancel("No peer provided")
-        if not HostInfo.ping_check(self, self.iface, self.peer, "2"):
-            self.cancel("No connection to peer")
         self.mtu = self.params.get("mtu", default=1500)
         self.peer_user = self.params.get("peer_user", default="root")
         self.peer_password = self.params.get("peer_password", '*',
@@ -75,9 +73,9 @@ def setUp(self):
                                  peer_password=self.peer_password)
         self.peer_interface = self.peerinfo.get_peer_interface(self.peer)
         self.mtu_set()
-        if not self.ping_check("-c 2"):
-            self.cancel("No connection to peer")
         self.mtu = self.params.get("mtu", default=1500)
+        if not HostInfo.ping_check(self, self.iface, self.peer, "2"):
+            self.cancel("No connection to peer")
 
     def mtu_set(self):
         '''
@@ -246,12 +244,12 @@ def tearDown(self):
         '''
         Remove the files created
         '''
-        configure_network.unset_ip(self.iface)
+        self.mtu_set_back()
         if 'scp' in str(self.name.name):
             process.run("rm -rf /tmp/tempfile")
             cmd = "timeout 600 ssh %s \" rm -rf /tmp/tempfile\"" % self.peer
             process.system(cmd, shell=True, verbose=True, ignore_status=True)
-        self.mtu_set_back()
+        configure_network.unset_ip(self.iface)
 
 
 if __name__ == "__main__":

io/net/network_test.py.data/network_test.yaml

@@ -1,7 +1,7 @@
 interface:
 peer_ip:
-peer_password: "root"
-peer_user: "********"
+peer_password: "********"
+peer_user: "root"
 host_ip:
 netmask:
 mtu: !mux

io/net/network_test.py.data/network_test_infiniband.yaml

@@ -1,5 +1,9 @@
 interface:
 peer_ip:
+peer_user: "root"
+peer_password: "********"
+host_ip:
+netmask:
 mtu: !mux
     1500:
         mtu: 1500

io/net/network_test.py.data/network_test_one_variant.yaml

@@ -1,2 +1,6 @@
 interface:
 peer_ip:
+peer_user: "root"
+peer_password: "********"
+host_ip:
+netmask:

io/net/network_test.py.data/network_test_virt_net.yaml

@@ -1,5 +1,9 @@
 interface:
 peer_ip:
+peer_user: "root"
+peer_password: "********"
+host_ip:
+netmask:
 mtu: !mux
     1500:
         mtu: 1500