Merge pull request #378 from mekanix/feature/provider

Make provider based on type

onelove/api/provider.py

@@ -19,9 +19,12 @@ def get(self):
     def post(self):
         """Create provider"""
         schema = ProviderSchema()
-        provider, errors = schema.load(current_app.api.payload)
-        if errors:
-            return errors, 409
+        try:
+            provider, errors = schema.load(current_app.api.payload)
+            if errors:
+                return errors, 409
+        except ValueError:
+            return {'message': 'Invalid provider type'}, 409
         provider.save()
         response, errors = schema.dump(provider)
         if errors:

onelove/api/provision.py

@@ -47,4 +47,3 @@ def get(self, provision_id):
         if errors:
             abort(409, errors)
         return data
-

onelove/api/schemas.py

@@ -5,7 +5,7 @@
 from ..models.auth import User
 from ..models.cluster import Cluster
 from ..models.parsing import TokenModel
-from ..models.provider import HostSSH, Provider, ProviderSSH
+from ..models.provider import HostSSH, providers
 from ..models.provision import Option, Provision, ProvisionOptions
 from ..models.service import Application, Service
 
@@ -142,14 +142,13 @@ class ProviderSchema(BaseSchema):
 
     @post_load
     def make_object(self, data):
-        real_data = dict(data)
-        del real_data['type']
-        if data['type'] == 'SSH':
-            return ProviderSSH(**real_data)
-        raise ValueError('No such provider type {}'.format(data['type']))
+        Provider = providers.get(data['type'], None)
+        if Provider is None:
+            raise ValueError('No such provider type {}'.format(data['type']))
+        del data['type']
+        return Provider(**data)
 
     class Meta:
-        model = Provider
         name = 'Provider'
 
 

onelove/models/provider.py

@@ -125,3 +125,8 @@ def update(self, hostname, new_ip=None, new_hostname=None):
 
     def hosts_by_tag(self, tags=[]):
         return list(filter(lambda host: host.has_tags(tags), self.hosts))
+
+
+providers = {}
+for provider in [ProviderSSH]:
+    providers[provider.type] = provider