From 817f800fbd4e126e90b10b40a24f70c2dfadad21 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Sun, 11 Jun 2017 11:44:14 -0500
Subject: [PATCH 1/3] fixed #3350

---
 hosting/views.py         | 2 +-
 opennebula_api/models.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hosting/views.py b/hosting/views.py
index d99342e2..fc7796e1 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -369,7 +369,7 @@ class SSHKeyCreateView(LoginRequiredMixin, FormView):
         manager = OpenNebulaManager()
 
         # Get user ssh key
-        public_key = form.cleaned_data.get('public_key')
+        public_key = form.cleaned_data.get('public_key', '').decode('utf-8')
         # Add ssh key to user
         try:
             manager.add_public_key(user=owner, public_key=public_key, merge=True)
diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index 4165e344..77c95db4 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -449,6 +449,7 @@ class OpenNebulaManager():
         """
         # TODO: Check if we can remove this first try because we basically just
         # raise the possible Errors 
+
         try:
             open_user = self._get_user(user)
             try:
@@ -492,7 +493,8 @@ class OpenNebulaManager():
             try:
                 old_key = open_user.template.ssh_public_key 
                 if public_key not in old_key:
-                    raise KeyDoesNotExistsError()
+                    return False
+                    # raise KeyDoesNotExistsError()
                 if '\n{}'.format(public_key) in old_key:
                     public_key = old_key.replace('\n{}'.format(public_key), '')
                 else: 

From d7a38dffa2d700cb80ae098b3a7c41bbb40aef0f Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Sun, 11 Jun 2017 12:20:25 -0500
Subject: [PATCH 2/3] added changelog

---
 Changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog b/Changelog
index f3e3d4d4..d48a5346 100644
--- a/Changelog
+++ b/Changelog
@@ -27,3 +27,7 @@
     * [datacenterlight] Fix initially shown price
 1.0.0: 2017-05-25
     * Initial stable release
+
+    Next:
+       [datacenterlight] Fixed error trying to delete ssh key
+       [datacenterlight] Fixed footer links

From 993039c020f95879e294b4151c910b81608fb97d Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Sun, 11 Jun 2017 12:59:57 -0500
Subject: [PATCH 3/3] fixing 500 error

---
 opennebula_api/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index 77c95db4..7330a7fe 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -501,7 +501,8 @@ class OpenNebulaManager():
                     public_key = old_key.replace(public_key, '')
 
             except AttributeError:
-                raise KeyDoesNotExistsError()
+                return False
+                #raise KeyDoesNotExistsError()
                 
             self.oneadmin_client.call('user.update', open_user.id,
                          '<CONTEXT><SSH_PUBLIC_KEY>{key}</SSH_PUBLIC_KEY></CONTEXT>'.format(key=public_key))