Merge "Update sample code for networks calls"

api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json

@@ -1,7 +1,6 @@
 {
- "network":
-  {
-    "name": "sample_network",
-    "admin_state_up": false
-  }
+   "network":{
+      "name":"sample_network",
+      "admin_state_up":true
+   }
 }

api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <network>
-    <name>sample_network</name>
+    <name>sample_network2</name>
 </network>

api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json

@@ -1,13 +1,16 @@
 {
    "network":{
-      "admin_state_up":true,
-      "id":"850d3f2c-f0a5-4f8b-b1cf-5836fc0be940",
-      "name":"sample_network",
-      "shared":false,
       "status":"ACTIVE",
       "subnets":[
 
       ],
-      "tenant_id":"f667b69e4d6749749ef3bcba7251d9ce"
+      "name":"sample_network",
+      "provider:physical_network":null,
+      "admin_state_up":true,
+      "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+      "provider:network_type":"local",
+      "shared":false,
+      "id":"baed79dd-9136-4260-b9a9-d9dfa2bf6547",
+      "provider:segmentation_id":null
    }
 }

api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml

@@ -1,13 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <network xmlns="http://openstack.org/quantum/api/v2.0"
+    xmlns:provider="http://docs.openstack.org/ext/provider/api/v1.0"
     xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:router="http://docs.openstack.org/ext/quantum/router/api/v1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <status>ACTIVE</status>
     <subnets quantum:type="list"/>
-    <name>sample_network</name>
-    <tenant_id>4be6b806faa0491eb358018bbe9f0d4e</tenant_id>
+    <name>sample_network2</name>
+    <provider:physical_network xsi:nil="true"/>
     <admin_state_up quantum:type="bool">True</admin_state_up>
+    <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
+    <provider:network_type>local</provider:network_type>
     <shared quantum:type="bool">False</shared>
-    <id>0657ef52-d3f6-4320-9c26-015a3e9badea</id>
+    <id>c220b026-ece1-4ead-873f-83537f4c9f92</id>
+    <provider:segmentation_id xsi:nil="true"/>
 </network>

api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.json

@@ -1,12 +1,17 @@
 {
-  "network":
-  {
-    "status": "ACTIVE",
-    "subnets": ["e12f0c45-46e3-446a-b207-9474b27687a6"],
-    "name": "private",
-    "admin_state_up": true,
-    "tenant_id": "625887121e364204873d362b553ab171",
-    "id": "9d83c053-b0a4-4682-ae80-c00df269ce0a",
-    "shared": false
-  }
+   "network":{
+      "status":"ACTIVE",
+      "subnets":[
+
+      ],
+      "name":"sample_network_5_updated",
+      "provider:physical_network":null,
+      "admin_state_up":true,
+      "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+      "provider:network_type":"local",
+      "router:external":false,
+      "shared":false,
+      "id":"1f370095-98f6-4079-be64-6d3d4a6adcc6",
+      "provider:segmentation_id":null
+   }
 }

api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml

@@ -2,19 +2,17 @@
 <network xmlns="http://openstack.org/quantum/api/v2.0"
     xmlns:provider="http://docs.openstack.org/ext/provider/api/v1.0"
     xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:router="http://docs.openstack.org/ext/quantum/router/api/v1.0"
+    xmlns:router="http://docs.openstack.org/ext/neutron/router/api/v1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <status>ACTIVE</status>
-    <subnets>
-        <subnet>e12f0c45-46e3-446a-b207-9474b27687a6</subnet>
-    </subnets>
-    <name>private</name>
+    <subnets quantum:type="list"/>
+    <name>sample-network-4-updated</name>
     <provider:physical_network xsi:nil="true"/>
     <admin_state_up quantum:type="bool">True</admin_state_up>
-    <tenant_id>625887121e364204873d362b553ab171</tenant_id>
+    <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
     <provider:network_type>local</provider:network_type>
     <router:external quantum:type="bool">False</router:external>
     <shared quantum:type="bool">False</shared>
-    <id>9d83c053-b0a4-4682-ae80-c00df269ce0a</id>
+    <id>af374017-c9ae-4a1d-b799-ab73111476e2</id>
     <provider:segmentation_id xsi:nil="true"/>
 </network>

api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json

@@ -1,6 +1,6 @@
 {
  "network":
   {
-    "name": "updated_name"
+    "name": "sample_network_5_updated"
   }
 }

api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml

@@ -4,5 +4,5 @@
     xmlns:quantum="http://openstack.org/quantum/api/v2.0"
     xmlns:router="http://docs.openstack.org/ext/quantum/router/api/v1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <name>nova2</name>
+    <name>sample-network-4-updated</name>
 </network>

api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json

@@ -5,14 +5,13 @@
          "subnets":[
 
          ],
-         "name":"sample_network_1",
+         "name":"sample_network3",
          "provider:physical_network":null,
-         "admin_state_up":false,
-         "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3",
+         "admin_state_up":true,
+         "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
          "provider:network_type":"local",
-         "router:external":false,
          "shared":false,
-         "id":"e9330b1f-a2ef-4160-a951-169ee6ab17f5",
+         "id":"bc1a76cb-8767-4c3a-bb95-018b822f2130",
          "provider:segmentation_id":null
       },
       {
@@ -20,14 +19,13 @@
          "subnets":[
 
          ],
-         "name":"sample_network_2",
+         "name":"sample_network4",
          "provider:physical_network":null,
-         "admin_state_up":false,
-         "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3",
+         "admin_state_up":true,
+         "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
          "provider:network_type":"local",
-         "router:external":false,
          "shared":false,
-         "id":"cfb5f52c-dfe2-4357-a10d-a225693e2b84",
+         "id":"af374017-c9ae-4a1d-b799-ab73111476e2",
          "provider:segmentation_id":null
       }
    ]

api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml

@@ -2,32 +2,29 @@
 <networks xmlns="http://openstack.org/quantum/api/v2.0"
     xmlns:provider="http://docs.openstack.org/ext/provider/api/v1.0"
     xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:router="http://docs.openstack.org/ext/neutron/router/api/v1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <network>
         <status>ACTIVE</status>
         <subnets quantum:type="list"/>
-        <name>sample_network_1</name>
+        <name>sample_network_5</name>
         <provider:physical_network xsi:nil="true"/>
         <admin_state_up quantum:type="bool">True</admin_state_up>
-        <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
+        <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
         <provider:network_type>local</provider:network_type>
-        <router:external quantum:type="bool">False</router:external>
         <shared quantum:type="bool">False</shared>
-        <id>9eb3ce34-183b-4a75-b08f-d6a3d241e68b</id>
+        <id>1f370095-98f6-4079-be64-6d3d4a6adcc6</id>
         <provider:segmentation_id xsi:nil="true"/>
     </network>
     <network>
         <status>ACTIVE</status>
         <subnets quantum:type="list"/>
-        <name>sample_network_2</name>
+        <name>sample_network_6</name>
         <provider:physical_network xsi:nil="true"/>
         <admin_state_up quantum:type="bool">True</admin_state_up>
-        <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
+        <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
         <provider:network_type>local</provider:network_type>
-        <router:external quantum:type="bool">False</router:external>
         <shared quantum:type="bool">False</shared>
-        <id>df679a25-915d-41ed-b5ec-721481ddfd56</id>
+        <id>ee2d3158-3e80-4fb3-ba87-c99f515d85e7</id>
         <provider:segmentation_id xsi:nil="true"/>
     </network>
 </networks>

api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.json

@@ -1,12 +1,17 @@
 {
-  "network":
-  {
-    "status": "ACTIVE",
-    "subnets": ["e12f0c45-46e3-446a-b207-9474b27687a6"],
-    "name": "private",
-    "admin_state_up": true,
-    "tenant_id": "625887121e364204873d362b553ab171",
-    "id": "9d83c053-b0a4-4682-ae80-c00df269ce0a",
-    "shared": false
-  }
+   "network":{
+      "status":"ACTIVE",
+      "subnets":[
+         "54d6f61d-db07-451c-9ab3-b9609b6b6f0b"
+      ],
+      "name":"private-network",
+      "provider:physical_network":null,
+      "admin_state_up":true,
+      "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+      "provider:network_type":"local",
+      "router:external":true,
+      "shared":true,
+      "id":"d32019d3-bc6e-4319-9c1d-6722fc136a22",
+      "provider:segmentation_id":null
+   }
 }

api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml

@@ -1,16 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<network xmlns="http://openstack.org/quantum/api/v2.0" xmlns:provider="http://docs.openstack.org/ext/provider/api/v1.0" xmlns:quantum="http://openstack.org/quantum/api/v2.0" xmlns:router="http://docs.openstack.org/ext/quantum/router/api/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<network xmlns="http://openstack.org/quantum/api/v2.0"
+    xmlns:provider="http://docs.openstack.org/ext/provider/api/v1.0"
+    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
+    xmlns:router="http://docs.openstack.org/ext/neutron/router/api/v1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <status>ACTIVE</status>
     <subnets>
-        <subnet>e12f0c45-46e3-446a-b207-9474b27687a6</subnet>
+        <subnet>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</subnet>
     </subnets>
-    <name>private</name>
-    <provider:physical_network xsi:nil="true" />
+    <name>private-network</name>
+    <provider:physical_network xsi:nil="true"/>
     <admin_state_up quantum:type="bool">True</admin_state_up>
-    <tenant_id>625887121e364204873d362b553ab171</tenant_id>
+    <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
     <provider:network_type>local</provider:network_type>
-    <router:external quantum:type="bool">False</router:external>
-    <shared quantum:type="bool">False</shared>
-    <id>9d83c053-b0a4-4682-ae80-c00df269ce0a</id>
-    <provider:segmentation_id xsi:nil="true" />
+    <router:external quantum:type="bool">True</router:external>
+    <shared quantum:type="bool">True</shared>
+    <id>d32019d3-bc6e-4319-9c1d-6722fc136a22</id>
+    <provider:segmentation_id xsi:nil="true"/>
 </network>

api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json

@@ -1,31 +1,34 @@
 {
-  "networks": [
-  {
-    "status": "ACTIVE",
-    "subnets": ["a318fcb4-9ff0-4485-b78c-9e6738c21b26"],
-    "name": "private",
-    "admin_state_up": true,
-    "tenant_id": "625887121e364204873d362b553ab171",
-    "id": "9d83c053-b0a4-4682-ae80-c00df269ce0a",
-    "shared": false
-  },
-  {
-    "status": "ACTIVE",
-    "subnets": ["aca4d43c-c48c-4a2c-9bb6-ba374ef7e135"],
-    "name": "nova",
-    "admin_state_up": true,
-    "tenant_id": "63878e4c5dd649d2a980e37aefddfa87",
-    "id": "ebda9658-093b-41ba-80ce-0cf8cb8365d4",
-    "shared": false
-  },
-  {
-    "status": "ACTIVE",
-    "subnets": ["e12f0c45-46e3-446a-b207-9474b27687a6"],
-    "name": "network_3",
-    "admin_state_up": true,
-    "tenant_id": "ed680f49ff714162ab3612d7876ffce5",
-    "id": "afc75773-640e-403c-9fff-62ba98db1f19",
-    "shared": true
-   }
- ]
+   "networks":[
+      {
+         "status":"ACTIVE",
+         "subnets":[
+            "54d6f61d-db07-451c-9ab3-b9609b6b6f0b"
+         ],
+         "name":"private-network",
+         "provider:physical_network":null,
+         "admin_state_up":true,
+         "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+         "provider:network_type":"local",
+         "router:external":true,
+         "shared":true,
+         "id":"d32019d3-bc6e-4319-9c1d-6722fc136a22",
+         "provider:segmentation_id":null
+      },
+      {
+         "status":"ACTIVE",
+         "subnets":[
+            "08eae331-0402-425a-923c-34f7cfe39c1b"
+         ],
+         "name":"private",
+         "provider:physical_network":null,
+         "admin_state_up":true,
+         "tenant_id":"26a7980765d0414dbc1fc1f88cdb7e6e",
+         "provider:network_type":"local",
+         "router:external":true,
+         "shared":true,
+         "id":"db193ab3-96e3-4cb3-8fc5-05f4296d0324",
+         "provider:segmentation_id":null
+      }
+   ]
 }

api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml

@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <networks xmlns="http://openstack.org/quantum/api/v2.0"
     xmlns:provider="http://docs.openstack.org/ext/provider/api/v1.0"
     xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:router="http://docs.openstack.org/ext/quantum/router/api/v1.0"
+    xmlns:router="http://docs.openstack.org/ext/neutron/router/api/v1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <network>
         <status>ACTIVE</status>
         <subnets>
-            <subnet>a318fcb4-9ff0-4485-b78c-9e6738c21b26</subnet>
+            <subnet>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</subnet>
         </subnets>
-        <name>private</name>
+        <name>private-network</name>
         <provider:physical_network xsi:nil="true"/>
         <admin_state_up quantum:type="bool">True</admin_state_up>
-        <tenant_id>625887121e364204873d362b553ab171</tenant_id>
+        <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
         <provider:network_type>local</provider:network_type>
-        <router:external quantum:type="bool">False</router:external>
-        <shared quantum:type="bool">False</shared>
-        <id>9d83c053-b0a4-4682-ae80-c00df269ce0a</id>
+        <router:external quantum:type="bool">True</router:external>
+        <shared quantum:type="bool">True</shared>
+        <id>d32019d3-bc6e-4319-9c1d-6722fc136a22</id>
         <provider:segmentation_id xsi:nil="true"/>
     </network>
     <network>
         <status>ACTIVE</status>
         <subnets>
-            <subnet>aca4d43c-c48c-4a2c-9bb6-ba374ef7e135</subnet>
+            <subnet>08eae331-0402-425a-923c-34f7cfe39c1b</subnet>
         </subnets>
-        <name>nova</name>
+        <name>private</name>
         <provider:physical_network xsi:nil="true"/>
         <admin_state_up quantum:type="bool">True</admin_state_up>
-        <tenant_id>63878e4c5dd649d2a980e37aefddfa87</tenant_id>
+        <tenant_id>26a7980765d0414dbc1fc1f88cdb7e6e</tenant_id>
         <provider:network_type>local</provider:network_type>
         <router:external quantum:type="bool">True</router:external>
-        <shared quantum:type="bool">False</shared>
-        <id>ebda9658-093b-41ba-80ce-0cf8cb8365d4</id>
+        <shared quantum:type="bool">True</shared>
+        <id>db193ab3-96e3-4cb3-8fc5-05f4296d0324</id>
         <provider:segmentation_id xsi:nil="true"/>
     </network>
 </networks>

api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json

@@ -1,12 +1,12 @@
 {
    "networks":[
       {
-         "name":"sample_network_1",
-         "admin_state_up":false
+         "name":"sample_network3",
+         "admin_state_up":true
       },
       {
-         "name":"sample_network_2",
-         "admin_state_up":false
+         "name":"sample_network4",
+         "admin_state_up":true
       }
    ]
 }

api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <networks>
     <network>
-        <name>sample_network_1</name>
+        <name>sample_network_5</name>
     </network>
     <network>
-        <name>sample_network_2</name>
+        <name>sample_network_6</name>
     </network>
 </networks>

api-ref/src/wadls/netconn-api/src/os-networks.wadl

@@ -19,7 +19,8 @@
     <!--*******************************************************-->
     <!--             All Resources                             -->
     <!--*******************************************************-->
-    <resources base="https://neutron.example.com/" xml:id="os-networks-v2.0">
+    <resources base="https://neutron.example.com/"
+        xml:id="os-networks-v2.0">
         <resource id="version" path="v2.0/">
             <resource id="Networks" type="#NetworkList"
                 path="networks">
@@ -185,7 +186,6 @@
             </representation>
             <representation mediaType="application/xml"
                 element="csapi:network">
-
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code