Merge "Add more association support to network API"

10 files changed, 28 insertions, 0 deletions

diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
index 79211b946..b85fae2de 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.json
+++ b/doc/api_samples/all_extensions/extensions-get-resp.json
@@ -297,6 +297,14 @@
             "updated": "2011-12-23T00:00:00+00:00"
         },
         {
+            "alias": "os-networks-associate",
+            "description": "Network association support",
+            "links": [],
+            "name": "NetworkAssociationSupport",
+            "namespace": "http://docs.openstack.org/compute/ext/networks_associate/api/v2",
+            "updated": "2012-11-19T00:00:00+00:00"
+        },
+        {
             "alias": "os-quota-class-sets",
             "description": "Quota classes management support",
             "links": [],
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml
index 6c53c875b..049498fc4 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.xml
+++ b/doc/api_samples/all_extensions/extensions-get-resp.xml
@@ -125,6 +125,9 @@
   <extension alias="os-networks" updated="2011-12-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/networks/api/v1.1" name="Networks">
     <description>Admin-only Network Management Extension</description>
   </extension>
+  <extension alias="os-networks-associate" updated="2012-11-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/networks_associate/api/v2" name="NetworkAssociationSupport">
+    <description>Network association support</description>
+  </extension>
   <extension alias="os-quota-class-sets" updated="2012-03-12T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1" name="QuotaClasses">
     <description>Quota classes management support</description>
   </extension>
diff --git a/doc/api_samples/os-networks-associate/network-associate-host-req.json b/doc/api_samples/os-networks-associate/network-associate-host-req.json
new file mode 100644
index 000000000..a6487211e
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-associate-host-req.json
@@ -0,0 +1,3 @@
+{
+    "associate_host": "testHost"
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-associate-host-req.xml b/doc/api_samples/os-networks-associate/network-associate-host-req.xml
new file mode 100644
index 000000000..3221be61d
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-associate-host-req.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<associate_host>testHost</associate_host>
\ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-host-req.json b/doc/api_samples/os-networks-associate/network-disassociate-host-req.json
new file mode 100644
index 000000000..d6c5419fd
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-disassociate-host-req.json
@@ -0,0 +1,3 @@
+{
+    "disassociate_host": null
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml
new file mode 100644
index 000000000..3c2cc0d84
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-disassociate-host-req.xml
@@ -0,0 +1 @@
+<disassociate_host/>
\ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-project-req.json b/doc/api_samples/os-networks-associate/network-disassociate-project-req.json
new file mode 100644
index 000000000..6c0e46730
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-disassociate-project-req.json
@@ -0,0 +1,3 @@
+{
+    "disassociate_project": null
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml
new file mode 100644
index 000000000..be94feb9f
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-disassociate-project-req.xml
@@ -0,0 +1 @@
+<disassociate_project/>
\ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-req.json b/doc/api_samples/os-networks-associate/network-disassociate-req.json
new file mode 100644
index 000000000..66ab7cef0
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-disassociate-req.json
@@ -0,0 +1,3 @@
+{
+    "disassociate": null
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-networks-associate/network-disassociate-req.xml b/doc/api_samples/os-networks-associate/network-disassociate-req.xml
new file mode 100644
index 000000000..bcad8e0a8
--- /dev/null
+++ b/doc/api_samples/os-networks-associate/network-disassociate-req.xml
@@ -0,0 +1 @@
+<disassociate/>
\ No newline at end of file