From edc700c8079997ad39fb2f86da75feb172b18058 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 19 Sep 2017 17:16:45 +0200
Subject: [PATCH] Configure storage by platform kind

---
 cloud_platform/models/cloud_platform.py     | 26 +++++++++++++++++----
 cloud_platform_ovh/models/cloud_platform.py | 14 +++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/cloud_platform/models/cloud_platform.py b/cloud_platform/models/cloud_platform.py
index 99c2a8c..10b2ad4 100644
--- a/cloud_platform/models/cloud_platform.py
+++ b/cloud_platform/models/cloud_platform.py
@@ -38,14 +38,32 @@ class CloudPlatform(models.AbstractModel):
     _name = 'cloud.platform'
 
     @api.model
-    def _config_by_server_env(self, environment):
+    def _platform_kinds(self):
+        # XXX for backward compatibility, we need this one here, move
+        # it in cloud_platform_exoscale in V11
+        return ['exoscale']
+
+    # XXX for backward compatibility, we need this one here, move
+    # it in cloud_platform_exoscale in V11
+    @api.model
+    def _config_by_server_env_for_exoscale(self):
         configs = {
             'prod': PlatformConfig(filestore=FilestoreKind.s3),
             'integration': PlatformConfig(filestore=FilestoreKind.s3),
             'test': PlatformConfig(filestore=FilestoreKind.db),
             'dev': PlatformConfig(filestore=FilestoreKind.db),
         }
-        return configs.get(environment) or configs['dev']
+        return configs
+
+    @api.model
+    def _config_by_server_env(self, platform_kind, environment):
+        configs_getter = getattr(
+            self,
+            '_config_by_server_env_for_%s' % platform_kind,
+            None
+        )
+        configs = configs_getter() if configs_getter else {}
+        return configs.get(environment) or FilestoreKind.db
 
     # Due to the addition of the ovh cloud platform
     # This will be moved to cloud_platform_exoscale on v11
@@ -55,11 +73,11 @@ class CloudPlatform(models.AbstractModel):
 
     @api.model
     def install(self, platform_kind):
-        assert platform_kind in ('ovh', 'exoscale')
+        assert platform_kind in self._platform_kinds()
         params = self.env['ir.config_parameter'].sudo()
         params.set_param('cloud.platform.kind', platform_kind)
         environment = config['running_env']
-        configs = self._config_by_server_env(environment)
+        configs = self._config_by_server_env(platform_kind, environment)
         params.set_param('ir_attachment.location', configs.filestore)
         self.check()
         if configs.filestore in [FilestoreKind.swift, FilestoreKind.s3]:
diff --git a/cloud_platform_ovh/models/cloud_platform.py b/cloud_platform_ovh/models/cloud_platform.py
index 2036889..bb00f0f 100644
--- a/cloud_platform_ovh/models/cloud_platform.py
+++ b/cloud_platform_ovh/models/cloud_platform.py
@@ -9,8 +9,8 @@ from odoo import api, models
 _logger = logging.getLogger(__name__)
 
 try:
-    from ...cloud_platform.models.cloud_platform import FilestoreKind
-    from ...cloud_platform.models.cloud_platform import PlatformConfig
+    from odoo.addons.cloud_platform.models.cloud_platform import FilestoreKind
+    from odoo.addons.cloud_platform.models.cloud_platform import PlatformConfig
 except ImportError:
     FilestoreKind = None
     PlatformConfig = None
@@ -21,14 +21,20 @@ class CloudPlatform(models.AbstractModel):
     _inherit = 'cloud.platform'
 
     @api.model
-    def _config_by_server_env(self, environment):
+    def _platform_kinds(self):
+        kinds = super(CloudPlatform, self)._platform_kinds()
+        kinds.append('ovh')
+        return kinds
+
+    @api.model
+    def _config_by_server_env_for_ovh(self):
         configs = {
             'prod': PlatformConfig(filestore=FilestoreKind.swift),
             'integration': PlatformConfig(filestore=FilestoreKind.swift),
             'test': PlatformConfig(filestore=FilestoreKind.db),
             'dev': PlatformConfig(filestore=FilestoreKind.db),
         }
-        return configs.get(environment) or configs['dev']
+        return configs
 
     @api.model
     def install_ovh(self):