Reorganize code to use store crypto plug-in

We have made changes in code organization, this
CR is to sync crypto code with new organization and
store plug-in. Specifically for asymmetric generation
contracts

- Regenerated alembic version file
- Changed the branch name

Change-Id: I6d1686a4507bfbce5204ca41ed938c723ad0668d

barbican/model/repositories.py

@@ -268,6 +268,9 @@ class Repositories(object):
             self._set_repo('order_plugin_meta_repo', OrderPluginMetadatumRepo,
                            kwargs)
             self._set_repo('transport_key_repo', TransportKeyRepo, kwargs)
+            self._set_repo('container_repo', ContainerRepo, kwargs)
+            self._set_repo('container_secret_repo', ContainerSecretRepo,
+                           kwargs)
 
     def _set_repo(self, repo_name, repo_cls, specs):
         if specs and repo_name in specs:
@@ -917,6 +920,25 @@ class ContainerRepo(BaseRepo):
         pass
 
 
+class ContainerSecretRepo(BaseRepo):
+        """Repository for the ContainerSecret entity."""
+        def _do_entity_name(self):
+            """Sub-class hook: return entity name, such as for debugging."""
+            return "ContainerSecret"
+
+        def _do_create_instance(self):
+            return models.ContainerSecret()
+
+        def _do_build_get_query(self, entity_id, keystone_id, session):
+            """Sub-class hook: build a retrieve query."""
+            return session.query(models.ContainerSecret
+                                 ).filter_by(id=entity_id)
+
+        def _do_validate(self, values):
+            """Sub-class hook: validate values."""
+            pass
+
+
 class ContainerConsumerRepo(BaseRepo):
     """Repository for the Service entity."""