diff options
7 files changed, 62 insertions, 0 deletions
diff --git a/doc/api_samples/os-tenant-networks/networks-list-res.xml b/doc/api_samples/os-tenant-networks/networks-list-res.xml new file mode 100644 index 000000000..6aaeec85b --- /dev/null +++ b/doc/api_samples/os-tenant-networks/networks-list-res.xml @@ -0,0 +1,13 @@ +<?xml version='1.0' encoding='UTF-8'?> +<networks> + <network> + <cidr>10.0.0.0/29</cidr> + <id>cf3fb0f1-9967-4dac-8284-2d103e904099</id> + <label>test_0</label> + </network> + <network> + <cidr>10.0.0.8/29</cidr> + <id>434385bc-a7ac-4778-b295-56f8134fddbc</id> + <label>test_1</label> + </network> +</networks>
\ No newline at end of file diff --git a/doc/api_samples/os-tenant-networks/networks-post-req.xml b/doc/api_samples/os-tenant-networks/networks-post-req.xml new file mode 100644 index 000000000..f4c06aa9d --- /dev/null +++ b/doc/api_samples/os-tenant-networks/networks-post-req.xml @@ -0,0 +1,7 @@ +<network> + <label>public</label> + <cidr>172.0.0.0/24</cidr> + <vlan_start>1</vlan_start> + <num_networks>1</num_networks> + <network_size>255</network_size> +</network>
\ No newline at end of file diff --git a/doc/api_samples/os-tenant-networks/networks-post-res.xml b/doc/api_samples/os-tenant-networks/networks-post-res.xml new file mode 100644 index 000000000..7bbc6a4b6 --- /dev/null +++ b/doc/api_samples/os-tenant-networks/networks-post-res.xml @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8'?> +<network> + <cidr>172.0.0.0/24</cidr> + <id>9ac30188-57d8-4349-94d1-dbad63b20e4d</id> + <label>public</label> +</network>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl b/nova/tests/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl new file mode 100644 index 000000000..0562ebae7 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-tenant-networks/networks-list-res.xml.tpl @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<networks> + <network> + <cidr>10.0.0.0/29</cidr> + <id>%(id)s</id> + <label>test_0</label> + </network> + <network> + <cidr>10.0.0.8/29</cidr> + <id>%(id)s</id> + <label>test_1</label> + </network> +</networks> diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl b/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl new file mode 100644 index 000000000..0493de387 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-req.xml.tpl @@ -0,0 +1,7 @@ +<network> + <label>public</label> + <cidr>172.0.0.0/24</cidr> + <vlan_start>1</vlan_start> + <num_networks>1</num_networks> + <network_size>255</network_size> +</network> diff --git a/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl b/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl new file mode 100644 index 000000000..9c6c2f28b --- /dev/null +++ b/nova/tests/integrated/api_samples/os-tenant-networks/networks-post-res.xml.tpl @@ -0,0 +1,5 @@ +<network> + <cidr>172.0.0.0/24</cidr> + <id>%(id)s</id> + <label>public</label> +</network> diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 9b678ddd3..37a8de08a 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -2554,6 +2554,17 @@ class OsNetworksJsonTests(ApiSampleTestBase): self.assertEqual(response.status, 202) +class OsNetworksXmlTests(OsNetworksJsonTests): + ctype = 'xml' + + def test_delete_network(self): + response = self._do_post('os-tenant-networks', "networks-post-req", {}) + net = etree.fromstring(response.read()) + network_id = net.find('id').text + response = self._do_delete('os-tenant-networks/%s' % network_id) + self.assertEqual(response.status, 202) + + class NetworksJsonTests(ApiSampleTestBase): extension_name = ("nova.api.openstack.compute.contrib" ".os_networks.Os_networks") |