Merge de561aa into 0f6467a

.travis.yml

@@ -13,6 +13,7 @@ install:
     - pip install coverage
     - pip install nose
     - pip install .
+    - pip install datrie
 before_script:
     - flake8 --ignore E501,W504 contrail_api_cli
 script:

contrail_api_cli/resource.py

@@ -14,7 +14,10 @@
 except ImportError:
     from collections import UserDict, UserList
 
-import datrie
+try:
+    import datrie
+except ImportError:
+    datrie = False
 from keystoneauth1.exceptions.http import HttpError
 from prompt_toolkit.completion import Completion
 
@@ -759,6 +762,8 @@ class ResourceCache(object):
     """Resource cache of discovered resources.
     """
     def __init__(self):
+        if datrie is False:
+            raise RuntimeError("missing datrie package.")
         self.cache = {
             'resources': datrie.Trie(string.printable),
             'collections': datrie.Trie(string.printable)

setup.py

@@ -7,8 +7,10 @@
     'keystoneauth1',
     'requests>=2.20.0',
     'gevent<1.3',
-    'datrie'
 ]
+extras_require = {
+    'resource_completion': ['datrie'],
+}
 
 test_requires = []
 
@@ -30,6 +32,7 @@
     packages=find_packages(),
     package_data={'contrail_api_cli': ['schemas/*/*']},
     install_requires=install_requires,
+    extras_require=extras_require,
     scripts=[],
     license="MIT",
     entry_points={
@@ -62,8 +65,8 @@
             'help = contrail_api_cli.commands.shell:Help',
         ],
         'contrail_api_cli.completer': [
-            'resources = contrail_api_cli.resource:ResourceCache',
-            'collections = contrail_api_cli.resource:ResourceCache',
+            'resources = contrail_api_cli.resource:ResourceCache [resource_completion]',
+            'collections = contrail_api_cli.resource:ResourceCache [resource_completion]',
             'commands = contrail_api_cli.manager:CommandManager',
         ]
     },