From 3b44a3114c4fa9d53eb490e9368a7da945793a36 Mon Sep 17 00:00:00 2001
From: "t.moriyama" <t.moriyama@users.sourceforge.jp>
Date: Mon, 14 Oct 2013 02:25:28 +0900
Subject: [PATCH] modify README

---
 README               | 40 +++++++++++++++++++++++++++++++++++-----
 linkpair/modcheck.py | 21 +++++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100755 linkpair/modcheck.py

diff --git a/README b/README
index fe395dc..a3b1947 100644
--- a/README
+++ b/README
@@ -32,11 +32,14 @@ Options:
   -h, --help            show this help message and exit
   -f FORMAT, --format=FORMAT
                         specify output format [FORMAT: g/graph-easy,
-                        s/springy, r/springy-raphael]
-  -d FILE, --database=FILE
-                        store record to database
-  -t TYPE, --datatype=TYPE
-                        specify database type(default: json)
+                        s/springy, r/springy-raphael, t/graphviz-tb]
+  -d, --debug           enable debug output
+  -e FILE, --export_file=FILE
+                        export linkpairs to json file
+  -x, --export_stdout   export linkpairs to stdout
+  -i FILE, --import_file=FILE
+                        import json file as linkpairs
+  -a, --api_server      enable Web API server
   -v, --verbose         verbose output.
 
   Remote connection:
@@ -50,11 +53,34 @@ Options:
     -k FILE, --sshkey=FILE
                         specify user's SSH private-key file
 
+  Collector Agent flags:
+    disable Collector Agents
+
+    --disable_ovs_agent
+                        disable Open vSwitch collector agent
+    --disable_linux_agent
+                        disable linux OS collector agent
+    --disable_linuxnet_agent
+                        disable linux Network collector agent
+    --disable_linuxbridge_agent
+                        disable linux bridge collector agent
+    --disable_linuxvlan_agent
+                        disable linux vlan collector agent
+    --disable_libvirt_agent
+                        disable libvirt collector agent
+    --disable_namespace_agent
+                        disable network namespace collector agent
+    --disable_sspvxlan_agent
+                        disable SSP VXLAN collector agent
+    --disable_veth_agent
+                        disable veth collector agent
+
 
 Requirements
 ============
 * Python 2.6 or later
 * Python Libvirt Library 0.9.10 or later.
+* Python Flask Library 0.10.1 or later.
 * Python SSH Library 1.8.0 or later. (or Paramiko Library 1.7.5 or later.)
 
 
@@ -66,6 +92,10 @@ Apache License 2.0
 History
 =======
 
+1.2 (2013-10-14)
+------------------
+* public release
+
 1.1 (2013-03-06)
 ------------------
 * first release
diff --git a/linkpair/modcheck.py b/linkpair/modcheck.py
new file mode 100755
index 0000000..dc7b151
--- /dev/null
+++ b/linkpair/modcheck.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+
+__version__ = '1.1'
+
+import imp
+
+
+def check_modules():
+    mod_installed = 0
+    modules = ["libvirt", "ssh", "paramiko"]
+
+    for module in modules:
+        try:
+            (modfile, modpath, moddesc) = imp.find_module(module)
+            print module + ": " + str(modpath)
+        except ImportError, inst:
+            print inst
+
+    return mod_installed
-- 
2.11.0