Merge "Adds host_ip to hypervisor show API"

8 files changed, 48 insertions, 4 deletions

diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
index b688cb9d30..078ba1545d 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.json
+++ b/doc/api_samples/all_extensions/extensions-get-resp.json
@@ -281,6 +281,14 @@
             "updated": "2013-06-09T00:00:00+00:00"
         },
         {
+            "alias": "os-extended-hypervisors",
+            "description": "Extended hypervisors support.",
+            "links": [],
+            "name": "ExtendedHypervisors",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1",
+            "updated": "2013-10-21T00:00:00-00:00"
+        },
+        {
             "alias": "os-extended-services",
             "description": "Extended services 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 80337434dc..6fcacf603b 100644
--- a/doc/api_samples/all_extensions/extensions-get-resp.xml
+++ b/doc/api_samples/all_extensions/extensions-get-resp.xml
@@ -126,6 +126,9 @@
   <extension alias="os-extended-services" updated="2013-05-17T00:00:00-00:00" namespace="http://docs.openstack.org/compute/ext/extended_services/api/v2" name="ExtendedServices">
     <description>Extended services support.</description>
   </extension>
+  <extension alias="os-extended-hypervisors" updated="2013-10-21T00:00:00-00:00" namespace="http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1" name="ExtendedHypervisors">
+    <description>Extended hypervisors support.</description>
+  </extension>
   <extension alias="os-extended-volumes" updated="2013-06-07T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" name="ExtendedVolumes">
     <description>Extended Volumes support.</description>
   </extension>
diff --git a/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json b/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json
new file mode 100644
index 0000000000..01b6428446
--- /dev/null
+++ b/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.json
@@ -0,0 +1,25 @@
+{
+    "hypervisor": {
+        "cpu_info": "?",
+        "current_workload": 0,
+        "disk_available_least": 0,
+        "host_ip": "1.1.1.1",
+        "free_disk_gb": 1028,
+        "free_ram_mb": 7680,
+        "hypervisor_hostname": "fake-mini",
+        "hypervisor_type": "fake",
+        "hypervisor_version": 1,
+        "id": 1,
+        "local_gb": 1028,
+        "local_gb_used": 0,
+        "memory_mb": 8192,
+        "memory_mb_used": 512,
+        "running_vms": 0,
+        "service": {
+            "host": "5641188ab2964f88a21042b493585ff8",
+            "id": 2
+        },
+        "vcpus": 1,
+        "vcpus_used": 0
+    }
+}
diff --git a/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml b/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml
new file mode 100644
index 0000000000..244e899969
--- /dev/null
+++ b/doc/api_samples/os-extended-hypervisors/hypervisors-show-with-ip-resp.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hypervisor vcpus_used="0" hypervisor_type="fake" local_gb_used="0" hypervisor_hostname="fake-mini" memory_mb_used="512" memory_mb="8192" current_workload="0" vcpus="1" cpu_info="?" running_vms="0" free_disk_gb="1028" hypervisor_version="1" disk_available_least="0" host_ip="1.1.1.1" local_gb="1028" free_ram_mb="7680" id="1">
+  <service host="807e1a43ceb740138eea32969c3e9fe5" id="2"/>
+</hypervisor>
diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json b/doc/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json
index 149f031ded..5fa4493ef6 100644
--- a/doc/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json
+++ b/doc/v3/api_samples/os-hypervisors/hypervisors-detail-resp.json
@@ -4,6 +4,7 @@
             "cpu_info": "?",
             "current_workload": 0,
             "disk_available_least": 0,
+            "host_ip": "1.1.1.1",
             "free_disk_gb": 1028,
             "free_ram_mb": 7680,
             "hypervisor_hostname": "fake-mini",
@@ -23,4 +24,4 @@
             "vcpus_used": 0
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-hypervisors/hypervisors-show-resp.json b/doc/v3/api_samples/os-hypervisors/hypervisors-show-resp.json
index ef1aac6337..1ab1b99be8 100644
--- a/doc/v3/api_samples/os-hypervisors/hypervisors-show-resp.json
+++ b/doc/v3/api_samples/os-hypervisors/hypervisors-show-resp.json
@@ -3,6 +3,7 @@
         "cpu_info": "?",
         "current_workload": 0,
         "disk_available_least": 0,
+        "host_ip": "1.1.1.1",
         "free_disk_gb": 1028,
         "free_ram_mb": 7680,
         "hypervisor_hostname": "fake-mini",
@@ -21,4 +22,4 @@
         "vcpus": 1,
         "vcpus_used": 0
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json b/doc/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json
index 8751f9c44b..aa0e92efb3 100644
--- a/doc/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json
+++ b/doc/v3/api_samples/os-pci/hypervisors-pci-detail-resp.json
@@ -4,6 +4,7 @@
             "cpu_info": "?",
             "current_workload": 0,
             "disk_available_least": 0,
+            "host_ip": "1.1.1.1",
             "free_disk_gb": 1028,
             "free_ram_mb": 7680,
             "hypervisor_hostname": "fake-mini",
@@ -35,4 +36,4 @@
             "vcpus_used": 0
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-pci/hypervisors-pci-show-resp.json b/doc/v3/api_samples/os-pci/hypervisors-pci-show-resp.json
index 16b178ad5f..1750501621 100644
--- a/doc/v3/api_samples/os-pci/hypervisors-pci-show-resp.json
+++ b/doc/v3/api_samples/os-pci/hypervisors-pci-show-resp.json
@@ -3,6 +3,7 @@
         "cpu_info": "?",
         "current_workload": 0,
         "disk_available_least": 0,
+        "host_ip": "1.1.1.1",
         "free_disk_gb": 1028,
         "free_ram_mb": 7680,
         "hypervisor_hostname": "fake-mini",
@@ -33,4 +34,4 @@
         "vcpus": 1,
         "vcpus_used": 0
     }
-}
\ No newline at end of file
+}