Move network utils to util/network.py module

Currently network.py utility module lives under helpers/ module.
Move the module to util/ and update imports.

Change-Id: Ia9adc2185f2b9d2296954856fb37a0b9608bd9c3
Related-bug: 1576150

octane/commands/install_node.py

@@ -13,11 +13,11 @@
 import logging
 
 from octane.handlers.upgrade import controller as controller_upgrade
-from octane.helpers import network
 from octane.helpers.node_attributes import copy_disks
 from octane.helpers.node_attributes import copy_ifaces
 from octane import magic_consts
 from octane.util import env as env_util
+from octane.util import network
 from octane.util import node as node_util
 
 from cliff import command as cmd

octane/commands/rollback_controlplane.py

@@ -12,9 +12,9 @@
 from cliff import command as cmd
 from fuelclient.objects import environment as environment_obj
 
-from octane.helpers import network
 from octane.util import env as env_util
 from octane.util import maintenance
+from octane.util import network
 
 
 def rollback_control_plane(seed_id, orig_id):

octane/commands/upgrade_controlplane.py

@@ -12,9 +12,9 @@
 from cliff import command as cmd
 from fuelclient.objects import environment as environment_obj
 
-from octane.helpers import network
 from octane.util import env as env_util
 from octane.util import maintenance
+from octane.util import network
 from octane.util import ssh
 
 

octane/tests/test_network.py

@@ -13,7 +13,7 @@ import subprocess
 
 from mock import call
 from mock import Mock
-from octane.helpers import network
+from octane.util import network
 
 
 def test_create_overlay_network(mocker):
@@ -107,10 +107,10 @@ def test_delete_overlay_network(mocker):
 
     mock_ssh = mocker.patch('octane.util.ssh.call')
 
-    mock_ovs_tuns = mocker.patch('octane.helpers.network.list_tunnels_ovs')
+    mock_ovs_tuns = mocker.patch('octane.util.network.list_tunnels_ovs')
     mock_ovs_tuns.return_value = ['br-ex--gre-10.10.10.2']
 
-    mock_lnx_tun = mocker.patch('octane.helpers.network.list_tunnels_lnx')
+    mock_lnx_tun = mocker.patch('octane.util.network.list_tunnels_lnx')
     mock_lnx_tun.return_value = ['gre3-3']
 
     expected_args = [