Merge lp:~gz/pyjuju/os_scheduler_hints_json_fix into lp:pyjuju

[Martin Packman]

Fix format of the scheduler hints passed in the json dict when creating a server.

This is the juju part of getting hints working, see the mailing list post:

<https://lists.ubuntu.com/archives/juju/2013-February/002112.html>

There is some discussion about designing a neater abstraction, this is just fixing the existing code in the interim.

[John A Meinel (jameinel)]

Matches my understanding of how this should work.

review: Approve

[Kapil Thangavelu (hazmat)]

lgtm

review: Approve

=== modified file 'juju/providers/openstack/client.py'
--- juju/providers/openstack/client.py	2013-01-06 17:44:45 +0000
+++ juju/providers/openstack/client.py	2013-02-18 11:45:27 +0000
@@ -397,14 +397,15 @@
             'flavorRef': flavor_id,
             'imageRef': image_id,
         }
+        post_dict = {"server": server}
         if user_data is not None:
             server["user_data"] = base64.b64encode(user_data)
         if security_group_names is not None:
             server["security_groups"] = [{'name': n}
                 for n in security_group_names]
         if scheduler_hints is not None:
-            server["OS-SCH-HNT:scheduler_hints"] = scheduler_hints
-        return self.post(["servers"], {'server': server},
+            post_dict["OS-SCH-HNT:scheduler_hints"] = scheduler_hints
+        return self.post(["servers"], post_dict,
             root="server", code=202)
 
     def get_server_security_groups(self, server_id):

=== modified file 'juju/providers/openstack/tests/test_client.py'
--- juju/providers/openstack/tests/test_client.py	2012-10-26 14:52:35 +0000
+++ juju/providers/openstack/tests/test_client.py	2013-02-18 11:45:27 +0000
@@ -204,8 +204,9 @@
                 "imageRef": "an-image",
                 "flavorRef": "a-flavor",
                 "name": "Test",
-                "OS-SCH-HNT:scheduler_hints": {"hint-key": "hint-val"},
-            }}, obj)
+            },
+            "OS-SCH-HNT:scheduler_hints": {"hint-key": "hint-val"},
+            }, obj)
         return True
 
     @defer.inlineCallbacks