Merge pull request #6 from bitprophet/client-from_dict-fix

Import partial patch from upstream PR 2
coderanger · May 18, 2012 · fd57d34 · fd57d34
2 parents 62e90a3 + f25cf8f
commit fd57d34
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/commis/clients/models.py b/commis/clients/models.py
@@ -13,6 +13,13 @@ def create(self, *args, **kwargs):
         client.generate_key()
         return client
 
+    def from_dict(self, data, *args, **kwargs):
+        chef_client = chef.Client.from_search(data)
+        client, created = self.get_or_create(name=chef_client.name)
+        client.generate_key()
+        client.save()
+        client.private_key = client._key_cache.private_export()
+        return client
 
 class Client(models.Model):
     name = models.CharField(_('Name'), unique=True, max_length=1024)