Change security group ID from uuid to int

security group ID is not a uuid but is an int.
All occurrences of security-group are changed.

(df) updated code samples to reflect this change.

Partial-Bug: #1515222

Change-Id: Ia6ec855ac85442b1a369bac34f7680991145b5f9

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-add-post-req.json

@@ -0,0 +1,5 @@
+{
+    "addSecurityGroup": {
+        "name": "test"
+    }
+}

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-post-req.json

@@ -1,6 +1,6 @@
 {
     "security_group": {
         "name": "test",
-        "description": "test"
+        "description": "description"
     }
 }

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-group-remove-post-req.json

@@ -0,0 +1,5 @@
+{
+    "removeSecurityGroup": {
+        "name": "test"
+    }
+}

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-create-resp.json

@@ -1,8 +1,8 @@
 {
     "security_group": {
-        "description": "test",
-        "id": "de3ff110-46b2-4ace-bb76-a2e1ed741b95",
-        "name": "test",
+        "description": "default",
+        "id": 1,
+        "name": "default",
         "rules": [],
         "tenant_id": "openstack"
     }

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-get-resp.json

@@ -1,7 +1,7 @@
 {
     "security_group": {
         "description": "default",
-        "id": "de3ff110-46b2-4ace-bb76-a2e1ed741b95",
+        "id": 1,
         "name": "default",
         "rules": [],
         "tenant_id": "openstack"

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-list-get-resp.json

@@ -2,7 +2,7 @@
     "security_groups": [
         {
             "description": "default",
-            "id": "3fb26eb3-581b-4420-9963-b0879a026506",
+            "id": 1,
             "name": "default",
             "rules": [],
             "tenant_id": "openstack"

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/security-groups-update-resp.json

@@ -1,9 +1,9 @@
 {
     "security_group": {
-        "rules": [],
-        "tenant_id": "a52cdb9cc7854a39a23d3af73a40899e",
-        "id": "01fbade5-b664-42f6-83ae-4e214f4263fa",
+        "description": "my security group",
+        "id": 1,
         "name": "mysecgroup",
-        "description": "my security group"
+        "rules": [],
+        "tenant_id": "a52cdb9cc7854a39a23d3af73a40899e"
     }
 }

api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-security-groups/server-security-groups-list-resp.json

@@ -2,7 +2,7 @@
     "security_groups": [
         {
             "description": "default",
-            "id": "3fb26eb3-581b-4420-9963-b0879a026506",
+            "id": 1,
             "name": "default",
             "rules": [],
             "tenant_id": "openstack"

api-ref/src/wadls/compute-api/src/v2.1/common.ent

@@ -1665,12 +1665,12 @@
   </wadl:doc>
 </param>'>
 <!ENTITY securityGroupIdRequestParameter '
-<param name="security_group_id" style="template" type="csapi:UUID"
+<param name="security_group_id" style="template" type="xsd:int"
   xmlns="http://wadl.dev.java.net/2009/02">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xml:lang="EN"
    xmlns:wadl="http://wadl.dev.java.net/2009/02">
-    <para>The UUID of the security group.</para>
+    <para>The ID of the security group.</para>
   </wadl:doc>
 </param>'>
 <!ENTITY certificateIdRequestParameter '
@@ -2613,11 +2613,11 @@
 </param>
 <param xmlns:csapi="http://docs.openstack.org/compute/api/v2"
    xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain"
-   type="csapi:UUID" required="true">
+   type="xsd:int" required="true">
    <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN" title="Security group ID">
-      <para>The UUID of the security group.</para>
+      <para>The ID of the security group.</para>
    </wadl:doc>
 </param>
 <param xmlns:csapi="http://docs.openstack.org/compute/api/v2"
@@ -2673,11 +2673,11 @@
             </wadl:doc>
          </param>
          <param xmlns:csapi="http://docs.openstack.org/compute/api/v2"
-   xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain" type="csapi:UUID" required="true">
+   xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain" type="xsd:int" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xmlns:wadl="http://wadl.dev.java.net/2009/02"
    xml:lang="EN" title="Security group ID">
-               <para>The UUID of the security group.</para>
+               <para>The ID of the security group.</para>
             </wadl:doc>
          </param>
          <param xmlns:csapi="http://docs.openstack.org/compute/api/v2"