Add alias as prefix to request params for user_data v3

fix bug 1215710

DocImpact

Change-Id: Iae48d2caefb1de46698c57712eae357c70c78997

nova/api/openstack/compute/plugins/v3/user_data.py

@@ -17,6 +17,10 @@
 from nova.api.openstack import extensions
 
 
+ALIAS = "os-user-data"
+ATTRIBUTE_NAME = '%s:user_data' % ALIAS
+
+
 class UserData(extensions.V3APIExtensionBase):
     """Add user_data to the Create Server v1.1 API."""
 
@@ -33,9 +37,9 @@ def get_resources(self):
         return []
 
     def server_create(self, server_dict, create_kwargs):
-        create_kwargs['user_data'] = server_dict.get('user_data')
+        create_kwargs['user_data'] = server_dict.get(ATTRIBUTE_NAME)
 
     def server_xml_extract_server_deserialize(self, server_node, server_dict):
-        user_data = server_node.getAttribute('user_data')
+        user_data = server_node.getAttribute(ATTRIBUTE_NAME)
         if user_data:
-            server_dict['user_data'] = user_data
+            server_dict[ATTRIBUTE_NAME] = user_data

nova/tests/api/openstack/compute/plugins/v3/test_user_data.py

@@ -23,6 +23,7 @@
 
 from nova.api.openstack.compute import plugins
 from nova.api.openstack.compute.plugins.v3 import servers
+from nova.api.openstack.compute.plugins.v3 import user_data
 from nova.compute import api as compute_api
 from nova.compute import flavors
 from nova import db
@@ -84,7 +85,7 @@ def instance_create(context, inst):
                 'reservation_id': inst['reservation_id'],
                 "created_at": datetime.datetime(2010, 10, 10, 12, 0, 0),
                 "updated_at": datetime.datetime(2010, 11, 11, 11, 0, 0),
-                "user_data": None,
+                user_data.ATTRIBUTE_NAME: None,
                 "progress": 0,
                 "fixed_ips": [],
                 "task_state": "",
@@ -160,7 +161,7 @@ def _test_create_extra(self, params, no_image=False,
             server = self.controller.create(req, body).obj['server']
 
     def test_create_instance_with_user_data_disabled(self):
-        params = {'user_data': base64.b64encode('fake')}
+        params = {user_data.ATTRIBUTE_NAME: base64.b64encode('fake')}
         old_create = compute_api.API.create
 
         def create(*args, **kwargs):
@@ -173,7 +174,7 @@ def create(*args, **kwargs):
             override_controller=self.no_user_data_controller)
 
     def test_create_instance_with_user_data_enabled(self):
-        params = {'user_data': base64.b64encode('fake')}
+        params = {user_data.ATTRIBUTE_NAME: base64.b64encode('fake')}
         old_create = compute_api.API.create
 
         def create(*args, **kwargs):
@@ -197,7 +198,7 @@ def test_create_instance_with_user_data(self):
                     'open': 'stack',
                 },
                 'personality': {},
-                'user_data': base64.b64encode(value),
+                user_data.ATTRIBUTE_NAME: base64.b64encode(value),
             },
         }
 
@@ -224,7 +225,7 @@ def test_create_instance_with_bad_user_data(self):
                     'open': 'stack',
                 },
                 'personality': {},
-                'user_data': value,
+                user_data.ATTRIBUTE_NAME: value,
             },
         }
 
@@ -247,17 +248,20 @@ def setUp(self):
     def test_request_with_user_data(self):
         serial_request = """
     <server xmlns="http://docs.openstack.org/compute/api/v3"
+        xmlns:%(alias)s="%(namespace)s"
         name="user_data_test"
         image_ref="1"
         flavor_ref="1"
-        user_data="IyEvYmluL2Jhc2gKL2Jpbi9"/>"""
+        %(alias)s:user_data="IyEvYmluL2Jhc2gKL2Jpbi9"/>""" % {
+            'alias': user_data.ALIAS,
+            'namespace': user_data.UserData.namespace}
         request = self.deserializer.deserialize(serial_request)
         expected = {
             "server": {
                 "name": "user_data_test",
                 "image_ref": "1",
                 "flavor_ref": "1",
-                "user_data": "IyEvYmluL2Jhc2gKL2Jpbi9"
+                user_data.ATTRIBUTE_NAME: "IyEvYmluL2Jhc2gKL2Jpbi9"
             },
         }
         self.assertEquals(request['body'], expected)