Fix XML and JSON validation errors

Change-Id: Iaca924b0015739b5e12c6ca208da8458a4a84a1e
author: diane fleming
This commit is contained in:
Diane Fleming 2014-02-26 09:48:40 -06:00
parent b759c1b20a
commit d01d4af212
19 changed files with 871 additions and 902 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +1,18 @@
{
"extensions": [
{
"name": "Cisco Port Profile",
"namespace": "http://docs.ciscocloud.com/api/ext/portprofile/v1.0",
"alias": "Cisco Port Profile",
"updated": "2011-07-23T13:25:27-06:00",
"description": "Portprofile include QoS information"
},
{
"name": "Cisco qos",
"namespace": "http://docs.ciscocloud.com/api/ext/qos/v1.0",
"alias": "Cisco qos",
"updated": "2011-07-25T13:25:27-06:00",
"description": "qos include qos_name and qos_desc"
}
]
"extensions":[
{
"name":"Cisco Port Profile",
"namespace":"http://docs.ciscocloud.com/api/ext/portprofile/v1.0",
"alias":"Cisco Port Profile",
"updated":"2011-07-23T13:25:27-06:00",
"description":"Portprofile include QoS information"
},
{
"name":"Cisco qos",
"namespace":"http://docs.ciscocloud.com/api/ext/qos/v1.0",
"alias":"Cisco qos",
"updated":"2011-07-25T13:25:27-06:00",
"description":"qos include qos_name and qos_desc"
}
]
}

View File

@ -1,21 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension
name="Cisco Port Profile"
<extension name="Cisco Port Profile"
namespace="http://docs.ciscocloud.com/api/ext/portprofile/v1.0"
alias="Cisco Port Profile"
updated="2011-07-23T13:25:27-06:00">
alias="Cisco Port Profile" updated="2011-07-23T13:25:27-06:00">
<description>Portprofile include QoS information</description>
</extension>
<extension
name="Cisco qos"
<extension name="Cisco qos"
namespace="http://docs.ciscocloud.com/api/ext/qos/v1.0"
alias="Cisco qos"
updated="2011-07-25T13:25:27-06:00">
alias="Cisco qos" updated="2011-07-25T13:25:27-06:00">
<description>qos include qos_name and qos_desc</description>
</extension>
</extensions>

View File

@ -1,8 +1,7 @@
<networkNotFound code="420" xmlns="http://netstack.org/quantum/api/v1.0">
<message>
Unable to find a network with the specified identifier.
</message>
<detail>
Network 8de6af7c-ef95-4ac1-9d37-172f8df33a1f could not be found
</detail>
<?xml version="1.0" encoding="UTF-8"?>
<networkNotFound code="420"
xmlns="http://netstack.org/quantum/api/v1.0">
<message> Unable to find a network with the specified identifier. </message>
<detail> Network 8de6af7c-ef95-4ac1-9d37-172f8df33a1f could not be
found </detail>
</networkNotFound>

View File

@ -1,7 +1,6 @@
{
"network":
{
"id": "8bec1293-16bd-4568-ba75-1f58bec0b4c3",
"name": "test_network"
}
"network":{
"id":"8bec1293-16bd-4568-ba75-1f58bec0b4c3",
"name":"test_network"
}
}

View File

@ -1,3 +1,2 @@
<network
id="8bec1293-16bd-4568-ba75-1f58bec0b4c3"
name="test_network"/>
<?xml version="1.0" encoding="UTF-8"?>
<network id="8bec1293-16bd-4568-ba75-1f58bec0b4c3" name="test_network"/>

View File

@ -1,6 +1,5 @@
{
"network":
{
"name": "test_create_network"
}
"network":{
"name":"test_create_network"
}
}

View File

@ -1,2 +1,2 @@
<network
name="test_create_network"/>
<?xml version="1.0" encoding="UTF-8"?>
<network name="test_create_network"/>

View File

@ -1,6 +1,5 @@
{
"network":
{
"id": "158233b0-ca9a-40b4-8614-54a4a99d47d1"
}
"network":{
"id":"158233b0-ca9a-40b4-8614-54a4a99d47d1"
}
}

View File

@ -1,2 +1,2 @@
<network
id="158233b0-ca9a-40b4-8614-54a4a99d47d1"/>
<?xml version="1.0" encoding="UTF-8"?>
<network id="158233b0-ca9a-40b4-8614-54a4a99d47d1"/>

View File

@ -1,5 +1,5 @@
{
"network": {
"name": "test"
}
}
"network":{
"name":"test"
}
}

View File

@ -1,8 +1,7 @@
{
"port":
{
"state": "DOWN",
"id": "98017ddc-efc8-4c25-a915-774b2a633855"
}
"port":{
"state":"DOWN",
"id":"98017ddc-efc8-4c25-a915-774b2a633855"
}
}

View File

@ -1,3 +1,2 @@
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"
state="DOWN"/>
<?xml version="1.0" encoding="UTF-8"?>
<port id="98017ddc-efc8-4c25-a915-774b2a633855" state="DOWN"/>

View File

@ -1,12 +1,12 @@
{
"ports": [
{
"id": "98017ddc-efc8-4c25-a915-774b2a633855",
"state": "ACTIVE"
},
{
"id": "b832be00-6553-4f69-af33-acd554e36d08",
"state": "ACTIVE"
}
"ports":[
{
"id":"98017ddc-efc8-4c25-a915-774b2a633855",
"state":"ACTIVE"
},
{
"id":"b832be00-6553-4f69-af33-acd554e36d08",
"state":"ACTIVE"
}
]
}
}

View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ports>
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"
state="ACTIVE"/>
<port
id="b832be00-6553-4f69-af33-acd554e36d08"
state="ACTIVE"/>
<port id="98017ddc-efc8-4c25-a915-774b2a633855" state="ACTIVE"/>
<port id="b832be00-6553-4f69-af33-acd554e36d08" state="ACTIVE"/>
</ports>

View File

@ -1,11 +1,10 @@
{
"ports":
[
{
"id": "98017ddc-efc8-4c25-a915-774b2a633855"
},
{
"id": "b832be00-6553-4f69-af33-acd554e36d08"
}
]
"ports":[
{
"id":"98017ddc-efc8-4c25-a915-774b2a633855"
},
{
"id":"b832be00-6553-4f69-af33-acd554e36d08"
}
]
}

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ports>
<port
id="98017ddc-efc8-4c25-a915-774b2a633855"/>
<port
id="b832be00-6553-4f69-af33-acd554e36d08"/>
<port id="98017ddc-efc8-4c25-a915-774b2a633855"/>
<port id="b832be00-6553-4f69-af33-acd554e36d08"/>
</ports>

View File

@ -143,5 +143,5 @@
<xi:include href="ch_neutron_overview.xml"/>
<xi:include href="ch_neutron_general_info.xml"/>
<xi:include href="ch_neutron_api_operations.xml"/>
<xi:include href="ch_neutron_api_extensions.xml"/>
<xi:include href="ch_neutron_api_extensions.xml"/>
</book>

View File

@ -34,11 +34,10 @@
xmlns:m="http://www.w3.org/1998/Math/MathML"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:db="http://docbook.org/ns/docbook" version="5.0"
status="final" xml:id="security-groups-ext"
xmlns:wadl="http://wadl.dev.java.net/2009/02">
<title>Security Groups and Rules</title>
<para>Creates, modifies, and deletes OpenStack Networking security groups and
rules.</para>
<wadl:resources href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/netconn-api/src/security-groups.wadl"/>
status="final" xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:id="security_groups">
<title>Security groups and rules (security-groups)</title>
<wadl:resources
href="https://raw.github.com/openstack/api-site/master/api-ref/src/wadls/netconn-api/src/security-groups.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</section>