Merge "Fix os-hosts extension can't return xml response correctly."

This commit is contained in:
Jenkins 2012-11-20 23:17:30 +00:00 committed by Gerrit Code Review
commit 0728c0ef08
4 changed files with 86 additions and 0 deletions

View File

@ -0,0 +1,31 @@
{
"host": [
{
"resource": {
"cpu": 1,
"disk_gb": 1028,
"host": "5ca60c6792a1442f9471ff575443f94d",
"memory_mb": 8192,
"project": "(total)"
}
},
{
"resource": {
"cpu": 0,
"disk_gb": 0,
"host": "5ca60c6792a1442f9471ff575443f94d",
"memory_mb": 512,
"project": "(used_now)"
}
},
{
"resource": {
"cpu": 0,
"disk_gb": 0,
"host": "5ca60c6792a1442f9471ff575443f94d",
"memory_mb": 0,
"project": "(used_max)"
}
}
]
}

View File

@ -0,0 +1,24 @@
<?xml version='1.0' encoding='UTF-8'?>
<host>
<resource>
<project>(total)</project>
<memory_mb>8192</memory_mb>
<host>ecf3458ac6bf4a299cc2e0efa740f426</host>
<cpu>1</cpu>
<disk_gb>1028</disk_gb>
</resource>
<resource>
<project>(used_now)</project>
<memory_mb>512</memory_mb>
<host>ecf3458ac6bf4a299cc2e0efa740f426</host>
<cpu>0</cpu>
<disk_gb>0</disk_gb>
</resource>
<resource>
<project>(used_max)</project>
<memory_mb>0</memory_mb>
<host>ecf3458ac6bf4a299cc2e0efa740f426</host>
<cpu>0</cpu>
<disk_gb>0</disk_gb>
</resource>
</host>

View File

@ -0,0 +1,24 @@
{
"hosts": [
{
"host_name": "c5a4acad61bc463ab5f60d164d942516",
"service": "compute",
"zone": "nova"
},
{
"host_name": "9112426abe5f4934a81b494fcdee8c5b",
"service": "cert",
"zone": "nova"
},
{
"host_name": "d483b9e6124d47f2a6ad14e57716a778",
"service": "network",
"zone": "nova"
},
{
"host_name": "3f9c73ba6d634092a70d6640f53930c8",
"service": "scheduler",
"zone": "nova"
}
]
}

View File

@ -0,0 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<hosts>
<host host_name="e5e145b49d244d97982c922e101859fd" service="compute"/>
<host host_name="6d85457c4d884047b41999540c2bf454" service="cert"/>
<host host_name="1f9a3cef66bd450aa004655ef239ddee" service="network"/>
<host host_name="c6fd14f8e3be44628e76ae4a6e88cffb" service="scheduler"/>
</hosts>