Merge: Fix for SOL-708, SOL-715. Adding rmmod before modprobe in case of package upgrade. Increasing timeout between stop start of plumgrid service

hooks/pg_gw_hooks.py

@@ -78,6 +78,7 @@ def config_changed():
     pkgs = determine_packages()
     for pkg in pkgs:
         apt_install(pkg, options=['--force-yes'], fatal=True)
+    remove_iovisor()
     load_iovisor()
     ensure_mtu()
     ensure_files()

hooks/pg_gw_utils.py

@@ -140,10 +140,10 @@ def restart_pg():
     Stops and Starts PLUMgrid service after flushing iptables.
     '''
     service_stop('plumgrid')
-    time.sleep(2)
+    time.sleep(30)
     _exec_cmd(cmd=['iptables', '-F'])
     service_start('plumgrid')
-    time.sleep(5)
+    time.sleep(30)
 
 
 def stop_pg():
@@ -167,6 +167,7 @@ def remove_iovisor():
     '''
     _exec_cmd(cmd=['rmmod', 'iovisor'],
               error_msg='Error Loading Iovisor Kernel Module')
+    time.sleep(1)
 
 
 def get_mgmt_interface():