Clean up executable modules

Disabled execution of modules loaded by execution files in bin
Changed file bit mode of modules which are executable

Change-Id: If8a3378c79bb5bfcde1b93066c6b2c0a3d1107ad

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index bcc3aa9d18ad111a8c7e4bf8aed919f9746facf9..18f9660040e71c9cd8cefadcea6ce6827da12dea 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -544,7 +544,3 @@ def main():
 
     mgr = DhcpAgent(cfg.CONF)
     mgr.run()
-
-
-if __name__ == '__main__':
-    main()

diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index 41313b119247b480097a0304733b4cbd8ff6267f..32e80fb33fd4d2b44990d9e613a4121cbc8868ea 100644 (file)
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -552,7 +552,3 @@ def main():
 
     mgr = L3NATAgent(conf)
     mgr.daemon_loop()
-
-
-if __name__ == '__main__':
-    main()

diff --git a/quantum/debug/shell.py b/quantum/debug/shell.py
index f2495d2e0f08d86aca603ebc9d992670e3bf102b..65c9dc85f6c3cd89232cf75180e4e8b3988c73e2 100644 (file)
--- a/quantum/debug/shell.py
+++ b/quantum/debug/shell.py
@@ -79,6 +79,3 @@ class QuantumDebugShell(QuantumShell):
 
 def main(argv=None):
     return QuantumDebugShell(QUANTUM_API_VERSION).run(argv or sys.argv[1:])
-
-if __name__ == "__main__":
-    sys.exit(main())

diff --git a/quantum/plugins/cisco/client/cli.py b/quantum/plugins/cisco/client/cli.py
old mode 100644 (file)
new mode 100755 (executable)
index 7530ddb..333bd0c
--- a/quantum/plugins/cisco/client/cli.py
+++ b/quantum/plugins/cisco/client/cli.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2011 Cisco Systems, Inc.  All rights reserved.

diff --git a/quantum/plugins/cisco/run_tests.py b/quantum/plugins/cisco/run_tests.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/quantum/plugins/cisco/services/service_insertion.py b/quantum/plugins/cisco/services/service_insertion.py
old mode 100644 (file)
new mode 100755 (executable)
index afd6b60..19af73a
--- a/quantum/plugins/cisco/services/service_insertion.py
+++ b/quantum/plugins/cisco/services/service_insertion.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2011 Cisco Systems, Inc.  All rights reserved.