Enable extension access_ips for v3 API

This patch enable extension access_ips, remove old 'access_ip_*'
attributes and related unittest from servers core. And remove
old attributes from api samples.

Partially implements bp nova-v3-api

DocImpact

Change-Id: Id4c8bb721550e317e0695d7876e2faa3d6e91a60

doc/v3/api_samples/all_extensions/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {
@@ -48,6 +46,8 @@
             "My Server Name": "Apache1"
         },
         "name": "new-server-test",
+        "os-access-ips:access_ip_v4": "",
+        "os-access-ips:access_ip_v6": "",
         "os-config-drive:config_drive": "",
         "os-disk-config:disk_config": "AUTO",
         "os-extended-availability-zone:availability_zone": "nova",

doc/v3/api_samples/all_extensions/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-23T13:25:51Z" user_id="fake" name="new-server-test" created="2013-09-23T13:25:51Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="cf633433346bd3b095fe1ee9039b553f9d55b552f001c02544b1da64" id="97918d76-884c-4629-8500-4cc147194463" access_ip_v6="" os-config-drive:config_drive="" os-server-usage:launched_at="2013-09-23 13:25:51.254223" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="b78e05fa358d404bb5c5f803aba22060" key_name="None">
+<server xmlns:os-access-ips="http://docs.openstack.org/compute/ext/os-access-ips/api/v3" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-23T13:25:51Z" user_id="fake" name="new-server-test" created="2013-09-23T13:25:51Z" tenant_id="openstack" progress="0" host_id="cf633433346bd3b095fe1ee9039b553f9d55b552f001c02544b1da64" id="97918d76-884c-4629-8500-4cc147194463" os-config-drive:config_drive="" os-server-usage:launched_at="2013-09-23 13:25:51.254223" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="b78e05fa358d404bb5c5f803aba22060" key_name="None" os-access-ips:access_ip_v4="" os-access-ips:access_ip_v6="">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/all_extensions/server-post-resp.json

@@ -12,6 +12,8 @@
                 "rel": "bookmark"
             }
         ],
+        "os-access-ips:access_ip_v4": "",
+        "os-access-ips:access_ip_v6": "",
         "os-disk-config:disk_config": "AUTO",
         "security_groups": [
             {

doc/v3/api_samples/all_extensions/server-post-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="72885505-d8fb-4078-8bdb-65222c08f4d1" admin_pass="V24sJmhzzKLu" os-disk-config:disk_config="AUTO">
+<server xmlns:os-access-ips="http://docs.openstack.org/compute/ext/os-access-ips/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="72885505-d8fb-4078-8bdb-65222c08f4d1" admin_pass="V24sJmhzzKLu" os-disk-config:disk_config="AUTO" os-access-ips:access_ip_v4="" os-access-ips:access_ip_v6="">
   <metadata/>
   <atom:link href="http://openstack.example.com/v3/servers/72885505-d8fb-4078-8bdb-65222c08f4d1" rel="self"/>
   <atom:link href="http://openstack.example.com/servers/72885505-d8fb-4078-8bdb-65222c08f4d1" rel="bookmark"/>

doc/v3/api_samples/all_extensions/servers-details-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {
@@ -49,6 +47,8 @@
                 "My Server Name": "Apache1"
             },
             "name": "new-server-test",
+            "os-access-ips:access_ip_v4": "",
+            "os-access-ips:access_ip_v6": "",
             "os-config-drive:config_drive": "",
             "os-disk-config:disk_config": "AUTO",
             "os-extended-availability-zone:availability_zone": "nova",

doc/v3/api_samples/all_extensions/servers-details-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1">
+<servers xmlns:os-access-ips="http://docs.openstack.org/compute/ext/os-access-ips/api/v3" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-23T13:29:37Z" user_id="fake" name="new-server-test" created="2013-09-23T13:29:36Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="6da2179515d81d177b0fb59fb11a1b70f7ca3b859bb6d8beb6331403" id="dbcc8944-8510-46bd-a017-ecacd6e6de5c" access_ip_v6="" os-config-drive:config_drive="" os-server-usage:launched_at="2013-09-23 13:29:37.150043" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="ac7b409b83234b25af19fc4d36793f8d" key_name="None">
+  <server status="ACTIVE" updated="2013-09-23T13:29:37Z" user_id="fake" name="new-server-test" created="2013-09-23T13:29:36Z" tenant_id="openstack" progress="0" host_id="6da2179515d81d177b0fb59fb11a1b70f7ca3b859bb6d8beb6331403" id="dbcc8944-8510-46bd-a017-ecacd6e6de5c" os-config-drive:config_drive="" os-server-usage:launched_at="2013-09-23 13:29:37.150043" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="ac7b409b83234b25af19fc4d36793f8d" key_name="None" os-access-ips:access_ip_v4="" os-access-ips:access_ip_v6="">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-disk-config/list-servers-detail-get.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/os-disk-config/list-servers-detail-get.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-10-15T02:10:26Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:26Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="91afc29a75a4060983952e3a85271fa9ae5748430d4688e81b2baf4d" id="b4bcbdb4-837c-4070-88df-3da18ffbf303" access_ip_v6="" os-disk-config:disk_config="AUTO" key_name="None">
+  <server status="ACTIVE" updated="2013-10-15T02:10:26Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:26Z" tenant_id="openstack" progress="0" host_id="91afc29a75a4060983952e3a85271fa9ae5748430d4688e81b2baf4d" id="b4bcbdb4-837c-4070-88df-3da18ffbf303" os-disk-config:disk_config="AUTO" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-10-15T02:10:27Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:27Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="197205cc7340272607a9c5fa34f3520bbf53103399a6e80a06b67583" id="beb22987-dd7c-4791-8b7a-542c4f53cdd7" access_ip_v6="" admin_pass="whSjs3JXbb6p" os-disk-config:disk_config="AUTO">
+<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-10-15T02:10:27Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:27Z" tenant_id="openstack" progress="0" host_id="197205cc7340272607a9c5fa34f3520bbf53103399a6e80a06b67583" id="beb22987-dd7c-4791-8b7a-542c4f53cdd7" admin_pass="whSjs3JXbb6p" os-disk-config:disk_config="AUTO">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-disk-config/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-disk-config/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-10-15T02:10:26Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:26Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="0f65e54d42dc6ab16e7a970df1c58d93ea8fa92636550f0d00af48f4" id="31c9e8eb-0527-4dfe-a631-52d487baa7be" access_ip_v6="" os-disk-config:disk_config="AUTO" key_name="None">
+<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-10-15T02:10:26Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:26Z" tenant_id="openstack" progress="0" host_id="0f65e54d42dc6ab16e7a970df1c58d93ea8fa92636550f0d00af48f4" id="31c9e8eb-0527-4dfe-a631-52d487baa7be" os-disk-config:disk_config="AUTO" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-disk-config/server-update-put-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-disk-config/server-update-put-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-10-15T02:10:28Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:28Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="44694455e4f8b2616f1b84eeb20234ff2d66220d7cfb595930a89ccb" id="3b094134-6907-4682-874c-5ecf44f4b6c5" access_ip_v6="" os-disk-config:disk_config="AUTO">
+<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-10-15T02:10:28Z" user_id="fake" name="new-server-test" created="2013-10-15T02:10:28Z" tenant_id="openstack" progress="0" host_id="44694455e4f8b2616f1b84eeb20234ff2d66220d7cfb595930a89ccb" id="3b094134-6907-4682-874c-5ecf44f4b6c5" os-disk-config:disk_config="AUTO">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-extended-availability-zone/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-extended-availability-zone/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T02:55:02Z" user_id="fake" name="new-server-test" created="2013-09-16T02:55:01Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="146f5f54649a2655d2daed87b2da7eec04777520ce4aaa0642845173" id="d693cfcb-b6b8-4d9c-acb9-4db3bd16593f" access_ip_v6="" os-extended-availability-zone:availability_zone="nova" key_name="None">
+<server xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T02:55:02Z" user_id="fake" name="new-server-test" created="2013-09-16T02:55:01Z" tenant_id="openstack" progress="0" host_id="146f5f54649a2655d2daed87b2da7eec04777520ce4aaa0642845173" id="d693cfcb-b6b8-4d9c-acb9-4db3bd16593f" os-extended-availability-zone:availability_zone="nova" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-16T02:55:00Z" user_id="fake" name="new-server-test" created="2013-09-16T02:54:59Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="1c938f2d8fe831c1a6f1e1c013ae40400218c92013d1452fe4a8ffc3" id="81a6e93a-eeeb-4169-b562-bbe42bffea27" access_ip_v6="" os-extended-availability-zone:availability_zone="nova" key_name="None">
+  <server status="ACTIVE" updated="2013-09-16T02:55:00Z" user_id="fake" name="new-server-test" created="2013-09-16T02:54:59Z" tenant_id="openstack" progress="0" host_id="1c938f2d8fe831c1a6f1e1c013ae40400218c92013d1452fe4a8ffc3" id="81a6e93a-eeeb-4169-b562-bbe42bffea27" os-extended-availability-zone:availability_zone="nova" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-extended-server-attributes/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-extended-server-attributes/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T02:54:58Z" user_id="fake" name="new-server-test" created="2013-09-16T02:54:56Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="6a5d92e002c044ec7a57b04d7b564d6536d172601518d66559bfd736" id="17f2690d-2369-4b8a-9b28-66e503c079e9" access_ip_v6="" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="45dc15db04d54001801b10996b49db9e" key_name="None">
+<server xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T02:54:58Z" user_id="fake" name="new-server-test" created="2013-09-16T02:54:56Z" tenant_id="openstack" progress="0" host_id="6a5d92e002c044ec7a57b04d7b564d6536d172601518d66559bfd736" id="17f2690d-2369-4b8a-9b28-66e503c079e9" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="45dc15db04d54001801b10996b49db9e" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-16T02:55:11Z" user_id="fake" name="new-server-test" created="2013-09-16T02:55:10Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="b9389d025797d258fd68840325fd2905a5f004d01d0f3dea37691c27" id="cf2daa06-ae23-430c-9c6e-6ea303339bd8" access_ip_v6="" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="d1ba3610704b49fcbf70477d4d5840cd" key_name="None">
+  <server status="ACTIVE" updated="2013-09-16T02:55:11Z" user_id="fake" name="new-server-test" created="2013-09-16T02:55:10Z" tenant_id="openstack" progress="0" host_id="b9389d025797d258fd68840325fd2905a5f004d01d0f3dea37691c27" id="cf2daa06-ae23-430c-9c6e-6ea303339bd8" os-extended-server-attributes:hypervisor_hostname="fake-mini" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="d1ba3610704b49fcbf70477d4d5840cd" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-extended-status/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-extended-status/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T03:07:19Z" user_id="fake" name="new-server-test" created="2013-09-16T03:07:17Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="9d03fc2b812a0c9b5b170f9b6eb3eef2f5e0f4829ba1c1d1be3e3c35" id="348a9852-69c2-4dc2-a78d-fe7af4c2bf19" access_ip_v6="" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" key_name="None">
+<server xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T03:07:19Z" user_id="fake" name="new-server-test" created="2013-09-16T03:07:17Z" tenant_id="openstack" progress="0" host_id="9d03fc2b812a0c9b5b170f9b6eb3eef2f5e0f4829ba1c1d1be3e3c35" id="348a9852-69c2-4dc2-a78d-fe7af4c2bf19" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-extended-status/servers-detail-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/os-extended-status/servers-detail-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-16T03:07:14Z" user_id="fake" name="new-server-test" created="2013-09-16T03:07:12Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="37b4264fc07f9caded91f833e7dbe0123d35f90c9980c1af76aa627f" id="712915a0-9acb-4ff5-aa4c-f546cd50d3f6" access_ip_v6="" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" key_name="None">
+  <server status="ACTIVE" updated="2013-09-16T03:07:14Z" user_id="fake" name="new-server-test" created="2013-09-16T03:07:12Z" tenant_id="openstack" progress="0" host_id="37b4264fc07f9caded91f833e7dbe0123d35f90c9980c1af76aa627f" id="712915a0-9acb-4ff5-aa4c-f546cd50d3f6" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-extended-volumes/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-extended-volumes/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T03:22:42Z" user_id="fake" name="new-server-test" created="2013-09-16T03:22:39Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="2af1b68147c670fe4fcc9393435901abcfc46b2b3f7796be6fc17d5c" id="6c23b329-374d-449a-9e9f-6087cba322c0" access_ip_v6="" key_name="None">
+<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-16T03:22:42Z" user_id="fake" name="new-server-test" created="2013-09-16T03:22:39Z" tenant_id="openstack" progress="0" host_id="2af1b68147c670fe4fcc9393435901abcfc46b2b3f7796be6fc17d5c" id="6c23b329-374d-449a-9e9f-6087cba322c0" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-extended-volumes/servers-detail-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/os-extended-volumes/servers-detail-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-16T03:22:37Z" user_id="fake" name="new-server-test" created="2013-09-16T03:22:36Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="7840e9f7175388e4a55b12a2c4b877aed4aed61c78fcf910f53c5ccb" id="a7a8a042-e1cf-41ab-be9c-085c1f3ee4fc" access_ip_v6="" key_name="None">
+  <server status="ACTIVE" updated="2013-09-16T03:22:37Z" user_id="fake" name="new-server-test" created="2013-09-16T03:22:36Z" tenant_id="openstack" progress="0" host_id="7840e9f7175388e4a55b12a2c4b877aed4aed61c78fcf910f53c5ccb" id="a7a8a042-e1cf-41ab-be9c-085c1f3ee4fc" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-hide-server-addresses/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {},
         "created": "2013-09-24T14:39:00Z",
         "flavor": {

doc/v3/api_samples/os-hide-server-addresses/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?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" status="ACTIVE" updated="2013-09-24T14:46:44Z" user_id="fake" name="new-server-test" created="2013-09-24T14:46:44Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="2936a2ffe8b5bfa4daa8515e8a5efd7f8842232f471fb01a4238520d" id="91bf1e67-e322-42bd-acba-72a05b456d71" access_ip_v6="" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-24T14:46:44Z" user_id="fake" name="new-server-test" created="2013-09-24T14:46:44Z" tenant_id="openstack" progress="0" host_id="2936a2ffe8b5bfa4daa8515e8a5efd7f8842232f471fb01a4238520d" id="91bf1e67-e322-42bd-acba-72a05b456d71" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {},
             "created": "2013-09-24T14:44:01Z",
             "flavor": {

doc/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-24T14:46:12Z" user_id="fake" name="new-server-test" created="2013-09-24T14:46:12Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="2bd7dab315ad4219b9762b73fdd9e4b12c00e28d9c21864491ca31f8" id="7e699638-e818-4e05-91f4-15cb802e6da0" access_ip_v6="" key_name="None">
+  <server status="ACTIVE" updated="2013-09-24T14:46:12Z" user_id="fake" name="new-server-test" created="2013-09-24T14:46:12Z" tenant_id="openstack" progress="0" host_id="2bd7dab315ad4219b9762b73fdd9e4b12c00e28d9c21864491ca31f8" id="7e699638-e818-4e05-91f4-15cb802e6da0" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-rescue/server-get-resp-rescue.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-rescue/server-get-resp-rescue.xml

@@ -1,5 +1,5 @@
 <?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" status="RESCUE" updated="2013-09-18T07:22:11Z" user_id="fake" name="new-server-test" created="2013-09-18T07:22:09Z" tenant_id="openstack" access_ip_v4="" host_id="e244b05099c8c9dcf6bf3eba83bf113a81c79ad3e66444ae33e7e85c" id="46d75a5e-8eb5-4268-849a-b109c1fbed45" access_ip_v6="" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="RESCUE" updated="2013-09-18T07:22:11Z" user_id="fake" name="new-server-test" created="2013-09-18T07:22:09Z" tenant_id="openstack" host_id="e244b05099c8c9dcf6bf3eba83bf113a81c79ad3e66444ae33e7e85c" id="46d75a5e-8eb5-4268-849a-b109c1fbed45" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-rescue/server-get-resp-unrescue.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-rescue/server-get-resp-unrescue.xml

@@ -1,5 +1,5 @@
 <?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" status="ACTIVE" updated="2013-09-18T07:22:16Z" user_id="fake" name="new-server-test" created="2013-09-18T07:22:14Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="1ea4183046453bc628b2c08deaff5dc35ae219f91a1879677307e4ec" id="40555ea8-e995-47fb-8959-9e383f58cdc5" access_ip_v6="" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-18T07:22:16Z" user_id="fake" name="new-server-test" created="2013-09-18T07:22:14Z" tenant_id="openstack" progress="0" host_id="1ea4183046453bc628b2c08deaff5dc35ae219f91a1879677307e4ec" id="40555ea8-e995-47fb-8959-9e383f58cdc5" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-security-groups/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-security-groups/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?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" status="ACTIVE" updated="2013-09-25T03:29:14Z" user_id="fake" name="new-server-test" created="2013-09-25T03:29:14Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="a41e10b8b76a145704a8d4cd340fc14a7e005188ecc475aaea04de44" id="0c2e89e5-491a-4416-ae48-e77edfb04705" access_ip_v6="" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-25T03:29:14Z" user_id="fake" name="new-server-test" created="2013-09-25T03:29:14Z" tenant_id="openstack" progress="0" host_id="a41e10b8b76a145704a8d4cd340fc14a7e005188ecc475aaea04de44" id="0c2e89e5-491a-4416-ae48-e77edfb04705" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-security-groups/servers-detail-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/os-security-groups/servers-detail-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-25T03:29:12Z" user_id="fake" name="new-server-test" created="2013-09-25T03:29:11Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="a26871d6b20ffd0c27cebe72624fb2547be453c746edde9df33161f1" id="c7edb38c-18bf-4522-8ddc-3af9dd3ab513" access_ip_v6="" key_name="None">
+  <server status="ACTIVE" updated="2013-09-25T03:29:12Z" user_id="fake" name="new-server-test" created="2013-09-25T03:29:11Z" tenant_id="openstack" progress="0" host_id="a26871d6b20ffd0c27cebe72624fb2547be453c746edde9df33161f1" id="c7edb38c-18bf-4522-8ddc-3af9dd3ab513" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/os-server-usage/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/os-server-usage/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-08-15T08:12:42Z" user_id="fake" name="new-server-test" created="2013-08-15T08:12:42Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="f05316395b5e0b792d2f4f75bc54ef97745900629a11a9cf82a9cdf4" id="63bd45d9-c0bd-4825-9520-38d3f88225ae" access_ip_v6="" os-server-usage:launched_at="2013-08-15 08:12:42.949732" os-server-usage:terminated_at="None" key_name="None">
+<server xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-08-15T08:12:42Z" user_id="fake" name="new-server-test" created="2013-08-15T08:12:42Z" tenant_id="openstack" progress="0" host_id="f05316395b5e0b792d2f4f75bc54ef97745900629a11a9cf82a9cdf4" id="63bd45d9-c0bd-4825-9520-38d3f88225ae" os-server-usage:launched_at="2013-08-15 08:12:42.949732" os-server-usage:terminated_at="None" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/os-server-usage/servers-detail-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/os-server-usage/servers-detail-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-08-15T12:04:07Z" user_id="fake" name="new-server-test" created="2013-08-15T12:04:06Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="897fe6cb84a7ce95220c0f6a3a2b3bbc33e6190f6f166ab32a2e3f59" id="14288a58-1ffc-468d-8412-98fc85650d93" access_ip_v6="" os-server-usage:launched_at="2013-08-15 12:04:07.293502" os-server-usage:terminated_at="None" key_name="None">
+  <server status="ACTIVE" updated="2013-08-15T12:04:07Z" user_id="fake" name="new-server-test" created="2013-08-15T12:04:06Z" tenant_id="openstack" progress="0" host_id="897fe6cb84a7ce95220c0f6a3a2b3bbc33e6190f6f166ab32a2e3f59" id="14288a58-1ffc-468d-8412-98fc85650d93" os-server-usage:launched_at="2013-08-15 12:04:07.293502" os-server-usage:terminated_at="None" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

doc/v3/api_samples/servers/server-get-resp.json

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

doc/v3/api_samples/servers/server-get-resp.xml

@@ -1,5 +1,5 @@
 <?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" status="ACTIVE" updated="2013-09-03T04:01:33Z" user_id="fake" name="new-server-test" created="2013-09-03T04:01:33Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="4fc6224a1e5d689f858d087c5ff6d24def5eab35646b53c3454d1234" id="f07e01fa-ed8f-4084-99b6-9311e6956e70" access_ip_v6="" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-09-03T04:01:33Z" user_id="fake" name="new-server-test" created="2013-09-03T04:01:33Z" tenant_id="openstack" progress="0" host_id="4fc6224a1e5d689f858d087c5ff6d24def5eab35646b53c3454d1234" id="f07e01fa-ed8f-4084-99b6-9311e6956e70" key_name="None">
   <image id="70a599e0-31e7-49b7-b260-868f441e862b">
     <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
   </image>

doc/v3/api_samples/servers/servers-details-resp.json

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

doc/v3/api_samples/servers/servers-details-resp.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="2013-09-03T04:01:34Z" user_id="fake" name="new-server-test" created="2013-09-03T04:01:33Z" tenant_id="openstack" access_ip_v4="" progress="0" host_id="9afcaa50605be561503e2d707aed0c219081dc8a87d7f67a965512c8" id="3af51aa7-a2aa-477b-9499-e5528bcf32a5" access_ip_v6="" key_name="None">
+  <server status="ACTIVE" updated="2013-09-03T04:01:34Z" user_id="fake" name="new-server-test" created="2013-09-03T04:01:33Z" tenant_id="openstack" progress="0" host_id="9afcaa50605be561503e2d707aed0c219081dc8a87d7f67a965512c8" id="3af51aa7-a2aa-477b-9499-e5528bcf32a5" key_name="None">
     <image id="70a599e0-31e7-49b7-b260-868f441e862b">
       <atom:link href="http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
     </image>

nova/api/openstack/compute/plugins/v3/servers.py

@@ -73,8 +73,6 @@ def make_server(elem, detailed=False):
         elem.set('updated')
         elem.set('created')
         elem.set('host_id')
-        elem.set('access_ip_v4')
-        elem.set('access_ip_v6')
         elem.set('status')
         elem.set('progress')
         elem.set('reservation_id')
@@ -160,7 +158,7 @@ class CommonDeserializer(wsgi.MetadataXMLDeserializer):
         server_node = self.find_first_child_named(node, 'server')
 
         attributes = ["name", "image_ref", "flavor_ref", "admin_pass",
-                      "access_ip_v4", "access_ip_v6", "key_name"]
+                      "key_name"]
         for attr in attributes:
             if server_node.getAttribute(attr):
                 server[attr] = server_node.getAttribute(attr)
@@ -250,12 +248,6 @@ class ActionDeserializer(CommonDeserializer):
         if node.hasAttribute("admin_pass"):
             rebuild["admin_pass"] = node.getAttribute("admin_pass")
 
-        if node.hasAttribute("access_ip_v4"):
-            rebuild["access_ip_v4"] = node.getAttribute("access_ip_v4")
-
-        if node.hasAttribute("access_ip_v6"):
-            rebuild["access_ip_v6"] = node.getAttribute("access_ip_v6")
-
         if self.controller:
             self.controller.server_rebuild_xml_deserialize(node, rebuild)
         return rebuild
@@ -686,16 +678,6 @@ class ServersController(wsgi.Controller):
         except TypeError:
             return None
 
-    def _validate_access_ipv4(self, address):
-        if not utils.is_valid_ipv4(address):
-            expl = _('access_ip_v4 is not proper IPv4 format')
-            raise exc.HTTPBadRequest(explanation=expl)
-
-    def _validate_access_ipv6(self, address):
-        if not utils.is_valid_ipv6(address):
-            expl = _('access_ip_v6 is not proper IPv6 format')
-            raise exc.HTTPBadRequest(explanation=expl)
-
     @wsgi.serializers(xml=ServerTemplate)
     def show(self, req, id):
         """Returns server details by server id."""
@@ -769,14 +751,6 @@ class ServersController(wsgi.Controller):
             requested_networks = self._get_requested_networks(
                 requested_networks)
 
-        (access_ip_v4, ) = server_dict.get('access_ip_v4'),
-        if access_ip_v4 is not None:
-            self._validate_access_ipv4(access_ip_v4)
-
-        (access_ip_v6, ) = server_dict.get('access_ip_v6'),
-        if access_ip_v6 is not None:
-            self._validate_access_ipv6(access_ip_v6)
-
         try:
             flavor_id = self._flavor_id_from_req_data(body)
         except ValueError as error:
@@ -793,8 +767,6 @@ class ServersController(wsgi.Controller):
                             display_name=name,
                             display_description=name,
                             metadata=server_dict.get('metadata', {}),
-                            access_ip_v4=access_ip_v4,
-                            access_ip_v6=access_ip_v6,
                             admin_password=password,
                             requested_networks=requested_networks,
                             **create_kwargs)
@@ -876,7 +848,6 @@ class ServersController(wsgi.Controller):
     def _update_extension_point(self, ext, update_dict, update_kwargs):
         handler = ext.obj
         LOG.debug(_("Running _update_extension_point for %s"), ext.obj)
-
         handler.server_update(update_dict, update_kwargs)
 
     def _delete(self, context, req, instance_uuid):
@@ -906,20 +877,6 @@ class ServersController(wsgi.Controller):
             self._validate_server_name(name)
             update_dict['display_name'] = name.strip()
 
-        if 'access_ip_v4' in body['server']:
-            access_ipv4 = body['server']['access_ip_v4']
-            if access_ipv4:
-                self._validate_access_ipv4(access_ipv4)
-            update_dict['access_ip_v4'] = (
-                access_ipv4 and access_ipv4.strip() or None)
-
-        if 'access_ip_v6' in body['server']:
-            access_ipv6 = body['server']['access_ip_v6']
-            if access_ipv6:
-                self._validate_access_ipv6(access_ipv6)
-            update_dict['access_ip_v6'] = (
-                access_ipv6 and access_ipv6.strip() or None)
-
         if 'host_id' in body['server']:
             msg = _("host_id cannot be updated.")
             raise exc.HTTPBadRequest(explanation=msg)
@@ -1144,20 +1101,12 @@ class ServersController(wsgi.Controller):
 
         attr_map = {
             'name': 'display_name',
-            'access_ip_v4': 'access_ip_v4',
-            'access_ip_v6': 'access_ip_v6',
             'metadata': 'metadata',
         }
 
         if 'name' in rebuild_dict:
             self._validate_server_name(rebuild_dict['name'])
 
-        if 'access_ip_v4' in rebuild_dict:
-            self._validate_access_ipv4(rebuild_dict['access_ip_v4'])
-
-        if 'access_ip_v6' in rebuild_dict:
-            self._validate_access_ipv6(rebuild_dict['access_ip_v6'])
-
         rebuild_kwargs = {}
         if list(self.rebuild_extension_manager):
             self.rebuild_extension_manager.map(self._rebuild_extension_point,

nova/api/openstack/compute/schemas/v3/server.rng

@@ -7,8 +7,6 @@
   <attribute name="updated">    <text/> </attribute>
   <attribute name="created">    <text/> </attribute>
   <attribute name="host_id">     <text/> </attribute>
-  <attribute name="access_ip_v4"> <text/> </attribute>
-  <attribute name="access_ip_v6"> <text/> </attribute>
   <attribute name="status">     <text/> </attribute>
   <optional>
     <attribute name="progress"> <text/> </attribute>

nova/api/openstack/compute/views/servers.py

@@ -234,8 +234,6 @@ class ViewBuilderV3(ViewBuilder):
 
     def show(self, request, instance):
         """Detailed view of a single instance."""
-        ip_v4 = instance.get('access_ip_v4')
-        ip_v6 = instance.get('access_ip_v6')
         server = {
             "server": {
                 "id": instance["uuid"],
@@ -250,8 +248,6 @@ class ViewBuilderV3(ViewBuilder):
                 "created": timeutils.isotime(instance["created_at"]),
                 "updated": timeutils.isotime(instance["updated_at"]),
                 "addresses": self._get_addresses(request, instance),
-                "access_ip_v4": str(ip_v4) if ip_v4 is not None else '',
-                "access_ip_v6": str(ip_v6) if ip_v6 is not None else '',
                 "links": self._get_links(request,
                                          instance["uuid"],
                                          self._collection_name),

nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py

@@ -431,35 +431,6 @@ class ServerActionsControllerTest(test.TestCase):
                           self.controller._action_rebuild,
                           req, FAKE_UUID, body)
 
-    def test_rebuild_accessIP(self):
-        attributes = {
-            'access_ip_v4': '172.19.0.1',
-            'access_ip_v6': 'fe80::1',
-        }
-
-        body = {
-            "rebuild": {
-                "image_ref": self._image_href,
-                "access_ip_v4": "172.19.0.1",
-                "access_ip_v6": "fe80::1",
-            },
-        }
-
-        update = self.mox.CreateMockAnything()
-        self.stubs.Set(compute_api.API, 'update', update)
-        req = fakes.HTTPRequestV3.blank(self.url)
-        context = req.environ['nova.context']
-        update(context, mox.IgnoreArg(),
-                image_ref=self._image_href,
-                kernel_id="", ramdisk_id="",
-                task_state=task_states.REBUILDING,
-                expected_task_state=None,
-                progress=0, **attributes).AndReturn(
-                        fakes.stub_instance(1, host='fake_host'))
-        self.mox.ReplayAll()
-
-        self.controller._action_rebuild(req, FAKE_UUID, body)
-
     def test_rebuild_when_kernel_not_exists(self):
 
         def return_image_meta(*args, **kwargs):

nova/tests/api/openstack/compute/plugins/v3/test_servers.py

@@ -306,8 +306,6 @@ class ServersControllerTest(ControllerTest):
                 "progress": progress,
                 "name": "server1",
                 "status": status,
-                "access_ip_v4": "",
-                "access_ip_v6": "",
                 "host_id": '',
                 "image": {
                     "id": "10",
@@ -1183,19 +1181,7 @@ class ServersControllerRebuildInstanceTest(ControllerTest):
         self.req.method = 'POST'
         self.req.headers["content-type"] = "application/json"
 
-    def test_rebuild_instance_with_access_ipv4_bad_format(self):
-        # proper local hrefs must start with 'http://localhost/v2/'
-        self.body['rebuild']['access_ip_v4'] = 'bad_format'
-        self.body['rebuild']['access_ip_v6'] = 'fead::1234'
-        self.body['rebuild']['metadata']['hello'] = 'world'
-        self.req.body = jsonutils.dumps(self.body)
-        self.assertRaises(webob.exc.HTTPBadRequest,
-                          self.controller._action_rebuild,
-                          self.req, FAKE_UUID, self.body)
-
     def test_rebuild_instance_with_blank_metadata_key(self):
-        self.body['rebuild']['access_ip_v4'] = '0.0.0.0'
-        self.body['rebuild']['access_ip_v6'] = 'fead::1234'
         self.body['rebuild']['metadata'][''] = 'world'
         self.req.body = jsonutils.dumps(self.body)
         self.assertRaises(webob.exc.HTTPBadRequest,
@@ -1203,8 +1189,6 @@ class ServersControllerRebuildInstanceTest(ControllerTest):
                           self.req, FAKE_UUID, self.body)
 
     def test_rebuild_instance_with_metadata_key_too_long(self):
-        self.body['rebuild']['access_ip_v4'] = '0.0.0.0'
-        self.body['rebuild']['access_ip_v6'] = 'fead::1234'
         self.body['rebuild']['metadata'][('a' * 260)] = 'world'
 
         self.req.body = jsonutils.dumps(self.body)
@@ -1213,8 +1197,6 @@ class ServersControllerRebuildInstanceTest(ControllerTest):
                           self.req, FAKE_UUID, self.body)
 
     def test_rebuild_instance_with_metadata_value_too_long(self):
-        self.body['rebuild']['access_ip_v4'] = '0.0.0.0'
-        self.body['rebuild']['access_ip_v6'] = 'fead::1234'
         self.body['rebuild']['metadata']['key1'] = ('a' * 260)
 
         self.req.body = jsonutils.dumps(self.body)
@@ -1291,16 +1273,6 @@ class ServersControllerRebuildInstanceTest(ControllerTest):
                           self.controller._action_rebuild,
                           self.req, FAKE_UUID, self.body)
 
-    def test_rebuild_instance_with_access_ipv6_bad_format(self):
-        self.body['rebuild']['access_ip_v4'] = '1.2.3.4'
-        self.body['rebuild']['access_ip_v6'] = 'bad_format'
-        self.body['rebuild']['metadata']['hello'] = 'world'
-        self.req.body = jsonutils.dumps(self.body)
-        self.req.headers["content-type"] = "application/json"
-        self.assertRaises(webob.exc.HTTPBadRequest,
-                          self.controller._action_rebuild,
-                          self.req, FAKE_UUID, self.body)
-
     def test_start(self):
         self.mox.StubOutWithMock(compute_api.API, 'start')
         compute_api.API.start(mox.IgnoreArg(), mox.IgnoreArg())
@@ -1379,18 +1351,12 @@ class ServersControllerUpdateTest(ControllerTest):
     def test_update_server_all_attributes(self):
         body = {'server': {
                   'name': 'server_test',
-                  'access_ip_v4': '0.0.0.0',
-                  'access_ip_v6': 'beef::0123',
                }}
-        req = self._get_request(body, {'name': 'server_test',
+        req = self._get_request(body, {'name': 'server_test'})
-                                       'access_ipv4': '0.0.0.0',
-                                       'access_ipv6': 'beef::0123'})
         res_dict = self.controller.update(req, FAKE_UUID, body)
 
         self.assertEqual(res_dict['server']['id'], FAKE_UUID)
         self.assertEqual(res_dict['server']['name'], 'server_test')
-        self.assertEqual(res_dict['server']['access_ip_v4'], '0.0.0.0')
-        self.assertEqual(res_dict['server']['access_ip_v6'], 'beef::123')
 
     def test_update_server_invalid_xml_raises_lookup(self):
         req = webob.Request.blank('/v3/servers/%s' % FAKE_UUID)
@@ -1447,66 +1413,6 @@ class ServersControllerUpdateTest(ControllerTest):
         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
                           req, FAKE_UUID, body)
 
-    def test_update_server_access_ipv4(self):
-        body = {'server': {'access_ip_v4': '0.0.0.0'}}
-        req = self._get_request(body, {'access_ipv4': '0.0.0.0'})
-        res_dict = self.controller.update(req, FAKE_UUID, body)
-
-        self.assertEqual(res_dict['server']['id'], FAKE_UUID)
-        self.assertEqual(res_dict['server']['access_ip_v4'], '0.0.0.0')
-
-    def test_update_server_access_ipv4_bad_format(self):
-        body = {'server': {'access_ip_v4': 'bad_format'}}
-        req = self._get_request(body, {'access_ipv4': '0.0.0.0'})
-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
-                          req, FAKE_UUID, body)
-
-    def test_update_server_access_ipv4_none(self):
-        body = {'server': {'access_ip_v4': None}}
-        req = self._get_request(body, {'access_ipv4': '0.0.0.0'})
-        res_dict = self.controller.update(req, FAKE_UUID, body)
-
-        self.assertEqual(res_dict['server']['id'], FAKE_UUID)
-        self.assertEqual(res_dict['server']['access_ip_v4'], '')
-
-    def test_update_server_access_ipv4_blank(self):
-        body = {'server': {'access_ip_v4': ''}}
-        req = self._get_request(body, {'access_ipv4': '0.0.0.0'})
-        res_dict = self.controller.update(req, FAKE_UUID, body)
-
-        self.assertEqual(res_dict['server']['id'], FAKE_UUID)
-        self.assertEqual(res_dict['server']['access_ip_v4'], '')
-
-    def test_update_server_access_ipv6(self):
-        body = {'server': {'access_ip_v6': 'beef::0123'}}
-        req = self._get_request(body, {'access_ipv6': 'beef::0123'})
-        res_dict = self.controller.update(req, FAKE_UUID, body)
-
-        self.assertEqual(res_dict['server']['id'], FAKE_UUID)
-        self.assertEqual(res_dict['server']['access_ip_v6'], 'beef::123')
-
-    def test_update_server_access_ipv6_bad_format(self):
-        body = {'server': {'access_ip_v6': 'bad_format'}}
-        req = self._get_request(body, {'access_ipv6': 'beef::0123'})
-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
-                          req, FAKE_UUID, body)
-
-    def test_update_server_access_ipv6_none(self):
-        body = {'server': {'access_ip_v6': None}}
-        req = self._get_request(body, {'access_ipv6': 'beef::0123'})
-        res_dict = self.controller.update(req, FAKE_UUID, body)
-
-        self.assertEqual(res_dict['server']['id'], FAKE_UUID)
-        self.assertEqual(res_dict['server']['access_ip_v6'], '')
-
-    def test_update_server_access_ipv6_blank(self):
-        body = {'server': {'access_ip_v6': ''}}
-        req = self._get_request(body, {'access_ipv6': 'beef::0123'})
-        res_dict = self.controller.update(req, FAKE_UUID, body)
-
-        self.assertEqual(res_dict['server']['id'], FAKE_UUID)
-        self.assertEqual(res_dict['server']['access_ip_v6'], '')
-
     def test_update_server_adminPass_ignored(self):
         inst_dict = dict(name='server_test', adminPass='bacon')
         body = dict(server=inst_dict)
@@ -1687,8 +1593,6 @@ class ServersControllerCreateTest(test.TestCase):
                 'display_name': inst['display_name'] or 'test',
                 'uuid': FAKE_UUID,
                 'instance_type': dict(inst_type),
-                'access_ip_v4': '1.2.3.4',
-                'access_ip_v6': 'fead::1234',
                 'image_ref': inst.get('image_ref', def_image_ref),
                 'user_id': 'fake',
                 'project_id': 'fake',
@@ -1981,20 +1885,7 @@ class ServersControllerCreateTest(test.TestCase):
         self.stubs.Set(compute_api.API, 'create', create)
         self._test_create_extra(params)
 
-    def test_create_instance_with_access_ip(self):
+    def test_create_instance_with_pass_disabled(self):
-        # proper local hrefs must start with 'http://localhost/v3/'
-        image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid
-        self.body['server']['image_ref'] = image_href
-        self.body['server']['access_ip_v4'] = '1.2.3.4'
-        self.body['server']['access_ip_v6'] = 'fead::1234'
-
-        self.req.body = jsonutils.dumps(self.body)
-        res = self.controller.create(self.req, self.body).obj
-        server = res['server']
-        self._check_admin_pass_len(server)
-        self.assertEqual(FAKE_UUID, server['id'])
-
-    def test_create_instance_with_access_ip_pass_disabled(self):
         # test with admin passwords disabled See lp bug 921814
         self.flags(enable_instance_password=False)
 
@@ -2002,8 +1893,6 @@ class ServersControllerCreateTest(test.TestCase):
         self.flags(enable_instance_password=False)
         image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid
         self.body['server']['image_ref'] = image_href
-        self.body['server']['access_ip_v4'] = '1.2.3.4'
-        self.body['server']['access_ip_v6'] = 'fead::1234'
         self.req.body = jsonutils.dumps(self.body)
         res = self.controller.create(self.req, self.body).obj
 
@@ -2011,26 +1900,6 @@ class ServersControllerCreateTest(test.TestCase):
         self._check_admin_pass_missing(server)
         self.assertEqual(FAKE_UUID, server['id'])
 
-    def test_create_instance_bad_format_access_ip_v4(self):
-        # proper local hrefs must start with 'http://localhost/v3/'
-        image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid
-        self.body['server']['image_ref'] = image_href
-        self.body['server']['access_ip_v4'] = 'bad_format'
-        self.body['server']['access_ip_v6'] = 'fead::1234'
-        self.req.body = jsonutils.dumps(self.body)
-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
-                          self.req, self.body)
-
-    def test_create_instance_bad_format_access_ip_v6(self):
-        # proper local hrefs must start with 'http://localhost/v3/'
-        image_href = 'http://localhost/v2/fake/images/%s' % self.image_uuid
-        self.body['server']['image_ref'] = image_href
-        self.body['server']['access_ip_v4'] = '1.2.3.4'
-        self.body['server']['access_ip_v6'] = 'bad_format'
-        self.req.body = jsonutils.dumps(self.body)
-        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
-                          self.req, self.body)
-
     def test_create_instance_name_too_long(self):
         # proper local hrefs must start with 'http://localhost/v3/'
         image_href = 'http://localhost/v2/images/%s' % self.image_uuid
@@ -2385,62 +2254,6 @@ class TestServerCreateRequestXMLDeserializer(test.TestCase):
             }
         self.assertEquals(request['body'], expected)
 
-    def test_access_ipv4(self):
-        serial_request = """
-<server xmlns="http://docs.openstack.org/compute/api/v2"
-        name="new-server-test"
-        image_ref="1"
-        flavor_ref="2"
-        access_ip_v4="1.2.3.4"/>"""
-        request = self.deserializer.deserialize(serial_request)
-        expected = {
-            "server": {
-                "name": "new-server-test",
-                "image_ref": "1",
-                "flavor_ref": "2",
-                "access_ip_v4": "1.2.3.4",
-            },
-        }
-        self.assertEquals(request['body'], expected)
-
-    def test_access_ipv6(self):
-        serial_request = """
-<server xmlns="http://docs.openstack.org/compute/api/v2"
-        name="new-server-test"
-        image_ref="1"
-        flavor_ref="2"
-        access_ip_v6="fead::1234"/>"""
-        request = self.deserializer.deserialize(serial_request)
-        expected = {
-            "server": {
-                "name": "new-server-test",
-                "image_ref": "1",
-                "flavor_ref": "2",
-                "access_ip_v6": "fead::1234",
-            },
-        }
-        self.assertEquals(request['body'], expected)
-
-    def test_access_ip(self):
-        serial_request = """
-<server xmlns="http://docs.openstack.org/compute/api/v2"
-        name="new-server-test"
-        image_ref="1"
-        flavor_ref="2"
-        access_ip_v4="1.2.3.4"
-        access_ip_v6="fead::1234"/>"""
-        request = self.deserializer.deserialize(serial_request)
-        expected = {
-            "server": {
-                "name": "new-server-test",
-                "image_ref": "1",
-                "flavor_ref": "2",
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
-            },
-        }
-        self.assertEquals(request['body'], expected)
-
     def test_admin_pass(self):
         serial_request = """
 <server xmlns="http://docs.openstack.org/compute/api/v2"
@@ -2893,8 +2706,6 @@ class ServersViewBuilderTest(test.TestCase):
                 "progress": 0,
                 "name": "test_server",
                 "status": "BUILD",
-                "access_ip_v4": "",
-                "access_ip_v6": "",
                 "host_id": '',
                 "image": {
                     "id": "5",
@@ -2961,8 +2772,6 @@ class ServersViewBuilderTest(test.TestCase):
                 "created": "2010-10-10T12:00:00Z",
                 "name": "test_server",
                 "status": "ERROR",
-                "access_ip_v4": "",
-                "access_ip_v6": "",
                 "host_id": '',
                 "image": {
                     "id": "5",
@@ -3095,8 +2904,6 @@ class ServersViewBuilderTest(test.TestCase):
                 "progress": 100,
                 "name": "test_server",
                 "status": "ACTIVE",
-                "access_ip_v4": "",
-                "access_ip_v6": "",
                 "host_id": '',
                 "image": {
                     "id": "5",
@@ -3141,134 +2948,6 @@ class ServersViewBuilderTest(test.TestCase):
         output = self.view_builder.show(self.request, self.instance)
         self.assertThat(output, matchers.DictMatches(expected_server))
 
-    def test_build_server_detail_with_accessipv4(self):
-
-        self.instance['access_ip_v4'] = '1.2.3.4'
-
-        image_bookmark = "http://localhost:9292/images/5"
-        flavor_bookmark = "http://localhost/flavors/1"
-        self_link = "http://localhost/v3/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/servers/%s" % self.uuid
-        expected_server = {
-            "server": {
-                "id": self.uuid,
-                "user_id": "fake_user",
-                "tenant_id": "fake_project",
-                "updated": "2010-11-11T11:00:00Z",
-                "created": "2010-10-10T12:00:00Z",
-                "progress": 0,
-                "name": "test_server",
-                "status": "BUILD",
-                "host_id": '',
-                "image": {
-                    "id": "5",
-                    "links": [
-                        {
-                            "rel": "bookmark",
-                            "href": image_bookmark,
-                        },
-                    ],
-                },
-                "flavor": {
-                    "id": "1",
-                    "links": [
-                                              {
-                            "rel": "bookmark",
-                            "href": flavor_bookmark,
-                        },
-                    ],
-                },
-                "addresses": {
-                    'test1': [
-                        {'version': 4, 'addr': '192.168.1.100',
-                         'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'},
-                        {'version': 6, 'addr': '2001:db8:0:1::1',
-                         'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'},
-                    ]
-                },
-                "metadata": {},
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "",
-                "links": [
-                    {
-                        "rel": "self",
-                        "href": self_link,
-                    },
-                    {
-                        "rel": "bookmark",
-                        "href": bookmark_link,
-                    },
-                ],
-            }
-        }
-
-        output = self.view_builder.show(self.request, self.instance)
-        self.assertThat(output, matchers.DictMatches(expected_server))
-
-    def test_build_server_detail_with_accessipv6(self):
-
-        self.instance['access_ip_v6'] = 'fead::1234'
-
-        image_bookmark = "http://localhost:9292/images/5"
-        flavor_bookmark = "http://localhost/flavors/1"
-        self_link = "http://localhost/v3/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/servers/%s" % self.uuid
-        expected_server = {
-            "server": {
-                "id": self.uuid,
-                "user_id": "fake_user",
-                "tenant_id": "fake_project",
-                "updated": "2010-11-11T11:00:00Z",
-                "created": "2010-10-10T12:00:00Z",
-                "progress": 0,
-                "name": "test_server",
-                "status": "BUILD",
-                "host_id": '',
-                "image": {
-                    "id": "5",
-                    "links": [
-                        {
-                            "rel": "bookmark",
-                            "href": image_bookmark,
-                        },
-                    ],
-                },
-                "flavor": {
-                    "id": "1",
-                    "links": [
-                                              {
-                            "rel": "bookmark",
-                            "href": flavor_bookmark,
-                        },
-                    ],
-                },
-                "addresses": {
-                    'test1': [
-                        {'version': 4, 'addr': '192.168.1.100',
-                         'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'},
-                        {'version': 6, 'addr': '2001:db8:0:1::1',
-                         'type': 'fixed', 'mac_addr': 'aa:aa:aa:aa:aa:aa'},
-                    ]
-                },
-                "metadata": {},
-                "access_ip_v4": "",
-                "access_ip_v6": "fead::1234",
-                "links": [
-                    {
-                        "rel": "self",
-                        "href": self_link,
-                    },
-                    {
-                        "rel": "bookmark",
-                        "href": bookmark_link,
-                    },
-                ],
-            }
-        }
-
-        output = self.view_builder.show(self.request, self.instance)
-        self.assertThat(output, matchers.DictMatches(expected_server))
-
     def test_build_server_detail_with_metadata(self):
 
         metadata = []
@@ -3290,8 +2969,6 @@ class ServersViewBuilderTest(test.TestCase):
                 "progress": 0,
                 "name": "test_server",
                 "status": "BUILD",
-                "access_ip_v4": "",
-                "access_ip_v6": "",
                 "host_id": '',
                 "image": {
                     "id": "5",
@@ -3360,8 +3037,6 @@ class ServerXMLSerializationTest(test.TestCase):
                 "name": "test_server",
                 "status": "BUILD",
                 "host_id": 'e4d909c290d0fb1ca068ffaddf22cbd0',
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
                 "image": {
                     "id": "5",
                     "links": [
@@ -3445,8 +3120,6 @@ class ServerXMLSerializationTest(test.TestCase):
                 "name": "test_server",
                 "status": "BUILD",
                 "host_id": 'e4d909c290d0fb1ca068ffaddf22cbd0',
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
                 "image": {
                     "id": "5",
                     "links": [
@@ -3518,9 +3191,8 @@ class ServerXMLSerializationTest(test.TestCase):
 
         server_dict = fixture['server']
 
-        for key in ['name', 'id', 'created', 'access_ip_v4',
+        for key in ['name', 'id', 'created',
-                    'updated', 'progress', 'status', 'host_id',
+                    'updated', 'progress', 'status', 'host_id']:
-                    'access_ip_v6']:
             self.assertEqual(root.get(key), str(server_dict[key]))
 
         link_nodes = root.findall('{0}link'.format(ATOMNS))
@@ -3585,8 +3257,6 @@ class ServerXMLSerializationTest(test.TestCase):
                 "progress": 0,
                 "name": "test_server",
                 "status": "BUILD",
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
                 "host_id": "e4d909c290d0fb1ca068ffaddf22cbd0",
                 "admin_pass": "test_password",
                 "image": {
@@ -3660,9 +3330,8 @@ class ServerXMLSerializationTest(test.TestCase):
 
         server_dict = fixture['server']
 
-        for key in ['name', 'id', 'created', 'access_ip_v4',
+        for key in ['name', 'id', 'created',
-                    'updated', 'progress', 'status', 'host_id',
+                    'updated', 'progress', 'status', 'host_id', 'admin_pass']:
-                    'access_ip_v6', 'admin_pass']:
             self.assertEqual(root.get(key), str(server_dict[key]))
 
         link_nodes = root.findall('{0}link'.format(ATOMNS))
@@ -3861,8 +3530,6 @@ class ServerXMLSerializationTest(test.TestCase):
                 "progress": 0,
                 "name": "test_server",
                 "status": "BUILD",
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
                 "host_id": 'e4d909c290d0fb1ca068ffaddf22cbd0',
                 "image": {
                     "id": "5",
@@ -3923,8 +3590,6 @@ class ServerXMLSerializationTest(test.TestCase):
                 "progress": 100,
                 "name": "test_server_2",
                 "status": "ACTIVE",
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
                 "host_id": 'e4d909c290d0fb1ca068ffaddf22cbd0',
                 "image": {
                     "id": "5",
@@ -3986,9 +3651,8 @@ class ServerXMLSerializationTest(test.TestCase):
         for i, server_elem in enumerate(server_elems):
             server_dict = fixture['servers'][i]
 
-            for key in ['name', 'id', 'created', 'access_ip_v4',
+            for key in ['name', 'id', 'created',
-                        'updated', 'progress', 'status', 'host_id',
+                        'updated', 'progress', 'status', 'host_id']:
-                        'access_ip_v6']:
                 self.assertEqual(server_elem.get(key), str(server_dict[key]))
 
             link_nodes = server_elem.findall('{0}link'.format(ATOMNS))
@@ -4054,8 +3718,6 @@ class ServerXMLSerializationTest(test.TestCase):
                 "name": "test_server",
                 "status": "BUILD",
                 "host_id": 'e4d909c290d0fb1ca068ffaddf22cbd0',
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
                 "image": {
                     "id": "5",
                     "links": [
@@ -4133,9 +3795,8 @@ class ServerXMLSerializationTest(test.TestCase):
 
         server_dict = fixture['server']
 
-        for key in ['name', 'id', 'created', 'access_ip_v4',
+        for key in ['name', 'id', 'created',
-                    'updated', 'progress', 'status', 'host_id',
+                    'updated', 'progress', 'status', 'host_id']:
-                    'access_ip_v6']:
             self.assertEqual(root.get(key), str(server_dict[key]))
 
         link_nodes = root.findall('{0}link'.format(ATOMNS))
@@ -4209,8 +3870,6 @@ class ServerXMLSerializationTest(test.TestCase):
                 "progress": 0,
                 "name": "test_server",
                 "status": "BUILD",
-                "access_ip_v4": "1.2.3.4",
-                "access_ip_v6": "fead::1234",
                 "host_id": "e4d909c290d0fb1ca068ffaddf22cbd0",
                 "admin_pass": "test_password",
                 "image": {
@@ -4284,9 +3943,8 @@ class ServerXMLSerializationTest(test.TestCase):
 
         server_dict = fixture['server']
 
-        for key in ['name', 'id', 'created', 'access_ip_v4',
+        for key in ['name', 'id', 'created',
-                    'updated', 'progress', 'status', 'host_id',
+                    'updated', 'progress', 'status', 'host_id', 'admin_pass']:
-                    'access_ip_v6', 'admin_pass']:
             self.assertEqual(root.get(key), str(server_dict[key]))
 
         link_nodes = root.findall('{0}link'.format(ATOMNS))
@@ -4446,28 +4104,24 @@ class ServersUnprocessableEntityTestCase(test.TestCase):
         self._unprocessable_server_update(body=body)
 
 
-class TestServerRebuildXMLDeserializer(test.TestCase):
+class TestServerRebuildXMLDeserializer(test.NoDBTestCase):
 
     def setUp(self):
         super(TestServerRebuildXMLDeserializer, self).setUp()
         self.deserializer = servers.ActionDeserializer(None)
 
-    def test_rebuild_with_access_ip(self):
+    def test_rebuild(self):
         serial_request = """<?xml version="1.0" encoding="UTF-8"?>
                 <rebuild
                     xmlns="http://docs.openstack.org/compute/api/v1.1"
                     name="new-server-test"
-                    image_ref="http://localhost/images/1"
+                    image_ref="http://localhost/images/1">
-                    access_ip_v4="1.2.3.4"
-                    access_ip_v6="fe80::">
                 </rebuild>"""
         request = self.deserializer.deserialize(serial_request, 'action')
         expected = {
             "rebuild": {
                 "name": "new-server-test",
                 "image_ref": "http://localhost/images/1",
-                'access_ip_v4': '1.2.3.4',
-                'access_ip_v6': 'fe80::'
             },
         }
         self.assertThat(request['body'], matchers.DictMatches(expected))

nova/tests/integrated/test_servers.py

@@ -366,6 +366,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
             self._access_ipv6_parameter: "fe80::2",
             "metadata": {'some': 'thing'},
         }
+        post['rebuild'].update(self._get_access_ips_params())
 
         self.api.post_server_action(created_server_id, post)
         LOG.debug("rebuilt server: %s" % created_server)
@@ -377,9 +378,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
         self.assertEqual('blah', found_server.get('name'))
         self.assertEqual(post['rebuild'][self._image_ref_parameter],
                          found_server.get('image')['id'])
-        self.assertEqual('172.19.0.2',
+        self._verify_access_ips(found_server)
-                         found_server[self._access_ipv4_parameter])
-        self.assertEqual('fe80::2', found_server[self._access_ipv6_parameter])
 
         # rebuild the server with empty metadata and nothing else
         post = {}
@@ -398,13 +397,20 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
         self.assertEqual('blah', found_server.get('name'))
         self.assertEqual(post['rebuild'][self._image_ref_parameter],
                          found_server.get('image')['id'])
-        self.assertEqual('172.19.0.2',
+        self._verify_access_ips(found_server)
-                         found_server[self._access_ipv4_parameter])
-        self.assertEqual('fe80::2', found_server[self._access_ipv6_parameter])
 
         # Cleanup
         self._delete_server(created_server_id)
 
+    def _get_access_ips_params(self):
+        return {self._access_ipv4_parameter: "172.19.0.2",
+                self._access_ipv6_parameter: "fe80::2"}
+
+    def _verify_access_ips(self, server):
+        self.assertEqual('172.19.0.2',
+                         server[self._access_ipv4_parameter])
+        self.assertEqual('fe80::2', server[self._access_ipv6_parameter])
+
     def test_rename_server(self):
         # Test building and renaming a server.
         fake_network.set_stub_network_methods(self.stubs)
@@ -508,7 +514,15 @@ class ServersTestV3(client.TestOpenStackClientV3Mixin, ServersTest):
     _api_version = 'v3'
     _image_ref_parameter = 'image_ref'
     _flavor_ref_parameter = 'flavor_ref'
-    _access_ipv4_parameter = 'access_ip_v4'
-    _access_ipv6_parameter = 'access_ip_v6'
     _return_resv_id_parameter = 'os-multiple-create:return_reservation_id'
     _min_count_parameter = 'os-multiple-create:min_count'
+    _access_ipv4_parameter = None
+    _access_ipv6_parameter = None
+
+    def _get_access_ips_params(self):
+        return {}
+
+    def _verify_access_ips(self, server):
+        # NOTE(alexxu): access_ips was demoted as extensions in v3 api.
+        # So skips verifying access_ips
+        pass

nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl

@@ -1,7 +1,7 @@
 {
     "server": {
-        "access_ip_v4": "",
+        "os-access-ips:access_ip_v4": "",
-        "access_ip_v6": "",
+        "os-access-ips:access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" os-config-drive:config_drive="" os-server-usage:launched_at="%(timestamp)s" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="%(compute_host)s" key_name="None">
+<server xmlns:os-access-ips="http://docs.openstack.org/compute/ext/os-access-ips/api/v3" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" os-config-drive:config_drive="" os-server-usage:launched_at="%(timestamp)s" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="%(compute_host)s" key_name="None" os-access-ips:access_ip_v4="" os-access-ips:access_ip_v6="">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.json.tpl

@@ -17,6 +17,8 @@
             {
                 "name": "default"
             }
-        ]
+        ],
+        "os-access-ips:access_ip_v4": "",
+        "os-access-ips:access_ip_v6": ""
     }
 }

nova/tests/integrated/v3/api_samples/all_extensions/server-post-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="%(id)s" admin_pass="%(password)s" os-disk-config:disk_config="AUTO">
+<server xmlns:os-access-ips="http://docs.openstack.org/compute/ext/os-access-ips/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="%(id)s" admin_pass="%(password)s" os-disk-config:disk_config="AUTO" os-access-ips:access_ip_v4="" os-access-ips:access_ip_v6="">
   <metadata/>
   <atom:link href="%(host)s/v3/servers/%(uuid)s" rel="self"/>
   <atom:link href="%(host)s/servers/%(uuid)s" rel="bookmark"/>

nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl

@@ -1,8 +1,8 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
+            "os-access-ips:access_ip_v4": "",
-            "access_ip_v6": "",
+            "os-access-ips:access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.xml.tpl

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1">
+<servers xmlns:os-access-ips="http://docs.openstack.org/compute/ext/os-access-ips/api/v3" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:os-config-drive="http://docs.openstack.org/compute/ext/config_drive/api/v3" xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" os-config-drive:config_drive="" os-server-usage:launched_at="%(timestamp)s" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="%(compute_host)s" key_name="None">
+  <server status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" os-config-drive:config_drive="" os-server-usage:launched_at="%(timestamp)s" os-server-usage:terminated_at="None" os-extended-status:vm_state="active" os-extended-status:locked_by="None" os-extended-status:power_state="1" os-extended-status:task_state="None" os-disk-config:disk_config="AUTO" os-extended-availability-zone:availability_zone="nova" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" os-extended-server-attributes:instance_name="instance-00000001" os-extended-server-attributes:host="%(compute_host)s" key_name="None" os-access-ips:access_ip_v4="" os-access-ips:access_ip_v6="">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.json.tpl

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

nova/tests/integrated/v3/api_samples/os-disk-config/list-servers-detail-get.xml.tpl

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" os-disk-config:disk_config="AUTO" key_name="None">
+  <server status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" os-disk-config:disk_config="AUTO" key_name="None">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-disk-config/server-action-rebuild-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" admin_pass="%(password)s" os-disk-config:disk_config="AUTO">
+<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" admin_pass="%(password)s" os-disk-config:disk_config="AUTO">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-disk-config/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" key_name="None" os-disk-config:disk_config="AUTO">
+<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" key_name="None" os-disk-config:disk_config="AUTO">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-disk-config/server-update-put-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" os-disk-config:disk_config="AUTO">
+<server xmlns:os-disk-config="http://docs.openstack.org/compute/ext/disk_config/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" os-disk-config:disk_config="AUTO">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl

@@ -3,8 +3,6 @@
         "updated": "%(timestamp)s",
         "created": "%(timestamp)s",
         "os-extended-availability-zone:availability_zone": "nova",
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(uuid)s" os-extended-availability-zone:availability_zone="nova" key_name="None">
+<server xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(uuid)s" os-extended-availability-zone:availability_zone="nova" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl

@@ -4,8 +4,6 @@
             "updated": "%(timestamp)s",
             "created": "%(timestamp)s",
             "os-extended-availability-zone:availability_zone": "nova",
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<servers xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s" os-extended-availability-zone:availability_zone="nova" key_name="None">
+<servers xmlns:os-extended-availability-zone="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(id)s" os-extended-availability-zone:availability_zone="nova" key_name="None">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl

@@ -5,8 +5,6 @@
         "os-extended-server-attributes:instance_name": "%(instance_name)s",
         "updated": "%(timestamp)s",
         "created": "%(timestamp)s",
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(uuid)s" os-extended-server-attributes:instance_name="%(instance_name)s" os-extended-server-attributes:host="%(compute_host)s" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" key_name="None">
+<server xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(uuid)s" os-extended-server-attributes:instance_name="%(instance_name)s" os-extended-server-attributes:host="%(compute_host)s" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl

@@ -6,8 +6,6 @@
             "os-extended-server-attributes:instance_name": "%(instance_name)s",
             "updated": "%(timestamp)s",
             "created": "%(timestamp)s",
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.xml.tpl

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-extended-server-attributes="http://docs.openstack.org/compute/ext/extended_server_attributes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s" os-extended-server-attributes:instance_name="%(instance_name)s" os-extended-server-attributes:host="%(compute_host)s" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" key_name="None">
+  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(id)s" os-extended-server-attributes:instance_name="%(instance_name)s" os-extended-server-attributes:host="%(compute_host)s" os-extended-server-attributes:hypervisor_hostname="%(hypervisor_hostname)s" key_name="None">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl

@@ -6,8 +6,6 @@
         "os-extended-status:locked_by": null,
         "updated": "%(timestamp)s",
         "created": "%(timestamp)s",
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(uuid)s" os-extended-status:vm_state="active" os-extended-status:task_state="None" os-extended-status:power_state="1" os-extended-status:locked_by="None" key_name="None">
+<server xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(uuid)s" os-extended-status:vm_state="active" os-extended-status:task_state="None" os-extended-status:power_state="1" os-extended-status:locked_by="None" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl

@@ -7,8 +7,6 @@
             "os-extended-status:locked_by": null,
             "updated": "%(timestamp)s",
             "created": "%(timestamp)s",
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.xml.tpl

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-extended-status="http://docs.openstack.org/compute/ext/extended_status/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s" os-extended-status:vm_state="active" os-extended-status:task_state="None" os-extended-status:power_state="1" os-extended-status:locked_by="None" key_name="None">
+  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(id)s" os-extended-status:vm_state="active" os-extended-status:task_state="None" os-extended-status:power_state="1" os-extended-status:locked_by="None" key_name="None">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" key_name="None">
+<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl

@@ -3,8 +3,6 @@
     {
             "updated": "%(timestamp)s",
             "created": "%(timestamp)s",
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s" key_name="None">
+  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(id)s" key_name="None">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
         },
         "created": "%(timestamp)s",

nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?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" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl

@@ -1,8 +1,6 @@
 {
     "servers": [
         {
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {},
             "created": "%(timestamp)s",
             "flavor": {

nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s" key_name="None">
+  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(id)s" key_name="None">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.xml.tpl

@@ -1,5 +1,5 @@
 <?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" status="%(status)s" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" id="%(id)s" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" id="%(id)s" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl

@@ -1,5 +1,5 @@
 <?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" status="%(status)s" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(id)s" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl

@@ -1,7 +1,5 @@
 {
     "server": {
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?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" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" key_name="None">
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>

nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl

@@ -3,8 +3,6 @@
     {
             "updated": "%(timestamp)s",
             "created": "%(timestamp)s",
-            "access_ip_v4": "",
-            "access_ip_v6": "",
             "addresses": {
                 "private": [
                     {

nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.xml.tpl

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s" key_name="None">
+  <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" progress="0" id="%(id)s" key_name="None">
     <image id="%(uuid)s">
       <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
     </image>

nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl

@@ -2,8 +2,6 @@
     "server": {
         "os-server-usage:launched_at": "%(timestamp)s",
         "os-server-usage:terminated_at": null,
-        "access_ip_v4": "",
-        "access_ip_v6": "",
         "addresses": {
             "private": [
                 {

nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<server xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" os-server-usage:terminated_at="None" os-server-usage:launched_at="%(timestamp)s" key_name="None">
+<server xmlns:os-server-usage="http://docs.openstack.org/compute/ext/os-server-usage/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" progress="0" host_id="%(hostid)s" id="%(id)s" os-server-usage:terminated_at="None" os-server-usage:launched_at="%(timestamp)s" key_name="None">
   <image id="%(uuid)s">
     <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/>
   </image>