Revert "Include list of attached volumes with instance info"

This reverts commit dd66f235ecf2ff67819917ee07bcb0ea13a1b17b.

This changed the core servers API without doing it as an API extension,
so it's not an acceptable change as written.

Change-Id: I3787060583de1371e366647d38d69f37746317d5

33 files changed, 26 insertions, 86 deletions

diff --git a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl
index c24c61ce3..acb9bf531 100644
--- a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl
@@ -51,8 +51,7 @@
             "status": "ACTIVE",
             "tenant_id": "openstack",
             "updated": "%(timestamp)s",
-            "user_id": "fake",
-            "volumes_attached": []
+            "user_id": "fake"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl
index 9a4ab81b9..1608b9f6b 100644
--- a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl
@@ -51,7 +51,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl
index dbeb3f325..25e51a878 100644
--- a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl
@@ -50,7 +50,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl
index dbeb3f325..25e51a878 100644
--- a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl
@@ -50,7 +50,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl
index c4ff3b432..413f3ce95 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl
@@ -50,7 +50,6 @@
         "progress": 0,
         "status": "ACTIVE",
         "tenant_id": "openstack",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl
index 3d777ba34..362c85085 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl
@@ -51,8 +51,7 @@
             "progress": 0,
             "status": "ACTIVE",
             "tenant_id": "openstack",
-            "user_id": "fake",
-            "volumes_attached": []
+            "user_id": "fake"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl
index 05ceee13b..600a063c3 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl
@@ -50,7 +50,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl
index d2224b8c0..6b5901098 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl
@@ -51,7 +51,6 @@
             "hostId": "%(hostid)s",
             "metadata": {
                 "My Server Name": "Apache1"
-            },
-            "volumes_attached": []
+            }
     }]
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl
index 7bd189bf3..bea96d4f6 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl
@@ -50,7 +50,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl
index 8ce04e474..27c6faa4e 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl
@@ -51,7 +51,6 @@
             "hostId": "%(hostid)s",
             "metadata": {
                 "My Server Name": "Apache1"
-            },
-            "volumes_attached": []
+            }
     }]
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl
index c81e814b7..c70192949 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl
@@ -52,7 +52,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
\ No newline at end of file
diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl
index 0f7da9870..1fb8e1a47 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl
@@ -53,8 +53,7 @@
             "status": "ACTIVE",
             "tenant_id": "openstack",
             "updated": "%(timestamp)s",
-            "user_id": "fake",
-            "volumes_attached": []
+            "user_id": "fake"
         }
     ]
 }
\ No newline at end of file
diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl
index d6a86c8fb..7ac35024b 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl
@@ -52,7 +52,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl
index a4818165d..a060332d4 100644
--- a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl
@@ -53,7 +53,6 @@
             "hostId": "%(hostid)s",
             "metadata": {
                 "My Server Name": "Apache1"
-            },
-            "volumes_attached": []
+            }
     }]
 }
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl
index 3421225ed..884be7549 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl
@@ -51,7 +51,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl
index 0fa93402b..22be331e4 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl
@@ -66,10 +66,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": [
-            {"id": "volume_id1"},
-            {"id": "volume_id2"}
-        ]
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl
index 211259fe5..35fe0a6c3 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl
@@ -15,8 +15,6 @@
           OS-EXT-IPS-MAC:mac_addr="%(mac_addr)s"/>
     </network>
   </addresses>
-  <volume_attached id="volume_id1"/>
-  <volume_attached id="volume_id2"/>
   <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
   <security_groups>
diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl
index 84a5eb47d..649aa6f9b 100644
--- a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl
@@ -67,11 +67,7 @@
             "status": "ACTIVE",
             "tenant_id": "openstack",
             "updated": "%(timestamp)s",
-            "user_id": "fake",
-            "volumes_attached": [
-                {"id": "volume_id1"},
-                {"id": "volume_id2"}
-            ]
+            "user_id": "fake"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl
index 3f4f72495..6ac363176 100644
--- a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl
@@ -16,8 +16,6 @@
             OS-EXT-IPS-MAC:mac_addr="%(mac_addr)s"/>
       </network>
     </addresses>
-    <volume_attached id="volume_id1"/>
-    <volume_attached id="volume_id2"/>
     <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
     <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
     <security_groups>
diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
index 54d1e7c2f..ea47da06c 100644
--- a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
@@ -50,7 +50,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
index 4235c51c1..535d00410 100644
--- a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
@@ -51,8 +51,7 @@
             "status": "ACTIVE",
             "tenant_id": "openstack",
             "updated": "%(timestamp)s",
-            "user_id": "fake",
-            "volumes_attached": []
+            "user_id": "fake"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
index 8c19e34c6..86e39aedc 100644
--- a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
@@ -49,10 +49,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": [
-            {"id": "volume_id1"},
-            {"id": "volume_id2"}
-        ]
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl
index 07db2436c..adc8a5c1b 100644
--- a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl
@@ -14,8 +14,6 @@
       <ip version="4" addr="%(ip)s"/>
     </network>
   </addresses>
-  <volume_attached id="volume_id1"/>
-  <volume_attached id="volume_id2"/>
   <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
 </server>
diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
index 1f96734bc..e244ea0df 100644
--- a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
@@ -50,11 +50,7 @@
             "status": "ACTIVE",
             "tenant_id": "openstack",
             "updated": "%(timestamp)s",
-            "user_id": "fake",
-            "volumes_attached": [
-                {"id": "volume_id1"},
-                {"id": "volume_id2"}
-            ]
+            "user_id": "fake"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl
index 90d38375a..568807ecb 100644
--- a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl
@@ -15,8 +15,6 @@
         <ip version="4" addr="%(ip)s"/>
       </network>
     </addresses>
-    <volume_attached id="volume_id1"/>
-    <volume_attached id="volume_id2"/>
     <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
     <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
   </server>
diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl
index 03d4cfa03..011ed6396 100644
--- a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl
+++ b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl
@@ -48,7 +48,6 @@
         "status": "%(status)s",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
index 366bdcef6..bc483c6da 100644
--- a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
+++ b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
@@ -49,7 +49,6 @@
         "status": "%(status)s",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl
index d6da7ec07..9c16a15f0 100644
--- a/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl
@@ -50,7 +50,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": []
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/server-get-resp.json.tpl
index 8c19e34c6..86e39aedc 100644
--- a/nova/tests/integrated/api_samples/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/server-get-resp.json.tpl
@@ -49,10 +49,6 @@
         "status": "ACTIVE",
         "tenant_id": "openstack",
         "updated": "%(timestamp)s",
-        "user_id": "fake",
-        "volumes_attached": [
-            {"id": "volume_id1"},
-            {"id": "volume_id2"}
-        ]
+        "user_id": "fake"
     }
 }
diff --git a/nova/tests/integrated/api_samples/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/server-get-resp.xml.tpl
index 07db2436c..adc8a5c1b 100644
--- a/nova/tests/integrated/api_samples/server-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/server-get-resp.xml.tpl
@@ -14,8 +14,6 @@
       <ip version="4" addr="%(ip)s"/>
     </network>
   </addresses>
-  <volume_attached id="volume_id1"/>
-  <volume_attached id="volume_id2"/>
   <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
 </server>
diff --git a/nova/tests/integrated/api_samples/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/servers-details-resp.json.tpl
index 1f96734bc..e244ea0df 100644
--- a/nova/tests/integrated/api_samples/servers-details-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/servers-details-resp.json.tpl
@@ -50,11 +50,7 @@
             "status": "ACTIVE",
             "tenant_id": "openstack",
             "updated": "%(timestamp)s",
-            "user_id": "fake",
-            "volumes_attached": [
-                {"id": "volume_id1"},
-                {"id": "volume_id2"}
-            ]
+            "user_id": "fake"
         }
     ]
 }
diff --git a/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl
index 90d38375a..568807ecb 100644
--- a/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl
@@ -15,8 +15,6 @@
         <ip version="4" addr="%(ip)s"/>
       </network>
     </addresses>
-    <volume_attached id="volume_id1"/>
-    <volume_attached id="volume_id2"/>
     <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
     <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
   </server>
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index d33cda028..e24f24189 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -459,8 +459,6 @@ class ServersSampleJsonTest(ServersSampleBase):
 
     def test_servers_get(self):
         uuid = self.test_servers_post()
-        self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
-                       fakes.stub_bdm_get_all_by_instance)
         response = self._do_get('servers/%s' % uuid)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
@@ -478,8 +476,6 @@ class ServersSampleJsonTest(ServersSampleBase):
 
     def test_servers_details(self):
         uuid = self._post_server()
-        self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
-                       fakes.stub_bdm_get_all_by_instance)
         response = self._do_get('servers/detail')
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'