summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-06 17:43:01 +0000
committerGerrit Code Review <review@openstack.org>2013-02-06 17:43:02 +0000
commitd052a664c8d22ba28d8187df5ca375841bd1961a (patch)
tree1c84acfddfce7726253f89b4610fa6a69fabe7c1 /doc
parentcc8d92382cdb3121843e9f3982b8d8c45e9e7a74 (diff)
parentf3476c95415b0070f5284d7d22927bf0b5daa323 (diff)
downloadnova-d052a664c8d22ba28d8187df5ca375841bd1961a.tar.gz
nova-d052a664c8d22ba28d8187df5ca375841bd1961a.tar.xz
nova-d052a664c8d22ba28d8187df5ca375841bd1961a.zip
Merge "Add API sample tests to os-network"
Diffstat (limited to 'doc')
-rw-r--r--doc/api_samples/os-networks/network-add-req.json1
-rw-r--r--doc/api_samples/os-networks/network-add-req.xml1
-rw-r--r--doc/api_samples/os-networks/network-create-req.json6
-rw-r--r--doc/api_samples/os-networks/network-create-req.xml4
-rw-r--r--doc/api_samples/os-networks/network-create-resp.json32
-rw-r--r--doc/api_samples/os-networks/network-create-resp.xml31
-rw-r--r--doc/api_samples/os-networks/network-show-resp.json32
-rw-r--r--doc/api_samples/os-networks/network-show-resp.xml31
-rw-r--r--doc/api_samples/os-networks/networks-disassociate-req.json1
-rw-r--r--doc/api_samples/os-networks/networks-disassociate-req.xml1
-rw-r--r--doc/api_samples/os-networks/networks-list-resp.json64
-rw-r--r--doc/api_samples/os-networks/networks-list-resp.xml63
12 files changed, 267 insertions, 0 deletions
diff --git a/doc/api_samples/os-networks/network-add-req.json b/doc/api_samples/os-networks/network-add-req.json
new file mode 100644
index 000000000..eca9c65b8
--- /dev/null
+++ b/doc/api_samples/os-networks/network-add-req.json
@@ -0,0 +1 @@
+{"id": "1"} \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-add-req.xml b/doc/api_samples/os-networks/network-add-req.xml
new file mode 100644
index 000000000..3ba873da3
--- /dev/null
+++ b/doc/api_samples/os-networks/network-add-req.xml
@@ -0,0 +1 @@
+<id>1</id> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-create-req.json b/doc/api_samples/os-networks/network-create-req.json
new file mode 100644
index 000000000..422e77234
--- /dev/null
+++ b/doc/api_samples/os-networks/network-create-req.json
@@ -0,0 +1,6 @@
+{
+ "network": {
+ "label": "new net 111",
+ "cidr": "10.20.105.0/24"
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-create-req.xml b/doc/api_samples/os-networks/network-create-req.xml
new file mode 100644
index 000000000..890d7bf3a
--- /dev/null
+++ b/doc/api_samples/os-networks/network-create-req.xml
@@ -0,0 +1,4 @@
+<network>
+ <label>new net 111</label>
+ <cidr>10.20.105.0/24</cidr>
+</network> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-create-resp.json b/doc/api_samples/os-networks/network-create-resp.json
new file mode 100644
index 000000000..194694a77
--- /dev/null
+++ b/doc/api_samples/os-networks/network-create-resp.json
@@ -0,0 +1,32 @@
+{
+ "network": {
+ "bridge": null,
+ "bridge_interface": null,
+ "broadcast": "10.20.105.255",
+ "cidr": "10.20.105.0/24",
+ "cidr_v6": null,
+ "created_at": null,
+ "deleted": null,
+ "deleted_at": null,
+ "dhcp_start": "10.20.105.2",
+ "dns1": null,
+ "dns2": null,
+ "gateway": "10.20.105.1",
+ "gateway_v6": null,
+ "host": null,
+ "id": "668687f9-d724-4976-a6f4-a6fd3ad83da3",
+ "injected": null,
+ "label": "new net 111",
+ "multi_host": null,
+ "netmask": "255.255.255.0",
+ "netmask_v6": null,
+ "priority": null,
+ "project_id": null,
+ "rxtx_base": null,
+ "updated_at": null,
+ "vlan": null,
+ "vpn_private_address": null,
+ "vpn_public_address": null,
+ "vpn_public_port": null
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-create-resp.xml b/doc/api_samples/os-networks/network-create-resp.xml
new file mode 100644
index 000000000..f638228ef
--- /dev/null
+++ b/doc/api_samples/os-networks/network-create-resp.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<network>
+ <bridge>None</bridge>
+ <vpn_public_port>None</vpn_public_port>
+ <dhcp_start>10.20.105.2</dhcp_start>
+ <bridge_interface>None</bridge_interface>
+ <updated_at>None</updated_at>
+ <id>1bbbed2b-0daa-47a1-b869-1981c29150b1</id>
+ <cidr_v6>None</cidr_v6>
+ <deleted_at>None</deleted_at>
+ <gateway>10.20.105.1</gateway>
+ <rxtx_base>None</rxtx_base>
+ <label>new net 111</label>
+ <priority>None</priority>
+ <project_id>None</project_id>
+ <vpn_private_address>None</vpn_private_address>
+ <deleted>False</deleted>
+ <vlan>None</vlan>
+ <broadcast>10.20.105.255</broadcast>
+ <netmask>255.255.255.0</netmask>
+ <injected>None</injected>
+ <cidr>10.20.105.0/24</cidr>
+ <vpn_public_address>None</vpn_public_address>
+ <multi_host>None</multi_host>
+ <dns2>None</dns2>
+ <created_at>None</created_at>
+ <host>None</host>
+ <gateway_v6>None</gateway_v6>
+ <netmask_v6>None</netmask_v6>
+ <dns1>None</dns1>
+</network> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-show-resp.json b/doc/api_samples/os-networks/network-show-resp.json
new file mode 100644
index 000000000..f3d7a18ce
--- /dev/null
+++ b/doc/api_samples/os-networks/network-show-resp.json
@@ -0,0 +1,32 @@
+{
+ "network": {
+ "bridge": "br100",
+ "bridge_interface": "eth0",
+ "broadcast": "10.0.0.7",
+ "cidr": "10.0.0.0/29",
+ "cidr_v6": null,
+ "created_at": "2011-08-15 06:19:19.387525",
+ "deleted": false,
+ "deleted_at": null,
+ "dhcp_start": "10.0.0.3",
+ "dns1": null,
+ "dns2": null,
+ "gateway": "10.0.0.1",
+ "gateway_v6": null,
+ "host": "nsokolov-desktop",
+ "id": "20c8acc0-f747-4d71-a389-46d078ebf047",
+ "injected": false,
+ "label": "mynet_0",
+ "multi_host": false,
+ "netmask": "255.255.255.248",
+ "netmask_v6": null,
+ "priority": null,
+ "project_id": "1234",
+ "rxtx_base": null,
+ "updated_at": "2011-08-16 09:26:13.048257",
+ "vlan": 100,
+ "vpn_private_address": "10.0.0.2",
+ "vpn_public_address": "127.0.0.1",
+ "vpn_public_port": 1000
+ }
+} \ No newline at end of file
diff --git a/doc/api_samples/os-networks/network-show-resp.xml b/doc/api_samples/os-networks/network-show-resp.xml
new file mode 100644
index 000000000..2faed7a28
--- /dev/null
+++ b/doc/api_samples/os-networks/network-show-resp.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<network>
+ <bridge>br100</bridge>
+ <vpn_public_port>1000</vpn_public_port>
+ <dhcp_start>10.0.0.3</dhcp_start>
+ <bridge_interface>eth0</bridge_interface>
+ <updated_at>2011-08-16 09:26:13.048257</updated_at>
+ <id>20c8acc0-f747-4d71-a389-46d078ebf047</id>
+ <cidr_v6>None</cidr_v6>
+ <deleted_at>None</deleted_at>
+ <gateway>10.0.0.1</gateway>
+ <rxtx_base>None</rxtx_base>
+ <label>mynet_0</label>
+ <priority>None</priority>
+ <project_id>1234</project_id>
+ <vpn_private_address>10.0.0.2</vpn_private_address>
+ <deleted>False</deleted>
+ <vlan>100</vlan>
+ <broadcast>10.0.0.7</broadcast>
+ <netmask>255.255.255.248</netmask>
+ <injected>False</injected>
+ <cidr>10.0.0.0/29</cidr>
+ <vpn_public_address>127.0.0.1</vpn_public_address>
+ <multi_host>False</multi_host>
+ <dns2>None</dns2>
+ <created_at>2011-08-15 06:19:19.387525</created_at>
+ <host>nsokolov-desktop</host>
+ <gateway_v6>None</gateway_v6>
+ <netmask_v6>None</netmask_v6>
+ <dns1>None</dns1>
+</network> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/networks-disassociate-req.json b/doc/api_samples/os-networks/networks-disassociate-req.json
new file mode 100644
index 000000000..81e17d809
--- /dev/null
+++ b/doc/api_samples/os-networks/networks-disassociate-req.json
@@ -0,0 +1 @@
+{"disassociate": null} \ No newline at end of file
diff --git a/doc/api_samples/os-networks/networks-disassociate-req.xml b/doc/api_samples/os-networks/networks-disassociate-req.xml
new file mode 100644
index 000000000..85762fd0d
--- /dev/null
+++ b/doc/api_samples/os-networks/networks-disassociate-req.xml
@@ -0,0 +1 @@
+<disassociate>None</disassociate> \ No newline at end of file
diff --git a/doc/api_samples/os-networks/networks-list-resp.json b/doc/api_samples/os-networks/networks-list-resp.json
new file mode 100644
index 000000000..90da7c15d
--- /dev/null
+++ b/doc/api_samples/os-networks/networks-list-resp.json
@@ -0,0 +1,64 @@
+{
+ "networks": [
+ {
+ "bridge": "br100",
+ "bridge_interface": "eth0",
+ "broadcast": "10.0.0.7",
+ "cidr": "10.0.0.0/29",
+ "cidr_v6": null,
+ "created_at": "2011-08-15 06:19:19.387525",
+ "deleted": false,
+ "deleted_at": null,
+ "dhcp_start": "10.0.0.3",
+ "dns1": null,
+ "dns2": null,
+ "gateway": "10.0.0.1",
+ "gateway_v6": null,
+ "host": "nsokolov-desktop",
+ "id": "20c8acc0-f747-4d71-a389-46d078ebf047",
+ "injected": false,
+ "label": "mynet_0",
+ "multi_host": false,
+ "netmask": "255.255.255.248",
+ "netmask_v6": null,
+ "priority": null,
+ "project_id": "1234",
+ "rxtx_base": null,
+ "updated_at": "2011-08-16 09:26:13.048257",
+ "vlan": 100,
+ "vpn_private_address": "10.0.0.2",
+ "vpn_public_address": "127.0.0.1",
+ "vpn_public_port": 1000
+ },
+ {
+ "bridge": "br101",
+ "bridge_interface": "eth0",
+ "broadcast": "10.0.0.15",
+ "cidr": "10.0.0.10/29",
+ "cidr_v6": null,
+ "created_at": "2011-08-15 06:19:19.885495",
+ "deleted": false,
+ "deleted_at": null,
+ "dhcp_start": "10.0.0.11",
+ "dns1": null,
+ "dns2": null,
+ "gateway": "10.0.0.9",
+ "gateway_v6": null,
+ "host": null,
+ "id": "20c8acc0-f747-4d71-a389-46d078ebf000",
+ "injected": false,
+ "label": "mynet_1",
+ "multi_host": false,
+ "netmask": "255.255.255.248",
+ "netmask_v6": null,
+ "priority": null,
+ "project_id": null,
+ "rxtx_base": null,
+ "updated_at": null,
+ "vlan": 101,
+ "vpn_private_address": "10.0.0.10",
+ "vpn_public_address": null,
+ "vpn_public_port": 1001
+ }
+ ]
+} \ No newline at end of file
diff --git a/doc/api_samples/os-networks/networks-list-resp.xml b/doc/api_samples/os-networks/networks-list-resp.xml
new file mode 100644
index 000000000..59620c228
--- /dev/null
+++ b/doc/api_samples/os-networks/networks-list-resp.xml
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<networks>
+ <network>
+ <bridge>br100</bridge>
+ <vpn_public_port>1000</vpn_public_port>
+ <dhcp_start>10.0.0.3</dhcp_start>
+ <bridge_interface>eth0</bridge_interface>
+ <updated_at>2011-08-16 09:26:13.048257</updated_at>
+ <id>20c8acc0-f747-4d71-a389-46d078ebf047</id>
+ <cidr_v6>None</cidr_v6>
+ <deleted_at>None</deleted_at>
+ <gateway>10.0.0.1</gateway>
+ <rxtx_base>None</rxtx_base>
+ <label>mynet_0</label>
+ <priority>None</priority>
+ <project_id>1234</project_id>
+ <vpn_private_address>10.0.0.2</vpn_private_address>
+ <deleted>False</deleted>
+ <vlan>100</vlan>
+ <broadcast>10.0.0.7</broadcast>
+ <netmask>255.255.255.248</netmask>
+ <injected>False</injected>
+ <cidr>10.0.0.0/29</cidr>
+ <vpn_public_address>127.0.0.1</vpn_public_address>
+ <multi_host>False</multi_host>
+ <dns2>None</dns2>
+ <created_at>2011-08-15 06:19:19.387525</created_at>
+ <host>nsokolov-desktop</host>
+ <gateway_v6>None</gateway_v6>
+ <netmask_v6>None</netmask_v6>
+ <dns1>None</dns1>
+ </network>
+ <network>
+ <bridge>br101</bridge>
+ <vpn_public_port>1001</vpn_public_port>
+ <dhcp_start>10.0.0.11</dhcp_start>
+ <bridge_interface>eth0</bridge_interface>
+ <updated_at>None</updated_at>
+ <id>20c8acc0-f747-4d71-a389-46d078ebf000</id>
+ <cidr_v6>None</cidr_v6>
+ <deleted_at>None</deleted_at>
+ <gateway>10.0.0.9</gateway>
+ <rxtx_base>None</rxtx_base>
+ <label>mynet_1</label>
+ <priority>None</priority>
+ <project_id>None</project_id>
+ <vpn_private_address>10.0.0.10</vpn_private_address>
+ <deleted>False</deleted>
+ <vlan>101</vlan>
+ <broadcast>10.0.0.15</broadcast>
+ <netmask>255.255.255.248</netmask>
+ <injected>False</injected>
+ <cidr>10.0.0.10/29</cidr>
+ <vpn_public_address>None</vpn_public_address>
+ <multi_host>False</multi_host>
+ <dns2>None</dns2>
+ <created_at>2011-08-15 06:19:19.885495</created_at>
+ <host>None</host>
+ <gateway_v6>None</gateway_v6>
+ <netmask_v6>None</netmask_v6>
+ <dns1>None</dns1>
+ </network>
+</networks> \ No newline at end of file