From 3867d191d0b4aca3a3a07c063465065d2308a0a5 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Sun, 20 Apr 2014 15:01:51 -0500
Subject: [PATCH] Fix description of security_groups attribute for create
 servers

Closes-Bug: #1276370

Change-Id: I55cbb78ec02e94984d7e5956350e7cc5cb4a4270
author: diane fleming
---
 .../src/v2/api_samples/server-post-req.json   |  8 ++++
 .../src/v2/api_samples/server-post-req.xml    |  4 ++
 .../src/wadls/compute-api/src/v2/common.ent   | 48 ++++++++++++-------
 .../compute-api/src/v2/wadl/os-compute-2.wadl |  6 ++-
 4 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.json
index e87ba6cb6..8de50a120 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.json
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.json
@@ -9,6 +9,14 @@
          {
             "uuid":"d32019d3-bc6e-4319-9c1d-6722fc136a22"
          }
+      ],
+      "security_groups":[
+         {
+            "name":"default"
+         },
+         {
+            "name":"another-secgroup-name"
+         }
       ]
    }
 }
\ No newline at end of file
diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.xml
index 58e1b7a66..4c2c01d5a 100644
--- a/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.xml
+++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/server-post-req.xml
@@ -20,4 +20,8 @@
   <networks>
     <network uuid="0ef47ac7-6797-4e01-8a47-ed26ec3aaa56"/>
   </networks>
+  <security_groups>
+    <security_group name="default"/>
+    <security_group name="another-secgroup-name"/>
+  </security_groups>
 </server>
diff --git a/api-ref/src/wadls/compute-api/src/v2/common.ent b/api-ref/src/wadls/compute-api/src/v2/common.ent
index 93f99143d..576b642e6 100644
--- a/api-ref/src/wadls/compute-api/src/v2/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2/common.ent
@@ -151,19 +151,30 @@
                 <option value="ALL"/>
             </param>'>
     <!-- Server Create Parameters -->
-
-<!ENTITY serverCreateParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
-                name="security_group" style="query" required="true"
+<!ENTITY serverCreateParameters '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="security_groups" style="plain" required="false"
                 type="xsd:string">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                    xml:lang="EN"><para>The name of the security
-                        group. If blank, the server is created in the
+                    xml:lang="EN"><para>A <code>security_groups</code>
+                        object.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="security_group" style="plain" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN"><para>One or more
+                            <code>security_group</code> objects.
+                        Specify the name of the security group in the
+                            <code>name</code> attribute. If you omit
+                        this attribute, the server is created in the
                             <code>default</code> security
                         group.</para></wadl:doc>
             </param>
             <param xmlns="http://wadl.dev.java.net/2009/02"
-                name="user_data" style="query" required="false"
+                name="user_data" style="plain" required="false"
                 type="xsd:string">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -172,11 +183,11 @@
                         encoded.</para></wadl:doc>
             </param>
             <param xmlns="http://wadl.dev.java.net/2009/02"
-                name="availability_zone" style="query"
+                name="availability_zone" style="plain"
                 required="false" type="xsd:string">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                        xml:lang="EN"><para>The availability zone in which
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN"><para>The availability zone in which
                         to launch the server.</para></wadl:doc>
             </param>
             <param xmlns="http://wadl.dev.java.net/2009/02"
@@ -214,8 +225,8 @@
                 name="networks" style="plain" type="xsd:string"
                 required="false">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                        xml:lang="EN">
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
                     <para>A <code>networks</code> object. By default,
                         the server instance is provisioned with all
                         isolated networks for the tenant.</para>
@@ -238,8 +249,8 @@
                 name="uuid" style="plain" type="xsd:string"
                 required="false">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                        xml:lang="EN">
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
                     <para>To provision the server instance with a NIC
                         for a <code>nova-network</code> network,
                         specify the UUID in the <code>uuid</code>
@@ -252,8 +263,8 @@
                 name="port" style="plain" type="xsd:string"
                 required="false">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                        xml:lang="EN">
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
                     <para>To provision the server instance with a NIC
                         for a <code>neutron</code> network, specify
                         the UUID in the <code>port</code> attribute in
@@ -266,8 +277,8 @@
                 name="fixed_ip" style="plain" type="xsd:string"
                 required="false">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                        xml:lang="EN">
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
                     <para>A fixed IPv4 address for the NIC. Valid with
                         a <code>neutron</code> or
                             <code>nova-networks</code> network.</para>
@@ -291,7 +302,8 @@
                         size of the metadata key and value is 255
                         bytes each.</para></wadl:doc>
             </param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="personality" style="plain" required="false"
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="personality" style="plain" required="false"
                 type="csapi:string">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xmlns:wadl="http://wadl.dev.java.net/2009/02"
diff --git a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
index 7e2c66474..0e5dcc2b7 100644
--- a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
@@ -414,8 +414,10 @@
             title="Create server">
             <para role="shortdesc">Creates a server.</para>
         </wadl:doc>
-        <request> &serverCreateParameters; <representation
-                mediaType="application/xml" element="csapi:server"> </representation>
+        <request>
+            &serverCreateParameters;
+            <representation mediaType="application/xml"
+                element="csapi:server"> </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">