Updated Ports binding extended attributes

Closes-Bug: #1157159 Change-Id: I8d5e0bce044ba2dc689c23640f170868266a1170 author: diane fleming
openstack · Oct 10, 2013 · 4818278 · 4818278
1 parent cb4f880
commit 4818278
Show file tree

Hide file tree

Showing 10 changed files with 212 additions and 94 deletions.
diff --git a/api-ref/src/docbkx/api-ref-networking.xml b/api-ref/src/docbkx/api-ref-networking.xml
@@ -68,5 +68,17 @@
       <wadl:resources href="../wadls/netconn-api/src/os-quotas.wadl"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
+      <section xml:id="network_provider">
+        <title>Networks provider Extended Attributes</title>
+
+        <wadl:resources href="../wadls/netconn-api/src/os-networks-provider-ext.wadl"
+          xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+      </section>
+      <section xml:id="port_binding">
+        <title>Ports binding Extended Attributes</title>
+
+        <wadl:resources href="../wadls/netconn-api/src/os-ports-binding-ext.wadl"
+          xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
+      </section>
   </chapter>
 </book>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.json
@@ -0,0 +1,25 @@
+{
+   "port":[
+      {
+         "status":"ACTIVE",
+         "name":"",
+         "admin_state_up":true,
+         "network_id":"ebda9658-093b-41ba-80ce-0cf8cb8365d4",
+         "tenant_id":"63878e4c5dd649d2a980e37aefddfa87",
+         "binding:vif_type":"ovs",
+         "device_owner":"compute:None",
+         "binding:capabilities":{
+            "port_filter":false
+         },
+         "mac_address":"fa:16:3e:b9:ef:05",
+         "fixed_ips":[
+            {
+               "subnet_id":"aca4d43c-c48c-4a2c-9bb6-ba374ef7e135",
+               "ip_address":"172.24.4.227"
+            }
+         ],
+         "id":"664ebd1a-facd-4c20-948c-07a784475ab0",
+         "device_id":"f288bb5f-920d-4276-8345-2c0319c16f58"
+      }
+   ]
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<port xmlns="http://openstack.org/quantum/api/v2.0"
+    xmlns:binding="http://docs.openstack.org/ext/binding/api/v1.0"
+    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <status>ACTIVE</status>
+    <name/>
+    <admin_state_up quantum:type="bool">True</admin_state_up>
+    <network_id>ebda9658-093b-41ba-80ce-0cf8cb8365d4</network_id>
+    <tenant_id>63878e4c5dd649d2a980e37aefddfa87</tenant_id>
+    <binding:vif_type>ovs</binding:vif_type>
+    <device_owner>compute:None</device_owner>
+    <binding:capabilities>
+        <port_filter quantum:type="bool">False</port_filter>
+    </binding:capabilities>
+    <mac_address>fa:16:3e:b9:ef:05</mac_address>
+    <fixed_ips>
+        <fixed_ip>
+            <subnet_id>aca4d43c-c48c-4a2c-9bb6-ba374ef7e135</subnet_id>
+            <ip_address>172.24.4.227</ip_address>
+        </fixed_ip>
+    </fixed_ips>
+    <id>664ebd1a-facd-4c20-948c-07a784475ab0</id>
+    <device_id>f288bb5f-920d-4276-8345-2c0319c16f58</device_id>
+</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_or_update_resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/port_create_or_update_resp.json
@@ -0,0 +1,26 @@
+{
+   "port":[
+      {
+         "status":"DOWN",
+         "binding:host_id":null,
+         "name":"sample_port_1",
+         "admin_state_up":true,
+         "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce",
+         "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3",
+         "binding:vif_type":"ovs",
+         "device_owner":"",
+         "binding:capabilities":{
+            "port_filter":true
+         },
+         "mac_address":"fa:16:3e:2e:7c:8a",
+         "fixed_ips":[
+
+         ],
+         "id":"8fb361d8-bab0-418d-b1b8-7204a230fb06",
+         "security_groups":[
+            "99f465bc-0d7c-4142-8829-7ae0179f2fa8"
+         ],
+         "device_id":""
+      }
+   ]
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_or_update_resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port_create_or_update_resp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<port xmlns="http://openstack.org/quantum/api/v2.0"
+    xmlns:binding="http://docs.openstack.org/ext/binding/api/v1.0"
+    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <status>DOWN</status>
+    <binding:host_id xsi:nil="true"/>
+    <name>test_port_1</name>
+    <admin_state_up quantum:type="bool">True</admin_state_up>
+    <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
+    <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
+    <binding:vif_type>ovs</binding:vif_type>
+    <device_owner/>
+    <binding:capabilities>
+        <port_filter quantum:type="bool">True</port_filter>
+    </binding:capabilities>
+    <mac_address>fa:16:3e:c9:8d:cf</mac_address>
+    <fixed_ips quantum:type="list"/>
+    <id>7f0aa3f1-883a-43b2-8d1b-e85fac52b417</id>
+    <security_groups>
+        <security_group>99f465bc-0d7c-4142-8829-7ae0179f2fa8</security_group>
+    </security_groups>
+    <device_id/>
+</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-create-bulk-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/ports-create-bulk-resp.json
@@ -1,34 +1,48 @@
 {
-"ports": [
-{
-"status": "DOWN",
-"binding:host_id": null,
-"name": "sample_port_1",
-"admin_state_up": true,
-"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce",
-"tenant_id": "60cd4f6dbc2f491982a284e7b83b5be3",
-"binding:vif_type": "ovs",
-"device_owner": "",
-"binding:capabilities": {"port_filter": true},
-"mac_address": "fa:16:3e:2e:7c:8a",
-"fixed_ips": [],
-"id": "8fb361d8-bab0-418d-b1b8-7204a230fb06",
-"security_groups": ["99f465bc-0d7c-4142-8829-7ae0179f2fa8"],
-"device_id": ""
-},
-{
-"status": "DOWN",
-"binding:host_id": null,
-"name": "sample_port_2",
-"admin_state_up": false,
-"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce",
-"tenant_id": "60cd4f6dbc2f491982a284e7b83b5be3",
-"binding:vif_type": "ovs",
-"device_owner": "",
-"binding:capabilities": {"port_filter": true},
-"mac_address": "fa:16:3e:0a:4e:13", "fixed_ips": [],
-"id": "d4c93b0b-f593-424e-a199-d648478a5a3c",
-"security_groups": ["99f465bc-0d7c-4142-8829-7ae0179f2fa8"],
-"device_id": ""}]
-}
+   "ports":[
+      {
+         "status":"DOWN",
+         "binding:host_id":null,
+         "name":"sample_port_1",
+         "admin_state_up":true,
+         "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce",
+         "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3",
+         "binding:vif_type":"ovs",
+         "device_owner":"",
+         "binding:capabilities":{
+            "port_filter":true
+         },
+         "mac_address":"fa:16:3e:2e:7c:8a",
+         "fixed_ips":[
+
+         ],
+         "id":"8fb361d8-bab0-418d-b1b8-7204a230fb06",
+         "security_groups":[
+            "99f465bc-0d7c-4142-8829-7ae0179f2fa8"
+         ],
+         "device_id":""
+      },
+      {
+         "status":"DOWN",
+         "binding:host_id":null,
+         "name":"sample_port_2",
+         "admin_state_up":false,
+         "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce",
+         "tenant_id":"60cd4f6dbc2f491982a284e7b83b5be3",
+         "binding:vif_type":"ovs",
+         "device_owner":"",
+         "binding:capabilities":{
+            "port_filter":true
+         },
+         "mac_address":"fa:16:3e:0a:4e:13",
+         "fixed_ips":[
 
+         ],
+         "id":"d4c93b0b-f593-424e-a199-d648478a5a3c",
+         "security_groups":[
+            "99f465bc-0d7c-4142-8829-7ae0179f2fa8"
+         ],
+         "device_id":""
+      }
+   ]
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-create-bulk-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/ports-create-bulk-resp.xml
@@ -5,42 +5,42 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <port>
         <status>DOWN</status>
-        <binding:host_id xsi:nil="true" />
+        <binding:host_id xsi:nil="true"/>
         <name>test_port_1</name>
         <admin_state_up quantum:type="bool">True</admin_state_up>
         <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
         <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
         <binding:vif_type>ovs</binding:vif_type>
-        <device_owner />
+        <device_owner/>
         <binding:capabilities>
             <port_filter quantum:type="bool">True</port_filter>
         </binding:capabilities>
         <mac_address>fa:16:3e:c9:8d:cf</mac_address>
-        <fixed_ips quantum:type="list" />
+        <fixed_ips quantum:type="list"/>
         <id>7f0aa3f1-883a-43b2-8d1b-e85fac52b417</id>
         <security_groups>
             <security_group>99f465bc-0d7c-4142-8829-7ae0179f2fa8</security_group>
         </security_groups>
-        <device_id />
+        <device_id/>
     </port>
     <port>
         <status>DOWN</status>
-        <binding:host_id xsi:nil="true" />
+        <binding:host_id xsi:nil="true"/>
         <name>test_port_2</name>
         <admin_state_up quantum:type="bool">True</admin_state_up>
         <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
         <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
         <binding:vif_type>ovs</binding:vif_type>
-        <device_owner />
+        <device_owner/>
         <binding:capabilities>
             <port_filter quantum:type="bool">True</port_filter>
         </binding:capabilities>
         <mac_address>fa:16:3e:79:90:81</mac_address>
-        <fixed_ips quantum:type="list" />
+        <fixed_ips quantum:type="list"/>
         <id>a4a81484-c1c4-4b2b-95bc-f8c4484241d0</id>
         <security_groups>
             <security_group>99f465bc-0d7c-4142-8829-7ae0179f2fa8</security_group>
         </security_groups>
-        <device_id />
+        <device_id/>
     </port>
 </ports>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.json
@@ -1,13 +1,14 @@
 {
-"ports": [
-{
-"name": "sample_port_1",
-"admin_state_up": false,
-"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce"
-},
-{
-"name": "sample_port_2",
-"admin_state_up": false,
-"network_id": "a3775a7d-9f8b-4148-be81-c84bbd0837ce"
-}]
+   "ports":[
+      {
+         "name":"sample_port_1",
+         "admin_state_up":false,
+         "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce"
+      },
+      {
+         "name":"sample_port_2",
+         "admin_state_up":false,
+         "network_id":"a3775a7d-9f8b-4148-be81-c84bbd0837ce"
+      }
+   ]
 }
diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent
@@ -144,13 +144,13 @@
      <param required="false" name="fixed_ips" style="plain" type="xsd:dict"><doc><p xmlns="http://www.w3.org/1999/xhtml">If you specify only a subnet ID, OpenStack Networking allocates an available IP from that subnet to the port. If you specify both a subnet ID and an IP address, OpenStack Networking tries to allocate the specified address to the port.</p></doc></param>
       <param required="false" name="security_groups" style="plain" type="csapi:uuid"><doc><p xmlns="http://www.w3.org/1999/xhtml">Security groups. Specify one or more security group IDs.</p></doc></param>
          '>
-    <!-- Port Provider Parameters -->
-   <!ENTITY portProviderParameters
+    <!-- Port binding Parameters -->
+   <!ENTITY portBindingParameters
          '
-<param required="false" name="provider:vif_type" style="plain" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">The The vif type for the specified port.</p></doc></param>
-<param required="false" name="provider:host_id"     style="plain" type="csapi:uuid"><doc><p xmlns="http://www.w3.org/1999/xhtml">The host where the port is allocated. In some cases, different implementations can run on different hosts.</p></doc></param>
-<param required="false" name="provider:profile"  style="plain" type="xsd:dict"><doc><p xmlns="http://www.w3.org/1999/xhtml">A dictionary the enables the application running on the specified host to pass and receive vif port-specific information to the plug-in.</p></doc></param>
-<param required="false" name="provider:capabilities"  style="plain" type="xsd:dict"><doc><p xmlns="http://www.w3.org/1999/xhtml">A dictionary that enables the application to pass information about functions that the Networking API povides. Specify the following value:  port_filter : Boolean to define whether port filtering features such as security group and anti-MAC/IP spoofing are provided.</p></doc></param>
+<param required="false" name="binding:vif_type" style="plain" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">Read-only. The The vif type for the specified port.</p></doc></param>
+<param required="false" name="binding:host_id"     style="plain" type="csapi:uuid"><doc><p xmlns="http://www.w3.org/1999/xhtml">The ID of the host where the port is allocated. In some cases, different implementations can run on different hosts.</p></doc></param>
+<param required="false" name="binding:profile"  style="plain" type="xsd:dict"><doc><p xmlns="http://www.w3.org/1999/xhtml">A dictionary the enables the application running on the specified host to pass and receive vif port-specific information to the plug-in.</p></doc></param>
+<param required="false" name="binding:capabilities"  style="plain" type="xsd:dict"><doc><p xmlns="http://www.w3.org/1999/xhtml">Read-only. A dictionary that enables the application to pass information about functions that the Networking API povides. Specify the following value:  port_filter : Boolean to define whether port filtering features such as security group and anti-MAC/IP spoofing are provided.</p></doc></param>
          '>
 	<!-- Server List Parameters -->