Move gnt-node to ganeti.client.gnt_node

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

.gitignore

@@ -69,4 +69,5 @@
 # scripts
 /scripts/gnt-cluster
 /scripts/gnt-debug
+/scripts/gnt-node
 /scripts/gnt-os

Makefile.am

@@ -141,6 +141,7 @@ client_PYTHON = \
 	lib/client/__init__.py \
 	lib/client/gnt_cluster.py \
 	lib/client/gnt_debug.py \
+	lib/client/gnt_node.py \
 	lib/client/gnt_os.py
 
 hypervisor_PYTHON = \
@@ -260,6 +261,7 @@ gnt_scripts = \
 PYTHON_BOOTSTRAP = \
 	scripts/gnt-cluster \
 	scripts/gnt-debug \
+	scripts/gnt-node \
 	scripts/gnt-os
 
 dist_sbin_SCRIPTS = \
@@ -270,8 +272,7 @@ dist_sbin_SCRIPTS = \
 	daemons/ganeti-rapi \
 	scripts/gnt-backup \
 	scripts/gnt-instance \
-	scripts/gnt-job \
-	scripts/gnt-node
+	scripts/gnt-job
 
 nodist_sbin_SCRIPTS = \
 	$(PYTHON_BOOTSTRAP) \

scripts/gnt-node → lib/client/gnt_node.py

-#!/usr/bin/python
+#
 #
 
 # Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
@@ -26,8 +26,6 @@
 # W0614: Unused import %s from wildcard import (since we need cli)
 # C0103: Invalid name gnt-node
 
-import sys
-
 from ganeti.cli import *
 from ganeti import bootstrap
 from ganeti import opcodes
@@ -760,5 +758,5 @@ commands = {
   }
 
 
-if __name__ == '__main__':
-  sys.exit(GenericMain(commands, override={"tag_type": constants.TAG_NODE}))
+def Main():
+  return GenericMain(commands, override={"tag_type": constants.TAG_NODE})