virtualopensystems · bopopescu · Jun 30, 2014 · Jul 9, 2014 · Jul 9, 2014 · Jun 30, 2014
diff --git a/HACKING.rst b/HACKING.rst
@@ -35,6 +35,8 @@ Nova Specific Commandments
   self.flags(option=value) instead.
 - [N321] Validate that LOG messages, except debug ones, have translations
 - [N322] Method's default argument shouldn't be mutable
+- [N323] Ensure that the _() function is explicitly imported to ensure proper translations.
+- [N324] Ensure that jsonutils.%(fun)s must be used instead of json.%(fun)s
 
 Creating Unit Tests
 -------------------

diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
@@ -272,6 +272,14 @@
             "namespace": "http://docs.openstack.org/compute/ext/evacuate/api/v2",
             "updated": "2013-01-06T00:00:00Z"
         },
+        {
+            "alias": "os-extended-evacuate-find-host",
+            "description": "Enables server evacuation without target host. Scheduler will select\n       one to target.\n    ",
+            "links": [],
+            "name": "ExtendedEvacuateFindHost",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_evacuate_find_host/api/v2",
+            "updated": "2014-02-12T00:00:00Z"
+        },
         {
             "alias": "os-extended-floating-ips",
             "description": "Adds optional fixed_address to the add floating IP command.",
@@ -288,6 +296,14 @@
             "namespace": "http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1",
             "updated": "2014-01-04T00:00:00Z"
         },
+        {
+            "alias": "os-extended-networks",
+            "description": "Adds additional fields to networks",
+            "links": [],
+            "name": "ExtendedNetworks",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_networks/api/v2",
+            "updated": "2014-05-09T00:00:00Z"
+        },
         {
             "alias": "os-extended-quotas",
             "description": "Adds ability for admins to delete quota\n    and optionally force the update Quota command.\n    ",
@@ -304,6 +320,14 @@
             "namespace": "http://docs.openstack.org/compute/ext/extended_rescue_with_image/api/v2",
             "updated": "2014-01-04T00:00:00Z"
         },
+        {
+            "alias": "os-hypervisor-status",
+            "description": "Show hypervisor status.",
+            "links": [],
+            "name": "HypervisorStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/hypervisor_status/api/v1.1",
+            "updated": "2014-04-17T00:00:00Z"
+        },
         {
             "alias": "os-extended-services",
             "description": "Extended services support.",
@@ -568,6 +592,14 @@
             "namespace": "http://docs.openstack.org/compute/ext/servergroups/api/v2",
             "updated": "2013-06-20T00:00:00Z"
         },
+        {
+            "alias": "os-server-list-multi-status",
+            "description": "Allow to filter the servers by a set of status values.",
+            "links": [],
+            "name": "ServerListMultiStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/os-server-list-multi-status/api/v2",
+            "updated": "2014-05-11T00:00:00Z"
+        },
         {
             "alias": "os-server-password",
             "description": "Server password support.",

diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml
@@ -118,12 +118,20 @@
   <extension alias="os-evacuate" updated="2013-01-06T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/evacuate/api/v2" name="Evacuate">
     <description>Enables server evacuation.</description>
   </extension>
+  <extension alias="os-extended-evacuate-find-host" updated="2014-02-12T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_evacuate_find_host/api/v2" name="ExtendedEvacuateFindHost">
+    <description>Enables server evacuation without target host. Scheduler will select
+       one to target.
+    </description>
+  </extension>
   <extension alias="os-extended-floating-ips" updated="2013-04-19T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_floating_ips/api/v2" name="ExtendedFloatingIps">
     <description>Adds optional fixed_address to the add floating IP command.</description>
   </extension>
   <extension alias="os-extended-hypervisors" updated="2014-01-04T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_hypervisors/api/v1.1" name="ExtendedHypervisors">
     <description>Extended hypervisors support.</description>
   </extension>
+  <extension alias="os-extended-networks" updated="2014-05-09T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_networks/api/v2" name="ExtendedNetworks">
+    <description>Adds additional fields to networks</description>
+  </extension>
   <extension alias="os-extended-quotas" updated="2013-06-09T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_quotas/api/v1.1" name="ExtendedQuotas">
     <description>Adds ability for admins to delete quota
     and optionally force the update Quota command.
@@ -138,6 +146,9 @@
   <extension alias="os-extended-services-delete" updated="2013-12-10T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_services_delete/api/v2" name="ExtendedServicesDelete">
     <description>Extended services deletion support.</description>
   </extension>
+  <extension alias="os-hypervisor-status" updated="2014-04-17T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/hypervisor_status/api/v1.1" name="HypervisorStatus">
+    <description>Show hypervisor status.</description>
+  </extension>
   <extension alias="os-extended-volumes" updated="2013-06-07T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" name="ExtendedVolumes">
     <description>Extended Volumes support.</description>
   </extension>
@@ -231,6 +242,9 @@
   <extension alias="os-server-groups" updated="2013-06-20T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/servergroups/api/v2" name="ServerGroups">
     <description>Server group support.</description>
   </extension>
+  <extension alias="os-server-list-multi-status" updated="2014-05-11T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/os-server-list-multi-status/api/v2" name="ServerListMultiStatus">
+    <description>Allow to filter the servers by a set of status values.</description>
+  </extension>
   <extension alias="os-server-password" updated="2012-11-29T00:00:00Z" namespace="http://docs.openstack.org/compute/ext/server-password/api/v2" name="ServerPassword">
     <description>Server password support.</description>
   </extension>

diff --git a/doc/api_samples/os-agents/agent-post-req.json b/doc/api_samples/os-agents/agent-post-req.json
@@ -5,6 +5,6 @@
         "architecture": "x86",
         "version": "8.0",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
-        "url": "xxxxxxxxxxxx"
+        "url": "http://example.com/path/to/resource"
     }
-}
+}
diff --git a/doc/api_samples/os-agents/agent-post-req.xml b/doc/api_samples/os-agents/agent-post-req.xml
@@ -5,5 +5,5 @@
   <architecture>x86</architecture>
   <version>8.0</version>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-  <url>xxxxxxxxxxxx</url>
-</agent>
+  <url>http://example.com/path/to/resource</url>
+</agent>
diff --git a/doc/api_samples/os-agents/agent-post-resp.json b/doc/api_samples/os-agents/agent-post-resp.json
@@ -5,7 +5,7 @@
         "hypervisor": "hypervisor",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
         "os": "os",
-        "url": "xxxxxxxxxxxx",
+        "url": "http://example.com/path/to/resource",
         "version": "8.0"
     }
-}
+}
diff --git a/doc/api_samples/os-agents/agent-post-resp.xml b/doc/api_samples/os-agents/agent-post-resp.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <agent>
-  <url>xxxxxxxxxxxx</url>
+  <url>http://example.com/path/to/resource</url>
   <hypervisor>hypervisor</hypervisor>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
   <version>8.0</version>
   <architecture>x86</architecture>
   <os>os</os>
   <agent_id>1</agent_id>
-</agent>
+</agent>
diff --git a/doc/api_samples/os-agents/agent-update-put-req.json b/doc/api_samples/os-agents/agent-update-put-req.json
@@ -1,7 +1,7 @@
 {
     "para": {
-        "url": "xxx://xxxx/xxx/xxx",
+        "url": "http://example.com/path/to/resource",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
         "version": "7.0"
     }
-}
+}
diff --git a/doc/api_samples/os-agents/agent-update-put-req.xml b/doc/api_samples/os-agents/agent-update-put-req.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <para>
   <version>7.0</version>
-  <url>xxx://xxxx/xxx/xxx</url>
+  <url>http://example.com/path/to/resource</url>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-</para>
+</para>
diff --git a/doc/api_samples/os-agents/agent-update-put-resp.json b/doc/api_samples/os-agents/agent-update-put-resp.json
@@ -2,7 +2,7 @@
     "agent": {
         "agent_id": "1",
         "md5hash": "add6bb58e139be103324d04d82d8f545",
-        "url": "xxx://xxxx/xxx/xxx",
+        "url": "http://example.com/path/to/resource",
         "version": "7.0"
     }
-}
+}
diff --git a/doc/api_samples/os-agents/agent-update-put-resp.xml b/doc/api_samples/os-agents/agent-update-put-resp.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <agent>
-  <url>xxx://xxxx/xxx/xxx</url>
+  <url>http://example.com/path/to/resource</url>
   <version>7.0</version>
   <agent_id>1</agent_id>
   <md5hash>add6bb58e139be103324d04d82d8f545</md5hash>
-</agent>
+</agent>
diff --git a/doc/api_samples/os-agents/agents-get-resp.json b/doc/api_samples/os-agents/agents-get-resp.json
@@ -6,8 +6,8 @@
             "hypervisor": "hypervisor",
             "md5hash": "add6bb58e139be103324d04d82d8f545",
             "os": "os",
-            "url": "xxxxxxxxxxxx",
+            "url": "http://example.com/path/to/resource",
             "version": "8.0"
         }
     ]
-}
+}
diff --git a/doc/api_samples/os-agents/agents-get-resp.xml b/doc/api_samples/os-agents/agents-get-resp.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <agents>
-  <agent url="xxxxxxxxxxxx" hypervisor="hypervisor" md5hash="add6bb58e139be103324d04d82d8f545" version="8.0" architecture="x86" os="os" agent_id="1"/>
-</agents>
+    <agent url="http://example.com/path/to/resource" hypervisor="hypervisor" md5hash="add6bb58e139be103324d04d82d8f545" version="8.0" architecture="x86" os="os" agent_id="1"/>
+</agents>
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.json
@@ -0,0 +1,6 @@
+{
+    "evacuate": {
+        "adminPass": "MySecretPass",
+        "onSharedStorage": "False"
+    }
+}
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-req.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<evacuate xmlns="http://docs.openstack.org/compute/api/v2"
+    adminPass="MySecretPass"
+    onSharedStorage="False"/>
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.json
@@ -0,0 +1,3 @@
+{
+    "adminPass": "MySecretPass"
+}
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml b/doc/api_samples/os-extended-evacuate-find-host/server-evacuate-find-host-resp.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<adminPass>MySecretPass</adminPass>
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-req.json b/doc/api_samples/os-extended-evacuate-find-host/server-post-req.json
@@ -0,0 +1,16 @@
+{
+    "server" : {
+        "name" : "new-server-test",
+        "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "metadata" : {
+            "My Server Name" : "Apache1"
+        },
+        "personality" : [
+            {
+                "path" : "/etc/banner.txt",
+                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+            }
+        ]
+    }
+}
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml b/doc/api_samples/os-extended-evacuate-find-host/server-post-req.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <personality>
+    <file path="/etc/banner.txt">
+        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
+        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
+        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
+        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
+        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
+        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
+        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
+        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
+        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
+    </file>
+  </personality>
+</server>
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.json b/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "adminPass": "y6hsKno56L6R",
+        "id": "1c650ba2-6a76-41d1-805c-64f4e312200e",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/servers/1c650ba2-6a76-41d1-805c-64f4e312200e",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/servers/1c650ba2-6a76-41d1-805c-64f4e312200e",
+                "rel": "bookmark"
+            }
+        ]
+    }
+}
diff --git a/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml b/doc/api_samples/os-extended-evacuate-find-host/server-post-resp.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="b7fe468c-c283-4757-ba25-7e313fa55617" adminPass="CiyJLbaJS3j3">
+  <metadata/>
+  <atom:link href="http://openstack.example.com/v2/openstack/servers/b7fe468c-c283-4757-ba25-7e313fa55617" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/servers/b7fe468c-c283-4757-ba25-7e313fa55617" rel="bookmark"/>
+</server>
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
@@ -8,7 +8,7 @@
         "free_ram_mb": 7680,
         "hypervisor_hostname": "fake-mini",
         "hypervisor_type": "fake",
-        "hypervisor_version": 1,
+        "hypervisor_version": 1000,
         "id": 1,
         "local_gb": 1028,
         "local_gb_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
@@ -1,4 +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">
+<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="1000" 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/api_samples/os-extended-networks/network-create-req.json b/doc/api_samples/os-extended-networks/network-create-req.json
@@ -0,0 +1,12 @@
+{
+    "network": {
+        "label": "new net 111",
+        "cidr": "10.20.105.0/24",
+        "mtu": 9000,
+        "dhcp_server": "10.20.105.2",
+        "enable_dhcp": false,
+        "share_address": true,
+        "allowed_start": "10.20.105.10",
+        "allowed_end": "10.20.105.200"
+    }
+}
diff --git a/doc/api_samples/os-extended-networks/network-create-req.xml b/doc/api_samples/os-extended-networks/network-create-req.xml
@@ -0,0 +1,10 @@
+<network>
+    <label>new net 111</label>
+    <cidr>10.20.105.0/24</cidr>
+    <mtu>9000</mtu>
+    <dhcp_server>10.20.105.2</dhcp_server>
+    <enable_dhcp>False</enable_dhcp>
+    <share_address>True</share_address>
+    <allowed_start>10.20.105.10</allowed_start>
+    <allowed_end>10.20.105.200</allowed_end>
+</network>
diff --git a/doc/api_samples/os-extended-networks/network-create-resp.json b/doc/api_samples/os-extended-networks/network-create-resp.json
@@ -0,0 +1,36 @@
+{
+    "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_server": "10.20.105.2",
+        "dhcp_start": "10.20.105.2",
+        "dns1": null,
+        "dns2": null,
+        "enable_dhcp": false,
+        "gateway": "10.20.105.1",
+        "gateway_v6": null,
+        "host": null,
+        "id": "d7a17c0c-457e-4ab4-a99c-4fa1762f5359",
+        "injected": null,
+        "label": "new net 111",
+        "mtu": 9000,
+        "multi_host": null,
+        "netmask": "255.255.255.0",
+        "netmask_v6": null,
+        "priority": null,
+        "project_id": null,
+        "rxtx_base": null,
+        "share_address": true,
+        "updated_at": null,
+        "vlan": null,
+        "vpn_private_address": null,
+        "vpn_public_address": null,
+        "vpn_public_port": null
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version='1.0' encoding='UTF-8'?>
		<adminPass>MySecretPass</adminPass>