From 9e5c2aba2090aa63a559489b590c125360660fca Mon Sep 17 00:00:00 2001
From: Jamie Hannaford <jamie.hannaford@rackspace.com>
Date: Tue, 28 Oct 2014 14:04:34 +0100
Subject: [PATCH 1/2] Ensure that different JSON attribute is sent to Rackspace
 API

---
 lib/OpenCloud/Identity/Resource/User.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/OpenCloud/Identity/Resource/User.php b/lib/OpenCloud/Identity/Resource/User.php
index 404496652..46613a785 100644
--- a/lib/OpenCloud/Identity/Resource/User.php
+++ b/lib/OpenCloud/Identity/Resource/User.php
@@ -20,6 +20,7 @@
 use OpenCloud\Common\Collection\PaginatedIterator;
 use OpenCloud\Common\Http\Message\Formatter;
 use OpenCloud\Common\PersistentObject;
+use OpenCloud\Rackspace;
 
 /**
  * User class which encapsulates functionality for a user.
@@ -59,7 +60,7 @@ class User extends PersistentObject
     protected $updateKeys = array('username', 'email', 'enabled', 'RAX-AUTH:defaultRegion', 'RAX-AUTH:domainId', 'id');
 
     protected $aliases = array(
-        'name'                   => 'username',
+        'name'               => 'username',
         'RAX-AUTH:defaultRegion' => 'defaultRegion',
         'RAX-AUTH:domainId'      => 'domainId',
         'OS-KSADM:password'      => 'password'
@@ -68,6 +69,18 @@ class User extends PersistentObject
     protected static $url_resource = 'users';
     protected static $json_name = 'user';
 
+    public function createJson()
+    {
+        $json = parent::createJson();
+
+        if ($this->getClient() instanceof Rackspace) {
+            $json->user->username = $json->user->name;
+            unset($json->user->name);
+        }
+
+        return $json;
+    }
+
     /**
      * @param $region Set the default region
      */

From 53c25c3f9df1b33deb0fa1ed588b7053d2bffbb9 Mon Sep 17 00:00:00 2001
From: Jamie Hannaford <jamie.hannaford@rackspace.com>
Date: Tue, 28 Oct 2014 14:07:17 +0100
Subject: [PATCH 2/2] Fix indent

---
 lib/OpenCloud/Identity/Resource/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/OpenCloud/Identity/Resource/User.php b/lib/OpenCloud/Identity/Resource/User.php
index 46613a785..736fbd09f 100644
--- a/lib/OpenCloud/Identity/Resource/User.php
+++ b/lib/OpenCloud/Identity/Resource/User.php
@@ -60,7 +60,7 @@ class User extends PersistentObject
     protected $updateKeys = array('username', 'email', 'enabled', 'RAX-AUTH:defaultRegion', 'RAX-AUTH:domainId', 'id');
 
     protected $aliases = array(
-        'name'               => 'username',
+        'name'                   => 'username',
         'RAX-AUTH:defaultRegion' => 'defaultRegion',
         'RAX-AUTH:domainId'      => 'domainId',
         'OS-KSADM:password'      => 'password'