From ad94e2e6a3050b258cb715e660b3ed0e7140d701 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diflemin@cisco.com>
Date: Fri, 11 Dec 2015 20:29:41 -0600
Subject: [PATCH] Update Networking API v2 to spellcheck and make other changes

- Remove passive voice from api-site
- Renamed api-ref/src/wadls/netconn-api/src/v1/api_samples
  to .../samples
- Renamed code samples using this naming convention:
  <resource>-<action>-request.json or <resource>-<action>-response.json.
  For example, volume-create-request.json and volume-create-response.json.
- Removed unused code samples
- Made method names consistent throughout - use list<resource> for list
  operations, show<resource> for show operations, and so on.
- Removed xml code samples
- Change csapi:uuid -> csapi:UUID

Change-Id: I4d628870017f12ec1a5341e41886259acc0481a8
Partial-Bug: #1521244
Closes-Bug: #1525353
---
 api-ref/src/docbkx/ch_netconn-v2-ext.xml      | 209 ++---
 api-ref/src/docbkx/ch_netconn-v2.xml          |  44 +-
 .../HealthMonitor-post-associate-req.json     |   5 -
 .../HealthMonitor-post-associate-resp.json    |   5 -
 .../HealthMonitor-put-update-resp.json        |  19 -
 .../HealthMonitor-put-update.req.json         |   5 -
 .../api_samples/Member-put-update-resp.json   |  13 -
 .../api_samples/Member-put-update.req.json    |   5 -
 .../src/api_samples/Pool-put-update-resp.json |  20 -
 .../netconn-api/src/api_samples/extension.xml |  10 -
 .../src/api_samples/extensions.xml            | 138 ----
 .../api_samples/healthmonitor-get-resp.json   |  25 -
 .../src/api_samples/hms-get-resp.json         |  25 -
 .../api_samples/loadbalancer-delete-resp.json |   8 -
 .../src/api_samples/member-get-resp.json      |  24 -
 .../src/api_samples/network-post-req.xml      |   4 -
 .../src/api_samples/network-post-resp.xml     |  16 -
 .../api_samples/network-put-update-resp.xml   |  18 -
 .../api_samples/network-put-update.req.xml    |   8 -
 .../api_samples/networks-create-bulk-resp.xml |  30 -
 .../api_samples/networks-get-detail-resp.xml  |  16 -
 .../src/api_samples/networks-get-resp.xml     |  37 -
 .../networks-post-create-bulk-req.xml         |   9 -
 .../api_samples/neutron-versions-response.xml |  15 -
 .../src/api_samples/pool-put-req.json         |  11 -
 .../src/api_samples/pool-put-resp.json        |  22 -
 .../src/api_samples/pool-put-update.req.json  |   5 -
 .../src/api_samples/pools-get-resp.json       |  24 -
 .../src/api_samples/port-bind-get-resp.xml    |  32 -
 .../src/api_samples/port-get-resp.xml         |  23 -
 .../src/api_samples/port-post-create-req.json |   6 -
 .../port_bind_create_or_update_resp.xml       |  30 -
 .../src/api_samples/port_create_req.xml       |   5 -
 .../src/api_samples/port_create_resp.xml      |  24 -
 .../src/api_samples/port_update_req.xml       |   5 -
 .../src/api_samples/port_update_resp.xml      |  24 -
 .../src/api_samples/ports-bind-get-resp.xml   |  64 --
 .../api_samples/ports-create-bulk-resp.xml    |  47 --
 .../src/api_samples/ports-get-resp.xml        |  45 --
 .../ports-post-create-bulk-req.xml            |  11 -
 .../src/api_samples/router-update-req.json    |  10 -
 .../src/api_samples/router-update-resp.json   |  24 -
 .../src/api_samples/subnet-create-req.xml     |   6 -
 .../src/api_samples/subnet-create-resp.xml    |  19 -
 .../src/api_samples/subnet-show-resp.xml      |  19 -
 .../src/api_samples/subnet-update-req.xml     |   4 -
 .../src/api_samples/subnet-update-resp.xml    |  19 -
 .../api_samples/subnets-create-bulk-resp.xml  |  39 -
 .../src/api_samples/subnets-get-resp.xml      |  39 -
 .../subnets-post-create-bulk-req.xml          |  15 -
 .../version-v2-neutron-get-resp.xml           |  35 -
 api-ref/src/wadls/netconn-api/src/common.ent  | 405 ++++++----
 .../wadls/netconn-api/src/os-networks.wadl    | 748 ------------------
 .../firewalls/firewall-create-request.json}   |   0
 .../firewalls/firewall-create-response.json}  |   0
 .../firewall-policies-list-response.json}     |   0
 .../firewall-policy-create-request.json}      |   0
 .../firewall-policy-create-response.json}     |   0
 .../firewall-policy-insert-rule-request.json} |   0
 ...firewall-policy-insert-rule-response.json} |   0
 .../firewall-policy-remove-rule-request.json} |   0
 ...firewall-policy-remove-rule-response.json} |   0
 .../firewall-policy-show-response.json}       |   0
 .../firewall-policy-update-request.json}      |   0
 .../firewall-policy-update-response.json}     |   0
 .../firewall-rule-create-request.json}        |   0
 .../firewall-rule-create-response.json}       |   0
 .../firewall-rule-show-response.json}         |   0
 .../firewall-rule-update-request.json}        |   0
 .../firewall-rule-update-response.json}       |   0
 .../firewall-rules-list-response.json}        |   0
 .../firewalls/firewall-show-response.json}    |   0
 .../firewalls/firewall-update-request.json}   |   0
 .../firewalls/firewall-update-response.json}  |   0
 .../firewalls/firewalls-list-response.json}   |   0
 .../healthmonitor-associate-request.json      |   5 +
 .../healthmonitor-associate-response.json     |   3 +
 .../lbaas/healthmonitor-create-request.json}  |   0
 .../lbaas/healthmonitor-create-response.json} |   0
 .../lbaas/healthmonitor-show-response.json}   |   0
 .../lbaas/healthmonitor-update-request.json}  |   0
 .../lbaas/healthmonitor-update-response.json} |   0
 .../lbaas/healthmonitors-list-response.json}  |   0
 .../lbaas/listener-create-request.json}       |   0
 .../lbaas/listener-create-response.json}      |   0
 .../lbaas/listener-show-response.json}        |   0
 .../lbaas/listener-update-request.json}       |   0
 .../lbaas/listener-update-response.json}      |   0
 .../lbaas/listeners-list-response.json}       |   0
 .../lbaas/loadbalancer-create-request.json}   |   0
 .../lbaas/loadbalancer-create-response.json}  |   0
 .../lbaas/loadbalancer-delete-response.json   |   8 +
 .../lbaas/loadbalancer-show-response.json}    |   0
 .../lbaas/loadbalancer-update-request.json}   |   0
 .../lbaas/loadbalancer-update-response.json}  |   0
 .../lbaas/loadbalancer-update-response.txt}   |   0
 .../lbaas/loadbalancers-list-response.json}   |   0
 .../lbaas/member-create-request.json}         |   0
 .../lbaas/member-create-response.json}        |   0
 .../lbaas/member-show-response.json}          |   0
 .../lbaas/member-update-request.json}         |   0
 .../lbaas/member-update-response.json}        |   0
 .../samples/lbaas/members-list-response.json  |  24 +
 .../lbaas/pool-create-request.json}           |   0
 .../lbaas/pool-create-response.json}          |   0
 .../lbaas}/pool-list-resp.json                |   0
 .../lbaas/pool-members-list-response.json}    |   0
 .../lbaas/pool-show-response.json}            |   0
 .../samples/lbaas/pool-update-request.json    |   5 +
 .../samples/lbaas/pool-update-response.json   |  16 +
 .../samples/lbaas/pools-list-response.json    |  24 +
 .../samples/lbaas/pools-list-response2.json   |  20 +
 .../lbaas/vip-create-request.json}            |   2 +-
 .../lbaas/vip-create-response.json}           |   2 +-
 .../lbaas/vip-show-response.json}             |   2 +-
 .../lbaas/vip-update-request.json}            |   2 +-
 .../lbaas/vip-update-response.json}           |   2 +-
 .../lbaas/vips-list-response.json}            |   2 +-
 .../metering-label-create-request.json}       |   2 +-
 .../metering-label-create-response.json}      |   0
 ...tering-label-delete-request-json-http.txt} |   0
 ...ering-label-delete-response-json-http.txt} |   0
 .../metering-label-rule-create-request.json}  |   2 +-
 .../metering-label-rule-create-response.json} |   2 +-
 ...g-label-rule-delete-request-json-http.txt} |   0
 ...-label-rule-delete-response-json-http.txt} |   0
 ...ing-label-rule-show-request-json-http.txt} |   0
 .../metering-label-rule-show-response.json}   |   2 +-
 ...ng-label-rules-list-request-json-http.txt} |   0
 .../metering-label-rules-list-response.json}  |   2 +-
 ...metering-label-show-request-json-http.txt} |   0
 .../metering-label-show-response.json}        |   0
 ...etering-labels-list-request-json-http.txt} |   0
 .../metering-labels-list-response.json}       |   0
 .../networks/extension-show-response.json}    |   0
 .../networks/extensions-list-response.json}   |   0
 .../networks/network-create-request.json}     |   2 +-
 .../networks/network-create-response.json}    |   0
 .../network-multi-create-request.json}        |   2 +-
 .../network-multi-create-response.json}       |   0
 .../networks/network-show-response.json}      |   0
 .../networks/network-update-request.json}     |   2 +-
 .../networks/network-update-response.json}    |   0
 ...work-vlan-transparent-create-request.json} |   0
 ...ork-vlan-transparent-create-response.json} |   0
 ...twork-vlan-transparent-show-response.json} |   0
 .../networks-bulk-create-request.json}        |   2 +-
 .../networks-bulk-create-response.json}       |   2 +-
 .../networks/networks-list-response.json}     |   2 +-
 .../networks-multi-list-response.json}        |   0
 .../networks-multi-show-response.json}        |   0
 ...works-vlan-transparent-list-response.json} |   0
 .../networks/version-show-response.json}      |   2 +-
 .../networks/versions-list-response.json}     |   2 +-
 .../port-bind-create-update-response.json}    |   0
 .../ports/port-bind-show-response.json}       |   0
 .../ports/port-create-request.json}           |   0
 .../ports/port-create-response.json}          |   0
 .../ports/port-show-response.json}            |   0
 .../ports/port-update-request.json}           |   0
 .../ports/port-update-response.json}          |   0
 .../ports/ports-bind-show-response.json}      |   0
 .../ports/ports-bulk-create-request.json}     |   2 +-
 .../ports/ports-bulk-create-response.json}    |   0
 .../ports/ports-list-response.json}           |   0
 .../quotas-list-for-tenant-response.json}     |   0
 .../quotas/quotas-list-response.json}         |   0
 .../quotas/quotas-update-request.json}        |   0
 .../quotas/quotas-update-response.json}       |   0
 .../routers/floating-ips-list-response.json}  |   0
 .../routers/floatingip-create-request.json}   |   2 +-
 .../routers/floatingip-create-response.json}  |   0
 .../floatingip-disassociate-request.json}     |   2 +-
 .../floatingip-disassociate-response.json}    |   0
 .../routers/floatingip-show-response.json}    |   0
 .../routers/floatingip-update-request.json}   |   2 +-
 .../routers/floatingip-update-response.json}  |   0
 .../router-add-interface-request.json}        |   0
 .../router-add-interface-response.json}       |   0
 .../routers/router-create-request.json}       |   0
 .../routers/router-create-response.json}      |   0
 .../router-remove-interface-request.json}     |   0
 .../router-remove-interface-response.json}    |   0
 .../routers/router-show-response.json}        |   0
 .../routers/router-update-request.json}       |   0
 .../routers/router-update-response.json}      |   0
 .../routers/routers-list-response.json}       |   0
 .../security-group-create-request.json}       |   2 +-
 .../security-group-create-response.json}      |   2 +-
 ...curity-group-delete-request-json-http.txt} |   0
 ...urity-group-delete-response-json-http.txt} |   0
 .../security-group-rule-create-request.json}  |   2 +-
 .../security-group-rule-create-response.json} |   2 +-
 ...y-group-rule-delete-request-json-http.txt} |   0
 ...-group-rule-delete-response-json-http.txt} |   0
 ...ity-group-rule-show-request-json-http.txt} |   0
 .../security-group-rule-show-response.json}   |   2 +-
 ...ty-group-rules-list-request-json-http.txt} |   0
 .../security-group-rules-list-response.json}  |   2 +-
 ...security-group-show-request-json-http.txt} |   0
 .../security-group-show-response.json}        |   2 +-
 .../security-group-update-request.json}       |   0
 .../security-group-update-response.json}      |   0
 ...ecurity-groups-list-request-json-http.txt} |   0
 .../security-groups-list-response.json}       |   2 +-
 .../service-type-response.json}               |   0
 .../subnets/subnet-create-request.json}       |   0
 .../subnets/subnet-create-response.json}      |   0
 .../subnets/subnet-show-response.json}        |   0
 .../subnets/subnet-update-request.json}       |   0
 .../subnets/subnet-update-response.json}      |   0
 .../subnets/subnetpool-create-request.json}   |   0
 .../subnets/subnetpool-create-response.json}  |   0
 .../subnets/subnetpool-show-response.json}    |   0
 .../subnets/subnetpool-update-request.json}   |   0
 .../subnets/subnetpool-update-response.json}  |   0
 .../subnets/subnetpools-list-response.json}   |   0
 .../subnets/subnets-create-bulk-request.json} |   0
 .../subnets-create-bulk-response.json}        |   0
 .../subnets/subnets-list-response.json}       |   0
 .../vpn/ikepolicies-list-response.json}       |   0
 .../vpn/ikepolicy-create-request.json}        |   0
 .../vpn/ikepolicy-create-response.json}       |   0
 .../vpn/ikepolicy-show-response.json}         |   0
 .../vpn/ikepolicy-update-request.json}        |   0
 .../vpn/ikepolicy-update-response.json}       |   0
 ...ipsec-site-connection-create-request.json} |   0
 ...psec-site-connection-create-response.json} |   0
 .../ipsec-site-connection-show-response.json} |   0
 ...ipsec-site-connection-update-request.json} |   0
 ...psec-site-connection-update-response.json} |   0
 ...ipsec-site-connections-list-response.json} |   0
 .../vpn/ipsecpolicies-list-response.json}     |   0
 .../vpn/ipsecpolicy-create-request.json}      |   0
 .../vpn/ipsecpolicy-create-response.json}     |   0
 .../vpn/ipsecpolicy-show-response.json}       |   0
 .../vpn/ipsecpolicy-update-request.json}      |   0
 .../vpn/ipsecpolicy-update-response.json}     |   0
 .../vpn-endpoint-group-create-request.json}   |   0
 .../vpn-endpoint-group-create-response.json}  |   0
 .../vpn-endpoint-group-show-response.json}    |   0
 .../vpn-endpoint-group-update-request.json}   |   0
 .../vpn-endpoint-group-update-response.json}  |   0
 .../vpn-endpoint-groups-list-response.json}   |   0
 .../vpn/vpnservice-create-request.json}       |   0
 .../vpn/vpnservice-create-response.json}      |   0
 .../vpn/vpnservice-show-response.json}        |   0
 .../vpn/vpnservice-update-request.json}       |   0
 .../vpn/vpnservice-update-response.json}      |   0
 .../vpn/vpnservices-list-response.json}       |   0
 .../firewalls.wadl}                           |  31 +-
 .../{os-layer3-ext.wadl => wadl/layer3.wadl}  | 196 +++--
 .../lbaas-v1.0.wadl}                          |  71 +-
 .../lbaas-v2.0.wadl}                          |  78 +-
 .../src/{ => wadl}/metering-labels.wadl       | 109 ++-
 .../networks-multi-provider.wadl}             |  37 +-
 .../networks-provider.wadl}                   |  91 +--
 .../networks-vlan-transparency.wadl}          |  38 +-
 .../wadls/netconn-api/src/wadl/networks.wadl  | 589 ++++++++++++++
 .../ports-binding.wadl}                       |  74 +-
 .../src/{os-ports.wadl => wadl/ports.wadl}    | 112 +--
 .../src/{os-quotas.wadl => wadl/quotas.wadl}  |  39 +-
 .../{os-routers.wadl => wadl/routers.wadl}    |  43 +-
 .../src/{ => wadl}/security-groups.wadl       |  87 +-
 .../service-providers.wadl}                   |  12 +-
 .../subnet-pools.wadl}                        |  30 +-
 .../{os-subnets.wadl => wadl/subnets.wadl}    |  92 +--
 .../vpnaas-v2.0.wadl}                         |  78 +-
 268 files changed, 1577 insertions(+), 2865 deletions(-)
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-req.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update.req.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update.req.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/Pool-put-update-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/extension.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/extensions.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-get-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/hms-get-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-delete-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/member-get-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/neutron-versions-response.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/pool-put-req.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/pool-put-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/pool-put-update.req.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/pools-get-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port-bind-get-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port-post-create-req.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port_bind_create_or_update_resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port_create_req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port_create_resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port_update_req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/port_update_resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/ports-bind-get-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/ports-create-bulk-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/router-update-req.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/router-update-resp.json
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/api_samples/version-v2-neutron-get-resp.xml
 delete mode 100644 api-ref/src/wadls/netconn-api/src/os-networks.wadl
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall-create-req.json => samples/firewalls/firewall-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall-create-res.json => samples/firewalls/firewall-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policies-list-res.json => samples/firewalls/firewall-policies-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-create-req.json => samples/firewalls/firewall-policy-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-create-res.json => samples/firewalls/firewall-policy-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-insert-rule-req.json => samples/firewalls/firewall-policy-insert-rule-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-insert-rule-res.json => samples/firewalls/firewall-policy-insert-rule-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-remove-rule-req.json => samples/firewalls/firewall-policy-remove-rule-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-remove-rule-res.json => samples/firewalls/firewall-policy-remove-rule-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-show-res.json => samples/firewalls/firewall-policy-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-update-req.json => samples/firewalls/firewall-policy-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_policy-update-res.json => samples/firewalls/firewall-policy-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_rule-create-req.json => samples/firewalls/firewall-rule-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_rule-create-res.json => samples/firewalls/firewall-rule-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_rule-show-res.json => samples/firewalls/firewall-rule-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_rule-update-req.json => samples/firewalls/firewall-rule-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_rule-update-res.json => samples/firewalls/firewall-rule-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall_rules-list-res.json => samples/firewalls/firewall-rules-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall-show-res.json => samples/firewalls/firewall-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall-update-req.json => samples/firewalls/firewall-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewall-update-res.json => samples/firewalls/firewall-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/firewall/firewalls-list-res.json => samples/firewalls/firewalls-list-response.json} (100%)
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-request.json
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-response.json
 rename api-ref/src/wadls/netconn-api/src/{api_samples/HealthMonitor-post-req.json => samples/lbaas/healthmonitor-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/HealthMonitor-get-detail-resp.json => samples/lbaas/healthmonitor-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/HealthMonitor-post-resp.json => samples/lbaas/healthmonitor-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/healthmonitor-put-req.json => samples/lbaas/healthmonitor-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/healthmonitor-put-resp.json => samples/lbaas/healthmonitor-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/healthmonitor-list-resp.json => samples/lbaas/healthmonitors-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/listener-post-req.json => samples/lbaas/listener-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/listener-post-resp.json => samples/lbaas/listener-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/listener-get-detail-resp.json => samples/lbaas/listener-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/listener-put-req.json => samples/lbaas/listener-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/listener-put-resp.json => samples/lbaas/listener-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/listener-list-resp.json => samples/lbaas/listeners-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/loadbalancer-post-req.json => samples/lbaas/loadbalancer-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/loadbalancer-post-resp.json => samples/lbaas/loadbalancer-create-response.json} (100%)
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-delete-response.json
 rename api-ref/src/wadls/netconn-api/src/{api_samples/loadbalancer-get-detail-resp.json => samples/lbaas/loadbalancer-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/loadbalancer-put-req.json => samples/lbaas/loadbalancer-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/loadbalancer-put-resp.json => samples/lbaas/loadbalancer-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/loadbalancer-put-resp.txt => samples/lbaas/loadbalancer-update-response.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/loadbalancer-list-resp.json => samples/lbaas/loadbalancers-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/Member-post-req.json => samples/lbaas/member-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/Member-post-resp.json => samples/lbaas/member-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/Member-get-detail-resp.json => samples/lbaas/member-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/member-put-req.json => samples/lbaas/member-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/member-put-resp.json => samples/lbaas/member-update-response.json} (100%)
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/members-list-response.json
 rename api-ref/src/wadls/netconn-api/src/{api_samples/pool-post-req.json => samples/lbaas/pool-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/pool-post-resp.json => samples/lbaas/pool-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples => samples/lbaas}/pool-list-resp.json (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/member-list-resp.json => samples/lbaas/pool-members-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/pool-get-detail-resp.json => samples/lbaas/pool-show-response.json} (100%)
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-request.json
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-response.json
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response.json
 create mode 100644 api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response2.json
 rename api-ref/src/wadls/netconn-api/src/{api_samples/VIP-post-req.json => samples/lbaas/vip-create-request.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/VIP-post-resp.json => samples/lbaas/vip-create-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/VIP-get-detail-resp.json => samples/lbaas/vip-show-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/VIP-put-update-req.json => samples/lbaas/vip-update-request.json} (96%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/VIP-put-update-resp.json => samples/lbaas/vip-update-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vips-get-resp.json => samples/lbaas/vips-list-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-create-req.json => samples/metering-labels/metering-label-create-request.json} (98%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-create-resp.json => samples/metering-labels/metering-label-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-delete-req-json-http.txt => samples/metering-labels/metering-label-delete-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-delete-resp-json-http.txt => samples/metering-labels/metering-label-delete-response-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rule-create-req.json => samples/metering-labels/metering-label-rule-create-request.json} (98%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rule-create-resp.json => samples/metering-labels/metering-label-rule-create-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rule-delete-req-json-http.txt => samples/metering-labels/metering-label-rule-delete-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rule-delete-resp-json-http.txt => samples/metering-labels/metering-label-rule-delete-response-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rule-get-req-json-http.txt => samples/metering-labels/metering-label-rule-show-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rule-get-resp.json => samples/metering-labels/metering-label-rule-show-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rules-list-get-req-json-http.txt => samples/metering-labels/metering-label-rules-list-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-rules-list-get-resp.json => samples/metering-labels/metering-label-rules-list-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-get-req-json-http.txt => samples/metering-labels/metering-label-show-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-label-get-resp.json => samples/metering-labels/metering-label-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-labels-list-get-req-json-http.txt => samples/metering-labels/metering-labels-list-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/metering-labels-list-get-resp.json => samples/metering-labels/metering-labels-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/extension.json => samples/networks/extension-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/extensions.json => samples/networks/extensions-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-post-req.json => samples/networks/network-create-request.json} (97%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-post-resp.json => samples/networks/network-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-multi-post-req.json => samples/networks/network-multi-create-request.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-multi-post-resp.json => samples/networks/network-multi-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-get-detail-resp.json => samples/networks/network-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-put-update.req.json => samples/networks/network-update-request.json} (97%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-put-update-resp.json => samples/networks/network-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-vlan-transparent-post-req.json => samples/networks/network-vlan-transparent-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/network-vlan-transparent-post-resp.json => samples/networks/network-vlan-transparent-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-vlan-transparent-get-detail-resp.json => samples/networks/network-vlan-transparent-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-post-create-bulk-req.json => samples/networks/networks-bulk-create-request.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-create-bulk-resp.json => samples/networks/networks-bulk-create-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-get-resp.json => samples/networks/networks-list-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-multi-list-resp.json => samples/networks/networks-multi-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-multi-get-detail-resp.json => samples/networks/networks-multi-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/networks-vlan-transparent-resp.json => samples/networks/networks-vlan-transparent-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/version-v2-neutron-get-resp.json => samples/networks/version-show-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/neutron-versions-response.json => samples/networks/versions-list-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/port_bind_create_or_update_resp.json => samples/ports/port-bind-create-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/port-bind-get-resp.json => samples/ports/port-bind-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/port_create_req.json => samples/ports/port-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/port_create_resp.json => samples/ports/port-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/port-get-resp.json => samples/ports/port-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/port_update_req.json => samples/ports/port-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/port_update_resp.json => samples/ports/port-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/ports-bind-get-resp.json => samples/ports/ports-bind-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/ports-post-create-bulk-req.json => samples/ports/ports-bulk-create-request.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/ports-create-bulk-resp.json => samples/ports/ports-bulk-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/ports-get-resp.json => samples/ports/ports-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/quotas-put-req.json => samples/quotas/quotas-list-for-tenant-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/quotas-list-resp.json => samples/quotas/quotas-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/quotas-show-resp.json => samples/quotas/quotas-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/quotas-put-resp.json => samples/quotas/quotas-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floating-ips-get-resp.json => samples/routers/floating-ips-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floatingip-post-req.json => samples/routers/floatingip-create-request.json} (98%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floatingip-post-resp.json => samples/routers/floatingip-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floatingip-put-disassociate-update.req.json => samples/routers/floatingip-disassociate-request.json} (96%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floatingip-put-disassociate-update-resp.json => samples/routers/floatingip-disassociate-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floatingip-get-detail-resp.json => samples/routers/floatingip-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floatingip-put-update.req.json => samples/routers/floatingip-update-request.json} (97%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/floatingip-put-update-resp.json => samples/routers/floatingip-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-add-interface.req.json => samples/routers/router-add-interface-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-add-interface-resp.json => samples/routers/router-add-interface-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-post-req.json => samples/routers/router-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-post-resp.json => samples/routers/router-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-remove-interface-req.json => samples/routers/router-remove-interface-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-remove-interface-resp.json => samples/routers/router-remove-interface-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-get-detail-resp.json => samples/routers/router-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-put-update.req.json => samples/routers/router-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/router-put-update-resp.json => samples/routers/router-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/routers-get-resp.json => samples/routers/routers-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-create-req.json => samples/security-groups/security-group-create-request.json} (98%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-create-resp.json => samples/security-groups/security-group-create-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-delete-req-json-http.txt => samples/security-groups/security-group-delete-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-delete-resp-json-http.txt => samples/security-groups/security-group-delete-response-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-create-req.json => samples/security-groups/security-group-rule-create-request.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-create-resp.json => samples/security-groups/security-group-rule-create-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-delete-req-json-http.txt => samples/security-groups/security-group-rule-delete-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-delete-resp-json-http.txt => samples/security-groups/security-group-rule-delete-response-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-get-req-json-http.txt => samples/security-groups/security-group-rule-show-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-get-resp.json => samples/security-groups/security-group-rule-show-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-list-get-req-json-http.txt => samples/security-groups/security-group-rules-list-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/rules-security-groups-list-get-resp.json => samples/security-groups/security-group-rules-list-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-get-req-json-http.txt => samples/security-groups/security-group-show-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-get-resp.json => samples/security-groups/security-group-show-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-update-req.json => samples/security-groups/security-group-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-update-resp.json => samples/security-groups/security-group-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-list-get-req-json-http.txt => samples/security-groups/security-groups-list-request-json-http.txt} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/security-groups-list-get-resp.json => samples/security-groups/security-groups-list-response.json} (99%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/service-type-resp.json => samples/service-type-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnet-create-req.json => samples/subnets/subnet-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnet-create-resp.json => samples/subnets/subnet-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnet-show-resp.json => samples/subnets/subnet-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnet-update-req.json => samples/subnets/subnet-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnet-update-resp.json => samples/subnets/subnet-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnetpool-create-req.json => samples/subnets/subnetpool-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnetpool-create-resp.json => samples/subnets/subnetpool-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnetpool-show-resp.json => samples/subnets/subnetpool-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnetpool-update-req.json => samples/subnets/subnetpool-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnetpool-update-resp.json => samples/subnets/subnetpool-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnetpools-get-resp.json => samples/subnets/subnetpools-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnets-post-create-bulk-req.json => samples/subnets/subnets-create-bulk-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnets-create-bulk-resp.json => samples/subnets/subnets-create-bulk-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/subnets-get-resp.json => samples/subnets/subnets-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ikepolicy-list-res.json => samples/vpn/ikepolicies-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ikepolicy-create-req.json => samples/vpn/ikepolicy-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ikepolicy-create-res.json => samples/vpn/ikepolicy-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ikepolicy-show-res.json => samples/vpn/ikepolicy-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ikepolicy-update-req.json => samples/vpn/ikepolicy-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ikepolicy-update-res.json => samples/vpn/ikepolicy-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsec-site-connection-create-req.json => samples/vpn/ipsec-site-connection-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsec-site-connection-create-res.json => samples/vpn/ipsec-site-connection-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsec-site-connection-show-res.json => samples/vpn/ipsec-site-connection-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsec-site-connection-update-req.json => samples/vpn/ipsec-site-connection-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsec-site-connection-update-res.json => samples/vpn/ipsec-site-connection-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsec-site-connection-list-res.json => samples/vpn/ipsec-site-connections-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsecpolicy-list-res.json => samples/vpn/ipsecpolicies-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsecpolicy-create-req.json => samples/vpn/ipsecpolicy-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsecpolicy-create-res.json => samples/vpn/ipsecpolicy-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsecpolicy-show-res.json => samples/vpn/ipsecpolicy-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsecpolicy-update-req.json => samples/vpn/ipsecpolicy-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/ipsecpolicy-update-res.json => samples/vpn/ipsecpolicy-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpn-endpoint-group-create-req.json => samples/vpn/vpn-endpoint-group-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpn-endpoint-group-create-res.json => samples/vpn/vpn-endpoint-group-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpn-endpoint-group-show-res.json => samples/vpn/vpn-endpoint-group-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpn-endpoint-group-update-req.json => samples/vpn/vpn-endpoint-group-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpn-endpoint-group-update-res.json => samples/vpn/vpn-endpoint-group-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpn-endpoint-group-list-res.json => samples/vpn/vpn-endpoint-groups-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpnservice-create-req.json => samples/vpn/vpnservice-create-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpnservice-create-res.json => samples/vpn/vpnservice-create-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpnservice-show-res.json => samples/vpn/vpnservice-show-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpnservice-update-req.json => samples/vpn/vpnservice-update-request.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpnservice-update-res.json => samples/vpn/vpnservice-update-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{api_samples/vpn/vpnservice-list-res.json => samples/vpn/vpnservices-list-response.json} (100%)
 rename api-ref/src/wadls/netconn-api/src/{os-fwaasv2.0-ext.wadl => wadl/firewalls.wadl} (86%)
 rename api-ref/src/wadls/netconn-api/src/{os-layer3-ext.wadl => wadl/layer3.wadl} (82%)
 rename api-ref/src/wadls/netconn-api/src/{os-lbaasv1.0-ext.wadl => wadl/lbaas-v1.0.wadl} (88%)
 rename api-ref/src/wadls/netconn-api/src/{os-lbaasv2.0-ext.wadl => wadl/lbaas-v2.0.wadl} (95%)
 rename api-ref/src/wadls/netconn-api/src/{ => wadl}/metering-labels.wadl (80%)
 rename api-ref/src/wadls/netconn-api/src/{os-networks-multi-provider-ext.wadl => wadl/networks-multi-provider.wadl} (76%)
 rename api-ref/src/wadls/netconn-api/src/{os-networks-provider-ext.wadl => wadl/networks-provider.wadl} (59%)
 rename api-ref/src/wadls/netconn-api/src/{os-networks-vlan-transparency-ext.wadl => wadl/networks-vlan-transparency.wadl} (75%)
 create mode 100644 api-ref/src/wadls/netconn-api/src/wadl/networks.wadl
 rename api-ref/src/wadls/netconn-api/src/{os-ports-binding-ext.wadl => wadl/ports-binding.wadl} (65%)
 rename api-ref/src/wadls/netconn-api/src/{os-ports.wadl => wadl/ports.wadl} (67%)
 rename api-ref/src/wadls/netconn-api/src/{os-quotas.wadl => wadl/quotas.wadl} (86%)
 rename api-ref/src/wadls/netconn-api/src/{os-routers.wadl => wadl/routers.wadl} (69%)
 rename api-ref/src/wadls/netconn-api/src/{ => wadl}/security-groups.wadl (80%)
 rename api-ref/src/wadls/netconn-api/src/{os-service-type.wadl => wadl/service-providers.wadl} (85%)
 rename api-ref/src/wadls/netconn-api/src/{os-subnetpools-ext.wadl => wadl/subnet-pools.wadl} (84%)
 rename api-ref/src/wadls/netconn-api/src/{os-subnets.wadl => wadl/subnets.wadl} (71%)
 rename api-ref/src/wadls/netconn-api/src/{os-vpnaasv2.0-ext.wadl => wadl/vpnaas-v2.0.wadl} (87%)

diff --git a/api-ref/src/docbkx/ch_netconn-v2-ext.xml b/api-ref/src/docbkx/ch_netconn-v2-ext.xml
index 38048da2a..3dc4a3952 100644
--- a/api-ref/src/docbkx/ch_netconn-v2-ext.xml
+++ b/api-ref/src/docbkx/ch_netconn-v2-ext.xml
@@ -17,11 +17,11 @@
         <para>Lists available Networking API v2.0 extensions and shows details for an
             extension.</para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/netconn-api/src/os-networks.wadl#extensions">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/networks.wadl#extensions">
                 <wadl:method href="#listExtensions"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-networks.wadl#extension">
-                <wadl:method href="#getExtension"/>
+            <wadl:resource href="../wadls/netconn-api/src/wadl/networks.wadl#extension">
+                <wadl:method href="#showExtension"/>
             </wadl:resource>
         </wadl:resources>
     </section>
@@ -35,10 +35,10 @@
             A quota value of <code>-1</code> means that quota has no limit.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/netconn-api/src/os-quotas.wadl#Quotas">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/quotas.wadl#quotas">
                 <wadl:method href="#listQuotas"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-quotas.wadl#tenant_id">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/quotas.wadl#tenant_id">
                 <wadl:method href="#listQuotasForTenant"/>
                 <wadl:method href="#updateQuota"/>
                 <wadl:method href="#resetQuota"/>
@@ -49,11 +49,11 @@
         <title>Networks provider extended attributes (networks)</title>
         <para>Lists, creates, shows information for, updates, and deletes networks.</para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/netconn-api/src/os-networks-provider-ext.wadl#ProviderNetworks">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/networks-provider.wadl#ProviderNetworks">
                 <wadl:method href="#listProviderNetworks"/>
                 <wadl:method href="#createProviderNetwork"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-networks-provider-ext.wadl#network_id">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/networks-provider.wadl#network_id">
                 <wadl:method href="#showProviderNetwork"/>
                 <wadl:method href="#updateProviderNetwork"/>
                 <wadl:method href="#deleteProviderNetwork"/>
@@ -62,13 +62,19 @@
     </section>
     <section xml:id="network_multi_provider-ext">
         <title>Networks multiple provider extension (networks)</title>
-        <para>Enables administrative users to define multiple physical bindings for an OpenStack
-            Networking network and list or show details for networks with multiple physical
-            bindings.</para>
-        <para>You cannot update any <code>provider</code> attributes. If you try to do so, an
-            error occurs.</para>
-        <para>To delete a network with multiple physical bindings, issue a normal delete network
-            request.</para>
+        <para>
+            Enables administrative users to define multiple physical bindings
+            for an OpenStack Networking network and list or show details for
+            networks with multiple physical bindings.
+        </para>
+        <para>
+            You cannot update any <code>provider</code> attributes. If you try
+            to do so, an error occurs.
+        </para>
+        <para>
+            To delete a network with multiple physical bindings, issue a
+            normal delete network request.
+        </para>
         <para>
             To define multiple physical bindings for a network, include a
             <code>segments</code> list in the request body of a <code>POST
@@ -80,15 +86,15 @@
             <code>provider:segmentation_id</code>. The validation rules for
             these attributes are the same as for the <link
             xlink:href="http://developer.openstack.org/api-ref-networking-v2.html#network_provider-ext">Networks
-            provider extended attributes</link>. You cannot use both extensions at the
-            same time.
+            provider extended attributes</link>. You cannot use both
+            extensions at the same time.
         </para>
         <para>
             The NSX and ML2 plug-ins support this extension. With the ML2
             plug-in, you can specify multiple VLANs for a network, a VXLAN
             tunnel ID, and a VLAN.
         </para>
-        <wadl:resources href="../wadls/netconn-api/src/os-networks-multi-provider-ext.wadl"
+        <wadl:resources href="../wadls/netconn-api/src/wadl/networks-multi-provider.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
     <section xml:id="network_vlan_transparency-ext">
@@ -113,18 +119,18 @@
             plug-in, you can set the <code>vlan-transparent</code> attribute
             to either <code>true</code> or <code>false</code>.
         </para>
-        <wadl:resources href="../wadls/netconn-api/src/os-networks-vlan-transparency-ext.wadl"
+        <wadl:resources href="../wadls/netconn-api/src/wadl/networks-vlan-transparency.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
     <section xml:id="port_binding-ext">
         <title>Ports binding extended attributes (ports)</title>
         <para>Lists, creates, shows information for, and updates ports.</para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/netconn-api/src/os-ports-binding-ext.wadl#Ports">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/ports-binding.wadl#ports">
                 <wadl:method href="#listPorts"/>
                 <wadl:method href="#createPort"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-ports-binding-ext.wadl#port_id">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/ports-binding.wadl#port_id">
                 <wadl:method href="#showPort"/>
                 <wadl:method href="#updatePort"/>
                 <wadl:method href="#deletePort"/>
@@ -138,18 +144,18 @@
             security groups.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/netconn-api/src/security-groups.wadl#security_groups">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/security-groups.wadl#security_groups">
                 <wadl:method href="#listSecGroups"/>
                 <wadl:method href="#createSecGroup"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/security-groups.wadl#security_group_id">
-                <wadl:method href="#getSecGroup"/>
+            <wadl:resource href="../wadls/netconn-api/src/wadl/security-groups.wadl#security_group_id">
+                <wadl:method href="#showSecGroup"/>
                 <wadl:method href="#updateSecGroup"/>
                 <wadl:method href="#deleteSecGroup"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="security_group-ruless">
+    <!-- <section xml:id="netconn-security_group-rules">
         <title>Security group rules (security-group-rules)</title>
         <para>
             Lists, creates, shows information for, and deletes security group
@@ -157,46 +163,55 @@
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
-                href="../wadls/netconn-api/src/security-groups.wadl#security_groups_rules">
+                href="../wadls/netconn-api/src/wadl/security-groups.wadl#security_groups_rules">
                 <wadl:method href="#listSecGroupRules"/>
                 <wadl:method href="#createSecGroupRule"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/netconn-api/src/security-groups.wadl#rules-security-groups-id">
-                <wadl:method href="#getSecGroupRule"/>
+                href="../wadls/netconn-api/src/wadl/security-groups.wadl#rules-security-groups-id">
+                <wadl:method href="#showSecGroupRule"/>
                 <wadl:method href="#deleteSecGroupRule"/>
             </wadl:resource>
         </wadl:resources>
-    </section>
+    </section> -->
     <section xml:id="layer3">
         <title>Layer-3 networking</title>
-        <para>Routes packets between subnets, forwards packets from internal networks to external
-            ones, and accesses instances from external networks through floating IPs.</para>
-        <para>This extension introduces these resources:</para>
+        <para>
+            Routes packets between subnets, forwards packets from internal
+            networks to external ones, and accesses instances from external
+            networks through floating IPs.
+        </para>
+        <para>
+            This extension introduces these resources:
+        </para>
         <itemizedlist>
             <listitem>
-                <para><emphasis role="bold">router</emphasis>. A logical entity for forwarding
-                    packets across internal subnets and NATting them on external networks through an
-                    appropriate external gateway.</para>
+                <para>
+                    <emphasis role="bold">router</emphasis>. A logical entity
+                    for forwarding packets across internal subnets and NATting them on external
+                    networks through an appropriate external gateway.
+                </para>
             </listitem>
             <listitem>
-                <para><emphasis role="bold">floatingip</emphasis>. An external IP address that is
-                    mapped to a port that is attached to an internal network.</para>
+                <para>
+                    <emphasis role="bold">floatingip</emphasis>. An external
+                    IP address that you map to a port in an internal network.
+                </para>
             </listitem>
         </itemizedlist>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"
-            href="../wadls/netconn-api/src/os-layer3-ext.wadl"/>
+            href="../wadls/netconn-api/src/wadl/layer3.wadl"/>
     </section>
     <section status="final" xml:id="metering-ext" xmlns:wadl="http://wadl.dev.java.net/2009/02">
         <title>Metering labels and rules</title>
         <para>Creates, modifies, and deletes OpenStack Layer3 metering labels and rules.</para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"
-            href="../wadls/netconn-api/src/metering-labels.wadl"/>
+            href="../wadls/netconn-api/src/wadl/metering-labels.wadl"/>
     </section>
     <section xml:id="fwaas-v2.0">
-        <title>Firewall-as-a-Service (FWaaS) 2.0 (CURRENT)</title>
+        <title>Firewall-as-a-Service (FWaaS) v2.0 (CURRENT)</title>
         <para>
-            The FWaaS extension enables you to deploy firewalls to protect
+            The FWaaS v2.0 extension enables you to deploy firewalls to protect
             your networks.
         </para>
         <para>
@@ -212,8 +227,10 @@
                 rules.</para>
             </listitem>
             <listitem>
-                <para>Create and share firewall policies that hold an
-                    ordered collection of the firewall rules.</para>
+                <para>
+                    Create and share firewall policies that hold an ordered
+                    collection of the firewall rules.
+                </para>
             </listitem>
             <listitem>
                 <para>Audit firewall rules and policies.</para>
@@ -222,9 +239,10 @@
         <para>This extension introduces these resources:</para>
         <itemizedlist>
             <listitem>
-                <para><code>firewall</code>. A logical firewall
+                <para>
+                    <code>firewall</code>. A logical firewall
                     resource that a tenant can instantiate and manage. A
-                    firewall is associated with one firewall policy.
+                    firewall can have one firewall policy.
                 </para>
             </listitem>
             <listitem>
@@ -233,43 +251,43 @@
                     firewall rules. You can share a firewall policy across
                     tenants. You can include a firewall policy as part of an audit workflow
                     so that an authorized relevant entity can audit the firewall policy.
-                    This entity can be different from the tenant who created
-                    or the tenants that use the firewall policy.
+                    This entity can differ from the tenant who created, or the
+                    tenants that use, the firewall policy.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <code>firewall_rule</code>. A collection of
-                    attributes like ports and IP addresses that define match
-                    criteria and action, such as allow or deny, that must be taken
-                    on the matched data traffic.
+                    <code>firewall_rule</code>. A collection of attributes,
+                    such as ports and IP addresses. These attributes define match
+                    criteria and an action to take, such as allow or deny, on matched data
+                    traffic.
                 </para>
             </listitem>
         </itemizedlist>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/netconn-api/src/os-fwaasv2.0-ext.wadl#Firewalls">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/firewalls.wadl#firewalls">
                 <wadl:method href="#listFirewalls"/>
                 <wadl:method href="#createFirewall"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-fwaasv2.0-ext.wadl#firewall_id">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/firewalls.wadl#firewall_id">
                 <wadl:method href="#showFirewall"/>
                 <wadl:method href="#updateFirewall"/>
                 <wadl:method href="#deleteFirewall"/>
             </wadl:resource>
-           <!--  <wadl:resource href="../wadls/netconn-api/src/os-fwaasv2.0-ext.wadl#FirewallPolicies">
+           <!--  <wadl:resource href="../wadls/netconn-api/src/wadl/fwaasv2.0.wadl#FirewallPolicies">
                 <wadl:method href="#listFirewallPolicies"/>
                 <wadl:method href="#createFirewallPolicy"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-fwaasv2.0-ext.wadl#firewallpolicy_id">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/fwaasv2.0.wadl#firewallpolicy_id">
                 <wadl:method href="#showFirewallPolicy"/>
                 <wadl:method href="#updateFirewallPolicy"/>
                 <wadl:method href="#deleteFirewallPolicy"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-fwaasv2.0-ext.wadl#FirewallRules">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/fwaasv2.0.wadl#FirewallRules">
                 <wadl:method href="#listFirewallRules"/>
                 <wadl:method href="#createFirewallRule"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-fwaasv2.0-ext.wadl#firewall_rule_id">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/fwaasv2.0.wadl#firewall_rule_id">
                 <wadl:method href="#showFirewallRule"/>
                 <wadl:method href="#updateFirewallRule"/>
                 <wadl:method href="#deleteFirewallRule"/>
@@ -279,16 +297,14 @@
     <section xml:id="lbaas-v1.0">
         <title>Load-Balancer-as-a-Service (LBaaS) 1.0 (DEPRECATED)</title>
         <para>
-            The LBaaS version 1.0 extension pairs with the Networking 2.0 API
-            to enable OpenStack tenants to manage load balancers for their
-            VMs. With this extension, you can load-balance client traffic from
-            one network to application services, such as VMs, on the same
-            network.
+            The LBaaS v1.0 extension pairs with the Networking v2.0 API to
+            enable OpenStack tenants to manage load balancers for their VMs.
+            With this extension, you can load-balance client traffic from one
+            network to application services, such as VMs, on the same network.
         </para>
         <para>
             Use this extension to create and manage virtual IP addresses
-            (VIPs), pools, members of a pool, health monitors associated with
-            a pool, and view status of a resource.
+            (VIPs), pools, members of a pool, health monitors, and view status of a resource.
         </para>
         <table rules="all" frame="border">
             <caption>Load balancer statuses</caption>
@@ -303,29 +319,29 @@
             <tbody>
                 <tr>
                     <td><para>ACTIVE</para></td>
-                    <td><para>Resource is ready and active.</para></td>
+                    <td><para>The resource is ready and active.</para></td>
                 </tr>
                 <tr>
                     <td><para>PENDING_CREATE</para></td>
-                    <td><para>Resource is being created.</para></td>
+                    <td><para>The resource is being created.</para></td>
                 </tr>
                 <tr>
                     <td><para>PENDING_UPDATE</para></td>
-                    <td><para>Resource is being updated.</para></td>
+                    <td><para>The resource is being updated.</para></td>
                 </tr>
                 <tr>
                     <td><para>PENDING_DELETE</para></td>
-                    <td><para>Resource is pending deletion.</para></td>
+                    <td><para>The resource is pending deletion.</para></td>
                 </tr>
                 <tr>
                     <td><para>INACTIVE</para></td>
-                    <td><para>Resource was created but is not active.</para></td>
+                    <td><para>The resource is not active.</para></td>
                 </tr>
                 <tr>
                     <td><para>ERROR</para></td>
                     <td>
                         <para>
-                            Object within the service is not working. The
+                            An object within the service is not working. The
                             <code>error_details</code> attribute provides an
                             explanation for the error, its cause, and
                             possibly a solution.
@@ -336,7 +352,7 @@
         </table>
         <para></para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"
-            href="../wadls/netconn-api/src/os-lbaasv1.0-ext.wadl"
+            href="../wadls/netconn-api/src/wadl/lbaas-v1.0.wadl"
         > </wadl:resources>
     </section>
     <section xml:id="lbaas-v2.0">
@@ -350,8 +366,7 @@
         </para>
         <para>
             Use this extension to create and manage load balancers, listeners,
-            pools, members of a pool, and health monitors associated with a
-            pool and view status of a resource.
+            pools, members of a pool, and health monitors and view status of a resource.
         </para>
         <table rules="all" frame="border">
             <caption>Load balancer statuses</caption>
@@ -366,28 +381,28 @@
             <tbody>
                 <tr>
                     <td><para>ACTIVE</para></td>
-                    <td><para>Resource is ready and active.</para></td>
+                    <td><para>The resource is ready and active.</para></td>
                 </tr>
                 <tr>
                     <td><para>PENDING_CREATE</para></td>
-                    <td><para>Resource is being created.</para></td>
+                    <td><para>The resource is being created.</para></td>
                 </tr>
                 <tr>
                     <td><para>PENDING_UPDATE</para></td>
-                    <td><para>Resource is being updated.</para></td>
+                    <td><para>The resource is being updated.</para></td>
                 </tr>
                 <tr>
                     <td><para>PENDING_DELETE</para></td>
-                    <td><para>Resource is pending deletion.</para></td>
+                    <td><para>The resource is pending deletion.</para></td>
                 </tr>
                 <tr>
                     <td><para>INACTIVE</para></td>
-                    <td><para>Resource was created but is not active.</para></td>
+                    <td><para>The resource is not active.</para></td>
                 </tr>
                 <tr>
                     <td><para>ERROR</para></td>
                     <td><para>
-                        Object within the service is not working. The
+                        An object within the service is not working. The
                         <code>error_details</code> attribute provides an
                         explanation for the error, its cause, and possibly a
                         solution.
@@ -397,17 +412,17 @@
         </table>
         <para></para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"
-            href="../wadls/netconn-api/src/os-lbaasv2.0-ext.wadl"/>
+            href="../wadls/netconn-api/src/wadl/lbaas-v2.0.wadl"/>
     </section>
     <section xml:id="subnetpools-ext">
         <title>Subnet pools extension (subnetpools)</title>
         <para>Manages subnet pools</para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/netconn-api/src/os-subnetpools-ext.wadl#SubnetPools">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/subnet-pools.wadl#SubnetPools">
                 <wadl:method href="#listSubnetPools"/>
                 <wadl:method href="#createSubnetPool"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/netconn-api/src/os-subnetpools-ext.wadl#subnetpool_id">
+            <wadl:resource href="../wadls/netconn-api/src/wadl/subnet-pools.wadl#subnetpool_id">
                 <wadl:method href="#showSubnetPool"/>
                 <wadl:method href="#updateSubnetPool"/>
                 <wadl:method href="#removeSubnetPool"/>
@@ -456,10 +471,9 @@
             </listitem>
             <listitem>
                 <para>
-                    <code>ikepolicy</code>. The Internet
-                    Key Exchange (IKE) policy that identifies the
-                    authentication and encryption algorithm to use during
-                    phase one and two negotiation of a VPN connection.
+                    <code>ikepolicy</code>. The Internet Key Exchange (IKE)
+                    policy that identifies the authentication and encryption algorithm to use
+                    during phase one and two negotiation of a VPN connection.
                 </para>
             </listitem>
             <listitem>
@@ -471,14 +485,16 @@
                 </para>
             </listitem>
             <listitem>
-                <para><code>ipsec-site-connection</code>. Details for
+                <para>
+                    <code>ipsec-site-connection</code>. Details for
                     the site-to-site IPsec connection, including the peer
                     CIDRs, MTU, authentication mode, peer address, DPD
-                    settings, and status.</para>
+                    settings, and status.
+                </para>
             </listitem>
         </itemizedlist>
          <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"
-            href="../wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl"
+            href="../wadls/netconn-api/src/wadl/vpnaas-v2.0.wadl"
         > </wadl:resources>
     </section>
     <section xml:id="extraroute-ext">
@@ -488,15 +504,16 @@
         <para>You can update a router to add a set of next hop IPs and destination
             CIDRs.</para>
         <note>
-            <para>The next hop IP must be part of a subnet to
-                which the router interfaces are connected. You can
-                configure the <code>routes</code> attribute on only
-                update operations.</para>
+            <para>
+                The next hop IP must be part of a subnet to which the router
+                interfaces are connected. You can configure the
+                <code>routes</code> attribute on only update operations.
+            </para>
         </note>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../wadls/netconn-api/src/os-routers.wadl#router_id">
-                    <wadl:method href="#updateExtraRoutes"/>
-                </wadl:resource>
-            </wadl:resources>
+            <wadl:resource href="../wadls/netconn-api/src/wadl/routers.wadl#router_id">
+                <wadl:method href="#updateExtraRoutes"/>
+            </wadl:resource>
+        </wadl:resources>
     </section>
 </chapter>
diff --git a/api-ref/src/docbkx/ch_netconn-v2.xml b/api-ref/src/docbkx/ch_netconn-v2.xml
index 68f1aaa97..5729b005b 100644
--- a/api-ref/src/docbkx/ch_netconn-v2.xml
+++ b/api-ref/src/docbkx/ch_netconn-v2.xml
@@ -9,29 +9,31 @@
     role="api-reference">
     <title>Networking API v2.0 (CURRENT)</title>
     <para>
-        Use virtual networking services among devices that are managed by the
-        OpenStack Compute service. The Networking (neutron) API v2.0 combines
+        Use virtual networking services among devices that the OpenStack
+        Compute service manages. The Networking (neutron) API v2.0 combines
         the API v1.1 functionality with some essential Internet Protocol
         Address Management (IPAM) functionality. The API enables users to
         associate IP address blocks and other network configuration settings
-        with an OpenStack Networking network. You can choose a specific IP
-        address from the block or let OpenStack Networking choose the first
-        available IP address.
+        with an OpenStack Networking network. You can choose an IP address
+        from the block or let OpenStack Networking choose the first available
+        IP address.
     </para>
-    <para>Effective in the OpenStack Liberty release, XML support in requests
-        and responses was removed for the Networking API v2.0.</para>
-    <section xml:id="neutron-versions-v2">
+    <para>
+        Effective in the OpenStack Liberty release, the Networking API v2.0
+        does not support XML requests and responses.
+    </para>
+    <section xml:id="versions-networks-v2">
         <title>API versions</title>
-        <para>Lists information for all Networking API versions and shows
-            details about API v2.0.</para>
+        <para>
+            Lists information for all Networking API versions and shows
+            details about API v2.0.
+        </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource
-                href="../wadls/netconn-api/src/os-networks.wadl#versions">
-                <wadl:method href="#listVersionsv2-neutron"/>
+            <wadl:resource href="../wadls/netconn-api/src/wadl/networks.wadl#networks-versions">
+                <wadl:method href="#networks-listVersions"/>
             </wadl:resource>
-            <wadl:resource
-                href="../wadls/netconn-api/src/os-networks.wadl#version">
-                <wadl:method href="#showVersionDetailsv2-neutron"/>
+            <wadl:resource href="../wadls/netconn-api/src/wadl/networks.wadl#networks-version">
+                <wadl:method href="#networks-versionDetails"/>
             </wadl:resource>
         </wadl:resources>
     </section>
@@ -41,13 +43,13 @@
             networks.</para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
-                href="../wadls/netconn-api/src/os-networks.wadl#Networks">
+                href="../wadls/netconn-api/src/wadl/networks.wadl#networks">
                 <wadl:method href="#listNetworks"/>
                 <wadl:method href="#createNetwork"/>
                 <wadl:method href="#bulkCreateNetwork"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/netconn-api/src/os-networks.wadl#network_id">
+                href="../wadls/netconn-api/src/wadl/networks.wadl#network_id">
                 <wadl:method href="#showNetwork"/>
                 <wadl:method href="#updateNetwork"/>
                 <wadl:method href="#deleteNetwork"/>
@@ -60,20 +62,20 @@
             Lists, shows information for, creates, updates, and deletes subnet
             resources.
         </para>
-        <wadl:resources href="../wadls/netconn-api/src/os-subnets.wadl"
+        <wadl:resources href="../wadls/netconn-api/src/wadl/subnets.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
     <section xml:id="ports">
         <title>Ports</title>
         <para>Lists, shows information for, creates, updates, and deletes
             ports.</para>
-        <wadl:resources href="../wadls/netconn-api/src/os-ports.wadl"
+        <wadl:resources href="../wadls/netconn-api/src/wadl/ports.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
     <section xml:id="service-type">
         <title>Service providers</title>
         <para>Lists service providers.</para>
-        <wadl:resources href="../wadls/netconn-api/src/os-service-type.wadl"
+        <wadl:resources href="../wadls/netconn-api/src/wadl/service-providers.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
 </chapter>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-req.json
deleted file mode 100644
index f8d8d34ec..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "health_monitor":{
-      "id":"b624decf-d5d3-4c66-9a3d-f047e7786181"
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-resp.json
deleted file mode 100644
index 622fa17f7..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-associate-resp.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "health_monitor":{
-
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update-resp.json
deleted file mode 100644
index 56db860c8..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update-resp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "health_monitor": {
-        "admin_state_up": true,
-        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
-        "delay": 5,
-        "max_retries": 5,
-        "http_method": "GET",
-        "timeout": 1,
-        "pools": [
-            {
-                "status": "PENDING_CREATE",
-                "status_description": null,
-                "pool_id": "6e55751f-6ad4-4e53-b8d4-02e442cd21df"
-            }
-        ],
-        "type": "PING",
-        "id": "b05e44b5-81f9-4551-b474-711a722698f7"
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update.req.json b/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update.req.json
deleted file mode 100644
index cfc0831cc..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-put-update.req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "health_monitor":{
-      "delay":"3"
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update-resp.json
deleted file mode 100644
index ab7fd3418..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update-resp.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-   "member":{
-      "status":"PENDING_UPDATE",
-      "protocol_port":8080,
-      "weight":1,
-      "admin_state_up":false,
-      "tenant_id":"4fd44f30292945e481c7b8a0c8908869",
-      "pool_id":"7803631d-f181-4500-b3a2-1b68ba2a75fd",
-      "address":"10.0.0.5",
-      "status_description":null,
-      "id":"48a471ea-64f1-4eb6-9be7-dae6bbe40a0f"
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update.req.json b/api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update.req.json
deleted file mode 100644
index 61ae6090b..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/Member-put-update.req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "member":{
-      "admin_state_up":false
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Pool-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/Pool-put-update-resp.json
deleted file mode 100644
index 3075ecda0..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/Pool-put-update-resp.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "pool":{
-      "status":"PENDING_UPDATE",
-      "lb_method":"ROUND_ROBIN",
-      "protocol":"TCP",
-      "description":"",
-      "health_monitors":[
-
-      ],
-      "subnet_id":"8032909d-47a1-4715-90af-5153ffe39861",
-      "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
-      "admin_state_up":true,
-      "name":"SuperPool",
-      "members":[
-
-      ],
-      "id":"61b1f87a-7a21-4ad3-9dda-7f81d249944f",
-      "vip_id":null
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/extension.xml b/api-ref/src/wadls/netconn-api/src/api_samples/extension.xml
deleted file mode 100644
index 06ec9bf5e..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/extension.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extension xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <updated>2013-02-03T10:00:00-00:00</updated>
-    <name>agent</name>
-    <links quantum:type="list"/>
-    <alias>agent</alias>
-    <description>The agent management extension.</description>
-</extension>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/extensions.xml b/api-ref/src/wadls/netconn-api/src/api_samples/extensions.xml
deleted file mode 100644
index 4b0052d26..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/extensions.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<extensions xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <extension>
-        <updated>2013-01-20T00:00:00-00:00</updated>
-        <name>Neutron Service Type Management</name>
-        <links quantum:type="list"/>
-        <alias>service-type</alias>
-        <description>API for retrieving service providers for Neutron
-            advanced services</description>
-    </extension>
-    <extension>
-        <updated>2012-10-05T10:00:00-00:00</updated>
-        <name>security-group</name>
-        <links quantum:type="list"/>
-        <alias>security-group</alias>
-        <description>The security groups extension.</description>
-    </extension>
-    <extension>
-        <updated>2013-02-07T10:00:00-00:00</updated>
-        <name>L3 Agent Scheduler</name>
-        <links quantum:type="list"/>
-        <alias>l3_agent_scheduler</alias>
-        <description>Schedule routers among l3 agents</description>
-    </extension>
-    <extension>
-        <updated>2013-02-07T10:00:00-00:00</updated>
-        <name>Loadbalancer Agent Scheduler</name>
-        <links quantum:type="list"/>
-        <alias>lbaas_agent_scheduler</alias>
-        <description>Schedule pools among lbaas agents</description>
-    </extension>
-    <extension>
-        <updated>2013-03-28T10:00:00-00:00</updated>
-        <name>Neutron L3 Configurable external gateway mode</name>
-        <links quantum:type="list"/>
-        <alias>ext-gw-mode</alias>
-        <description>Extension of the router abstraction for
-            specifying whether SNAT should occur on the external
-            gateway</description>
-    </extension>
-    <extension>
-        <updated>2014-02-03T10:00:00-00:00</updated>
-        <name>Port Binding</name>
-        <links quantum:type="list"/>
-        <alias>binding</alias>
-        <description>Expose port bindings of a virtual port to
-            external application</description>
-    </extension>
-    <extension>
-        <updated>2012-09-07T10:00:00-00:00</updated>
-        <name>Provider Network</name>
-        <links quantum:type="list"/>
-        <alias>provider</alias>
-        <description>Expose mapping of virtual networks to physical
-            networks</description>
-    </extension>
-    <extension>
-        <updated>2013-02-03T10:00:00-00:00</updated>
-        <name>agent</name>
-        <links quantum:type="list"/>
-        <alias>agent</alias>
-        <description>The agent management extension.</description>
-    </extension>
-    <extension>
-        <updated>2012-07-29T10:00:00-00:00</updated>
-        <name>Quota management support</name>
-        <links quantum:type="list"/>
-        <alias>quotas</alias>
-        <description>Expose functions for quotas management per
-            tenant</description>
-    </extension>
-    <extension>
-        <updated>2013-02-07T10:00:00-00:00</updated>
-        <name>DHCP Agent Scheduler</name>
-        <links quantum:type="list"/>
-        <alias>dhcp_agent_scheduler</alias>
-        <description>Schedule networks among dhcp agents</description>
-    </extension>
-    <extension>
-        <updated>2013-06-27T10:00:00-00:00</updated>
-        <name>Multi Provider Network</name>
-        <links quantum:type="list"/>
-        <alias>multi-provider</alias>
-        <description>Expose mapping of virtual networks to multiple
-            physical networks</description>
-    </extension>
-    <extension>
-        <updated>2013-01-14T10:00:00-00:00</updated>
-        <name>Neutron external network</name>
-        <links quantum:type="list"/>
-        <alias>external-net</alias>
-        <description>Adds external network attribute to network
-            resource.</description>
-    </extension>
-    <extension>
-        <updated>2012-07-20T10:00:00-00:00</updated>
-        <name>Neutron L3 Router</name>
-        <links quantum:type="list"/>
-        <alias>router</alias>
-        <description>Router abstraction for basic L3 forwarding
-            between L2 Neutron networks and access to external
-            networks via a NAT gateway.</description>
-    </extension>
-    <extension>
-        <updated>2013-07-23T10:00:00-00:00</updated>
-        <name>Allowed Address Pairs</name>
-        <links quantum:type="list"/>
-        <alias>allowed-address-pairs</alias>
-        <description>Provides allowed address pairs</description>
-    </extension>
-    <extension>
-        <updated>2013-03-17T12:00:00-00:00</updated>
-        <name>Neutron Extra DHCP opts</name>
-        <links quantum:type="list"/>
-        <alias>extra_dhcp_opt</alias>
-        <description>Extra options configuration for DHCP. For example
-            PXE boot options to DHCP clients can be specified (e.g.
-            tftp-server, server-ip-address,
-            bootfile-name)</description>
-    </extension>
-    <extension>
-        <updated>2012-10-07T10:00:00-00:00</updated>
-        <name>LoadBalancing service</name>
-        <links quantum:type="list"/>
-        <alias>lbaas</alias>
-        <description>Extension for LoadBalancing service</description>
-    </extension>
-    <extension>
-        <updated>2013-02-01T10:00:00-00:00</updated>
-        <name>Neutron Extra Route</name>
-        <links quantum:type="list"/>
-        <alias>extraroute</alias>
-        <description>Extra routes configuration for L3
-            router</description>
-    </extension>
-</extensions>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-get-resp.json
deleted file mode 100644
index f5b98e85a..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-get-resp.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "health_monitors": [
-        {
-            "admin_state_up": true,
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "delay": 10,
-            "max_retries": 1,
-            "timeout": 1,
-            "type": "PING",
-            "id": "466c8345-28d8-4f84-a246-e04380b0461d"
-        },
-        {
-            "admin_state_up": true,
-            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
-            "delay": 5,
-            "expected_codes": "200",
-            "max_retries": 2,
-            "http_method": "GET",
-            "timeout": 2,
-            "url_path": "/",
-            "type": "HTTP",
-            "id": "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/hms-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/hms-get-resp.json
deleted file mode 100644
index f0c925eef..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/hms-get-resp.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-   "health_monitors":[
-      {
-         "admin_state_up":true,
-         "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
-         "delay":10,
-         "max_retries":1,
-         "timeout":1,
-         "type":"PING",
-         "id":"466c8345-28d8-4f84-a246-e04380b0461d"
-      },
-      {
-         "admin_state_up":true,
-         "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
-         "delay":5,
-         "expected_codes":"200",
-         "max_retries":2,
-         "http_method":"GET",
-         "timeout":2,
-         "url_path":"/",
-         "type":"HTTP",
-         "id":"5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-delete-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-delete-resp.json
deleted file mode 100644
index 004d15535..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-delete-resp.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-   "loadbalancer":{
-      "active_connections":0,
-      "total_connections":0,
-      "bytes_in":0,
-      "bytes_out":0
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/member-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/member-get-resp.json
deleted file mode 100644
index 30a118c43..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/member-get-resp.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-   "members":[
-      {
-         "status":"ACTIVE",
-         "weight":1,
-         "admin_state_up":true,
-         "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
-         "pool_id":"72741b06-df4d-4715-b142-276b6bce75ab",
-         "address":"10.0.0.4",
-         "protocol_port":80,
-         "id":"701b531b-111a-4f21-ad85-4795b7b12af6"
-      },
-      {
-         "status":"ACTIVE",
-         "weight":1,
-         "admin_state_up":true,
-         "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
-         "pool_id":"72741b06-df4d-4715-b142-276b6bce75ab",
-         "address":"10.0.0.3",
-         "protocol_port":80,
-         "id":"beb53b4d-230b-4abd-8118-575b8fa006ef"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml
deleted file mode 100644
index 9b4d2e932..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<network>
-    <name>sample_network2</name>
-</network>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml
deleted file mode 100644
index 4f7ffca8f..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <status>ACTIVE</status>
-    <subnets quantum:type="list"/>
-    <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>c220b026-ece1-4ead-873f-83537f4c9f92</id>
-    <provider:segmentation_id xsi:nil="true"/>
-</network>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml
deleted file mode 100644
index 07ab2e390..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/neutron/router/api/v1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <status>ACTIVE</status>
-    <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>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>af374017-c9ae-4a1d-b799-ab73111476e2</id>
-    <provider:segmentation_id xsi:nil="true"/>
-</network>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml
deleted file mode 100644
index 3d3b5b139..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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">
-    <name>sample-network-4-updated</name>
-</network>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml
deleted file mode 100644
index ea64cdc95..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <network>
-        <status>ACTIVE</status>
-        <subnets quantum:type="list"/>
-        <name>sample_network_5</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>1f370095-98f6-4079-be64-6d3d4a6adcc6</id>
-        <provider:segmentation_id xsi:nil="true"/>
-    </network>
-    <network>
-        <status>ACTIVE</status>
-        <subnets quantum:type="list"/>
-        <name>sample_network_6</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>ee2d3158-3e80-4fb3-ba87-c99f515d85e7</id>
-        <provider:segmentation_id xsi:nil="true"/>
-    </network>
-</networks>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml
deleted file mode 100644
index 5e66675b8..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/neutron/router/api/v1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <status>ACTIVE</status>
-    <subnets>
-        <subnet>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</subnet>
-    </subnets>
-    <name>private-network</name>
-    <admin_state_up quantum:type="bool">True</admin_state_up>
-    <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-    <shared quantum:type="bool">True</shared>
-    <id>d32019d3-bc6e-4319-9c1d-6722fc136a22</id>
-</network>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml
deleted file mode 100644
index 680bd4292..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/neutron/router/api/v1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <network>
-        <status>ACTIVE</status>
-        <subnets>
-            <subnet>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</subnet>
-        </subnets>
-        <name>private-network</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>
-        <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>08eae331-0402-425a-923c-34f7cfe39c1b</subnet>
-        </subnets>
-        <name>private</name>
-        <provider:physical_network xsi:nil="true"/>
-        <admin_state_up quantum:type="bool">True</admin_state_up>
-        <tenant_id>26a7980765d0414dbc1fc1f88cdb7e6e</tenant_id>
-        <provider:network_type>local</provider:network_type>
-        <router:external quantum:type="bool">True</router:external>
-        <shared quantum:type="bool">True</shared>
-        <id>db193ab3-96e3-4cb3-8fc5-05f4296d0324</id>
-        <provider:segmentation_id xsi:nil="true"/>
-    </network>
-</networks>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml
deleted file mode 100644
index 6e746e6b6..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<networks>
-    <network>
-        <name>sample_network_5</name>
-    </network>
-    <network>
-        <name>sample_network_6</name>
-    </network>
-</networks>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/neutron-versions-response.xml b/api-ref/src/wadls/netconn-api/src/api_samples/neutron-versions-response.xml
deleted file mode 100644
index a72ab3e10..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/neutron-versions-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<versions xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <version>
-        <status>CURRENT</status>
-        <id>v2.0</id>
-        <links>
-            <link>
-                <href>http://23.253.228.211:9696/v2.0</href>
-                <rel>self</rel>
-            </link>
-        </links>
-    </version>
-</versions>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-req.json
deleted file mode 100644
index 56b206b35..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-req.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "pool": {
-        "admin_state_up": false,
-        "description": "pool two",
-        "lb_algorithm": "LEAST_CONNECTIONS",
-        "name": "pool2",
-        "session_persistence": {
-            "type": "HTTP_COOKIE"
-        }
-    }
-}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-resp.json
deleted file mode 100644
index ac3867ad3..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-resp.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "pool": {
-        "admin_state_up": false,
-        "description": "pool two",
-        "healthmonitor_id": null,
-        "id": "12ff63af-4127-4074-a251-bcb2ecc53ebe",
-        "lb_algorithm": "LEAST_CONNECTIONS",
-        "listeners": [
-            {
-                "id": "39de4d56-d663-46e5-85a1-5b9d5fa17829"
-            }
-        ],
-        "members": [],
-        "name": "pool2",
-        "protocol": "HTTP",
-        "session_persistence": {
-            "cookie_name": null,
-            "type": "HTTP_COOKIE"
-        },
-        "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c"
-    }
-}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-update.req.json b/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-update.req.json
deleted file mode 100644
index 3ff8458bb..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/pool-put-update.req.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "pool":{
-      "name":"SuperPool"
-   }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pools-get-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/pools-get-resp.json
deleted file mode 100644
index a67cad912..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/pools-get-resp.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-   "pools":[
-      {
-         "status":"ACTIVE",
-         "lb_method":"ROUND_ROBIN",
-         "protocol":"HTTP",
-         "description":"",
-         "health_monitors":[
-            "466c8345-28d8-4f84-a246-e04380b0461d",
-            "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
-         ],
-         "subnet_id":"8032909d-47a1-4715-90af-5153ffe39861",
-         "tenant_id":"83657cfcdfe44cd5920adaf26c48ceea",
-         "admin_state_up":true,
-         "name":"app_pool",
-         "members":[
-            "701b531b-111a-4f21-ad85-4795b7b12af6",
-            "beb53b4d-230b-4abd-8118-575b8fa006ef"
-         ],
-         "id":"72741b06-df4d-4715-b142-276b6bce75ab",
-         "vip_id":"4ec89087-d057-4e2c-911f-60a3b47ee304"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port-bind-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port-bind-get-resp.xml
deleted file mode 100644
index eefdd1b4b..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port-bind-get-resp.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>
-    <binding:host_id>devstack</binding:host_id>
-    <name/>
-    <allowed_address_pairs quantum:type="list"/>
-    <admin_state_up quantum:type="bool">True</admin_state_up>
-    <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-    <tenant_id>7e02058126cc4950b75f9970368ba177</tenant_id>
-    <extra_dhcp_opts quantum:type="list"/>
-    <binding:vif_details>
-        <port_filter quantum:type="bool">True</port_filter>
-        <ovs_hybrid_plug quantum:type="bool">True</ovs_hybrid_plug>
-    </binding:vif_details>
-    <binding:vif_type>ovs</binding:vif_type>
-    <device_owner>network:router_interface</device_owner>
-    <mac_address>fa:16:3e:23:fd:d7</mac_address>
-    <binding:profile quantum:type="dict"/>
-    <binding:vnic_type>normal</binding:vnic_type>
-    <fixed_ips>
-        <fixed_ip>
-            <subnet_id>a0304c3a-4f08-4c43-88af-d796509c97d2</subnet_id>
-            <ip_address>10.0.0.1</ip_address>
-        </fixed_ip>
-    </fixed_ips>
-    <id>46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2</id>
-    <security_groups quantum:type="list"/>
-    <device_id>5e3898d7-11be-483e-9732-b2f5eccd2b2e</device_id>
-</port>
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
deleted file mode 100644
index c42669c59..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<port xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <status>ACTIVE</status>
-    <name/>
-    <allowed_address_pairs quantum:type="list"/>
-    <admin_state_up quantum:type="bool">True</admin_state_up>
-    <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-    <tenant_id>7e02058126cc4950b75f9970368ba177</tenant_id>
-    <extra_dhcp_opts quantum:type="list"/>
-    <device_owner>network:router_interface</device_owner>
-    <mac_address>fa:16:3e:23:fd:d7</mac_address>
-    <fixed_ips>
-        <fixed_ip>
-            <subnet_id>a0304c3a-4f08-4c43-88af-d796509c97d2</subnet_id>
-            <ip_address>10.0.0.1</ip_address>
-        </fixed_ip>
-    </fixed_ips>
-    <id>46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2</id>
-    <security_groups quantum:type="list"/>
-    <device_id>5e3898d7-11be-483e-9732-b2f5eccd2b2e</device_id>
-</port>
diff --git 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
deleted file mode 100644
index 4d3e21cd1..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port-post-create-req.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "port": {
-        "network_id": "ee2d3158-3e80-4fb3-ba87-c99f515d85e7",
-        "admin_state_up": true
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_bind_create_or_update_resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port_bind_create_or_update_resp.xml
deleted file mode 100644
index 30af2e855..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port_bind_create_or_update_resp.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/>
-    <name>test_port_1</name>
-    <allowed_address_pairs quantum:type="list"/>
-    <admin_state_up quantum:type="bool">True</admin_state_up>
-    <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-    <tenant_id>d6700c0c9ffa4f1cb322cd4a1f3906fa</tenant_id>
-    <binding:vif_details quantum:type="dict"/>
-    <binding:vnic_type>normal</binding:vnic_type>
-    <binding:vif_type>unbound</binding:vif_type>
-    <device_owner/>
-    <mac_address>fa:16:3e:09:e3:47</mac_address>
-    <binding:profile quantum:type="dict"/>
-    <fixed_ips>
-        <fixed_ip>
-            <subnet_id>a0304c3a-4f08-4c43-88af-d796509c97d2</subnet_id>
-            <ip_address>10.0.0.4</ip_address>
-        </fixed_ip>
-    </fixed_ips>
-    <id>8021790b-4bfd-46ab-bcc7-0ef2f73bff43</id>
-    <security_groups>
-        <security_group>f0ac4394-7e4a-4409-9701-ba8be283dbc3</security_group>
-    </security_groups>
-    <device_id/>
-</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port_create_req.xml
deleted file mode 100644
index 9f1dd6cfd..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<port>
-    <name>test_port_1</name>
-    <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port_create_resp.xml
deleted file mode 100644
index de9ba0d6b..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<port xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <status>DOWN</status>
-    <name>test_port_1</name>
-    <allowed_address_pairs quantum:type="list"/>
-    <admin_state_up quantum:type="bool">True</admin_state_up>
-    <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-    <tenant_id>d6700c0c9ffa4f1cb322cd4a1f3906fa</tenant_id>
-    <device_owner/>
-    <mac_address>fa:16:3e:09:e3:47</mac_address>
-    <fixed_ips>
-        <fixed_ip>
-            <subnet_id>a0304c3a-4f08-4c43-88af-d796509c97d2</subnet_id>
-            <ip_address>10.0.0.4</ip_address>
-        </fixed_ip>
-    </fixed_ips>
-    <id>8021790b-4bfd-46ab-bcc7-0ef2f73bff43</id>
-    <security_groups>
-        <security_group>f0ac4394-7e4a-4409-9701-ba8be283dbc3</security_group>
-    </security_groups>
-    <device_id/>
-</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_update_req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port_update_req.xml
deleted file mode 100644
index d9c3accf3..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port_update_req.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<port>
-    <name>test-for-port-update</name>
-    <device_owner>compute:nova</device_owner>
-</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_update_resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/port_update_resp.xml
deleted file mode 100644
index 2146f0342..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/port_update_resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<port xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <status>DOWN</status>
-    <name>test-for-port-update</name>
-    <allowed_address_pairs quantum:type="list"/>
-    <admin_state_up quantum:type="bool">True</admin_state_up>
-    <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-    <tenant_id>d6700c0c9ffa4f1cb322cd4a1f3906fa</tenant_id>
-    <device_owner>compute:nova</device_owner>
-    <mac_address>fa:16:3e:11:11:5e</mac_address>
-    <fixed_ips>
-        <fixed_ip>
-            <subnet_id>898dec4a-74df-4193-985f-c76721bcc746</subnet_id>
-            <ip_address>20.20.0.4</ip_address>
-        </fixed_ip>
-    </fixed_ips>
-    <id>43c831e0-19ce-4a76-9a49-57b57e69428b</id>
-    <security_groups>
-        <security_group>ce0179d6-8a94-4f7c-91c2-f3038e2acbd0</security_group>
-    </security_groups>
-    <device_id/>
-</port>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-bind-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/ports-bind-get-resp.xml
deleted file mode 100644
index 96c4b987f..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/ports-bind-get-resp.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ports 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">
-    <port>
-        <status>ACTIVE</status>
-        <binding:host_id>devstack</binding:host_id>
-        <name/>
-        <allowed_address_pairs quantum:type="list"/>
-        <admin_state_up quantum:type="bool">True</admin_state_up>
-        <network_id>70c1db1f-b701-45bd-96e0-a313ee3430b3</network_id>
-        <tenant_id/>
-        <extra_dhcp_opts quantum:type="list"/>
-        <binding:vif_details>
-            <port_filter quantum:type="bool">True</port_filter>
-            <ovs_hybrid_plug quantum:type="bool"
-                >True</ovs_hybrid_plug>
-        </binding:vif_details>
-        <binding:vif_type>ovs</binding:vif_type>
-        <device_owner>network:router_gateway</device_owner>
-        <mac_address>fa:16:3e:58:42:ed</mac_address>
-        <binding:profile quantum:type="dict"/>
-        <binding:vnic_type>normal</binding:vnic_type>
-        <fixed_ips>
-            <fixed_ip>
-                <subnet_id>008ba151-0b8c-4a67-98b5-0d2b87666062</subnet_id>
-                <ip_address>172.24.4.2</ip_address>
-            </fixed_ip>
-        </fixed_ips>
-        <id>d80b1a3b-4fc1-49f3-952e-1e2ab7081d8b</id>
-        <security_groups quantum:type="list"/>
-        <device_id>9ae135f4-b6e0-4dad-9e91-3c223e385824</device_id>
-    </port>
-    <port>
-        <status>ACTIVE</status>
-        <binding:host_id>devstack</binding:host_id>
-        <name/>
-        <allowed_address_pairs quantum:type="list"/>
-        <admin_state_up quantum:type="bool">True</admin_state_up>
-        <network_id>f27aa545-cbdd-4907-b0c6-c9e8b039dcc2</network_id>
-        <tenant_id>d397de8a63f341818f198abb0966f6f3</tenant_id>
-        <extra_dhcp_opts quantum:type="list"/>
-        <binding:vif_details>
-            <port_filter quantum:type="bool">True</port_filter>
-            <ovs_hybrid_plug quantum:type="bool"
-                >True</ovs_hybrid_plug>
-        </binding:vif_details>
-        <binding:vif_type>ovs</binding:vif_type>
-        <device_owner>network:router_interface</device_owner>
-        <mac_address>fa:16:3e:bb:3c:e4</mac_address>
-        <binding:profile quantum:type="dict"/>
-        <binding:vnic_type>normal</binding:vnic_type>
-        <fixed_ips>
-            <fixed_ip>
-                <subnet_id>288bf4a1-51ba-43b6-9d0a-520e9005db17</subnet_id>
-                <ip_address>10.0.0.1</ip_address>
-            </fixed_ip>
-        </fixed_ips>
-        <id>f71a6703-d6de-4be1-a91a-a570ede1d159</id>
-        <security_groups quantum:type="list"/>
-        <device_id>9ae135f4-b6e0-4dad-9e91-3c223e385824</device_id>
-    </port>
-</ports>
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
deleted file mode 100644
index 106e1258f..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/ports-create-bulk-resp.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ports xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <port>
-        <status>DOWN</status>
-        <name>test_port_1-xml</name>
-        <allowed_address_pairs quantum:type="list"/>
-        <admin_state_up quantum:type="bool">True</admin_state_up>
-        <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-        <tenant_id>d6700c0c9ffa4f1cb322cd4a1f3906fa</tenant_id>
-        <device_owner/>
-        <mac_address>fa:16:3e:fa:e2:34</mac_address>
-        <fixed_ips>
-            <fixed_ip>
-                <subnet_id>a0304c3a-4f08-4c43-88af-d796509c97d2</subnet_id>
-                <ip_address>10.0.0.7</ip_address>
-            </fixed_ip>
-        </fixed_ips>
-        <id>054e8f14-4082-400e-afcc-5d6e5b3bcc0c</id>
-        <security_groups>
-            <security_group>f0ac4394-7e4a-4409-9701-ba8be283dbc3</security_group>
-        </security_groups>
-        <device_id/>
-    </port>
-    <port>
-        <status>DOWN</status>
-        <name>test_port_2-xml</name>
-        <allowed_address_pairs quantum:type="list"/>
-        <admin_state_up quantum:type="bool">True</admin_state_up>
-        <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-        <tenant_id>d6700c0c9ffa4f1cb322cd4a1f3906fa</tenant_id>
-        <device_owner/>
-        <mac_address>fa:16:3e:e6:cf:d9</mac_address>
-        <fixed_ips>
-            <fixed_ip>
-                <subnet_id>a0304c3a-4f08-4c43-88af-d796509c97d2</subnet_id>
-                <ip_address>10.0.0.8</ip_address>
-            </fixed_ip>
-        </fixed_ips>
-        <id>879e96f9-6dd5-4232-bd19-3f39d0ae463b</id>
-        <security_groups>
-            <security_group>f0ac4394-7e4a-4409-9701-ba8be283dbc3</security_group>
-        </security_groups>
-        <device_id/>
-    </port>
-</ports>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.xml
deleted file mode 100644
index cd1b8e66e..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ports xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <port>
-        <status>ACTIVE</status>
-        <name/>
-        <allowed_address_pairs quantum:type="list"/>
-        <admin_state_up quantum:type="bool">True</admin_state_up>
-        <network_id>70c1db1f-b701-45bd-96e0-a313ee3430b3</network_id>
-        <tenant_id/>
-        <extra_dhcp_opts quantum:type="list"/>
-        <device_owner>network:router_gateway</device_owner>
-        <mac_address>fa:16:3e:58:42:ed</mac_address>
-        <fixed_ips>
-            <fixed_ip>
-                <subnet_id>008ba151-0b8c-4a67-98b5-0d2b87666062</subnet_id>
-                <ip_address>172.24.4.2</ip_address>
-            </fixed_ip>
-        </fixed_ips>
-        <id>d80b1a3b-4fc1-49f3-952e-1e2ab7081d8b</id>
-        <security_groups quantum:type="list"/>
-        <device_id>9ae135f4-b6e0-4dad-9e91-3c223e385824</device_id>
-    </port>
-    <port>
-        <status>ACTIVE</status>
-        <name/>
-        <allowed_address_pairs quantum:type="list"/>
-        <admin_state_up quantum:type="bool">True</admin_state_up>
-        <network_id>f27aa545-cbdd-4907-b0c6-c9e8b039dcc2</network_id>
-        <tenant_id>d397de8a63f341818f198abb0966f6f3</tenant_id>
-        <extra_dhcp_opts quantum:type="list"/>
-        <device_owner>network:router_interface</device_owner>
-        <mac_address>fa:16:3e:bb:3c:e4</mac_address>
-        <fixed_ips>
-            <fixed_ip>
-                <subnet_id>288bf4a1-51ba-43b6-9d0a-520e9005db17</subnet_id>
-                <ip_address>10.0.0.1</ip_address>
-            </fixed_ip>
-        </fixed_ips>
-        <id>f71a6703-d6de-4be1-a91a-a570ede1d159</id>
-        <security_groups quantum:type="list"/>
-        <device_id>9ae135f4-b6e0-4dad-9e91-3c223e385824</device_id>
-    </port>
-</ports>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.xml
deleted file mode 100644
index ebb9daec3..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ports>
-    <port>
-        <name>test_port_1-xml</name>
-        <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-    </port>
-    <port>
-        <name>test_port_2-xml</name>
-        <network_id>a87cc70a-3e15-4acf-8205-9b711a3531b7</network_id>
-    </port>
-</ports>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-update-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/router-update-req.json
deleted file mode 100644
index 3e46e92ab..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/router-update-req.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "router": {
-        "routes": [
-            {
-                "nexthop": "10.1.0.10",
-                "destination": "40.0.1.0/24"
-            }
-        ]
-    }
-}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-update-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/router-update-resp.json
deleted file mode 100644
index a36f9f12a..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/router-update-resp.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "router": {
-        "status": "ACTIVE",
-        "external_gateway_info": {
-            "network_id": "5c26e0bb-a9a9-429c-9703-5c417a221096",
-            "external_fixed_ips": [
-                {
-                    "subnet_id": "255.255.255.0",
-                    "ip": "192.168.10.2"
-                }
-            ]
-        },
-        "name": "router1",
-        "admin_state_up": true,
-        "tenant_id": "936fa220b2c24a87af51026439af7a3e",
-        "routes": [
-            {
-                "nexthop": "10.1.0.10",
-                "destination": "40.0.1.0/24"
-            }
-        ],
-        "id": "babc8173-46f6-4b6f-8b95-38c1683a4e22"
-    }
-}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml
deleted file mode 100644
index 72b021a9d..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<subnet>
-    <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
-    <ip_version>4</ip_version>
-    <cidr>10.0.0.1</cidr>
-</subnet>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml
deleted file mode 100644
index 7204df804..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<subnet>
-    <name>test_subnet_1</name>
-    <enable_dhcp>True</enable_dhcp>
-    <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
-    <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-    <dns_nameservers/>
-    <allocation_pools>
-        <allocation_pool>
-            <start>192.0.0.2</start>
-            <end>192.255.255.254</end>
-        </allocation_pool>
-    </allocation_pools>
-    <host_routes/>
-    <ip_version>4</ip_version>
-    <gateway_ip>192.0.0.1</gateway_ip>
-    <cidr>192.0.0.0/8</cidr>
-    <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
-</subnet>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml
deleted file mode 100644
index 7204df804..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<subnet>
-    <name>test_subnet_1</name>
-    <enable_dhcp>True</enable_dhcp>
-    <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
-    <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-    <dns_nameservers/>
-    <allocation_pools>
-        <allocation_pool>
-            <start>192.0.0.2</start>
-            <end>192.255.255.254</end>
-        </allocation_pool>
-    </allocation_pools>
-    <host_routes/>
-    <ip_version>4</ip_version>
-    <gateway_ip>192.0.0.1</gateway_ip>
-    <cidr>192.0.0.0/8</cidr>
-    <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
-</subnet>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.xml
deleted file mode 100644
index 4a6218afc..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<subnet>
-    <name>my_subnet</name>
-</subnet>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml
deleted file mode 100644
index 1575b85d1..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<subnet>
-    <name>my_subnet</name>
-    <enable_dhcp>True</enable_dhcp>
-    <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
-    <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-    <dns_nameservers/>
-    <allocation_pools>
-        <allocation_pool>
-            <start>192.0.0.2</start>
-            <end>192.255.255.254</end>
-        </allocation_pool>
-    </allocation_pools>
-    <host_routes/>
-    <ip_version>4</ip_version>
-    <gateway_ip>192.0.0.1</gateway_ip>
-    <cidr>192.0.0.0/8</cidr>
-    <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
-</subnet>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml
deleted file mode 100644
index b00267fcf..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<subnets>
-    <subnet>
-        <name>test_subnet_1</name>
-        <enable_dhcp>True</enable_dhcp>
-        <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
-        <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
-        <dns_nameservers/>
-        <allocation_pools>
-            <allocation_pool>
-                <start>10.0.0.2</start>
-                <end>10.255.255.254</end>
-            </allocation_pool>
-        </allocation_pools>
-        <host_routes/>
-        <ip_version>4</ip_version>
-        <gateway_ip>10.0.0.1</gateway_ip>
-        <cidr>10.0.0.0/8</cidr>
-        <id>bd3fd365-fe19-431a-be63-07017a09316c</id>
-    </subnet>
-    <subnet>
-        <name>test_subnet_2</name>
-        <enable_dhcp>True</enable_dhcp>
-        <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
-        <tenant_id>60cd4f6dbc2f491982a284e7b83b5be3</tenant_id>
-        <dns_nameservers/>
-        <allocation_pools>
-            <allocation_pool>
-                <start>192.168.0.2</start>
-                <end>192.168.255.254</end>
-            </allocation_pool>
-        </allocation_pools>
-        <host_routes/>
-        <ip_version>4</ip_version>
-        <gateway_ip>192.168.0.1</gateway_ip>
-        <cidr>192.168.0.0/16</cidr>
-        <id>86e7c838-fb75-402b-9dbf-d68166e3f5fe</id>
-    </subnet>
-</subnets>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml
deleted file mode 100644
index a97d48798..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<subnets>
-    <subnet>
-        <name>private-subnet</name>
-        <enable_dhcp>True</enable_dhcp>
-        <network_id>db193ab3-96e3-4cb3-8fc5-05f4296d0324</network_id>
-        <tenant_id>26a7980765d0414dbc1fc1f88cdb7e6e</tenant_id>
-        <dns_nameservers/>
-        <allocation_pools>
-            <allocation_pool>
-                <start>10.0.0.2</start>
-                <end>10.0.0.254</end>
-            </allocation_pool>
-        </allocation_pools>
-        <host_routes/>
-        <ip_version>4</ip_version>
-        <gateway_ip>10.0.0.1</gateway_ip>
-        <cidr>10.0.0.0/24</cidr>
-        <id>08eae331-0402-425a-923c-34f7cfe39c1b</id>
-    </subnet>
-    <subnet>
-        <name>my_subnet</name>
-        <enable_dhcp>True</enable_dhcp>
-        <network_id>d32019d3-bc6e-4319-9c1d-6722fc136a22</network_id>
-        <tenant_id>4fd44f30292945e481c7b8a0c8908869</tenant_id>
-        <dns_nameservers/>
-        <allocation_pools>
-            <allocation_pool>
-                <start>192.0.0.2</start>
-                <end>192.255.255.254</end>
-            </allocation_pool>
-        </allocation_pools>
-        <host_routes/>
-        <ip_version>4</ip_version>
-        <gateway_ip>192.0.0.1</gateway_ip>
-        <cidr>192.0.0.0/8</cidr>
-        <id>54d6f61d-db07-451c-9ab3-b9609b6b6f0b</id>
-    </subnet>
-</subnets>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.xml b/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.xml
deleted file mode 100644
index 0c19cc2df..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<subnets>
-    <subnet>
-        <name>test_subnet_1</name>
-        <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
-        <cidr>10.0.0.0/8</cidr>
-        <ip_version>4</ip_version>
-    </subnet>
-    <subnet>
-        <name>test_subnet_2</name>
-        <network_id>a3775a7d-9f8b-4148-be81-c84bbd0837ce</network_id>
-        <cidr>192.168.0.0/16</cidr>
-        <ip_version>4</ip_version>
-    </subnet>
-</subnets>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/version-v2-neutron-get-resp.xml b/api-ref/src/wadls/netconn-api/src/api_samples/version-v2-neutron-get-resp.xml
deleted file mode 100644
index 00bedbad1..000000000
--- a/api-ref/src/wadls/netconn-api/src/api_samples/version-v2-neutron-get-resp.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns="http://openstack.org/quantum/api/v2.0"
-    xmlns:quantum="http://openstack.org/quantum/api/v2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <resource>
-        <links>
-            <link>
-                <href>http://23.253.228.211:9696/v2.0/subnets</href>
-                <rel>self</rel>
-            </link>
-        </links>
-        <name>subnet</name>
-        <collection>subnets</collection>
-    </resource>
-    <resource>
-        <links>
-            <link>
-                <href>http://23.253.228.211:9696/v2.0/networks</href>
-                <rel>self</rel>
-            </link>
-        </links>
-        <name>network</name>
-        <collection>networks</collection>
-    </resource>
-    <resource>
-        <links>
-            <link>
-                <href>http://23.253.228.211:9696/v2.0/ports</href>
-                <rel>self</rel>
-            </link>
-        </links>
-        <name>port</name>
-        <collection>ports</collection>
-    </resource>
-</resources>
diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent
index 8b3ecfb0f..74722f4e6 100644
--- a/api-ref/src/wadls/netconn-api/src/common.ent
+++ b/api-ref/src/wadls/netconn-api/src/common.ent
@@ -2,10 +2,6 @@
        A collection of common faults, these are pretty much expected
        in every request. -->
 <!ENTITY commonFaults '
-<response xmlns="http://wadl.dev.java.net/2009/02">
-   <representation mediaType="application/xml" element="csapi:computeFault"/>
-   <representation mediaType="application/json"/>
-</response>
 <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
    <representation mediaType="application/xml" element="csapi:serviceUnavailable"/>
    <representation mediaType="application/json"/>
@@ -42,7 +38,7 @@
       element="csapi:serviceUnavailable"/>
     <representation mediaType="application/json"/>
 </response>'>
-  <!ENTITY fault500 '
+<!ENTITY fault500 '
 <response status="500" xmlns="http://wadl.dev.java.net/2009/02">
     <representation mediaType="application/xml"
       element="csapi:Internal-server-error"/>
@@ -125,9 +121,136 @@
       Holds build in progress which occurs when an operation fails
       because the server is in the process of being built.
 -->
+<!-- TEMPLATE PARAMETERS -->
+<!ENTITY firewall_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="firewall_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Firewall UUID">
+    <para>
+      The UUID of the firewall.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY floating_ip_idTemplateParameter '
+<param
+  xmlns="http://wadl.dev.java.net/2009/02"
+  name="floatingip_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Floating IP ID">
+    <para>
+      The UUID of the floating IP.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY metering_label_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="metering_label_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+    <para>
+      The UUID of the metering label.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY metering_label_rule_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="metering_label_rule_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+    <para>
+      The UUID of the metering label rule.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY network_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
+      name="network_id" style="template" type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+    <para>
+      The UUID of the network.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY port_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  type="csapi:UUID" style="template" required="true" name="port_id">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Port UUID">
+    <para>
+      The UUID of the port.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY router_idTemplateParameter '
+<param
+  xmlns="http://wadl.dev.java.net/2009/02"
+  name="router_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Router ID">
+    <para>
+      The UUID of the router.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY security_group_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
+    name="security_group_id" style="template" type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+    <para>
+      The UUID of the security group.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY security_group_rule_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" required="true"
+    name="security_group_rule_id" style="template" type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+    <para>
+      The UUID of the security group rule.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY subnet_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="subnet_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Subnet UUID">
+    <para>
+      The UUID of the subnet.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY subnetpool_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="subnetpool_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Subnet pool UUID">
+    <para>
+      The UUID of the subnet pool.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY tenant_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02" name="tenant_id" style="template"
+  type="csapi:UUID">
+  <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Tenant UUID">
+    <para>
+      The UUID of the tenant.
+    </para>
+  </wadl:doc>
+</param>'>
 <!ENTITY tenantIdOwnerNetwork '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -169,7 +292,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -214,7 +337,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -493,7 +616,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="subnet_id" style="plain" type="csapi:uuid">
+      name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -524,7 +647,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="network_id" style="plain" type="csapi:uuid">
+      name="network_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -588,7 +711,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="device_id" style="plain" type="csapi:uuid">
+      name="device_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -655,7 +778,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="network_id" style="plain" type="csapi:uuid">
+      name="network_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -664,7 +787,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="tenant_id" style="plain" type="csapi:uuid">
+      name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -730,7 +853,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="subnet_id" style="plain" type="csapi:uuid">
+      name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -748,7 +871,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="id" style="plain" type="csapi:uuid">
+      name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -766,7 +889,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="device_id" style="plain" type="csapi:uuid">
+      name="device_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -818,7 +941,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="network_id" style="query" type="csapi:uuid">
+      name="network_id" style="query" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -827,7 +950,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="tenant_id" style="query" type="csapi:uuid">
+      name="tenant_id" style="query" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -857,7 +980,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="port_id" style="query" type="csapi:uuid">
+      name="port_id" style="query" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -875,7 +998,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="device_id" style="query" type="csapi:uuid">
+      name="device_id" style="query" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -901,7 +1024,7 @@
     &portCommonResponseParams;'>
 <!ENTITY portBindingRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="binding:host_id" style="plain" type="csapi:uuid">
+      name="binding:host_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -934,7 +1057,7 @@
 </param>'>
 <!ENTITY portBindingResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="binding:host_id" style="plain" type="csapi:uuid">
+      name="binding:host_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -1055,7 +1178,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="network_id" style="plain" type="csapi:uuid">
+  name="network_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
   xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -1121,7 +1244,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="id" style="plain" type="csapi:uuid">
+  name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
   xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -1223,7 +1346,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-  name="network_id" style="query" type="csapi:uuid">
+  name="network_id" style="query" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns="http://docbook.org/ns/docbook"
     xml:lang="EN">
@@ -1264,7 +1387,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-  name="id" style="query" type="csapi:uuid">
+  name="id" style="query" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns="http://docbook.org/ns/docbook"
     xml:lang="EN">
@@ -1321,7 +1444,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="network_id" style="plain" type="csapi:uuid">
+  name="network_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns="http://docbook.org/ns/docbook"
     xml:lang="EN">
@@ -1849,7 +1972,7 @@
 </param>'>
 <!ENTITY tenant-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -1860,7 +1983,7 @@
 </param>'>
 <!ENTITY idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -1893,7 +2016,7 @@
 </param>'>
 <!ENTITY network-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="network_id" style="plain" type="csapi:uuid">
+    name="network_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -1904,7 +2027,7 @@
 </param>'>
 <!ENTITY device-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="device_id" style="plain" type="csapi:uuid">
+    name="device_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -1926,7 +2049,7 @@
 </param>'>
 <!ENTITY subnet-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -1970,7 +2093,7 @@
 </param>'>
 <!ENTITY port-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="port_id" style="plain" type="csapi:uuid">
+    name="port_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2018,7 +2141,7 @@
 </param>'>
 <!ENTITY floating-network-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="floating_network_id" style="plain" type="csapi:uuid">
+    name="floating_network_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2045,7 +2168,7 @@
 </param>'>
 <!ENTITY floatingip-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2089,7 +2212,7 @@
 </param>'>
 <!ENTITY router-idParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="router_id" style="plain" type="csapi:uuid">
+    name="router_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2123,7 +2246,7 @@
 <!ENTITY floatingipCreateRequestParams '
 &floating-ipParameter;
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2137,7 +2260,7 @@
 &fixed-ip-addressParameter;
 &floating-ip-addressParameter;
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="port_id" style="plain" type="csapi:uuid">
+    name="port_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2190,7 +2313,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="tenant_id" style="plain" type="csapi:uuid">
+  name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
   xmlns:wadl="http://wadl.dev.java.net/2009/02"
   xml:lang="EN">
@@ -2233,7 +2356,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="vip_subnet_id" style="plain" type="csapi:uuid">
+  name="vip_subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
@@ -2244,7 +2367,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="id" style="plain" type="csapi:uuid">
+  name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
@@ -2297,7 +2420,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="vip_subnet_id" style="plain" type="csapi:uuid">
+    name="vip_subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2307,7 +2430,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2423,7 +2546,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2501,7 +2624,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2511,7 +2634,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2521,7 +2644,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="vip_id" style="plain" type="csapi:uuid">
+    name="vip_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2598,7 +2721,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2608,7 +2731,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2649,7 +2772,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2659,7 +2782,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="vip_id" style="plain" type="csapi:uuid">
+    name="vip_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2712,7 +2835,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="health_monitor_id" style="plain" type="csapi:uuid">
+    name="health_monitor_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2722,7 +2845,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2788,7 +2911,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2800,7 +2923,7 @@
 </param>'>
 <!ENTITY poolCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2842,7 +2965,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="subnet_id" style="plain" type="csapi:uuid">
+  name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
     <para>
@@ -2877,7 +3000,7 @@
 </param>'>
 <!ENTITY poolCreateRequestParamsv2 '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -2919,7 +3042,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="subnet_id" style="plain" type="csapi:uuid">
+  name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
     <para>
@@ -2953,7 +3076,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="listener_id" style="plain" type="csapi:uuid">
+    name="listener_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
     <para>
@@ -2973,7 +3096,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="default_pool_id" style="plain" type="csapi:uuid">
+    name="default_pool_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3003,7 +3126,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3059,7 +3182,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="loadbalancer_id" style="plain" type="csapi:uuid">
+    name="loadbalancer_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
     <para>
@@ -3141,7 +3264,7 @@
 </param>'>
 <!ENTITY CommonMeteringLabelResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3171,7 +3294,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3213,7 +3336,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="metering_label_id" style="plain" type="csapi:uuid">
+    name="metering_label_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3277,7 +3400,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="metering_label_id" style="plain" type="csapi:uuid">
+    name="metering_label_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3287,7 +3410,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3340,7 +3463,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="metering_label_id" style="plain" type="csapi:uuid">
+  name="metering_label_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
@@ -3350,7 +3473,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-  name="id" style="plain" type="csapi:uuid">
+  name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
@@ -3395,7 +3518,7 @@
 </param>'>
 <!ENTITY hmResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3405,7 +3528,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3586,7 +3709,7 @@
 <!-- members -->
 <!ENTITY membercreateResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3596,7 +3719,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3607,7 +3730,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3669,7 +3792,7 @@
 </param>'>
 <!ENTITY memberCreatev2RequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3712,7 +3835,7 @@
 </param>'>
 <!ENTITY vipResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3722,7 +3845,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3753,7 +3876,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3763,7 +3886,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="port_id" style="plain" type="csapi:uuid">
+    name="port_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3805,7 +3928,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="pool_id" style="plain" type="csapi:uuid">
+    name="pool_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3860,7 +3983,7 @@
 </param>'>
 <!ENTITY vipCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3891,7 +4014,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3933,7 +4056,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="pool_id" style="plain" type="csapi:uuid">
+    name="pool_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -3999,7 +4122,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="pool_id" style="plain" type="csapi:uuid">
+    name="pool_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4096,7 +4219,7 @@
 <!-- health monitors -->
 <!ENTITY hmCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4203,7 +4326,7 @@
 <!--associateHealthMonitortoPool -->
 <!ENTITY hmassociatepoolRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
        xmlns:wadl="http://wadl.dev.java.net/2009/02"
        xml:lang="EN">
@@ -4237,7 +4360,7 @@
 </param>'>
 <!ENTITY memberResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4247,7 +4370,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4258,7 +4381,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="pool_id" style="plain" type="csapi:uuid">
+    name="pool_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4320,7 +4443,7 @@
 </param>'>
 <!ENTITY memberCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4331,7 +4454,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="pool_id" style="plain" type="csapi:uuid">
+    name="pool_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4385,7 +4508,7 @@
 </param>'>
 <!ENTITY memberUpdateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="pool_id" style="plain" type="csapi:uuid">
+    name="pool_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4448,7 +4571,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="id" style="plain" type="csapi:uuid">
+      name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4496,7 +4619,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" type="csapi:uuid" style="plain">
+    name="tenant_id" type="csapi:UUID" style="plain">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4569,7 +4692,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4613,7 +4736,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="remote_group_id" style="plain" type="csapi:uuid">
+    name="remote_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4637,7 +4760,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="security_group_id" style="plain" type="csapi:uuid">
+    name="security_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4646,7 +4769,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4680,7 +4803,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-      name="security_group_id" style="plain" type="csapi:uuid">
+      name="security_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4725,7 +4848,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="remote_group_id" style="plain" type="csapi:uuid">
+      name="remote_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4736,7 +4859,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-      name="remote_ip_prefix" style="plain" type="csapi:uuid">
+      name="remote_ip_prefix" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -4772,7 +4895,7 @@
 </param>'>
 <!ENTITY svcResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="router_id" style="plain" type="csapi:uuid">
+    name="router_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4839,7 +4962,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4850,7 +4973,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4861,7 +4984,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4928,7 +5051,7 @@
 </param>'>
 <!ENTITY svcCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4939,7 +5062,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="subnet_id" style="plain" type="csapi:uuid">
+    name="subnet_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -4950,7 +5073,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="router_id" style="plain" type="csapi:uuid">
+    name="router_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5016,7 +5139,7 @@
 </param>'>
 <!ENTITY ikeCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5156,7 +5279,7 @@
 </param>'>
 <!ENTITY ikeResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5166,7 +5289,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5292,7 +5415,7 @@
 </param>'>
 <!ENTITY ipsecCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5425,7 +5548,7 @@
 </param>'>
 <!ENTITY ipsecResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5435,7 +5558,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5563,7 +5686,7 @@
 </param>'>
 <!ENTITY vpnEndpointGroupCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5631,7 +5754,7 @@
 </param>'>
 <!ENTITY vpnEndpointGroupResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5641,7 +5764,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5697,7 +5820,7 @@
 </param>'>
 <!ENTITY connCreateRequestParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5741,7 +5864,7 @@
     </para>
   </wadl:doc>
 </param><param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="ikepolicy_id" style="plain" type="csapi:uuid">
+    name="ikepolicy_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5751,7 +5874,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="ipsecpolicy_id" style="plain" type="csapi:uuid">
+    name="ipsecpolicy_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5761,7 +5884,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="vpnservice_id" style="plain" type="csapi:uuid">
+    name="vpnservice_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5827,7 +5950,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="local_ep_group_id" style="plain" type="csapi:uuid">
+    name="local_ep_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5841,7 +5964,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="peer_ep_group_id" style="plain" type="csapi:uuid">
+    name="peer_ep_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5968,7 +6091,7 @@
 </param>'>
 <!ENTITY connResponseParams '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -5978,7 +6101,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6032,7 +6155,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="local_ep_group_id" style="plain" type="csapi:uuid">
+    name="local_ep_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6045,7 +6168,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="peer_ep_group_id" style="plain" type="csapi:uuid">
+    name="peer_ep_group_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6148,7 +6271,7 @@
     </para>
   </wadl:doc>
 </param><param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="ikepolicy_id" style="plain" type="csapi:uuid">
+    name="ikepolicy_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6158,7 +6281,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="ipsecpolicy_id" style="plain" type="csapi:uuid">
+    name="ipsecpolicy_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6168,7 +6291,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="vpnservice_id" style="plain" type="csapi:uuid">
+    name="vpnservice_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6587,7 +6710,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="address_scope_id" style="plain" type="csapi:uuid">
+    name="address_scope_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6662,7 +6785,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -6694,7 +6817,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="address_scope_id" style="plain" type="csapi:uuid">
+    name="address_scope_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6781,7 +6904,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
@@ -6824,7 +6947,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="address_scope_id" style="plain" type="csapi:uuid">
+    name="address_scope_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -6846,7 +6969,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -7081,7 +7204,7 @@
 </param>'>
 <!ENTITY firewall-firewall_policy_idResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="firewall_policy_id" style="plain" type="csapi:uuid">
+    name="firewall_policy_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -7092,7 +7215,7 @@
 </param>'>
 <!ENTITY firewall-idResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="id" style="plain" type="csapi:uuid">
+    name="id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -7137,7 +7260,7 @@
 </param>'>
 <!ENTITY firewall-tenant_idResponseParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -7210,7 +7333,7 @@
 </param>'>
 <!ENTITY firewall-firewall_policy_idRequestParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="true"
-    name="firewall_policy_id" style="plain" type="csapi:uuid">
+    name="firewall_policy_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xml:lang="EN">
@@ -7239,7 +7362,7 @@
 &firewall-nameRequestParameter;'>
 <!ENTITY FWId '
 <param xmlns="http://wadl.dev.java.net/2009/02" required="false"
-    name="tenant_id" style="plain" type="csapi:uuid">
+    name="tenant_id" style="plain" type="csapi:UUID">
   <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
       xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
     <para>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks.wadl b/api-ref/src/wadls/netconn-api/src/os-networks.wadl
deleted file mode 100644
index fbefc41ba..000000000
--- a/api-ref/src/wadls/netconn-api/src/os-networks.wadl
+++ /dev/null
@@ -1,748 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
-<!--*******************************************************-->
-<!--         Import Common XML Entities                    -->
-<!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
-<!--                                                       -->
-<!--        xmllint -noent os-networks.wadl               -->
-<!--*******************************************************-->
-<!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
-    %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
-    %common_project;
-]>
-<application xmlns="http://wadl.dev.java.net/2009/02"
-    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:linkend="http://www.w3.org/1999/linkend"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:wadl="http://wadl.dev.java.net/2009/02"
-    xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
-    <!--*******************************************************-->
-    <!--             All Resources                             -->
-    <!--*******************************************************-->
-    <resources base="https://neutron.example.com/"
-        xml:id="os-networks-v2.0">
-        <resource id="versions" path="//">
-            <method href="#listVersionsv2-neutron"/>
-        </resource>
-        <resource id="version" type="#VersionDetails" path="//v2.0">
-            <resource id="extensions" path="extensions">
-                <method href="#listExtensions"/>
-                <resource id="extension" path="{alias}">
-                    <param name="alias" style="template"
-                        type="xsd:string">
-                        <wadl:doc
-                            xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="Extension Alias">
-                            <para>The alias of an extension.</para>
-                        </wadl:doc>
-                    </param>
-                    <method href="#getExtension"/>
-                </resource>
-            </resource>
-            <resource id="Networks" type="#NetworkList"
-                path="networks">
-                <method href="#createNetwork"/>
-                <method href="#bulkCreateNetwork"/>
-                <resource path="{network_id}" id="network_id">
-                    <param name="network_id" style="template"
-                        type="csapi:UUID">
-                        <wadl:doc
-                            xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="Network ID">
-                            <para>The UUID for the network of
-                            interest to you.</para>
-                        </wadl:doc>
-                    </param>
-                    <method href="#showNetwork"/>
-                    <method href="#updateNetwork"/>
-                    <method href="#deleteNetwork"/>
-                </resource>
-            </resource>
-        </resource>
-    </resources>
-    <resource_type id="NetworkList">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Network list">
-            <para>A list of networks.</para>
-        </wadl:doc>
-        <method href="#listNetworks"/>
-    </resource_type>
-    <resource_type id="VersionDetails">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Version details">
-            <para>Details for a version.</para>
-        </wadl:doc>
-        <method href="#showVersionDetailsv2-neutron"/>
-    </resource_type>
-    <resource_type id="ExtensionList">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Extension List">
-            <para>A list of supported extensions.</para>
-        </wadl:doc>
-        <method href="#listExtensions"/>
-    </resource_type>
-    <!--*******************************************************-->
-    <!--               All Methods                             -->
-    <!--*******************************************************-->
-    <method name="GET" id="listVersionsv2-neutron">
-        <wadl:doc xml:lang="EN" title="List API versions"
-            xmlns="http://docbook.org/ns/docbook"><para
-                role="shortdesc">Lists information about all
-                Networking API versions.</para>
-        </wadl:doc>
-        <response status="200 300">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/neutron-versions-response.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/neutron-versions-response.xml"
-                    />
-                </wadl:doc>
-            </representation>
-        </response>
-    </method>
-    <method name="GET" id="showVersionDetailsv2-neutron">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Show API v2.0 details">
-            <para role="shortdesc">Shows details for Networking API
-                v2.0.</para>
-        </wadl:doc>
-        <response status="200">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/version-v2-neutron-get-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/version-v2-neutron-get-resp.xml"
-                    />
-                </wadl:doc>
-                <param name="location" style="plain" type="xsd:anyURI"
-                    required="true"
-                    path="/common:version/atom:link[@rel='self']/@href">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN" title="Location"><para>Full URL
-                            to a service or server.</para></wadl:doc>
-                    <link resource_type="#VersionDetails" rel="self"/>
-                </param>
-            </representation>
-        </response>
-        <response status="203">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/version-v2-neutron-get-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/version-v2-neutron-get-resp.xml"
-                    />
-                </wadl:doc>
-                <param name="location" style="plain" type="xsd:anyURI"
-                    required="true"
-                    path="/common:version/atom:link[@rel='self']/@href">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN" title="Location"><para>Full URL
-                            to a service or server.</para></wadl:doc>
-                    <link resource_type="#VersionDetails" rel="self"/>
-                </param>
-            </representation>
-        </response>
-    </method>
-    <!-- Extensions -->
-    <method name="GET" id="listExtensions">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="List extensions">
-            <para>Lists available Networking API extensions.</para>
-        </wadl:doc>
-        <response status="200">
-            <param name="next" style="plain" type="xsd:anyURI"
-                path="/capi:extensions/atom:link[@rel='next']/@href">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">Moves to the next item in the
-                    list.</wadl:doc>
-                <link resource_type="#ExtensionList" rel="next"/>
-            </param>
-            <param name="previous" style="plain" type="xsd:anyURI"
-                path="/capi:extensions/atom:link[@rel='previous']/@href">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">Moves to the previous item in the
-                    list.</wadl:doc>
-                <link resource_type="#ExtensionList" rel="previous"/>
-            </param>
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="List extensions: JSON response">
-                        <xsdxt:code href="api_samples/extensions.json"
-                        />
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="List extensions: XML response">
-                        <xsdxt:code href="api_samples/extensions.xml"
-                        />
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-        </response>
-        <response status="203">
-            <param name="next" style="plain" type="xsd:anyURI"
-                path="/capi:extensions/atom:link[@rel='next']/@href">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">Moves to the next item in the
-                    list.</wadl:doc>
-                <link resource_type="#ExtensionList" rel="next"/>
-            </param>
-            <param name="previous" style="plain" type="xsd:anyURI"
-                path="/capi:extensions/atom:link[@rel='previous']/@href">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">Moves to the previous item in the
-                    list.</wadl:doc>
-                <link resource_type="#ExtensionList" rel="previous"/>
-            </param>
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="List extensions: JSON response">
-                        <xsdxt:code href="api_samples/extensions.json"
-                        />
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="List extensions: XML response">
-                        <xsdxt:code href="api_samples/extensions.xml"
-                        />
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-        </response> &commonFaults; </method>
-    <method name="GET" id="getExtension">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Show extension details">
-            <para>Shows details for an
-                extension.</para>
-        </wadl:doc>
-        <response status="200">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="Get extension details: JSON response">
-                        <xsdxt:code href="api_samples/extension.json"
-                        />
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="Get extension details: XML response">
-                        <xsdxt:code href="api_samples/extension.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-        </response>
-        <response status="203">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="Get extension details: JSON response">
-                        <xsdxt:code href="api_samples/extension.json"
-                        />
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:sample
-                        title="Get extension details: XML response">
-                        <xsdxt:code href="api_samples/extension.xml"/>
-                    </xsdxt:sample>
-                </wadl:doc>
-            </representation>
-        </response> &commonFaults; </method>
-    <method name="GET" id="listNetworks">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="List networks">
-            <para role="shortdesc">Lists networks to which the
-             tenant has access.</para>
-            <para>You can control which response parameters are returned by
-                using the fields query parameter. For information, see <link
-                    xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/networking_general_api_information.html#filtering-and-column-selection"
-                    >Filtering and column selection</link>.</para>
-        </wadl:doc>
-        <response status="200">
-            &networksObject;
-            <param required="true" name="admin_state_up" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The administrative state of
-                        the network, which is up (<code>true</code>)
-                        or down
-                    (<code>false</code>).</para></wadl:doc>
-            </param>
-            <param required="true" name="id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    ID.</para></wadl:doc>
-            </param>
-            <param required="true" name="name" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    name.</para></wadl:doc>
-            </param>
-            <param required="true" name="shared" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Indicates whether this network
-                        is shared across all tenants. By default, only
-                        administrative users can change this
-                        value.</para></wadl:doc>
-            </param>
-            <param required="true" name="status" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    status.</para></wadl:doc>
-            </param>
-            <param required="true" name="subnets" style="plain"
-                type="xsd:dict">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The associated
-                    subnets.</para></wadl:doc>
-            </param>
-            <param required="true" name="tenant_id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The tenant
-                    ID.</para></wadl:doc>
-            </param>
-            <representation mediaType="application/json"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-get-resp.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-get-resp.xml"/>
-                </wadl:doc>
-            </representation>
-        </response> &fault401; </method>
-    <method name="POST" id="createNetwork">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Create network">
-            <para role="shortdesc">Creates a network.</para>
-            <para>
-                A request body is optional. An administrative user can
-                specify another tenant ID, which is the tenant who owns the
-                network, in the request body.
-            </para>
-        </wadl:doc>
-        <request>
-            &networkObject;
-            <param required="false" name="admin_state_up"
-                style="plain" type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The administrative state of
-                        the network, which is up (<code>true</code>)
-                        or down
-                    (<code>false</code>).</para></wadl:doc>
-            </param>
-            <param required="false" name="name" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network name. A request
-                        body is optional: If you include it, it can
-                        specify this optional
-                    attribute.</para></wadl:doc>
-            </param>
-            <param required="false" name="shared" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Indicates whether this network
-                        is shared across all tenants. By default, only
-                        administrative users can change this
-                        value.</para></wadl:doc>
-            </param>
-            <param required="false" name="tenant_id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Admin-only. The UUID of the
-                        tenant that will own the network. This tenant
-                        can be different from the tenant that makes
-                        the create network request. However, only
-                        administrative users can specify a tenant ID
-                        other than their own. You cannot change this
-                        value through authorization
-                    policies.</para></wadl:doc>
-            </param>
-            <representation mediaType="application/json"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-post-req.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-post-req.xml"/>
-                </wadl:doc>
-            </representation>
-        </request>
-        <response status="201">
-            &networkObject;
-            <param required="true" name="admin_state_up" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The administrative state of
-                        the network, which is up (<code>true</code>)
-                        or down
-                    (<code>false</code>).</para></wadl:doc>
-            </param>
-            <param required="true" name="id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    ID.</para></wadl:doc>
-            </param>
-            <param required="true" name="name" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    name.</para></wadl:doc>
-            </param>
-            <param required="true" name="shared" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Indicates whether this network
-                        is shared across all tenants. By default, only
-                        administrative users can change this
-                        value.</para></wadl:doc>
-            </param>
-            <param required="true" name="status" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    status.</para></wadl:doc>
-            </param>
-            <param required="true" name="subnets" style="plain"
-                type="xsd:dict">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The associated
-                    subnets.</para></wadl:doc>
-            </param>
-            <param required="true" name="tenant_id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The tenant
-                    ID.</para></wadl:doc>
-            </param>
-            <param required="true" name="router:external" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Indicates whether this
-                        network is externally
-                        accessible.</para></wadl:doc>
-            </param>
-            <representation mediaType="application/json"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-post-resp.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-post-resp.xml"/>
-                </wadl:doc>
-            </representation>
-        </response> &fault400; &fault401; </method>
-    <method name="POST" id="bulkCreateNetwork">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Bulk create networks">
-            <para role="shortdesc">Creates multiple networks in a
-                single request.</para>
-            <para>In the request body, specify a list of
-                networks.</para>
-            <para>The bulk create operation is always atomic. Either
-                all or no networks in the request body are
-                created.</para>
-        </wadl:doc>
-        <request> &networksObject; &networkCommonRequestParams;
-            <representation
-                mediaType="application/json" element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-post-create-bulk-req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-post-create-bulk-req.xml"
-                    />
-                </wadl:doc>
-            </representation>
-        </request>
-        <response status="201"> &networksObject; &networkCommonResponseParams;
-            <representation mediaType="application/json"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-create-bulk-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-create-bulk-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>
-        </response> &fault400; &fault401; </method>
-    <method name="GET" id="showNetwork">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Show network details">
-            <para role="shortdesc">Shows details for a
-                network.</para>
-            <para>You can control which response parameters are returned by
-                using the fields query parameter. For information, see <link
-                    xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/networking_general_api_information.html#filtering-and-column-selection"
-                    >Filtering and column selection</link>.</para>
-            <para>
-                In addition to the following response parameters, the response
-                might show extension response parameters. For information, see <link
-                xlink:href="http://developer.openstack.org/api-ref-networking-v2-ext.html#showProviderNetwork">Networks multiple provider extension (networks)</link>.
-            </para>
-        </wadl:doc>
-        <response status="200">
-            &networkObject;
-            <param required="true" name="admin_state_up" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <para>
-                        The administrative state of the network, which is up
-                        (<code>true</code>) or down (<code>false</code>).
-                    </para>
-                </wadl:doc>
-            </param>
-            <param required="true" name="id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    ID.</para></wadl:doc>
-            </param>
-            <param required="true" name="name" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    name.</para></wadl:doc>
-            </param>
-            <param required="true" name="shared" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Indicates whether this network
-                        is shared across all tenants. By default, only
-                        administrative users can change this
-                        value.</para></wadl:doc>
-            </param>
-            <param required="true" name="status" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    status.</para></wadl:doc>
-            </param>
-            <param required="true" name="subnets" style="plain"
-                type="xsd:dict">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The associated
-                    subnets.</para></wadl:doc>
-            </param>
-            <param required="true" name="tenant_id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The tenant
-                    ID.</para></wadl:doc>
-            </param>
-            <representation mediaType="application/json"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-get-detail-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-get-detail-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>
-        </response> &fault401; &fault404; </method>
-    <method name="PUT" id="updateNetwork">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Update network">
-            <para role="shortdesc">Updates a network.</para>
-        </wadl:doc>
-        <request>
-            &networkObject; &networkUpdateParameters;
-            <representation
-                mediaType="application/json" element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-put-update.req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-put-update.req.xml"
-                    />
-                </wadl:doc>
-            </representation>
-        </request>
-        <response status="200">
-            &networkObject;
-            <param required="true" name="admin_state_up" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The administrative state of
-                        the network, which is up (<code>true</code>)
-                        or down
-                    (<code>false</code>).</para></wadl:doc>
-            </param>
-            <param required="true" name="id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    ID.</para></wadl:doc>
-            </param>
-            <param required="true" name="name" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    name.</para></wadl:doc>
-            </param>
-            <param required="true" name="shared" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Indicates whether this network
-                        is shared across all tenants. By default, only
-                        administrative users can change this
-                        value.</para></wadl:doc>
-            </param>
-            <param required="true" name="status" style="plain"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The network
-                    status.</para></wadl:doc>
-            </param>
-            <param required="true" name="subnets" style="plain"
-                type="xsd:dict">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The associated
-                    subnets.</para></wadl:doc>
-            </param>
-            <param required="true" name="tenant_id" style="plain"
-                type="csapi:uuid">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The tenant
-                    ID.</para></wadl:doc>
-            </param>
-            <param required="true" name="router:external" style="plain"
-                type="xsd:bool">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>Indicates whether this
-                        network is externally
-                        accessible.</para></wadl:doc>
-            </param>
-            <representation mediaType="application/json"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-put-update-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml"
-                element="csapi:network">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-put-update-resp.xml"
-                    />
-                </wadl:doc>
-            </representation>
-        </response> &fault400; &fault401; &fault403; &fault404; </method>
-    <method name="DELETE" id="deleteNetwork">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Delete network">
-            <para role="shortdesc">Deletes a network and its
-                associated resources.</para>
-        </wadl:doc>
-        <response status="204"/> &fault401; &fault404;
-        &fault409conflict; </method>
-</application>
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policies-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policies-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policies-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policies-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-insert-rule-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-insert-rule-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-insert-rule-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-insert-rule-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-insert-rule-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-insert-rule-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-insert-rule-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-insert-rule-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-remove-rule-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-remove-rule-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-remove-rule-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-remove-rule-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-remove-rule-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-remove-rule-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-remove-rule-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-remove-rule-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_policy-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-policy-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rule-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rule-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rules-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rules-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall_rules-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-rules-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewall-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewall-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewalls-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/firewalls/firewalls-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/firewall/firewalls-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/firewalls/firewalls-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-request.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-request.json
new file mode 100644
index 000000000..9fe528a80
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-request.json
@@ -0,0 +1,5 @@
+{
+    "health_monitor": {
+        "id": "b624decf-d5d3-4c66-9a3d-f047e7786181"
+    }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-response.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-response.json
new file mode 100644
index 000000000..b70e51138
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-associate-response.json
@@ -0,0 +1,3 @@
+{
+    "health_monitor": {}
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/HealthMonitor-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-put-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-put-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-put-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-put-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitor-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-list-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitors-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/healthmonitor-list-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/healthmonitors-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/listener-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/listener-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/listener-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/listener-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/listener-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/listener-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/listener-put-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/listener-put-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/listener-put-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/listener-put-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/listener-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/listener-list-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/listeners-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/listener-list-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/listeners-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-delete-response.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-delete-response.json
new file mode 100644
index 000000000..9f8f3439c
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-delete-response.json
@@ -0,0 +1,8 @@
+{
+    "loadbalancer": {
+        "active_connections": 0,
+        "total_connections": 0,
+        "bytes_in": 0,
+        "bytes_out": 0
+    }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-put-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-put-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-put-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-put-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-put-resp.txt b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-update-response.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-put-resp.txt
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancer-update-response.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-list-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancers-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/loadbalancer-list-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/loadbalancers-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Member-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/member-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/Member-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/member-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Member-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/member-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/Member-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/member-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/member-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/Member-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/member-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/member-put-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/member-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/member-put-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/member-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/member-put-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/member-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/member-put-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/member-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/members-list-response.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/members-list-response.json
new file mode 100644
index 000000000..973bd0ca0
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/members-list-response.json
@@ -0,0 +1,24 @@
+{
+    "members": [
+        {
+            "status": "ACTIVE",
+            "weight": 1,
+            "admin_state_up": true,
+            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
+            "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
+            "address": "10.0.0.4",
+            "protocol_port": 80,
+            "id": "701b531b-111a-4f21-ad85-4795b7b12af6"
+        },
+        {
+            "status": "ACTIVE",
+            "weight": 1,
+            "admin_state_up": true,
+            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
+            "pool_id": "72741b06-df4d-4715-b142-276b6bce75ab",
+            "address": "10.0.0.3",
+            "protocol_port": 80,
+            "id": "beb53b4d-230b-4abd-8118-575b8fa006ef"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/pool-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/pool-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-list-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-list-resp.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/pool-list-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-list-resp.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/member-list-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-members-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/member-list-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-members-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/pool-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-request.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-request.json
new file mode 100644
index 000000000..d523eeabb
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-request.json
@@ -0,0 +1,5 @@
+{
+    "pool": {
+        "name": "SuperPool"
+    }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-response.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-response.json
new file mode 100644
index 000000000..195e26a0e
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pool-update-response.json
@@ -0,0 +1,16 @@
+{
+    "pool": {
+        "status": "PENDING_UPDATE",
+        "lb_method": "ROUND_ROBIN",
+        "protocol": "TCP",
+        "description": "",
+        "health_monitors": [],
+        "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
+        "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
+        "admin_state_up": true,
+        "name": "SuperPool",
+        "members": [],
+        "id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
+        "vip_id": null
+    }
+}
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response.json
new file mode 100644
index 000000000..c5c9d06f6
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response.json
@@ -0,0 +1,24 @@
+{
+    "pools": [
+        {
+            "status": "ACTIVE",
+            "lb_method": "ROUND_ROBIN",
+            "protocol": "HTTP",
+            "description": "",
+            "health_monitors": [
+                "466c8345-28d8-4f84-a246-e04380b0461d",
+                "5d4b5228-33b0-4e60-b225-9b727c1a20e7"
+            ],
+            "subnet_id": "8032909d-47a1-4715-90af-5153ffe39861",
+            "tenant_id": "83657cfcdfe44cd5920adaf26c48ceea",
+            "admin_state_up": true,
+            "name": "app_pool",
+            "members": [
+                "701b531b-111a-4f21-ad85-4795b7b12af6",
+                "beb53b4d-230b-4abd-8118-575b8fa006ef"
+            ],
+            "id": "72741b06-df4d-4715-b142-276b6bce75ab",
+            "vip_id": "4ec89087-d057-4e2c-911f-60a3b47ee304"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response2.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response2.json
new file mode 100644
index 000000000..b8bf9d00a
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/pools-list-response2.json
@@ -0,0 +1,20 @@
+{
+    "pools": [
+        {
+            "admin_state_up": true,
+            "description": "simple pool",
+            "healthmonitor_id": null,
+            "id": "4c0a0a5f-cf8f-44b7-b912-957daa8ce5e5",
+            "lb_algorithm": "ROUND_ROBIN",
+            "listeners": [
+                {
+                    "id": "35cb8516-1173-4035-8dae-0dae3453f37f"
+                }
+            ],
+            "members": [],
+            "name": "pool1",
+            "protocol": "HTTP",
+            "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-create-request.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/VIP-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-create-request.json
index 892d340c1..73c6ab4e1 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-post-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-create-request.json
@@ -7,4 +7,4 @@
         "pool_id": "61b1f87a-7a21-4ad3-9dda-7f81d249944f",
         "protocol_port": "80"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-create-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/VIP-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-create-response.json
index c1d9db558..7dc958c83 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-post-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-create-response.json
@@ -14,4 +14,4 @@
         "id": "c987d2be-9a3c-4ac9-a046-e8716b1350e2",
         "name": "NewVip"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-show-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/VIP-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-show-response.json
index 1280fda10..c237b39dd 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-get-detail-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-show-response.json
@@ -18,4 +18,4 @@
         "id": "4ec89087-d057-4e2c-911f-60a3b47ee304",
         "name": "my-vip"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-put-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-update-request.json
similarity index 96%
rename from api-ref/src/wadls/netconn-api/src/api_samples/VIP-put-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-update-request.json
index 87cc6ef23..a29693659 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-put-update-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-update-request.json
@@ -2,4 +2,4 @@
     "vip": {
         "connection_limit": "1000"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-update-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/VIP-put-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-update-response.json
index 4884901b0..9c1b61ff0 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/VIP-put-update-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vip-update-response.json
@@ -14,4 +14,4 @@
         "id": "c987d2be-9a3c-4ac9-a046-e8716b1350e2",
         "name": "NewVip"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vips-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vips-list-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vips-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/lbaas/vips-list-response.json
index 413103b76..0e05372cc 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/vips-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/lbaas/vips-list-response.json
@@ -20,4 +20,4 @@
             "name": "my-vip"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-create-request.json
similarity index 98%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-create-request.json
index d7b3e5e6d..5bf6500fd 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-create-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-create-request.json
@@ -3,4 +3,4 @@
         "name": "label1",
         "description": "description of label1"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-create-resp.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-create-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-delete-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-delete-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-delete-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-delete-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-delete-resp-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-delete-response-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-delete-resp-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-delete-response-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-create-request.json
similarity index 98%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-create-request.json
index 3ea27d19c..cac374496 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-create-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-create-request.json
@@ -4,4 +4,4 @@
         "direction": "ingress",
         "metering_label_id": "e131d186-b02d-4c0b-83d5-0c0725c4f812"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-create-resp.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-create-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-create-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-create-response.json
index 60e029f97..364d102a0 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-create-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-create-response.json
@@ -6,4 +6,4 @@
         "id": "00e13b58-b4f2-4579-9c9c-7ac94615f9ae",
         "excluded": false
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-delete-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-delete-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-delete-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-delete-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-delete-resp-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-delete-response-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-delete-resp-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-delete-response-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-show-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-show-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-show-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-show-response.json
index ec695466f..4b0c3bccc 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rule-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rule-show-response.json
@@ -6,4 +6,4 @@
         "id": "9536641a-7d14-4dc5-afaf-93a973ce0eb8",
         "excluded": false
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rules-list-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rules-list-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rules-list-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rules-list-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rules-list-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rules-list-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rules-list-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rules-list-response.json
index 48ca92bff..7144cfaaa 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-rules-list-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-rules-list-response.json
@@ -15,4 +15,4 @@
             "excluded": false
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-show-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-show-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-label-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-label-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-label-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-labels-list-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-labels-list-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-labels-list-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-labels-list-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/metering-labels-list-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-labels-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/metering-labels-list-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/metering-labels/metering-labels-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/extension.json b/api-ref/src/wadls/netconn-api/src/samples/networks/extension-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/extension.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/extension-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/extensions.json b/api-ref/src/wadls/netconn-api/src/samples/networks/extensions-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/extensions.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/extensions-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-create-request.json
similarity index 97%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-create-request.json
index 28daea5f0..d5391744c 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/network-create-request.json
@@ -3,4 +3,4 @@
         "name": "sample_network",
         "admin_state_up": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-multi-create-request.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-multi-create-request.json
index 6ca32c81d..8a0b624c7 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/network-multi-create-request.json
@@ -14,4 +14,4 @@
         "name": "net1",
         "admin_state_up": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-multi-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-multi-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-multi-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-update-request.json
similarity index 97%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-update-request.json
index e778f3c9a..1bec12c9d 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update.req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/network-update-request.json
@@ -2,4 +2,4 @@
     "network": {
         "name": "sample_network_5_updated"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-put-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-vlan-transparent-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-vlan-transparent-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-vlan-transparent-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-vlan-transparent-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/network-vlan-transparent-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-vlan-transparent-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/network-vlan-transparent-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-vlan-transparent-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-vlan-transparent-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/network-vlan-transparent-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-vlan-transparent-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/network-vlan-transparent-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-bulk-create-request.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/networks-bulk-create-request.json
index 211e9c5b4..e927b58ec 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-post-create-bulk-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-bulk-create-request.json
@@ -9,4 +9,4 @@
             "admin_state_up": true
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-bulk-create-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/networks-bulk-create-response.json
index d297e330d..c0b5bdf8e 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-create-bulk-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-bulk-create-response.json
@@ -25,4 +25,4 @@
             "provider:segmentation_id": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-list-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/networks-list-response.json
index 6d220124e..8ee1a207e 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/networks-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-list-response.json
@@ -31,4 +31,4 @@
             "provider:segmentation_id": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-list-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-multi-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-list-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/networks-multi-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-multi-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-multi-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/networks-multi-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/networks-vlan-transparent-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/networks-vlan-transparent-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/networks-vlan-transparent-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/networks-vlan-transparent-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/version-v2-neutron-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/networks/version-show-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/version-v2-neutron-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/version-show-response.json
index 0d21aaf71..ad6369afc 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/version-v2-neutron-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/version-show-response.json
@@ -31,4 +31,4 @@
             "collection": "ports"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/neutron-versions-response.json b/api-ref/src/wadls/netconn-api/src/samples/networks/versions-list-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/neutron-versions-response.json
rename to api-ref/src/wadls/netconn-api/src/samples/networks/versions-list-response.json
index 8f1331307..a20ed98c2 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/neutron-versions-response.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/networks/versions-list-response.json
@@ -11,4 +11,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_bind_create_or_update_resp.json b/api-ref/src/wadls/netconn-api/src/samples/ports/port-bind-create-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/port_bind_create_or_update_resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/port-bind-create-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port-bind-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/ports/port-bind-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/port-bind-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/port-bind-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_req.json b/api-ref/src/wadls/netconn-api/src/samples/ports/port-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/port_create_req.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/port-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_create_resp.json b/api-ref/src/wadls/netconn-api/src/samples/ports/port-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/port_create_resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/port-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/ports/port-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/port-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/port-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_update_req.json b/api-ref/src/wadls/netconn-api/src/samples/ports/port-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/port_update_req.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/port-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/port_update_resp.json b/api-ref/src/wadls/netconn-api/src/samples/ports/port-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/port_update_resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/port-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-bind-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/ports/ports-bind-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/ports-bind-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/ports-bind-show-response.json
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/samples/ports/ports-bulk-create-request.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/ports-bulk-create-request.json
index 8d4e29c86..1ded596cd 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/ports-post-create-bulk-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/ports/ports-bulk-create-request.json
@@ -11,4 +11,4 @@
             "network_id": "a87cc70a-3e15-4acf-8205-9b711a3531b7"
         }
     ]
-}
\ No newline at end of file
+}
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/samples/ports/ports-bulk-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/ports-create-bulk-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/ports-bulk-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/ports/ports-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/ports-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/ports/ports-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/quotas-put-req.json b/api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-list-for-tenant-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/quotas-put-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-list-for-tenant-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/quotas-list-resp.json b/api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/quotas-list-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/quotas-show-resp.json b/api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/quotas-show-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/quotas-put-resp.json b/api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/quotas-put-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/quotas/quotas-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floating-ips-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floating-ips-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floating-ips-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floating-ips-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-create-request.json
similarity index 98%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floatingip-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-create-request.json
index c290e86bd..72ed72fc2 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-post-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-create-request.json
@@ -3,4 +3,4 @@
         "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
         "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floatingip-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-disassociate-update.req.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-disassociate-request.json
similarity index 96%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-disassociate-update.req.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-disassociate-request.json
index e43066c75..1800d3276 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-disassociate-update.req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-disassociate-request.json
@@ -2,4 +2,4 @@
     "floatingip": {
         "port_id": null
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-disassociate-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-disassociate-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-disassociate-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-disassociate-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floatingip-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-update.req.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-update-request.json
similarity index 97%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-update.req.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-update-request.json
index 0931dc090..2772b5ad6 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-update.req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-update-request.json
@@ -2,4 +2,4 @@
     "floatingip": {
         "port_id": "fc861431-0e6c-4842-a0ed-e2363f9bc3a8"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/floatingip-put-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/floatingip-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-add-interface.req.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-add-interface-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-add-interface.req.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-add-interface-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-add-interface-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-add-interface-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-add-interface-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-add-interface-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-post-req.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-post-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-post-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-post-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-remove-interface-req.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-remove-interface-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-remove-interface-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-remove-interface-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-remove-interface-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-remove-interface-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-remove-interface-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-remove-interface-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-get-detail-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-get-detail-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-put-update.req.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-put-update.req.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/router-put-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/router-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/router-put-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/router-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/routers-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/routers/routers-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/routers-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/routers/routers-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-create-request.json
similarity index 98%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-create-request.json
index 28426b61c..8a93ef934 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-create-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-create-request.json
@@ -3,4 +3,4 @@
         "name": "new-webservers",
         "description": "security group for webservers"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-create-resp.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-create-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-create-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-create-response.json
index 1c80e585a..1ded3275c 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-create-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-create-response.json
@@ -31,4 +31,4 @@
         ],
         "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-delete-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-delete-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-delete-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-delete-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-delete-resp-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-delete-response-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-delete-resp-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-delete-response-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-create-request.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-create-request.json
index cf8a66117..959be0fb8 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-create-req.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-create-request.json
@@ -8,4 +8,4 @@
         "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
         "security_group_id": "a7734e61-b545-452d-a3cd-0189cbd9747a"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-create-resp.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-create-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-create-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-create-response.json
index 9b4ee87c7..500d06eee 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-create-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-create-response.json
@@ -11,4 +11,4 @@
         "security_group_id": "a7734e61-b545-452d-a3cd-0189cbd9747a",
         "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-delete-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-delete-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-delete-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-delete-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-delete-resp-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-delete-response-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-delete-resp-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-delete-response-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-show-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-show-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-show-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-show-response.json
index 61476cc69..7225101fb 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rule-show-response.json
@@ -11,4 +11,4 @@
         "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
         "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-list-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rules-list-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-list-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rules-list-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-list-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rules-list-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-list-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rules-list-response.json
index 41f1e4142..fbdeddf05 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/rules-security-groups-list-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-rules-list-response.json
@@ -49,4 +49,4 @@
             "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-show-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-show-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-show-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-show-response.json
index f83d03081..126b5d20c 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-show-response.json
@@ -55,4 +55,4 @@
         ],
         "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-group-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-list-get-req-json-http.txt b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-groups-list-request-json-http.txt
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-list-get-req-json-http.txt
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-groups-list-request-json-http.txt
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-list-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-groups-list-response.json
similarity index 99%
rename from api-ref/src/wadls/netconn-api/src/api_samples/security-groups-list-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/security-groups/security-groups-list-response.json
index c04dcd8e8..331792e60 100644
--- a/api-ref/src/wadls/netconn-api/src/api_samples/security-groups-list-get-resp.json
+++ b/api-ref/src/wadls/netconn-api/src/samples/security-groups/security-groups-list-response.json
@@ -57,4 +57,4 @@
             "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/service-type-resp.json b/api-ref/src/wadls/netconn-api/src/samples/service-type-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/service-type-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/service-type-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnet-create-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnet-show-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnet-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnet-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-create-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-create-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-show-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-show-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-update-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnetpool-update-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpool-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnetpools-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpools-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnetpools-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnetpools-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnets-create-bulk-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnets-post-create-bulk-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnets-create-bulk-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnets-create-bulk-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnets-create-bulk-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnets-create-bulk-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.json b/api-ref/src/wadls/netconn-api/src/samples/subnets/subnets-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/subnets-get-resp.json
rename to api-ref/src/wadls/netconn-api/src/samples/subnets/subnets-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicies-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicies-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ikepolicy-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ikepolicy-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connection-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connections-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsec-site-connection-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsec-site-connections-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicies-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicies-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/ipsecpolicy-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/ipsecpolicy-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-group-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-groups-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpn-endpoint-group-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpn-endpoint-groups-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-create-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-create-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-create-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-create-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-create-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-create-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-create-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-create-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-show-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-show-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-show-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-show-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-update-req.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-update-request.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-update-req.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-update-request.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-update-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-update-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-update-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservice-update-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-list-res.json b/api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservices-list-response.json
similarity index 100%
rename from api-ref/src/wadls/netconn-api/src/api_samples/vpn/vpnservice-list-res.json
rename to api-ref/src/wadls/netconn-api/src/samples/vpn/vpnservices-list-response.json
diff --git a/api-ref/src/wadls/netconn-api/src/os-fwaasv2.0-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/firewalls.wadl
similarity index 86%
rename from api-ref/src/wadls/netconn-api/src/os-fwaasv2.0-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/firewalls.wadl
index 1640f487c..9ebea0538 100644
--- a/api-ref/src/wadls/netconn-api/src/os-fwaasv2.0-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/firewalls.wadl
@@ -5,12 +5,12 @@
 <!--                                                       -->
 <!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-fwaasv2.0-ext.wadl           -->
+<!--        xmllint -noent firewalls.wadl                  -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -25,20 +25,11 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/" xml:id="os-fwaas-v2.0">
         <resource id="version" path="//v2.0/fw">
-            <resource id="Firewalls" path="firewalls">
+            <resource id="firewalls" path="firewalls">
                 <method href="#listFirewalls"/>
                 <method href="#createFirewall"/>
                 <resource path="{firewall_id}" id="firewall_id">
-                    <param name="firewall_id" style="template"
-                        type="csapi:UUID">
-                        <wadl:doc
-                            xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="Firewall UUID">
-                            <para>
-                                The UUID for the firewall.
-                            </para>
-                        </wadl:doc>
-                    </param>
+                    &firewall_idTemplateParameter;
                     <method href="#showFirewall"/>
                     <method href="#updateFirewall"/>
                     <method href="#deleteFirewall"/>
@@ -95,7 +86,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/firewall/firewalls-list-res.json"/>
+                    <xsdxt:code href="../samples/firewalls/firewalls-list-response.json"/>
                 </wadl:doc>
                 &firewallsObject;
                 &firewallResponseParameters;
@@ -119,7 +110,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/firewall/firewall-show-res.json"/>
+                    <xsdxt:code href="../samples/firewalls/firewall-show-response.json"/>
                 </wadl:doc>
                 &firewallObject;
                 &firewallResponseParameters;
@@ -142,7 +133,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/firewall/firewall-create-req.json"/>
+                    <xsdxt:code href="../samples/firewalls/firewall-create-request.json"/>
                 </wadl:doc>
                 &firewallObject;
                 &firewallRequestParameters;
@@ -151,7 +142,7 @@
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/firewall/firewall-create-res.json"/>
+                    <xsdxt:code href="../samples/firewalls/firewall-create-response.json"/>
                 </wadl:doc>
                 &firewallObject;
                 &firewallResponseParameters;
@@ -173,7 +164,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/firewall/firewall-update-req.json"/>
+                    <xsdxt:code href="../samples/firewalls/firewall-update-request.json"/>
                 </wadl:doc>
                 &firewallObject;
                 &firewallUpdateParameters;
@@ -182,7 +173,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/firewall/firewall-update-res.json"/>
+                    <xsdxt:code href="../samples/firewalls/firewall-update-response.json"/>
                 </wadl:doc>
                 &firewallObject;
                 &firewallResponseParameters;
diff --git a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/layer3.wadl
similarity index 82%
rename from api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/layer3.wadl
index 64543c099..c00240596 100644
--- a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/layer3.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-layer3-ext.wadl              -->
+<!--        xmllint -noent layer3.wadl                     -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -26,53 +26,35 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-layer3-ext-v2.0">
         <resource id="version" path="//v2.0">
-                <resource id="Routers" type="#RouterList"
-                    path="routers">
-                    <method href="#createRouter"/>
-                    <resource path="{router_id}" id="router_id">
-                        <param
-                            xmlns="http://wadl.dev.java.net/2009/02"
-                            name="router_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Router ID"
-                                   ><para>The UUID of the
-                                   router.</para></wadl:doc>
-                        </param>
-                        <method href="#showRouter"/>
-                        <method href="#updateRouter"/>
-                        <method href="#deleteRouter"/>
-                        <resource id="add_router_interface"
-                            path="add_router_interface">
-                            <method href="#addRouterInterface"/>
-                        </resource>
-                        <resource id="remove_router_interface"
-                            path="remove_router_interface">
-                            <method href="#removeRouterInterface"/>
-                        </resource>
+            <resource id="routers" type="#RouterList"
+                path="routers">
+                <method href="#createRouter"/>
+                <resource path="{router_id}" id="router_id">
+                    &router_idTemplateParameter;
+                    <method href="#showRouter"/>
+                    <method href="#updateRouter"/>
+                    <method href="#deleteRouter"/>
+                    <resource id="add_router_interface"
+                        path="add_router_interface">
+                        <method href="#addRouterInterface"/>
+                    </resource>
+                    <resource id="remove_router_interface"
+                        path="remove_router_interface">
+                        <method href="#removeRouterInterface"/>
                     </resource>
                 </resource>
-                <resource id="FloatingIps" type="#FloatingIpList"
-                    path="floatingips">
-                    <method href="#createFloatingIp"/>
-                    <resource path="{floatingip_id}"
-                        id="floatingip_id">
-                        <param
-                            xmlns="http://wadl.dev.java.net/2009/02"
-                            name="floatingip_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Floating IP ID"
-                                   ><para>The UUID of the floating
-                                   IP.</para></wadl:doc>
-                        </param>
-                        <method href="#showFloatingIp"/>
-                        <method href="#updateFloatingIp"/>
-                        <method href="#deleteFloatingIp"/>
-                    </resource>
+            </resource>
+            <resource id="FloatingIps" type="#FloatingIpList"
+                path="floatingips">
+                <method href="#createFloatingIp"/>
+                <resource path="{floatingip_id}"
+                    id="floatingip_id">
+                    &floating_ip_idTemplateParameter;
+                    <method href="#showFloatingIp"/>
+                    <method href="#updateFloatingIp"/>
+                    <method href="#deleteFloatingIp"/>
                 </resource>
+            </resource>
         </resource>
     </resources>
     <resource_type id="RouterList">
@@ -125,7 +107,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/routers-get-resp.json"/>
+                        href="../samples/routers/routers-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault401; </method>
@@ -133,18 +115,18 @@ Accept: application/json</programlisting>
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Create router">
             <para role="shortdesc">Creates a logical router.</para>
-            <para>This operation creates a new logical router. When it
-                is created, a logical router does not have any
-                internal interface; it is not associated to any
-                subnet. You can optionally specify an external gateway
-                for a router at create time. The external gateway for
-                the router must be plugged into an external network.
-                An external network has its extended field
-                    <code>router:external</code> set to <code>true</code>. To
-                specify an external gateway, the identifier of the
-                external network must be passed in the
-                    <code>external_gateway_info</code> attribute in
-                the request body, as follows:</para>
+            <para>
+                This operation creates a logical router. The logical router
+                does not have any internal interface and it is not associated
+                with any subnet. You can optionally specify an external
+                gateway for a router at create time. The external gateway for
+                the router must be plugged into an external network. An
+                external network has its <code>router:external</code> extended
+                field set to <code>true</code>. To specify an external
+                gateway, the UUID of the external network must be passed in the
+                <code>external_gateway_info</code> attribute in the request
+                body, as follows:
+            </para>
             <programlisting language="json">{
    "router": {
       "external_gateway_info": {
@@ -162,7 +144,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-post-req.json"/>
+                        href="../samples/routers/router-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -176,7 +158,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-post-resp.json"/>
+                        href="../samples/routers/router-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; </method>
@@ -187,8 +169,7 @@ Accept: application/json</programlisting>
                 router.</para>
             <para>This example request shows details for a router in
                 JSON format:</para>
-            <programlisting>GET /v2.0/routers/{router_id}
-Accept: application/json</programlisting>
+<programlisting>GET /v2.0/routers/{router_id} Accept: application/json</programlisting>
             <para>Use the <code>fields</code> query parameter to
                 control which fields are returned in the response
                 body. For information, see <link
@@ -206,7 +187,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-get-detail-resp.json"
+                        href="../samples/routers/router-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -236,7 +217,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-put-update.req.json"
+                        href="../samples/routers/router-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -251,7 +232,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-put-update-resp.json"
+                        href="../samples/routers/router-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -281,37 +262,37 @@ Accept: application/json</programlisting></wadl:doc>
                 Attaches a subnet to an internal router interface.
             </para>
             <para>
-                Specify a subnet ID or port ID in the request body:
+                Specify the UUID of a subnet or port in the request body:
             </para>
             <itemizedlist>
                 <listitem>
                     <para>
-                        Subnet ID. The gateway IP address for the subnet is
+                        Subnet UUID. The gateway IP address for the subnet is
                         used to create the router interface.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        Port ID. The IP address associated with the port is
+                        Port UUID. The IP address associated with the port is
                         used to create the router interface.
                     </para>
                 </listitem>
             </itemizedlist>
             <para>
                 When you specify an IPv6 subnet, this operation adds the
-                subnet to an existing internal port with same network ID, on
-                the router. If a port with the same network ID does not exist,
+                subnet to an existing internal port with same network UUID, on
+                the router. If a port with the same network UUID does not exist,
                 this operation creates a port on the router for that subnet.
             </para>
             <para>
                 The limitation of one IPv4 subnet per router port remains,
                 though a port can contain any number of IPv6 subnets that
-                belong to the same network ID.
+                belong to the same network UUID.
             </para>
             <para>
                 When you use the <code>port-create</code> command to add a
                 port and then call <code>router-interface-add</code> with this port
-                ID, this operation adds the port to the router if the following
+                UUID, this operation adds the port to the router if the following
                 conditions are met:
             </para>
             <itemizedlist>
@@ -321,13 +302,13 @@ Accept: application/json</programlisting></wadl:doc>
                     </para>
                     <para>
                         The IPv6 subnets, if any, on the port do not have same
-                        network ID as network ID of IPv6 subnets on any other
+                        network UUID as the network UUID of IPv6 subnets on any other
                         ports.
                     </para>
                 </listitem>
             </itemizedlist>
             <para>
-                If you specify both IDs, this operation returns the <code>Bad
+                If you specify both UUIDs, this operation returns the <code>Bad
                 Request (400)</code> response code.
             </para>
             <para>
@@ -335,18 +316,18 @@ Accept: application/json</programlisting></wadl:doc>
                 <code>Conflict (409)</code> response code.
             </para>
             <para>
-                This operation returns a port ID that is either:
+                This operation returns a port UUID that is either:
             </para>
             <itemizedlist>
                 <listitem>
                     <para>
-                        The same ID that is passed in the request body.
+                        The same UUID that is passed in the request body.
                     </para>
                 </listitem>
                 <listitem>
                     <para>
-                        The ID of a port that this operation creates to attach
-                        the specified subnet to the router.
+                        The UUID of a port that this operation creates to attach
+                        the subnet to the router.
                     </para>
                 </listitem>
             </itemizedlist>
@@ -356,7 +337,7 @@ Accept: application/json</programlisting></wadl:doc>
             <itemizedlist>
                 <listitem>
                     <para>
-                        The device ID of this port to the router ID.
+                        The device UUID of this port to the router UUID.
                     </para>
                 </listitem>
                 <listitem>
@@ -375,7 +356,7 @@ Accept: application/json</programlisting></wadl:doc>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-add-interface.req.json"
+                        href="../samples/routers/router-add-interface-request.json"
                     />
                 </wadl:doc>
                 &subnet-idParameter; &port-idParameter;
@@ -388,7 +369,7 @@ Accept: application/json</programlisting></wadl:doc>
                     xmlns:wadl="http://wadl.dev.java.net/2009/02"
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/router-add-interface-resp.json"/>
+                    <xsdxt:code href="../samples/routers/router-add-interface-response.json"/>
                 </wadl:doc>
                 &subnet-idParameter;
                 &tenant-idParameter;
@@ -409,19 +390,18 @@ Accept: application/json</programlisting></wadl:doc>
             </para>
             <para>
                 This operation removes an internal router interface, which
-                detaches a subnet from the router. If this subnet ID is the
+                detaches a subnet from the router. If this subnet UUID is the
                 last subnet on the port, this operation deletes the port
-                itself. You must specify either a subnet ID or port ID in the
+                itself. You must specify either a subnet UUID or port UUID in the
                 request body; the operation uses this value to identify which
                 router interface to remove.
             </para>
             <para>
-                You can also specify both a subnet ID and port ID. If you
-                specify both IDs, the subnet ID must correspond to the subnet
-                ID of the first IP address on the port specified by the port
-                ID. Otherwise, this operation returns the <code>Conflict
-                (409)</code> response code with information about the affected
-                router and interface.
+                You can also specify both a subnet UUID and port UUID. If you
+                specify both UUIDs, the subnet UUID must correspond to the subnet
+                UUID of the first IP address on the port. Otherwise, this
+                operation returns the <code>Conflict (409)</code> response
+                code with information about the affected router and interface.
             </para>
             <para>
                 If the router or the subnet and port do not exist or are not
@@ -443,7 +423,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-remove-interface-req.json"
+                        href="../samples/routers/router-remove-interface-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -456,7 +436,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/router-remove-interface-resp.json"
+                        href="../samples/routers/router-remove-interface-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -497,7 +477,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/floating-ips-get-resp.json"
+                        href="../samples/routers/floating-ips-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -511,8 +491,8 @@ Accept: application/json</programlisting>
             </para>
             <para>
                 To associate the floating IP with an internal port, specify
-                the port ID attribute in the request body. If you do not
-                specify a port ID in the request, you can issue a &PUT;
+                the port UUID attribute in the request body. If you do not
+                specify a port UUID in the request, you can issue a &PUT;
                 request instead of a &POST; request.
             </para>
             <para>
@@ -527,14 +507,14 @@ Accept: application/json</programlisting>
                 with a single fixed IP address that is configured on an
                 OpenStack Networking port. If a port has multiple IP
                 addresses, you must specify the <code>fixed_ip_address</code>
-                attribute in the request body to associate a specific fixed IP
+                attribute in the request body to associate a fixed IP
                 address with the floating IP address.
             </para>
             <para>
                 You can create floating IPs on only external networks. When
-                you create a floating IP, you must specify the ID of the
+                you create a floating IP, you must specify the UUID of the
                 network on which you want to create the floating IP.
-                Alternatively, you can create a floating IP on a specific
+                Alternatively, you can create a floating IP on a
                 subnet in the external network, based on the costs and
                 quality of that subnet.
             </para>
@@ -580,7 +560,7 @@ Accept: application/json</programlisting>
                   </para>
                </listitem>
                <listitem>
-                  <para><code>404</code> The port ID is not valid.
+                  <para><code>404</code> The port UUID is not valid.
                   </para>
                </listitem>
                <listitem>
@@ -612,7 +592,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/floatingip-post-req.json"/>
+                        href="../samples/routers/floatingip-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -630,7 +610,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/floatingip-post-resp.json"/>
+                        href="../samples/routers/floatingip-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault404; &fault409; </method>
@@ -665,7 +645,7 @@ Accept: application/json</programlisting>
                     xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/floatingip-get-detail-resp.json"
+                        href="../samples/routers/floatingip-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -696,7 +676,7 @@ Accept: application/json</programlisting>
                     xml:lang="EN"
                     title="Update floating IP (associate port): JSON">
                     <xsdxt:code
-                        href="api_samples/floatingip-put-update.req.json"
+                        href="../samples/routers/floatingip-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -708,7 +688,7 @@ Accept: application/json</programlisting>
                     xml:lang="EN"
                     title="Update floating IP (disassociate port): JSON">
                     <xsdxt:code
-                        href="api_samples/floatingip-put-disassociate-update.req.json"
+                        href="../samples/routers/floatingip-disassociate-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -727,7 +707,7 @@ Accept: application/json</programlisting>
                     xml:lang="EN"
                     title="Update floating IP (associate port): JSON">
                     <xsdxt:code
-                        href="api_samples/floatingip-put-update-resp.json"
+                        href="../samples/routers/floatingip-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -739,7 +719,7 @@ Accept: application/json</programlisting>
                     xml:lang="EN"
                     title="Update floating IP (disassociate port): JSON">
                     <xsdxt:code
-                        href="api_samples/floatingip-put-disassociate-update-resp.json"
+                        href="../samples/routers/floatingip-disassociate-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-lbaasv1.0-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/lbaas-v1.0.wadl
similarity index 88%
rename from api-ref/src/wadls/netconn-api/src/os-lbaasv1.0-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/lbaas-v1.0.wadl
index 1e4d28aab..f5f96fa56 100644
--- a/api-ref/src/wadls/netconn-api/src/os-lbaasv1.0-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/lbaas-v1.0.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-lbaas-ext.wadl               -->
+<!--        xmllint -noent lbaas-v1.0.wadl                 -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -34,7 +34,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="VIP ID">The UUID for
+                            xml:lang="EN" title="VIP UUID">The UUID for
                             the VIP.</wadl:doc>
                     </param>
                     <method href="#showVIP"/>
@@ -42,7 +42,6 @@
                     <method href="#deleteVIP"/>
                 </resource>
             </resource>
-
             <resource id="lb-health_monitors" path="lb/health_monitors">
                 <method href="#listHealthMonitors"/>
                 <method href="#createHealthMonitor"/>
@@ -52,7 +51,7 @@
                        type="csapi:UUID">
                         <wadl:doc
                         xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN" title="Network ID">
+                        xml:lang="EN" title="Health monitor UUID">
                         The UUID for the health monitor.
                         </wadl:doc>
                     </param>
@@ -69,7 +68,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="Network ID">The UUID
+                            xml:lang="EN" title="Pool UUID">The UUID
                             for the pool.</wadl:doc>
                     </param>
                     <method href="#showPool"/>
@@ -84,7 +83,7 @@
                                 style="template" type="csapi:UUID">
                                 <wadl:doc
                                    xmlns="http://docbook.org/ns/docbook"
-                                   xml:lang="EN" title="Network ID"
+                                   xml:lang="EN" title="Health monitor UUID"
                                    >The UUID for the health
                                    monitor.</wadl:doc>
                             </param>
@@ -102,7 +101,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="Network ID">The UUID
+                            xml:lang="EN" title="Member UUID">The UUID
                             for the member.</wadl:doc>
                     </param>
                     <method href="#showMember"/>
@@ -126,7 +125,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/vips-get-resp.json"
+                    <xsdxt:code href="../samples/lbaas/vips-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -140,7 +139,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/VIP-post-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/vip-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -148,7 +147,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/VIP-post-resp.json"
+                    <xsdxt:code href="../samples/lbaas/vip-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -164,7 +163,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/VIP-get-detail-resp.json"/>
+                        href="../samples/lbaas/vip-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
@@ -179,7 +178,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/VIP-put-update-req.json"/>
+                        href="../samples/lbaas/vip-update-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -188,7 +187,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/VIP-put-update-resp.json"/>
+                        href="../samples/lbaas/vip-update-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
@@ -210,7 +209,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/pools-get-resp.json"
+                    <xsdxt:code href="../samples/lbaas/pools-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -225,7 +224,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-post-req.json"
+                    <xsdxt:code href="../samples/lbaas/pool-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -235,7 +234,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-post-resp.json"
+                    <xsdxt:code href="../samples/lbaas/pool-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -251,7 +250,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/pool-get-detail-resp.json"/>
+                        href="../samples/lbaas/pool-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
@@ -266,7 +265,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/pool-put-update.req.json"/>
+                        href="../samples/lbaas/pool-update-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -276,7 +275,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/Pool-put-update-resp.json"/>
+                        href="../samples/lbaas/pool-update-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
@@ -299,7 +298,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/member-get-resp.json"/>
+                        href="../samples/lbaas/members-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
@@ -314,7 +313,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/Member-post-req.json"/>
+                        href="../samples/lbaas/member-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -324,7 +323,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/Member-post-resp.json"/>
+                        href="../samples/lbaas/member-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
@@ -340,7 +339,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/Member-get-detail-resp.json"
+                        href="../samples/lbaas/member-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -356,7 +355,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/Member-put-update.req.json"
+                        href="../samples/lbaas/member-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -367,7 +366,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/Member-put-update-resp.json"
+                        href="../samples/lbaas/member-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -389,7 +388,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/hms-get-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/healthmonitors-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
@@ -404,7 +403,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/HealthMonitor-post-req.json"
+                        href="../samples/lbaas/healthmonitor-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -414,7 +413,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/HealthMonitor-post-resp.json"
+                        href="../samples/lbaas/healthmonitor-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -430,7 +429,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/HealthMonitor-get-detail-resp.json"
+                        href="../samples/lbaas/healthmonitor-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -446,7 +445,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/HealthMonitor-put-update.req.json"
+                        href="../samples/lbaas/healthmonitor-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -456,7 +455,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/HealthMonitor-put-update-resp.json"
+                        href="../samples/lbaas/healthmonitor-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -481,7 +480,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/HealthMonitor-post-associate-req.json"
+                        href="../samples/lbaas/healthmonitor-associate-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -492,7 +491,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/HealthMonitor-post-associate-resp.json"
+                        href="../samples/lbaas/healthmonitor-associate-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-lbaasv2.0-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/lbaas-v2.0.wadl
similarity index 95%
rename from api-ref/src/wadls/netconn-api/src/os-lbaasv2.0-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/lbaas-v2.0.wadl
index 7121907f0..c39009586 100644
--- a/api-ref/src/wadls/netconn-api/src/os-lbaasv2.0-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/lbaas-v2.0.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-lbaasv2.0-ext.wadl           -->
+<!--        xmllint -noent lbaas-v2.0.wadl                 -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -102,7 +102,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/loadbalancer-list-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/loadbalancers-list-response.json"/>
                 </wadl:doc> &lbLoadbalancersParam; &lbResponseParams;</representation>
         </response> &fault401; &fault500; &fault503;</method>
     <method name="GET" id="showLoadBalancerv2">
@@ -181,7 +181,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/loadbalancer-get-detail-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/loadbalancer-show-response.json"/>
                 </wadl:doc> &lbLoadbalancerParam; &lbResponseParams; </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
     <method name="POST" id="createLoadBalancerv2">
@@ -285,13 +285,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/loadbalancer-post-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/loadbalancer-create-request.json"/>
                 </wadl:doc>&lbCreateRequestParams; </representation>
         </request>
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/loadbalancer-post-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/loadbalancer-create-response.json"/>
                 </wadl:doc> &lbLoadbalancerParam; &lbResponseParams; </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503;
     </method>
@@ -326,12 +326,12 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/loadbalancer-put-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/loadbalancer-update-request.json"/>
                 </wadl:doc> &lbLoadbalancerParam; &lbUpdateRequestParams; </representation>
         </request>
         <response status="200"><representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                <xsdxt:code href="api_samples/loadbalancer-put-resp.json"/>
+                <xsdxt:code href="../samples/lbaas/loadbalancer-update-response.json"/>
             </wadl:doc> &lbLoadbalancerParam; &lbResponseParams; </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
     <method name="DELETE" id="deleteLoadBalancerv2">
@@ -465,13 +465,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/listener-post-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/listener-create-request.json"/>
                 </wadl:doc> &listenerRequestParams; </representation>
         </request>
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/listener-post-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/listener-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
@@ -505,7 +505,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/listener-list-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/listeners-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault500; &fault503; </method>
@@ -542,7 +542,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/listener-get-detail-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/listener-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503;</method>
@@ -585,12 +585,12 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/listener-put-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/listener-update-request.json"/>
                 </wadl:doc> &listenerRequestParams; </representation>
         </request>
         <response status="200"><representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/listener-put-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/listener-update-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault500; &fault503; &fault401; &fault400;&fault413;</method>
@@ -653,7 +653,7 @@
                 </listitem>
                 <listitem>
                     <para>
-                        <code>listener_id</code>. The ID of the listener in
+                        <code>listener_id</code>. The UUID of the listener in
                         which this pool becomes the default pool. Each
                         listener can have only one default pool.
                     </para>
@@ -695,13 +695,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-post-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/pool-create-request.json"/>
                 </wadl:doc> &poolCreateRequestParamsv2; </representation>
         </request>
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-post-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/pool-create-response.json"/>
                 </wadl:doc> &poolObject; &poolcreateResponseParams; </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
     <method name="GET" id="listPoolsv2">
@@ -732,7 +732,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-list-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/pools-list-response.json"/>
                 </wadl:doc> &poolResponseParamsv2; </representation>
         </response> &fault401; &fault500; &fault503;</method>
     <method name="GET" id="showPoolv2">
@@ -768,7 +768,7 @@
         <response status="200">
             <representation mediaType="application/json"><wadl:doc
                     xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-get-detail-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/pool-show-response.json"/>
                 </wadl:doc> &poolResponseParamsv2; </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503;
     </method>
@@ -792,7 +792,7 @@
                 <listitem><para><code>session_persistence</code></para></listitem>
             </itemizedlist>
             <para>
-                Note: You cannot update the pool ID, <code>tenant_id</code>,
+                Note: You cannot update the pool UUID, <code>tenant_id</code>,
                 <code>listener_id</code>, <code>listeners</code>,
                 <code>health_monitor_id</code>, <code>protocol</code>, and
                 <code>members</code> immutable attributes. If you try to
@@ -809,13 +809,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-put-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/pool-update-request.json"/>
                 </wadl:doc> &poolObject; &poolUpdateRequestParams; </representation>
         </request>
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/pool-put-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/pool-update-response.json"/>
                 </wadl:doc> &poolResponseParamsv2; </representation>
         </response>  &fault400; &fault401; &fault413; &fault500; &fault503;</method>
     <method name="DELETE" id="deletePoolv2">
@@ -876,7 +876,7 @@
             </itemizedlist>
             <para>
                 If you omit the <code>subnet_id</code> parameter, LBaaS
-                uses the <code>vip_subnet_id</code> parameter value for the subnet ID.
+                uses the <code>vip_subnet_id</code> parameter value for the subnet UUID.
             </para>
             <para>
                 If the request fails due to incorrect data, the service
@@ -902,13 +902,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Add member to a pool: JSON request">
-                    <xsdxt:code href="api_samples/Member-post-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/member-create-request.json"/>
                 </wadl:doc> &memberObject; &memberCreatev2RequestParams; </representation>
         </request>
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/Member-post-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/member-create-response.json"/>
                 </wadl:doc> &memberObject; &membercreateResponseParams; </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
     <method name="GET" id="listMembersv2">
@@ -939,7 +939,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/member-list-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/pool-members-list-response.json"/>
                 </wadl:doc> &membersObject; &memberResponseParams; </representation></response> &fault401;
         &fault503; &fault500;</method>
     <method name="GET" id="showMemberv2">
@@ -972,7 +972,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/Member-get-detail-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/member-show-response.json"/>
                 </wadl:doc> &memberObject; &memberResponseParams; </representation>
         </response>&fault401; &fault403; &fault404;&fault409;&fault413;&fault500;&fault503;
     </method>
@@ -993,7 +993,7 @@
                 <listitem><para><code>admin_state_up</code></para></listitem>
             </itemizedlist>
             <para>
-                Note: You cannot update the member ID, <code>tenant_id</code>,
+                Note: You cannot update the member UUID, <code>tenant_id</code>,
                 <code>address</code>, <code>protocol_port</code>, and
                 <code>subnet_id</code> attributes. If you attempt to update
                 any of these attributes, the service returns the HTTP
@@ -1008,13 +1008,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/member-put-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/member-update-request.json"/>
                 </wadl:doc> &memberObject; &memberUpdateRequestParams; </representation>
         </request>
         <response status="200">
             <representation mediaType="application/json"><wadl:doc
                     xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/member-put-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/member-update-response.json"/>
                 </wadl:doc> &memberObject; &memberResponseParams; </representation>
         </response> &fault400; &fault401;  &fault413; &fault500; &fault503; </method>
     <method name="DELETE" id="deleteMemberv2">
@@ -1093,13 +1093,13 @@
         <request>
             <representation mediaType="application/json"><wadl:doc
                     xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/HealthMonitor-post-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/healthmonitor-create-request.json"/>
                 </wadl:doc> &hmObject; &hmCreateRequestParams; </representation>
         </request>
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/HealthMonitor-post-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/healthmonitor-create-response.json"/>
                 </wadl:doc> &hmObject; &hmResponseParams; </representation>
         </response> &fault401; &fault404; &fault409; &fault413; &fault500; &fault503; </method>
     <method name="GET" id="listHealthMonitors">
@@ -1126,7 +1126,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/healthmonitor-list-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/healthmonitors-list-response.json"/>
                 </wadl:doc> &hmsObject; &hmResponseParams; </representation>
         </response> &fault401; &fault500; &fault503;</method>
     <method name="GET" id="showHealthMonitorv2">
@@ -1163,7 +1163,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/HealthMonitor-get-detail-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/healthmonitor-show-response.json"/>
                 </wadl:doc> &hmObject; &hmResponseParams; </representation>
         </response> &fault401; &fault403; &fault404; &fault409; &fault413; &fault500; &fault503;
     </method>
@@ -1188,7 +1188,7 @@
                 <listitem><para><code>admin_state_up</code></para></listitem>
             </itemizedlist>
             <para>
-                Note: The health monitor ID, <code>tenant_id</code>,
+                Note: The health monitor UUID, <code>tenant_id</code>,
                 <code>pool_id</code>, and type are immutable attributes and
                 cannot be updated. If you specify an unsupported attribute,
                 the service returns the HTTP <code>Immutable (422)</code>
@@ -1198,13 +1198,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/healthmonitor-put-req.json"/>
+                    <xsdxt:code href="../samples/lbaas/healthmonitor-update-request.json"/>
                 </wadl:doc> &hmObject; &hmUpdateRequestParams; </representation>
         </request>
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/healthmonitor-put-resp.json"/>
+                    <xsdxt:code href="../samples/lbaas/healthmonitor-update-response.json"/>
                 </wadl:doc> &hmObject; &hmResponseParams; </representation>
         </response> &fault400; &fault401; &fault413; &fault500; &fault503; </method>
     <method name="DELETE" id="deleteHealthMonitorv2">
diff --git a/api-ref/src/wadls/netconn-api/src/metering-labels.wadl b/api-ref/src/wadls/netconn-api/src/wadl/metering-labels.wadl
similarity index 80%
rename from api-ref/src/wadls/netconn-api/src/metering-labels.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/metering-labels.wadl
index 700f1f8cf..761c924ee 100644
--- a/api-ref/src/wadls/netconn-api/src/metering-labels.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/metering-labels.wadl
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
+<!--*******************************************************-->
+<!--         Import Common XML Entities                    -->
+<!--                                                       -->
+<!--     You can resolve the entities with xmllint         -->
+<!--                                                       -->
+<!--        xmllint -noent metering-labels.wadl            -->
+<!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
-<!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -15,22 +22,13 @@
     <resources base="https://servers.api.openstack.com/"
         xml:id="metering-labels-v2.0">
         <resource id="version" path="//v2.0/metering">
-            <resource id="metering_labels" path="metering-labels">
+            <resource id="metering-labels" path="metering-labels">
                 <method href="#listMeteringLabels"/>
                 <method href="#createMeteringLabel"/>
                 <resource id="get_metering_label"
-                    path="{metering_label_id}">
-                    <param xmlns="http://wadl.dev.java.net/2009/02"
-                        name="metering_label_id" style="template"
-                        type="csapi:uuid">
-                        <wadl:doc xml:lang="EN"
-                            xmlns="http://docbook.org/ns/docbook">
-                            <para>
-                                The unique identifier of the metering label.
-                            </para>
-                        </wadl:doc>
-                    </param>
-                    <method href="#getMeteringLabel"/>
+                    path="{metering-label-id}">
+                    &metering_label_idTemplateParameter;
+                    <method href="#showMeteringLabel"/>
                     <method href="#deleteMeteringLabel"/>
                 </resource>
             </resource>
@@ -40,17 +38,8 @@
                 <method href="#createMeteringLabelRule"/>
                 <resource path="{metering-label-rule-id}"
                     id="metering-label-rule-id">
-                    <param xmlns="http://wadl.dev.java.net/2009/02"
-                        name="metering-label-rule-id" style="template"
-                        type="csapi:uuid">
-                        <wadl:doc xml:lang="EN"
-                            xmlns="http://docbook.org/ns/docbook">
-                            <para>
-                                The unique identifier of metering label rule.
-                            </para>
-                        </wadl:doc>
-                    </param>
-                    <method href="#getMeteringLabelRule"/>
+                    &metering_label_rule_idTemplateParameter;
+                    <method href="#showMeteringLabelRule"/>
                     <method href="#deleteMeteringLabelRule"/>
                 </resource>
             </resource>
@@ -60,18 +49,18 @@
         <wadl:doc xml:lang="EN" title="List metering labels"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
-                Lists all l3 metering labels that belong to the
+                Lists all L3 metering labels that belong to the
                 tenant.
             </para>
             <para>
-                The list shows the unique ID for each metering label.
+                The list shows the UUID for each metering label.
             </para>
         </wadl:doc>
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"><xsdxt:code
-                        href="api_samples/metering-labels-list-get-req-json-http.txt"
+                        href="../samples/metering-labels/metering-labels-list-request-json-http.txt"
                     /></wadl:doc>
             </representation>
         </request>
@@ -80,7 +69,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-labels-list-get-resp.json"
+                        href="../samples/metering-labels/metering-labels-list-response.json"
                     />
                 </wadl:doc>
                 &meteringlabelsObject;
@@ -98,7 +87,7 @@
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Create metering label">
             <para role="shortdesc">
-                Creates an l3 metering label.
+                Creates an L3 metering label.
             </para>
         </wadl:doc>
         <request>
@@ -106,7 +95,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-label-create-req.json"
+                        href="../samples/metering-labels/metering-label-create-request.json"
                     />
                 </wadl:doc>
                 &meteringlabelObject;
@@ -118,7 +107,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-label-create-resp.json"
+                        href="../samples/metering-labels/metering-label-create-response.json"
                     />
                 </wadl:doc>
                 &meteringlabelObject;
@@ -144,14 +133,14 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    <method name="GET" id="getMeteringLabel">
+    <method name="GET" id="showMeteringLabel">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="Show metering label">
+            title="Show metering label details">
             <para role="shortdesc">
-                Shows information for a metering label.
+                Shows details for a metering label.
             </para>
             <para>
-                The response body shows the description, name, ID.
+                The response body shows the description, name, and UUID.
             </para>
         </wadl:doc>
         <request>
@@ -159,7 +148,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-label-get-req-json-http.txt"
+                        href="../samples/metering-labels/metering-label-show-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -169,7 +158,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-label-get-resp.json"
+                        href="../samples/metering-labels/metering-label-show-response.json"
                     />
                 </wadl:doc>
                 &meteringlabelObject;
@@ -193,7 +182,7 @@
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Delete metering label">
             <para role="shortdesc">
-                Deletes an l3 metering label.
+                Deletes an L3 metering label.
             </para>
         </wadl:doc>
         <request>
@@ -201,7 +190,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-label-delete-req-json-http.txt"
+                        href="../samples/metering-labels/metering-label-delete-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -211,7 +200,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-label-delete-resp-json-http.txt"
+                        href="../samples/metering-labels/metering-label-delete-response-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -233,11 +222,11 @@
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="List metering label rules">
             <para role="shortdesc">
-                Lists a summary of all l3 metering label rules that belong to
+                Lists a summary of all L3 metering label rules that belong to
                 the tenant.
             </para>
             <para>
-                The list shows the unique ID for each metering label rule.
+                The list shows the UUID for each metering label rule.
             </para>
         </wadl:doc>
         <request>
@@ -245,7 +234,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/metering-label-rules-list-get-req-json-http.txt"
+                        href="../samples/metering-labels/metering-label-rules-list-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -255,7 +244,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/metering-label-rules-list-get-resp.json"
+                        href="../samples/metering-labels/metering-label-rules-list-response.json"
                     />
                 </wadl:doc>
                 &ListMeteringLabelRuleResponseParams;
@@ -272,7 +261,7 @@
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Create metering label rule">
             <para role="shortdesc">
-                Creates an l3 metering label rule.
+                Creates an L3 metering label rule.
             </para>
         </wadl:doc>
         <request>
@@ -280,7 +269,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/metering-label-rule-create-req.json"
+                        href="../samples/metering-labels/metering-label-rule-create-request.json"
                     />
                 </wadl:doc>
                 &CreateMeteringLabelRuleRequestParams;
@@ -291,7 +280,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/metering-label-rule-create-resp.json"
+                        href="../samples/metering-labels/metering-label-rule-create-response.json"
                     />
                 </wadl:doc>
                 &CreateMeteringLabelRuleResponseParams;
@@ -328,15 +317,15 @@
             <representation mediaType="application/json"/>
         </response>
     </method>
-    <method name="GET" id="getMeteringLabelRule">
+    <method name="GET" id="showMeteringLabelRule">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="Show metering label rule">
+            title="Show metering label rule details">
             <para role="shortdesc">
-                Shows detailed information for a metering label
+                Shows details for a metering label
                 rule.
             </para>
             <para>
-                The response body shows the following information for each
+                The response body shows this information for each
                 metering label rule:
             </para>
             <itemizedlist>
@@ -353,7 +342,7 @@
                 </listitem>
                 <listitem>
                     <para>
-                        The ID for the metering label rule.
+                        The UUID for the metering label rule.
                     </para>
                 </listitem>
                 <listitem>
@@ -374,7 +363,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/metering-label-rule-get-req-json-http.txt"
+                        href="../samples/metering-labels/metering-label-rule-show-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -384,7 +373,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/metering-label-rule-get-resp.json"
+                        href="../samples/metering-labels/metering-label-rule-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -406,7 +395,7 @@
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Delete metering label rule">
             <para role="shortdesc">
-                Deletes a l3 metering label rule.
+                Deletes an L3 metering label rule.
             </para>
         </wadl:doc>
         <request>
@@ -414,7 +403,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/metering-label-rule-delete-req-json-http.txt"
+                        href="../samples/metering-labels/metering-label-rule-delete-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -424,7 +413,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/metering-label-rule-delete-resp-json-http.txt"
+                        href="../samples/metering-labels/metering-label-rule-delete-response-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/networks-multi-provider.wadl
similarity index 76%
rename from api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/networks-multi-provider.wadl
index fc6203a87..52f9b8831 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/networks-multi-provider.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--  xmllint -noent os-networks-multi-provider-ext.wadl   -->
+<!--  xmllint -noent networks-multi-provider.wadl          -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -26,21 +26,14 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-multi-provider-ext-v2.0">
         <resource id="version" path="//v2.0">
-                <resource id="Networks" path="networks">
-                    <method href="#listMultiNetworks"/>
-                    <method href="#createMultiNetwork"/>
-                    <resource path="{network_id}" id="network_id">
-                        <param name="network_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN"><para>The UUID for the
-                                   network of interest to
-                                you.</para></wadl:doc>
-                        </param>
-                        <method href="#showMultiNetwork"/>
-                    </resource>
+            <resource id="Networks" path="networks">
+                <method href="#listMultiNetworks"/>
+                <method href="#createMultiNetwork"/>
+                <resource path="{network_id}" id="network_id">
+                    &network_idTemplateParameter;
+                    <method href="#showMultiNetwork"/>
                 </resource>
+            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
@@ -60,7 +53,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/networks-multi-list-resp.json"
+                        href="../samples/networks/networks-multi-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -80,7 +73,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-multi-post-req.json"
+                        href="../samples/networks/network-multi-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -91,7 +84,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-multi-post-resp.json"
+                        href="../samples/networks/network-multi-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -109,7 +102,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/networks-multi-get-detail-resp.json"
+                        href="../samples/networks/networks-multi-show-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/networks-provider.wadl
similarity index 59%
rename from api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/networks-provider.wadl
index f064c83df..f3d0f19c2 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/networks-provider.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-networks-provider-ext.wadl   -->
+<!--        xmllint -noent networks-provider.wadl          -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -26,23 +26,16 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-provider-ext-v2.0">
         <resource id="version" path="//v2.0">
-                <resource id="ProviderNetworks" path="networks">
-                    <method href="#listProviderNetworks"/>
-                    <method href="#createProviderNetwork"/>
-                    <resource path="{network_id}" id="network_id">
-                        <param name="network_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN"><para>The UUID for the
-                                   network of interest to
-                                you.</para></wadl:doc>
-                        </param>
-                        <method href="#showProviderNetwork"/>
-                        <method href="#updateProviderNetwork"/>
-                        <method href="#deleteProviderNetwork"/>
-                    </resource>
+            <resource id="ProviderNetworks" path="networks">
+                <method href="#listProviderNetworks"/>
+                <method href="#createProviderNetwork"/>
+                <resource path="{network_id}" id="network_id">
+                    &network_idTemplateParameter;
+                    <method href="#showProviderNetwork"/>
+                    <method href="#updateProviderNetwork"/>
+                    <method href="#deleteProviderNetwork"/>
                 </resource>
+            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
@@ -60,15 +53,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/networks-get-detail-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-get-detail-resp.xml"
+                        href="../samples/networks/networks-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -85,14 +70,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-post-req.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-post-req.xml"/>
+                        href="../samples/networks/network-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -102,14 +80,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-post-resp.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-post-resp.xml"/>
+                        href="../samples/networks/network-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401;
@@ -126,15 +97,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/networks-get-detail-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/networks-get-detail-resp.xml"
+                        href="../samples/networks/network-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -151,15 +114,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-put-update.req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-put-update.req.xml"
+                        href="../samples/networks/network-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -170,15 +125,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-put-update-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/network-put-update-resp.xml"
+                        href="../samples/networks/network-update-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-vlan-transparency-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/networks-vlan-transparency.wadl
similarity index 75%
rename from api-ref/src/wadls/netconn-api/src/os-networks-vlan-transparency-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/networks-vlan-transparency.wadl
index 627c8b681..62c78b32a 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-vlan-transparency-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/networks-vlan-transparency.wadl
@@ -5,12 +5,12 @@
 <!--                                                       -->
 <!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--  xmllint -noent os-networks-vlan-transparent-ext.wadl -->
+<!--  xmllint -noent networks-vlan-transparency.wadl       -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -26,24 +26,14 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-vlan-transparency-ext-v2.0">
         <resource id="version" path="//v2.0">
-                <resource id="Networks" path="networks">
-                    <method href="#listVTNetworks"/>
-                    <method href="#createVTNetwork"/>
-                    <resource path="{network_id}" id="network_id">
-                        <param name="network_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The UUID for the network of interest to
-                                    you.
-                                </para>
-                            </wadl:doc>
-                        </param>
-                        <method href="#showVTNetwork"/>
-                    </resource>
+            <resource id="VLANnetworks" path="networks">
+                <method href="#listVTNetworks"/>
+                <method href="#createVTNetwork"/>
+                <resource path="{network_id}" id="network_id">
+                    &network_idTemplateParameter;
+                    <method href="#showVTNetwork"/>
                 </resource>
+            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
@@ -63,7 +53,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/networks-vlan-transparent-resp.json"
+                        href="../samples/networks/networks-vlan-transparent-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -83,7 +73,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-vlan-transparent-post-req.json"
+                        href="../samples/networks/network-vlan-transparent-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -94,7 +84,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/network-vlan-transparent-post-resp.json"
+                        href="../samples/networks/network-vlan-transparent-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -113,7 +103,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/networks-vlan-transparent-get-detail-resp.json"
+                        href="../samples/networks/network-vlan-transparent-show-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/wadl/networks.wadl b/api-ref/src/wadls/netconn-api/src/wadl/networks.wadl
new file mode 100644
index 000000000..79a60833e
--- /dev/null
+++ b/api-ref/src/wadls/netconn-api/src/wadl/networks.wadl
@@ -0,0 +1,589 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
+<!--*******************************************************-->
+<!--         Import Common XML Entities                    -->
+<!--                                                       -->
+<!--     You can resolve the entities with xmllint         -->
+<!--                                                       -->
+<!--        xmllint -noent networks.wadl                   -->
+<!--*******************************************************-->
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "../common.ent">
+    %common;
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
+    %common_project;
+]>
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:linkend="http://www.w3.org/1999/linkend"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
+    <!--*******************************************************-->
+    <!--             All Resources                             -->
+    <!--*******************************************************-->
+    <resources base="https://neutron.example.com/" xml:id="os-networks-v2.0">
+        <resource id="networks-versions" path="//">
+            <method href="#networks-listVersions"/>
+        </resource>
+        <resource id="networks-version" type="#networks-versionDetails" path="//v2">
+            <resource id="extensions" path="extensions">
+                <method href="#listExtensions"/>
+                <resource id="extension" path="{alias}">
+                    <param name="alias" style="template"
+                        type="xsd:string">
+                        <wadl:doc
+                            xmlns="http://docbook.org/ns/docbook"
+                            xml:lang="EN" title="Extension Alias">
+                            <para>The alias of an extension.</para>
+                        </wadl:doc>
+                    </param>
+                    <method href="#showExtension"/>
+                </resource>
+            </resource>
+            <resource id="networks" type="#NetworkList"
+                path="networks">
+                <method href="#createNetwork"/>
+                <method href="#bulkCreateNetwork"/>
+                <resource path="{network_id}" id="network_id">
+                    <param xmlns="http://wadl.dev.java.net/2009/02" name="network_id" style="template"
+                        type="csapi:UUID">
+                        <wadl:doc
+                            xmlns="http://docbook.org/ns/docbook"
+                            xml:lang="EN" title="Network UUID">
+                            <para>The UUID of the network.</para>
+                        </wadl:doc>
+                    </param>
+                    <method href="#showNetwork"/>
+                    <method href="#updateNetwork"/>
+                    <method href="#deleteNetwork"/>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+    <resource_type id="networks-versionDetails">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Version details">
+            <para>
+                Details for a version.
+            </para>
+        </wadl:doc>
+        <method href="#showVersionDetails"/>
+    </resource_type>
+    <resource_type id="NetworkList">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Network list">
+            <para>A list of networks.</para>
+        </wadl:doc>
+        <method href="#listNetworks"/>
+    </resource_type>
+    <resource_type id="ExtensionList">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Extension List">
+            <para>A list of supported extensions.</para>
+        </wadl:doc>
+        <method href="#listExtensions"/>
+    </resource_type>
+    <!--*******************************************************-->
+    <!--               All Methods                             -->
+    <!--*******************************************************-->
+    <method name="GET" id="networks-listVersions">
+        <wadl:doc xml:lang="EN" title="List API versions"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">
+                Lists information about all Networking API versions.
+            </para>
+        </wadl:doc>
+        <response status="200 300">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/versions-list-response.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="showVersionDetails">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Show API v2 details">
+            <para role="shortdesc">
+                Shows details for Networking API v2.0.
+            </para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/version-show-response.json"
+                    />
+                </wadl:doc>
+                <param xmlns="http://wadl.dev.java.net/2009/02" name="location"
+                    style="plain" type="xsd:anyURI"
+                    required="true"
+                    path="/common:version/atom:link[@rel='self']/@href">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN" title="Location">
+                        <para>
+                            Full URL to a service or server.
+                        </para>
+                    </wadl:doc>
+                    <link resource_type="#VersionDetails" rel="self"/>
+                </param>
+            </representation>
+        </response>
+        <response status="203"/>
+    </method>
+    <!-- Extensions -->
+    <method name="GET" id="listExtensions">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List extensions">
+            <para>Lists available Networking API extensions.</para>
+        </wadl:doc>
+        <response status="200">
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="next" style="plain" type="xsd:anyURI"
+                path="/capi:extensions/atom:link[@rel='next']/@href">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <para>
+                        Moves to the next item in the list.
+                    </para>
+                </wadl:doc>
+                <link resource_type="#ExtensionList" rel="next"/>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="previous" style="plain" type="xsd:anyURI"
+                path="/capi:extensions/atom:link[@rel='previous']/@href">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <para>
+                        Moves to the previous item in the list.
+                    </para>
+                </wadl:doc>
+                <link resource_type="#ExtensionList" rel="previous"/>
+            </param>
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook">
+                    <xsdxt:sample
+                        title="List extensions: JSON response">
+                        <xsdxt:code href="../samples/networks/extensions-list-response.json"
+                        />
+                    </xsdxt:sample>
+                </wadl:doc>
+            </representation>
+        </response>
+        <response status="203"/>
+        &commonFaults; </method>
+    <method name="GET" id="showExtension">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Show extension details">
+            <para>Shows details for an
+                extension.</para>
+        </wadl:doc>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook">
+                    <xsdxt:sample
+                        title="Get extension details: JSON response">
+                        <xsdxt:code href="../samples/networks/extension-show-response.json"
+                        />
+                    </xsdxt:sample>
+                </wadl:doc>
+            </representation>
+        </response>
+        <response status="203"/>
+        &commonFaults; </method>
+    <method name="GET" id="listNetworks">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List networks">
+            <para role="shortdesc">Lists networks to which the
+             tenant has access.</para>
+            <para>You can control which response parameters are returned by
+                using the fields query parameter. For information, see <link
+                    xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/networking_general_api_information.html#filtering-and-column-selection"
+                    >Filtering and column selection</link>.</para>
+        </wadl:doc>
+        <response status="200">
+            &networksObject;
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="admin_state_up" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <para>
+                        The administrative state of the network, which is up
+                        (<code>true</code>) or down (<code>false</code>).
+                    </para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <para>The UUID of the network.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="name" 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 network
+                    name.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="shared" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <para>Indicates whether this network
+                        is shared across all tenants. By default, only
+                        administrative users can change this
+                        value.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="status" 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 network
+                    status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="subnets" style="plain"
+                type="xsd:dict">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The associated
+                    subnets.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="tenant_id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The UUID of the tenant.</para></wadl:doc>
+            </param>
+            <representation mediaType="application/json"
+                element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/networks-list-response.json"/>
+                </wadl:doc>
+            </representation>
+        </response> &fault401; </method>
+    <method name="POST" id="createNetwork">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Create network">
+            <para role="shortdesc">Creates a network.</para>
+            <para>
+                A request body is optional. An administrative user can
+                specify another tenant UUID, which is the tenant who owns the
+                network, in the request body.
+            </para>
+        </wadl:doc>
+        <request>
+            &networkObject;
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="false" name="admin_state_up"
+                style="plain" type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <para>
+                        The administrative state of the network, which is up
+                        (<code>true</code>) or down (<code>false</code>).
+                    </para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="false" name="name" 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 network name. A request body is optional: If you
+                        include it, it can specify this optional attribute.
+                    </para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="false" name="shared" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>Indicates whether this network
+                        is shared across all tenants. By default, only
+                        administrative users can change this
+                        value.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="false" name="tenant_id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>Admin-only. The UUID of the
+                        tenant that will own the network. This tenant
+                        can be different from the tenant that makes
+                        the create network request. However, only
+                        administrative users can specify a tenant UUID
+                        other than their own. You cannot change this
+                        value through authorization
+                    policies.</para></wadl:doc>
+            </param>
+            <representation mediaType="application/json"
+                element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/network-create-request.json"/>
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="201">
+            &networkObject;
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="admin_state_up" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The administrative state of
+                        the network, which is up (<code>true</code>)
+                        or down
+                    (<code>false</code>).</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The UUID of the network.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="name" 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 network
+                    name.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="shared" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>Indicates whether this network
+                        is shared across all tenants. By default, only
+                        administrative users can change this
+                        value.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="status" 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 network
+                    status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="subnets" style="plain"
+                type="xsd:dict">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The associated
+                    subnets.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="tenant_id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The UUID of the tenant.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="router:external" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>Indicates whether this
+                        network is externally
+                        accessible.</para></wadl:doc>
+            </param>
+            <representation mediaType="application/json"
+                element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/network-create-response.json"/>
+                </wadl:doc>
+            </representation>
+        </response> &fault400; &fault401; </method>
+    <method name="POST" id="bulkCreateNetwork">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Bulk create networks">
+            <para role="shortdesc">Creates multiple networks in a
+                single request.</para>
+            <para>In the request body, specify a list of
+                networks.</para>
+            <para>The bulk create operation is always atomic. Either
+                all or no networks in the request body are
+                created.</para>
+        </wadl:doc>
+        <request> &networksObject; &networkCommonRequestParams;
+            <representation
+                mediaType="application/json" element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/networks-bulk-create-request.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="201"> &networksObject; &networkCommonResponseParams;
+            <representation mediaType="application/json"
+                element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/networks-bulk-create-response.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response> &fault400; &fault401; </method>
+    <method name="GET" id="showNetwork">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Show network details">
+            <para role="shortdesc">Shows details for a
+                network.</para>
+            <para>You can control which response parameters are returned by
+                using the fields query parameter. For information, see <link
+                    xlink:href="http://specs.openstack.org/openstack/neutron-specs/specs/api/networking_general_api_information.html#filtering-and-column-selection"
+                    >Filtering and column selection</link>.</para>
+            <para>
+                In addition to the following response parameters, the response
+                might show extension response parameters. For information, see <link
+                xlink:href="http://developer.openstack.org/api-ref-networking-v2-ext.html#showProviderNetwork">Networks multiple provider extension (networks)</link>.
+            </para>
+        </wadl:doc>
+        <response status="200">
+            &networkObject;
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="admin_state_up" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <para>
+                        The administrative state of the network, which is up
+                        (<code>true</code>) or down (<code>false</code>).
+                    </para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The UUID of the network.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="name" 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 network
+                    name.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="shared" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>Indicates whether this network
+                        is shared across all tenants. By default, only
+                        administrative users can change this
+                        value.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="status" 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 network
+                    status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="subnets" style="plain"
+                type="xsd:dict">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The associated
+                    subnets.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="tenant_id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The UUID of the tenant.</para></wadl:doc>
+            </param>
+            <representation mediaType="application/json"
+                element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/network-show-response.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response> &fault401; &fault404; </method>
+    <method name="PUT" id="updateNetwork">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Update network">
+            <para role="shortdesc">Updates a network.</para>
+        </wadl:doc>
+        <request>
+            &networkObject; &networkUpdateParameters;
+            <representation
+                mediaType="application/json" element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/network-update-request.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="200">
+            &networkObject;
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="admin_state_up" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The administrative state of
+                        the network, which is up (<code>true</code>)
+                        or down
+                    (<code>false</code>).</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The UUID of the network.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="name" 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 network
+                    name.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="shared" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>Indicates whether this network
+                        is shared across all tenants. By default, only
+                        administrative users can change this
+                        value.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="status" 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 network
+                    status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="subnets" style="plain"
+                type="xsd:dict">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The associated
+                    subnets.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="tenant_id" style="plain"
+                type="csapi:UUID">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>The UUID of the tenant.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" required="true" name="router:external" style="plain"
+                type="xsd:bool">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN"><para>Indicates whether this
+                        network is externally
+                        accessible.</para></wadl:doc>
+            </param>
+            <representation mediaType="application/json"
+                element="csapi:network">
+                <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/networks/network-update-response.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response> &fault400; &fault401; &fault403; &fault404; </method>
+    <method name="DELETE" id="deleteNetwork">
+        <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Delete network">
+            <para role="shortdesc">Deletes a network and its
+                associated resources.</para>
+        </wadl:doc>
+        <response status="204"/> &fault401; &fault404;
+        &fault409conflict; </method>
+</application>
diff --git a/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/ports-binding.wadl
similarity index 65%
rename from api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/ports-binding.wadl
index aca4b1620..8a45e4eea 100644
--- a/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/ports-binding.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-ports-binding-ext.wadl       -->
+<!--        xmllint -noent ports-binding.wadl              -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -26,23 +26,16 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-ports-binding-ext-v2.0">
         <resource id="version" path="//v2.0">
-                <resource id="Ports" path="ports">
-                    <method href="#listPorts"/>
-                    <method href="#createPort"/>
-                    <resource path="{port_id}" id="port_id">
-                        <param name="port_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Port ID">
-                                <para>The UUID for the port of
-                                   interest to you.</para></wadl:doc>
-                        </param>
-                        <method href="#showPort"/>
-                        <method href="#updatePort"/>
-                        <method href="#deletePort"/>
-                    </resource>
+            <resource id="ports" path="ports">
+                <method href="#listPorts"/>
+                <method href="#createPort"/>
+                <resource path="{port_id}" id="port_id">
+                    &port_idTemplateParameter;
+                    <method href="#showPort"/>
+                    <method href="#updatePort"/>
+                    <method href="#deletePort"/>
                 </resource>
+            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
@@ -60,14 +53,7 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/ports-bind-get-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="api_samples/ports-bind-get-resp.xml"
+                    <xsdxt:code href="../samples/ports/ports-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -85,7 +71,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port-post-create-req.json"/>
+                        href="../samples/ports/port-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -95,15 +81,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port_bind_create_or_update_resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/port_bind_create_or_update_resp.xml"
+                        href="../samples/ports/port-bind-create-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -121,16 +99,10 @@
                 mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/port-bind-get-resp.json"
+                    <xsdxt:code href="../samples/ports/port-bind-show-response.json"
                     />
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="api_samples/port-bind-get-resp.xml"/>
-                </wadl:doc>
-            </representation>
         </response>
     </method>
     <method name="PUT" id="updatePort">
@@ -144,7 +116,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port-post-create-req.json"/>
+                        href="../samples/ports/port-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -154,15 +126,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port_bind_create_or_update_resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/port_bind_create_or_update_resp.xml"
+                        href="../samples/ports/port-bind-create-update-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-ports.wadl b/api-ref/src/wadls/netconn-api/src/wadl/ports.wadl
similarity index 67%
rename from api-ref/src/wadls/netconn-api/src/os-ports.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/ports.wadl
index fda42e57a..27d5d0674 100644
--- a/api-ref/src/wadls/netconn-api/src/os-ports.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/ports.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-ports.wadl                   -->
+<!--        xmllint -noent ports.wadl                      -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -27,24 +27,17 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-ports-v2.0">
         <resource id="version" path="//v2.0">
-                <resource id="Ports" path="ports">
-                    <method href="#listPorts"/>
-                    <method href="#createPort"/>
-                    <method href="#bulkCreatePorts"/>
-                    <resource path="{port_id}" id="port_id">
-                        <param name="port_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Port ID">The UUID
-                                for the port of interest to
-                                you.</wadl:doc>
-                        </param>
-                        <method href="#showPort"/>
-                        <method href="#updatePort"/>
-                        <method href="#removePort"/>
-                    </resource>
+            <resource id="ports" path="ports">
+                <method href="#listPorts"/>
+                <method href="#createPort"/>
+                <method href="#bulkCreatePorts"/>
+                <resource path="{port_id}" id="port_id">
+                    &port_idTemplateParameter;
+                    <method href="#showPort"/>
+                    <method href="#updatePort"/>
+                    <method href="#removePort"/>
                 </resource>
+            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
@@ -70,14 +63,7 @@
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/ports-get-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="api_samples/ports-get-resp.xml"
+                    <xsdxt:code href="../samples/ports/ports-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -97,15 +83,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port_create_req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/port_create_req.xml"
+                        href="../samples/ports/port-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -115,15 +93,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port_create_resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/port_create_resp.xml"
+                        href="../samples/ports/port-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -143,15 +113,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/ports-post-create-bulk-req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/ports-post-create-bulk-req.xml"
+                        href="../samples/ports/ports-bulk-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -161,15 +123,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/ports-create-bulk-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/ports-create-bulk-resp.xml"
+                        href="../samples/ports/ports-bulk-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -185,16 +139,10 @@
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/port-get-resp.json"
+                    <xsdxt:code href="../samples/ports/port-show-response.json"
                     />
                 </wadl:doc>
             </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code href="api_samples/port-get-resp.xml"/>
-                </wadl:doc>
-            </representation>
         </response> &fault401; &fault404; </method>
     <method name="PUT" id="updatePort">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
@@ -227,15 +175,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port_update_req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/port_update_req.xml"
+                        href="../samples/ports/port-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -245,15 +185,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/port_update_resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/port_update_resp.xml"
+                        href="../samples/ports/port-update-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-quotas.wadl b/api-ref/src/wadls/netconn-api/src/wadl/quotas.wadl
similarity index 86%
rename from api-ref/src/wadls/netconn-api/src/os-quotas.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/quotas.wadl
index 9164d2a8f..c24732dde 100644
--- a/api-ref/src/wadls/netconn-api/src/os-quotas.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/quotas.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-quotas.wadl                   -->
+<!--        xmllint -noent quotas.wadl                     -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -27,22 +27,15 @@
     <resources base="https://neutron.example.com/"
         xml:id="os-quotas-v2.0">
         <resource id="version" path="//v2.0">
-                <resource id="Quotas" path="quotas">
-                    <method href="#listQuotas"/>
-                    <resource id="tenant_id" path="{tenant_id}" >
-                        <param name="tenant_id" style="template"
-                            type="csapi:uuid">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Tenant ID">
-                                <para>
-                                The tenant ID.</para></wadl:doc>
-                        </param>
-                        <method href="#listQuotasForTenant"/>
-                        <method href="#updateQuota"/>
-                        <method href="#resetQuota"/>
-                    </resource>
+            <resource id="quotas" path="quotas">
+                <method href="#listQuotas"/>
+                <resource id="tenant_id" path="{tenant_id}" >
+                    &tenant_idTemplateParameter;
+                    <method href="#listQuotasForTenant"/>
+                    <method href="#updateQuota"/>
+                    <method href="#resetQuota"/>
                 </resource>
+            </resource>
         </resource>
     </resources>
     <!--*******************************************************-->
@@ -60,7 +53,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/quotas-list-resp.json"/>
+                        href="../samples/quotas/quotas-list-response.json"/>
                 </wadl:doc>
                 &quotasObject;
                 &subnetQuotaParameter;
@@ -99,7 +92,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/quotas-show-resp.json"/>
+                        href="../samples/quotas/quotas-list-for-tenant-response.json"/>
                 </wadl:doc>
                 &quotaObject;
                 &subnetQuotaParameter;
@@ -144,7 +137,7 @@
             <representation mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
-                    <xsdxt:code href="api_samples/quotas-put-req.json"
+                    <xsdxt:code href="../samples/quotas/quotas-update-request.json"
                     />
                 </wadl:doc>
                 &quotaObject;
@@ -164,7 +157,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/quotas-put-resp.json"/>
+                        href="../samples/quotas/quotas-update-response.json"/>
                 </wadl:doc>
                 &quotaObject;
                 &subnetQuotaParameter;
diff --git a/api-ref/src/wadls/netconn-api/src/os-routers.wadl b/api-ref/src/wadls/netconn-api/src/wadl/routers.wadl
similarity index 69%
rename from api-ref/src/wadls/netconn-api/src/os-routers.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/routers.wadl
index ed8a55c0d..7ede2ec3d 100644
--- a/api-ref/src/wadls/netconn-api/src/os-routers.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/routers.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-routers.wadl                 -->
+<!--        xmllint -noent routers.wadl                    -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -26,15 +26,9 @@
    <!--*******************************************************-->
    <resources base="https://neutron.example.com/" xml:id="os-routers-v2">
       <resource id="version" path="//v2.0">
-         <resource id="Routers" path="routers">
+         <resource id="routers" path="routers">
             <resource path="{router_id}" id="router_id">
-               <param name="router_id" style="template" type="csapi:UUID">
-                  <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Port ID">
-                    <para>
-                      The UUID for the router of interest to you.
-                    </para>
-                  </wadl:doc>
-               </param>
+               &router_idTemplateParameter;
                <method href="#updateExtraRoutes" />
             </resource>
          </resource>
@@ -47,30 +41,25 @@
       <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Update extra routes">
          <para role="shortdesc">Updates extra routes on a router.</para>
          <para>
-            The next hop IP address must be a part of one of the subnets to which
-                 the router interfaces are connected. Otherwise, the server
-                 responds with the
-            <code>400 Bad Request</code>
-            error code.
+            The next hop IP address must be a part of one of the subnets to
+            which the router interfaces are connected. Otherwise, the server
+            responds with the <code>Bad Request (400)</code> error code.
          </para>
          <para>
-            When a validation error is detected, such as a format
-                error of IP address or CIDR, the server responds with the
-            <code>400 Bad Request</code>
-            error code.
+            When a validation error is detected, such as a format error of IP
+            address or CIDR, the server responds with the <code>Bad Request
+            (400)</code> response code.
          </para>
          <para>
             When Networking receives a request to delete the router
-                interface for subnets that are used by one or more routes, it
-                responds with a
-            <code>409 Conflict</code>
-            error code.
+            interface for subnets that are used by one or more routes, it
+            responds with a <code>Conflict (409)</code> response code.
          </para>
       </wadl:doc>
       <request>
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-               <xsdxt:code href="api_samples/router-update-req.json" />
+               <xsdxt:code href="../samples/routers/router-update-request.json" />
             </wadl:doc>
             &routerParameter;
             &updateRouterParameters;
@@ -79,7 +68,7 @@
       <response status="200">
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-               <xsdxt:code href="api_samples/router-update-resp.json" />
+               <xsdxt:code href="../samples/routers/router-update-response.json" />
             </wadl:doc>
             &routerParameter; &statusParameter;
             &external-gateway-infoParameter; &nameParameter;
diff --git a/api-ref/src/wadls/netconn-api/src/security-groups.wadl b/api-ref/src/wadls/netconn-api/src/wadl/security-groups.wadl
similarity index 80%
rename from api-ref/src/wadls/netconn-api/src/security-groups.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/security-groups.wadl
index 11dd43c91..5bcdaba94 100644
--- a/api-ref/src/wadls/netconn-api/src/security-groups.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/security-groups.wadl
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
+<!--*******************************************************-->
+<!--         Import Common XML Entities                    -->
+<!--                                                       -->
+<!--     You can resolve the entities with xmllint         -->
+<!--                                                       -->
+<!--        xmllint -noent security-groups.wadl            -->
+<!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
-<!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -13,7 +20,7 @@
     xmlns:csapi="http://www.w3.org/2001/XMLSchema"
     xmlns:secgr="http://docs.openstack.org/neutron/api/v2.0">
     <grammars>
-        <include href="xsd/secgr.xsd"/>
+        <include href="../xsd/secgr.xsd"/>
     </grammars>
     <resources base="https://servers.api.openstack.com/"
         xml:id="security-groups-v2.0">
@@ -23,14 +30,8 @@
                 <method href="#createSecGroup"/>
                 <resource id="security_group_id"
                     path="{security_group_id}">
-                    <param name="security_group_id"
-                        style="template" type="csapi:uuid">
-                        <wadl:doc
-                            xmlns="http://www.w3.org/1999/xhtml"
-                            xml:lang="EN">The unique identifier of
-                            the security group.</wadl:doc>
-                    </param>
-                    <method href="#getSecGroup"/>
+                    &security_group_idTemplateParameter;
+                    <method href="#showSecGroup"/>
                     <method href="#updateSecGroup"/>
                     <method href="#deleteSecGroup"/>
                 </resource>
@@ -39,16 +40,10 @@
                 path="security-group-rules">
                 <method href="#listSecGroupRules"/>
                 <method href="#createSecGroupRule"/>
-                <resource path="{rules-security-groups-id}"
-                    id="rules-security-groups-id">
-                    <param name="rules-security-groups-id"
-                        style="template" type="csapi:uuid">
-                        <wadl:doc
-                            xmlns="http://www.w3.org/1999/xhtml"
-                            xml:lang="EN">The unique identifier of
-                            the security group rule.</wadl:doc>
-                    </param>
-                    <method href="#getSecGroupRule"/>
+                <resource path="{security-group-rules-id}"
+                    id="security-group-rules-id">
+                    &security_group_rule_idTemplateParameter;
+                    <method href="#showSecGroupRule"/>
                     <method href="#deleteSecGroupRule"/>
                 </resource>
             </resource>
@@ -62,7 +57,7 @@
               tenant has access.
             </para>
             <para>
-              The list shows the unique ID for and the rules that are
+              The list shows the UUID for and the rules that are
               associated with each security group.
             </para>
         </wadl:doc>
@@ -71,7 +66,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-list-get-req-json-http.txt"
+                        href="../samples/security-groups/security-groups-list-request-json-http.txt"
                     /></wadl:doc>
             </representation>
         </request>
@@ -82,7 +77,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-list-get-resp.json"
+                        href="../samples/security-groups/security-groups-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -105,7 +100,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-create-req.json"
+                        href="../samples/security-groups/security-group-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -117,20 +112,20 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-create-resp.json"
+                        href="../samples/security-groups/security-group-create-response.json"
                     />
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401;
     </method>
-    <method name="GET" id="getSecGroup">
+    <method name="GET" id="showSecGroup">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Show security group">
             <para role="shortdesc">
               Shows details for a security group.
             </para>
             <para>
-              The response contains the description, name, ID, and security
+              The response contains the description, name, UUID, and security
               group rules that are associated with the security group and
               tenant.
             </para>
@@ -140,7 +135,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-get-req-json-http.txt"
+                        href="../samples/security-groups/security-group-show-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -152,7 +147,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-get-resp.json"
+                        href="../samples/security-groups/security-group-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -168,7 +163,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN" title="Update security group: JSON request">
-               <xsdxt:code href="api_samples/security-groups-update-req.json" />
+               <xsdxt:code href="../samples/security-groups/security-group-update-request.json" />
             </wadl:doc>
             <param name="name" style="plain" type="xsd:string"
                required="true">
@@ -194,13 +189,13 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN" title="Update security group: JSON response">
-               <xsdxt:code href="api_samples/security-groups-update-resp.json" />
+               <xsdxt:code href="../samples/security-groups/security-group-update-response.json" />
             </wadl:doc>
             &securityGroupObjectParameter;
             &securityGroupResponseParameters;
          </representation>
       </response> &commonFaults; &getFaults;
-   </method>
+    </method>
     <method name="DELETE" id="deleteSecGroup">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Delete security group">
@@ -222,7 +217,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-delete-req-json-http.txt"
+                        href="../samples/security-groups/security-group-delete-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -232,7 +227,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/security-groups-delete-resp-json-http.txt"
+                        href="../samples/security-groups/security-group-delete-response-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -246,7 +241,7 @@
               rules that the tenant can access.
             </para>
             <para>
-              The list provides the unique ID for each security group
+              The list provides the UUID for each security group
               rule.
             </para>
         </wadl:doc>
@@ -255,7 +250,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-list-get-req-json-http.txt"
+                        href="../samples/security-groups/security-group-rules-list-request-json-http.txt"
                         />
                 </wadl:doc>
             </representation>
@@ -267,7 +262,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-list-get-resp.json"
+                        href="../samples/security-groups/security-group-rules-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -286,7 +281,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-create-req.json"
+                        href="../samples/security-groups/security-group-rule-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -298,13 +293,13 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-create-resp.json"
+                        href="../samples/security-groups/security-group-rule-create-response.json"
                     />
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault404; &fault409;
     </method>
-    <method name="GET" id="getSecGroupRule">
+    <method name="GET" id="showSecGroupRule">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Show security group rule">
             <para role="shortdesc">
@@ -321,7 +316,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-get-req-json-http.txt"
+                        href="../samples/security-groups/security-group-rule-show-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -332,7 +327,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-get-resp.json"
+                        href="../samples/security-groups/security-group-rule-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -351,7 +346,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-delete-req-json-http.txt"
+                        href="../samples/security-groups/security-group-rule-delete-request-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
@@ -361,7 +356,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="api_samples/rules-security-groups-delete-resp-json-http.txt"
+                        href="../samples/security-groups/security-group-rule-delete-response-json-http.txt"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-service-type.wadl b/api-ref/src/wadls/netconn-api/src/wadl/service-providers.wadl
similarity index 85%
rename from api-ref/src/wadls/netconn-api/src/os-service-type.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/service-providers.wadl
index 7c714dc71..27a0df517 100644
--- a/api-ref/src/wadls/netconn-api/src/os-service-type.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/service-providers.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-service-type.wadl            -->
+<!--        xmllint -noent service-providers.wadl          -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -26,7 +26,7 @@
    <!--*******************************************************-->
    <resources base="https://neutron.example.com/" xml:id="os-service-type-v2">
       <resource id="version" path="//v2.0">
-         <resource id="service_providers" path="service-providers">
+         <resource id="service-providers" path="service-providers">
             <method href="#listServiceProviders" />
          </resource>
       </resource>
@@ -44,7 +44,7 @@
       <response status="200">
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-               <xsdxt:code href="api_samples/service-type-resp.json" />
+               <xsdxt:code href="../samples/service-type-response.json" />
             </wadl:doc>
             &servicetypeResponseParameters;
          </representation>
diff --git a/api-ref/src/wadls/netconn-api/src/os-subnetpools-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/subnet-pools.wadl
similarity index 84%
rename from api-ref/src/wadls/netconn-api/src/os-subnetpools-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/subnet-pools.wadl
index 596b17eaa..372e40025 100644
--- a/api-ref/src/wadls/netconn-api/src/os-subnetpools-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/subnet-pools.wadl
@@ -5,12 +5,12 @@
 <!--                                                       -->
 <!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-subnetpools.wadl             -->
+<!--        xmllint -noent subnet-pools.wadl               -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -32,17 +32,7 @@
                 <method href="#listSubnetPools"/>
                 <method href="#createSubnetPool"/>
                 <resource path="{subnetpool_id}" id="subnetpool_id">
-                    <param name="subnetpool_id" style="template"
-                        type="csapi:UUID">
-                        <wadl:doc
-                            xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="Subnet Pool ID">
-                            <para>
-                                The UUID for the subnet pool of
-                                interest to you.
-                           </para>
-                        </wadl:doc>
-                    </param>
+                    &subnetpool_idTemplateParameter;
                     <method href="#showSubnetPool"/>
                     <method href="#updateSubnetPool"/>
                     <method href="#removeSubnetPool"/>
@@ -68,7 +58,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/subnetpools-get-resp.json"/>
+                    <xsdxt:code href="../samples/subnets/subnetpools-list-response.json"/>
                 </wadl:doc>
                 &subnetpoolsObjectParameter;
                 &subnetpoolRespParameters;
@@ -85,7 +75,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/subnetpool-create-req.json"/>
+                    <xsdxt:code href="../samples/subnets/subnetpool-create-request.json"/>
                 </wadl:doc>
                 &subnetpoolObjectParameter;
                 &subnetpoolCreateReqParameters;
@@ -94,7 +84,7 @@
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/subnetpool-create-resp.json"/>
+                    <xsdxt:code href="../samples/subnets/subnetpool-create-response.json"/>
                 </wadl:doc>
                 &subnetpoolObjectParameter;
                 &subnetpoolRespParameters;
@@ -114,7 +104,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/subnetpool-show-resp.json"/>
+                    <xsdxt:code href="../samples/subnets/subnetpool-show-response.json"/>
                 </wadl:doc>
                 &subnetpoolObjectParameter;
                 &subnetpoolRespParameters;
@@ -131,7 +121,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/subnetpool-update-req.json"/>
+                    <xsdxt:code href="../samples/subnets/subnetpool-update-request.json"/>
                 </wadl:doc>
                 &subnetpoolObjectParameter;
                 &subnetpoolUpdateReqParameters;
@@ -140,7 +130,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/subnetpool-update-resp.json"/>
+                    <xsdxt:code href="../samples/subnets/subnetpool-update-response.json"/>
                 </wadl:doc>
                 &subnetpoolObjectParameter;
                 &subnetpoolRespParameters;
diff --git a/api-ref/src/wadls/netconn-api/src/os-subnets.wadl b/api-ref/src/wadls/netconn-api/src/wadl/subnets.wadl
similarity index 71%
rename from api-ref/src/wadls/netconn-api/src/os-subnets.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/subnets.wadl
index 73329335a..4a989a87a 100644
--- a/api-ref/src/wadls/netconn-api/src/os-subnets.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/subnets.wadl
@@ -3,14 +3,14 @@
 <!--*******************************************************-->
 <!--         Import Common XML Entities                    -->
 <!--                                                       -->
-<!--     You can resolve the entities with xmllint          -->
+<!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-subnets.wadl                 -->
+<!--        xmllint -noent subnets.wadl                    -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -33,15 +33,7 @@
                     <method href="#createSubnet"/>
                     <method href="#bulkCreateSubnet"/>
                     <resource path="{subnet_id}" id="subnet_id">
-                        <param name="subnet_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Subnet ID">
-                                <para>The UUID for the subnet of
-                                   interest to you.</para>
-                            </wadl:doc>
-                        </param>
+                        &subnet_idTemplateParameter;
                         <method href="#showSubnet"/>
                         <method href="#updateSubnet"/>
                         <method href="#removeSubnet"/>
@@ -70,14 +62,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnets-get-resp.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnets-get-resp.xml"/>
+                        href="../samples/subnets/subnets-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault401; </method>
@@ -130,14 +115,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnet-create-req.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnet-create-req.xml"/>
+                        href="../samples/subnets/subnet-create-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -146,14 +124,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnet-create-resp.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnet-create-resp.xml"/>
+                        href="../samples/subnets/subnet-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault403; &fault404;
@@ -173,15 +144,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnets-post-create-bulk-req.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnets-post-create-bulk-req.xml"
+                        href="../samples/subnets/subnets-create-bulk-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -191,15 +154,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnets-create-bulk-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnets-create-bulk-resp.xml"
+                        href="../samples/subnets/subnets-create-bulk-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -217,14 +172,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnet-show-resp.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnet-show-resp.xml"/>
+                        href="../samples/subnets/subnet-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault401; &fault404; </method>
@@ -242,14 +190,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnet-update-req.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnet-update-req.xml"/>
+                        href="../samples/subnets/subnet-update-request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -258,14 +199,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/subnet-update-resp.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/subnet-update-resp.xml"/>
+                        href="../samples/subnets/subnet-update-response.json"/>
                 </wadl:doc>
             </representation>
         </response> &fault400; &fault401; &fault403; &fault404; </method>
diff --git a/api-ref/src/wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl b/api-ref/src/wadls/netconn-api/src/wadl/vpnaas-v2.0.wadl
similarity index 87%
rename from api-ref/src/wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl
rename to api-ref/src/wadls/netconn-api/src/wadl/vpnaas-v2.0.wadl
index 76f52d37c..478c96a10 100644
--- a/api-ref/src/wadls/netconn-api/src/os-vpnaasv2.0-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/wadl/vpnaas-v2.0.wadl
@@ -5,12 +5,12 @@
 <!--                                                       -->
 <!--     You can resolve the entities with xmllint         -->
 <!--                                                       -->
-<!--        xmllint -noent os-vpnaasv2.0-ext.wadl          -->
+<!--        xmllint -noent vpnaas-v2.0.wadl                -->
 <!--*******************************************************-->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -23,7 +23,7 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/" xml:id="os-vpnaas-v2.0">
         <resource id="version" path="//v2.0/vpn">
-            <resource id="VPNServices" path="vpnservices">
+            <resource id="vpnservices" path="vpnservices">
                 <method href="#listVPNServices"/>
                 <method href="#createVPNService"/>
                 <resource path="{service_id}" id="service_id">
@@ -31,7 +31,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="VPN service ID">The
+                            xml:lang="EN" title="VPN service UUID">The
                             UUID for the VPN service.</wadl:doc>
                     </param>
                     <method href="#showVPNService"/>
@@ -47,7 +47,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="IKE policy ID">The
+                            xml:lang="EN" title="IKE policy UUID">The
                             UUID for the IKE policy.</wadl:doc>
                     </param>
                     <method href="#showIKEPolicy"/>
@@ -63,7 +63,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="IPSec policy ID">The
+                            xml:lang="EN" title="IPSec policy UUID">The
                             UUID for the IPSec policy.</wadl:doc>
                     </param>
                     <method href="#showIPSecPolicy"/>
@@ -79,7 +79,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="VPN endpoint group ID">The
+                            xml:lang="EN" title="VPN endpoint group UUID">The
                             UUID for the VPN endpoint group.</wadl:doc>
                     </param>
                     <method href="#showVpnEndpointGroup"/>
@@ -95,7 +95,7 @@
                         type="csapi:UUID">
                         <wadl:doc
                             xmlns="http://docbook.org/ns/docbook"
-                            xml:lang="EN" title="IPSec connection ID">The
+                            xml:lang="EN" title="IPSec connection UUID">The
                             UUID for the IPSec site-to-site connection.</wadl:doc>
                     </param>
                     <method href="#showIPSecSiteConnection"/>
@@ -118,7 +118,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpnservice-list-res.json"/>
+                    <xsdxt:code href="../samples/vpn/vpnservices-list-response.json"/>
                 </wadl:doc> &svcListResponseParams; &svcResponseParams;</representation>
         </response> &fault401; &fault403;</method>
     <method name="GET" id="showVPNService">
@@ -135,7 +135,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpnservice-show-res.json"/>
+                    <xsdxt:code href="../samples/vpn/vpnservice-show-response.json"/>
                 </wadl:doc> &svcCreateVPNServiceObjectParam; &svcResponseParams; </representation>
         </response> &fault401; &fault403; &fault404;
     </method>
@@ -152,13 +152,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpnservice-create-req.json"/>
+                    <xsdxt:code href="../samples/vpn/vpnservice-create-request.json"/>
                 </wadl:doc>&svcRequestParams; &svcCreateVPNServiceObjectParam; &svcCreateRequestParams; </representation>
         </request>
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpnservice-create-res.json"/>
+                    <xsdxt:code href="../samples/vpn/vpnservice-create-response.json"/>
                 </wadl:doc> &svcCreateVPNServiceObjectParam; &svcResponseParams; </representation>
         </response> &fault400; &fault401;
     </method>
@@ -173,12 +173,12 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpnservice-update-req.json"/>
+                    <xsdxt:code href="../samples/vpn/vpnservice-update-request.json"/>
                 </wadl:doc> &svcRequestParams; </representation>
         </request>
         <response status="200"><representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                <xsdxt:code href="api_samples/vpn/vpnservice-update-res.json"/>
+                <xsdxt:code href="../samples/vpn/vpnservice-update-response.json"/>
             </wadl:doc> &svcCreateVPNServiceObjectParam; &svcResponseParams; </representation>
         </response>&fault400; &fault401; &fault404;</method>
     <method name="DELETE" id="deleteVPNService">
@@ -202,7 +202,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ikepolicy-create-req.json"/>
+                    <xsdxt:code href="../samples/vpn/ikepolicy-create-request.json"/>
                 </wadl:doc>
                 &ikepolicyObject; &ikeRequestParams; &ikeCreateRequestParams;
             </representation>
@@ -210,7 +210,7 @@
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ikepolicy-create-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ikepolicy-create-response.json"/>
                 </wadl:doc>
                 &ikepolicyObject; &ikeResponseParams;
             </representation>
@@ -222,7 +222,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ikepolicy-list-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ikepolicies-list-response.json"/>
                 </wadl:doc> &ikeListResponseParams; &ikeResponseParams; </representation>
         </response> &fault401; &fault403;</method>
     <method name="GET" id="showIKEPolicy">
@@ -233,7 +233,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ikepolicy-show-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ikepolicy-show-response.json"/>
                 </wadl:doc> &ikepolicyObject; &ikeResponseParams; </representation>
         </response> &fault401; &fault403; &fault404;</method>
     <method name="PUT" id="updateIKEPolicy">
@@ -245,12 +245,12 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ikepolicy-update-req.json"/>
+                    <xsdxt:code href="../samples/vpn/ikepolicy-update-request.json"/>
                 </wadl:doc> &ikepolicyObject; &ikeRequestParams; </representation>
         </request>
         <response status="200"><representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ikepolicy-update-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ikepolicy-update-response.json"/>
                 </wadl:doc> &ikepolicyObject; &ikeResponseParams; </representation>
         </response> &fault400; &fault401; &fault404;</method>
     <method name="DELETE" id="deleteIKEPolicy">
@@ -271,7 +271,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsecpolicy-create-req.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsecpolicy-create-request.json"/>
                 </wadl:doc>
                 &ipsecpolicyObject;
                 &ipsecRequestParams;
@@ -281,7 +281,7 @@
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsecpolicy-create-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsecpolicy-create-response.json"/>
                 </wadl:doc>
                 &ipsecpolicyObject;
                 &ipsecResponseParams;
@@ -294,7 +294,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsecpolicy-list-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsecpolicies-list-response.json"/>
                 </wadl:doc> &ipsecListResponseParams; &ipsecResponseParams; </representation>
         </response> &fault401; &fault403;</method>
     <method name="GET" id="showIPSecPolicy">
@@ -305,7 +305,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsecpolicy-show-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsecpolicy-show-response.json"/>
                 </wadl:doc>
                 &ipsecpolicyObject;
                 &ipsecResponseParams;
@@ -320,7 +320,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsecpolicy-update-req.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsecpolicy-update-request.json"/>
                 </wadl:doc>
                 &ipsecpolicyObject;
                 &ipsecRequestParams;
@@ -329,7 +329,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsecpolicy-update-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsecpolicy-update-response.json"/>
                 </wadl:doc>
                 &ipsecpolicyObject;
                 &ipsecResponseParams;
@@ -352,13 +352,13 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpn-endpoint-group-create-req.json"/>
+                    <xsdxt:code href="../samples/vpn/vpn-endpoint-group-create-request.json"/>
                 </wadl:doc> &vpnEndpointGroupRequestParams; &vpnEndpointGroupCreateRequestParams; </representation>
         </request>
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpn-endpoint-group-create-res.json"/>
+                    <xsdxt:code href="../samples/vpn/vpn-endpoint-group-create-response.json"/>
                 </wadl:doc> &vpnEndpointGroupResponseParams; </representation>
         </response>&fault400; &fault401;</method>
     <method name="GET" id="listVpnEndpointGroups">
@@ -368,7 +368,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpn-endpoint-group-list-res.json"/>
+                    <xsdxt:code href="../samples/vpn/vpn-endpoint-groups-list-response.json"/>
                 </wadl:doc> &vpnEndpointGroupListResponseParams; &vpnEndpointGroupResponseParams; </representation>
         </response> &fault401; &fault403;</method>
     <method name="GET" id="showVpnEndpointGroup">
@@ -379,7 +379,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpn-endpoint-group-show-res.json"/>
+                    <xsdxt:code href="../samples/vpn/vpn-endpoint-group-show-response.json"/>
                 </wadl:doc> &vpnEndpointGroupResponseParams; </representation>
         </response> &fault401; &fault403; &fault404;</method>
     <method name="PUT" id="updateVpnEndpointGroup">
@@ -389,12 +389,12 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpn-endpoint-group-update-req.json"/>
+                    <xsdxt:code href="../samples/vpn/vpn-endpoint-group-update-request.json"/>
                 </wadl:doc> &vpnEndpointGroupRequestParams; </representation>
         </request>
         <response status="200"><representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/vpn-endpoint-group-update-res.json"/>
+                    <xsdxt:code href="../samples/vpn/vpn-endpoint-group-update-response.json"/>
                 </wadl:doc> &vpnEndpointGroupResponseParams; </representation>
         </response> &fault400; &fault401; &fault404;</method>
     <method name="DELETE" id="deleteVpnEndpointGroup">
@@ -412,7 +412,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsec-site-connection-create-req.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsec-site-connection-create-request.json"/>
                 </wadl:doc>
                 &connObject;
                 &connRequestParams;
@@ -422,7 +422,7 @@
         <response status="201">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsec-site-connection-create-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsec-site-connection-create-response.json"/>
                 </wadl:doc>
                 &connObject;
                 &connResponseParams;
@@ -435,7 +435,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsec-site-connection-list-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsec-site-connections-list-response.json"/>
                 </wadl:doc>&connListResponseParams; &connResponseParams; </representation>
         </response> &fault401; &fault403;</method>
     <method name="GET" id="showIPSecSiteConnection">
@@ -446,7 +446,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsec-site-connection-show-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsec-site-connection-show-response.json"/>
                 </wadl:doc>
                 &connObject;
                 &connResponseParams;
@@ -459,7 +459,7 @@
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsec-site-connection-update-req.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsec-site-connection-update-request.json"/>
                 </wadl:doc>
                 &connObject;
                 &connRequestParams;
@@ -468,7 +468,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/vpn/ipsec-site-connection-update-res.json"/>
+                    <xsdxt:code href="../samples/vpn/ipsec-site-connection-update-response.json"/>
                 </wadl:doc>
                 &connObject;
                 &connResponseParams;