Client support for instance module feature2.2.0

This adds support in the python API and Trove CLI
for instance module commands.  These commands include:

    - module-apply
    - module-remove
    - module-query
    - module-retrieve
    - module-list-instance

The parsing of --instance was modified to allow multiple
modules to be specified.  This was extended to 'nics' as well.

Partially Implements: blueprint module-management
Change-Id: If62f5e51d4628cc6a8b10303d5c3893b3bd5057e

1 files changed, 25 insertions, 19 deletions

diff --git a/troveclient/tests/test_modules.py b/troveclient/tests/test_modules.py
index 01ee548..5616df7 100644
--- a/troveclient/tests/test_modules.py
+++ b/troveclient/tests/test_modules.py
@@ -14,8 +14,10 @@
 #    under the License.
 #
 
+import Crypto.Random
 import mock
 import testtools
+
 from troveclient.v1 import modules
 
 
@@ -52,25 +54,29 @@ class TestModules(testtools.TestCase):
         def side_effect_func(path, body, mod):
             return path, body, mod
 
-        self.modules._create = mock.Mock(side_effect=side_effect_func)
-        path, body, mod = self.modules.create(
-            self.module_name, "test", "my_contents",
-            description="my desc",
-            all_tenants=False,
-            datastore="ds",
-            datastore_version="ds-version",
-            auto_apply=True,
-            visible=True,
-            live_update=False)
-        self.assertEqual("/modules", path)
-        self.assertEqual("module", mod)
-        self.assertEqual(self.module_name, body["module"]["name"])
-        self.assertEqual("ds", body["module"]["datastore"]["type"])
-        self.assertEqual("ds-version", body["module"]["datastore"]["version"])
-        self.assertFalse(body["module"]["all_tenants"])
-        self.assertTrue(body["module"]["auto_apply"])
-        self.assertTrue(body["module"]["visible"])
-        self.assertFalse(body["module"]["live_update"])
+        text_contents = "my_contents"
+        binary_contents = Crypto.Random.new().read(20)
+        for contents in [text_contents, binary_contents]:
+            self.modules._create = mock.Mock(side_effect=side_effect_func)
+            path, body, mod = self.modules.create(
+                self.module_name, "test", contents,
+                description="my desc",
+                all_tenants=False,
+                datastore="ds",
+                datastore_version="ds-version",
+                auto_apply=True,
+                visible=True,
+                live_update=False)
+            self.assertEqual("/modules", path)
+            self.assertEqual("module", mod)
+            self.assertEqual(self.module_name, body["module"]["name"])
+            self.assertEqual("ds", body["module"]["datastore"]["type"])
+            self.assertEqual("ds-version",
+                             body["module"]["datastore"]["version"])
+            self.assertFalse(body["module"]["all_tenants"])
+            self.assertTrue(body["module"]["auto_apply"])
+            self.assertTrue(body["module"]["visible"])
+            self.assertFalse(body["module"]["live_update"])
 
     def test_update(self):
         resp = mock.Mock()