Merge lp:~bac/charmworld/index-charms-in-bundles into lp:~juju-jitsu/charmworld/trunk

[Brad Crittenden]

Allow elasticsearch to search for charm names within the services dict in a bundle.

Allow elasticsearch to search for charm names within the services dict in a bundle.

I took the opportunity to re-factor the indexing test so there is a single test for each thing being tested rather than one test that checks a bazillion things. The only new test is the last in the bunch.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'charmworld/search.py'
--- charmworld/search.py	2013-08-23 20:22:19 +0000
+++ charmworld/search.py	2013-08-26 19:45:33 +0000
@@ -48,7 +48,7 @@
     'basket': 5,
     'description': 3,
     'title': None,
-    'data.services': None,
+    'data.services.*.charm': None,
 }
 
 CHARM = 'charm'

=== modified file 'charmworld/tests/test_search.py'
--- charmworld/tests/test_search.py	2013-08-23 21:51:41 +0000
+++ charmworld/tests/test_search.py	2013-08-26 19:45:33 +0000
@@ -149,9 +149,7 @@
         self.assertEqual(1, len(results['bundle']))
         self.assertEqual(bundle, results['bundle'][0]['data'])
 
-    def test_store_bundles(self):
-        # Ensure that bundles stored into the index via the `store_bundles`
-        # function are searchable via the index.
+    def _setup_store_bundles(self):
         _id = '~abentley/wordpress-basket/5/wordpress-stage'
         deployer_config = dedent("""\
             wordpress-stage:
@@ -163,23 +161,47 @@
                         options:
                             tuning: optimized
                             engine: apache
+                    db:
+                        charm: cs:precise/mysql
         """)
         parsed = yaml.safe_load(deployer_config)
-        client = self.index_client
         store_bundles(None, parsed, 'abentley', 'wordpress-basket/5',
-                      index_client=client)
+                      index_client=self.index_client)
+        return _id
+
+    def test_store_bundles_bundle_name_indexed(self):
+        # Ensure that bundles stored into the index via the `store_bundles`
+        # function are searchable via the index.
+        _id = self._setup_store_bundles();
+
         # Bundle name is indexed.
-        results = client.search('wordpress-stage')['results']['bundle']
+        results = self.index_client.search(
+            'wordpress-stage')['results']['bundle']
         self.assertEqual(1, len(results))
         self.assertEqual(_id, results[0]['data'].id)
+
+
+    def test_store_bundles_series_indexed(self):
+        _id = self._setup_store_bundles();
         # Series is indexed.
-        results = client.search('precise')['results']['bundle']
+        results = self.index_client.search('precise')['results']['bundle']
         self.assertEqual(1, len(results))
         self.assertEqual(_id, results[0]['data'].id)
+
+    def test_store_bundles_series_indexed(self):
+        _id = self._setup_store_bundles();
         # Owner is indexed.
-        results = client.search('abentley')['results']['bundle']
-        self.assertEqual(1, len(results))
-        self.assertEqual(_id, results[0]['data'].id)
+        results = self.index_client.search('abentley')['results']['bundle']
+        self.assertEqual(1, len(results))
+        self.assertEqual(_id, results[0]['data'].id)
+
+    def test_store_bundles_series_indexed(self):
+        _id = self._setup_store_bundles();
+        # Charm names within services are index.
+        results = self.index_client.search('mysql')['results']['bundle']
+        self.assertEqual(1, len(results))
+        self.assertEqual(_id, results[0]['data'].id)
+
 
     def test_search_charms_and_bundles_same_name(self):
         charm = Charm(self.makeCharm(name='mozilla'))