Add binding: vnic_type attribute to ports wadl

Closes-Bug: #1283334 Change-Id: I4a0dcaae840a9c5b97d6450957cd18f724f51304 author: diane fleming
2014-03-31 11:23:34 -05:00 · 2014-03-31 11:23:34 -05:00 · bc86d2ef54
parent 0d1707e247
commit bc86d2ef54
4 changed files with 156 additions and 74 deletions
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port-post-create-req.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/port-post-create-req.json
@ -1,8 +1,6 @@
 {
-    "port": {
-        "admin_state_up": true,
-        "device_id": "d6b4d3a5-c700-476f-b609-1493dd9dadc0",
-        "name": "port1",
-        "network_id": "6aeaf34a-c482-4bd3-9dc3-7faf36412f12"
-    }
-} 
+   "port":{
+      "network_id":"ee2d3158-3e80-4fb3-ba87-c99f515d85e7",
+      "admin_state_up":true
+   }
+}
--- 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
@ -1,26 +1,27 @@
 {
-   "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":[
+   "port":{
+      "status":"DOWN",
+      "binding:host_id":"",
+      "name":"",
+      "allowed_address_pairs":[

-         ],
-         "id":"8fb361d8-bab0-418d-b1b8-7204a230fb06",
-         "security_groups":[
-            "99f465bc-0d7c-4142-8829-7ae0179f2fa8"
-         ],
-         "device_id":""
-      }
-   ]
+      ],
+      "admin_state_up":true,
+      "network_id":"ee2d3158-3e80-4fb3-ba87-c99f515d85e7",
+      "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+      "binding:vif_type":"unbound",
+      "device_owner":"",
+      "binding:capabilities":{
+         "port_filter":false
+      },
+      "mac_address":"fa:16:3e:80:14:5b",
+      "fixed_ips":[
+
+      ],
+      "id":"6f9f6319-ce4b-4267-a5f8-558d6795632d",
+      "security_groups":[
+         "d30c3c54-5dba-49cf-a323-48a86f078d2d"
+      ],
+      "device_id":""
+   }
 }
--- a/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.json
@ -2,87 +2,152 @@
   "ports":[
      {
         "status":"ACTIVE",
-         "name":"",
+         "binding:host_id":"devstack-havana",
+         "name":"vip-a54bc6e7-2e28-4c55-a676-6146a4c0f8b9",
+         "allowed_address_pairs":[
+
+         ],
         "admin_state_up":true,
-         "network_id":"ebda9658-093b-41ba-80ce-0cf8cb8365d4",
-         "tenant_id":"63878e4c5dd649d2a980e37aefddfa87",
+         "network_id":"d32019d3-bc6e-4319-9c1d-6722fc136a22",
+         "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+         "extra_dhcp_opts":[
+
+         ],
         "binding:vif_type":"ovs",
-         "device_owner":"compute:None",
+         "device_owner":"neutron:LOADBALANCER",
         "binding:capabilities":{
-            "port_filter":false
+            "port_filter":true
         },
-         "mac_address":"fa:16:3e:b9:ef:05",
+         "mac_address":"fa:16:3e:47:57:a0",
         "fixed_ips":[
            {
-               "subnet_id":"aca4d43c-c48c-4a2c-9bb6-ba374ef7e135",
-               "ip_address":"172.24.4.227"
+               "subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
+               "ip_address":"192.0.0.3"
            }
         ],
-         "id":"664ebd1a-facd-4c20-948c-07a784475ab0",
-         "device_id":"f288bb5f-920d-4276-8345-2c0319c16f58"
+         "id":"36242e87-0bae-49d7-bc59-a0867476c69a",
+         "security_groups":[
+            "d30c3c54-5dba-49cf-a323-48a86f078d2d"
+         ],
+         "device_id":"56016959-08ad-566c-8533-6240aff17dd5"
      },
      {
         "status":"DOWN",
-         "name":"",
+         "binding:host_id":"",
+         "name":"my_port",
+         "allowed_address_pairs":[
+
+         ],
         "admin_state_up":true,
-         "network_id":"ebda9658-093b-41ba-80ce-0cf8cb8365d4",
-         "tenant_id":"",
-         "binding:vif_type":"ovs",
-         "device_owner":"network:router_gateway",
+         "network_id":"d32019d3-bc6e-4319-9c1d-6722fc136a22",
+         "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+         "extra_dhcp_opts":[
+
+         ],
+         "binding:vif_type":"unbound",
+         "device_owner":"",
         "binding:capabilities":{
            "port_filter":false
         },
-         "mac_address":"fa:16:3e:4a:3a:a2",
+         "mac_address":"fa:16:3e:6c:e8:35",
         "fixed_ips":[
-            {
-               "subnet_id":"aca4d43c-c48c-4a2c-9bb6-ba374ef7e135",
-               "ip_address":"172.24.4.226"
-            }
+
         ],
-         "id":"c5ca7017-c390-4ccc-8cd7-333747e57fef",
-         "device_id":"0dc517bf-9169-4aa6-88b7-569219962881"
+         "id":"41064069-24d6-46e8-9b5a-6da327e357b3",
+         "security_groups":[
+            "d30c3c54-5dba-49cf-a323-48a86f078d2d"
+         ],
+         "device_id":""
      },
      {
-         "status":"ACTIVE",
+         "status":"DOWN",
+         "binding:host_id":"",
         "name":"",
+         "allowed_address_pairs":[
+
+         ],
         "admin_state_up":true,
-         "network_id":"9d83c053-b0a4-4682-ae80-c00df269ce0a",
-         "tenant_id":"625887121e364204873d362b553ab171",
-         "binding:vif_type":"ovs",
-         "device_owner":"network:router_interface",
+         "network_id":"ee2d3158-3e80-4fb3-ba87-c99f515d85e7",
+         "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+         "extra_dhcp_opts":[
+
+         ],
+         "binding:vif_type":"unbound",
+         "device_owner":"",
         "binding:capabilities":{
            "port_filter":false
         },
-         "mac_address":"fa:16:3e:2d:dc:7e",
+         "mac_address":"fa:16:3e:80:14:5b",
         "fixed_ips":[
-            {
-               "subnet_id":"a318fcb4-9ff0-4485-b78c-9e6738c21b26",
-               "ip_address":"10.0.0.1"
-            }
+
         ],
-         "id":"d7815f5b-a228-47bb-a5e5-f139c4e476f6",
-         "device_id":"0dc517bf-9169-4aa6-88b7-569219962881"
+         "id":"6f9f6319-ce4b-4267-a5f8-558d6795632d",
+         "security_groups":[
+            "d30c3c54-5dba-49cf-a323-48a86f078d2d"
+         ],
+         "device_id":""
      },
      {
         "status":"ACTIVE",
+         "binding:host_id":"devstack-havana",
         "name":"",
+         "allowed_address_pairs":[
+
+         ],
         "admin_state_up":true,
-         "network_id":"9d83c053-b0a4-4682-ae80-c00df269ce0a",
-         "tenant_id":"625887121e364204873d362b553ab171",
+         "network_id":"d32019d3-bc6e-4319-9c1d-6722fc136a22",
+         "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
+         "extra_dhcp_opts":[
+
+         ],
         "binding:vif_type":"ovs",
         "device_owner":"network:dhcp",
         "binding:capabilities":{
-            "port_filter":false
+            "port_filter":true
         },
-         "mac_address":"fa:16:3e:73:6d:1c",
+         "mac_address":"fa:16:3e:3b:63:e8",
         "fixed_ips":[
            {
-               "subnet_id":"a318fcb4-9ff0-4485-b78c-9e6738c21b26",
-               "ip_address":"10.0.0.2"
+               "subnet_id":"54d6f61d-db07-451c-9ab3-b9609b6b6f0b",
+               "ip_address":"192.0.0.2"
            }
         ],
-         "id":"f8639521-fab2-4879-94b2-83a47bee8a26",
-         "device_id":"dhcpe1b8334f-9be9-5e49-aeee-b31e6df6c847-9d83c053-b0a4-4682-ae80-c00df269ce0a"
+         "id":"9842e9ab-7849-4bb5-8441-9fa223bfce45",
+         "security_groups":[
+
+         ],
+         "device_id":"dhcp56016959-08ad-566c-8533-6240aff17dd5-d32019d3-bc6e-4319-9c1d-6722fc136a22"
+      },
+      {
+         "status":"ACTIVE",
+         "binding:host_id":"devstack-havana",
+         "name":"",
+         "allowed_address_pairs":[
+
+         ],
+         "admin_state_up":true,
+         "network_id":"db193ab3-96e3-4cb3-8fc5-05f4296d0324",
+         "tenant_id":"26a7980765d0414dbc1fc1f88cdb7e6e",
+         "extra_dhcp_opts":[
+
+         ],
+         "binding:vif_type":"ovs",
+         "device_owner":"network:dhcp",
+         "binding:capabilities":{
+            "port_filter":true
+         },
+         "mac_address":"fa:16:3e:f7:80:62",
+         "fixed_ips":[
+            {
+               "subnet_id":"08eae331-0402-425a-923c-34f7cfe39c1b",
+               "ip_address":"10.0.0.3"
+            }
+         ],
+         "id":"d2159251-552f-47ae-9960-f80d2aa6864f",
+         "security_groups":[
+
+         ],
+         "device_id":"dhcp56016959-08ad-566c-8533-6240aff17dd5-db193ab3-96e3-4cb3-8fc5-05f4296d0324"
      }
   ]
 }
--- a/api-ref/src/wadls/netconn-api/src/common.ent
+++ b/api-ref/src/wadls/netconn-api/src/common.ent
@ -322,8 +322,26 @@
            provides. To enable or disable port filtering features such as
            security group and anti-MAC/IP spoofing, specify <code>port_filter:
            True|False</code>.</para></wadl:doc>
-</param>'>
-    <!-- Subnet Parameters -->
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02" required="false"
+    name="binding:vnic_type" style="plain" type="xsd:string">
+    <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+        xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+        <para>The vnic type that is bound to the neutron port.</para>
+        <para>In &POST; and &PUT; operations, specify a value of
+                <code>normal</code> (virtual nic), <code>direct</code>
+            (pci passthrough), or <code>macvtap</code> (virtual
+            interface with a tap-like software interface). These
+            values support SR-IOV PCI passthrough networking. The ML2
+            plug-in supports the <code>vnic_type</code>.</para>
+        <para>In &GET; operations, the
+                <parameter>binding:vnic_type</parameter> extended
+            attribute is visible to only port owners and
+            administrative users.</para>
+    </wadl:doc>
+</param>
+'>
+<!-- Subnet Parameters -->
 <!ENTITY subnetListParameters
 '<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
         name="name" style="plain" type="xsd:string">