From 2da2f60feac8cac3378a546e31d8d88876f65489 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Thu, 19 Sep 2019 14:57:30 +0100
Subject: [PATCH] nova-net: Migrate 'test_availability_zone' functional tests

This is pretty simple - a nova-network host obviously won't be present
in nova-network is disabled.

Change-Id: I4872f0bcaabb8e1cf1aad297a1c55993f2a3fe6e
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 .../availability-zone-detail-resp.json                     | 7 -------
 .../availability-zone-detail-resp.json.tpl                 | 7 -------
 .../functional/api_sample_tests/test_availability_zone.py  | 2 --
 3 files changed, 16 deletions(-)

diff --git a/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json b/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json
index 67eb80f96080..22181387783d 100644
--- a/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json
+++ b/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json
@@ -9,13 +9,6 @@
                         "updated_at": null
                     }
                 },
-                "network": {
-                    "nova-network": {
-                        "active": true,
-                        "available": true,
-                        "updated_at": null
-                    }
-                },
                 "scheduler": {
                     "nova-scheduler": {
                         "active": true,
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl
index ce76bb48569c..a07f385e722a 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl
@@ -15,13 +15,6 @@
                         "available": true,
                         "updated_at": %(strtime_or_none)s
                     }
-                },
-                "network": {
-                    "nova-network": {
-                        "active": true,
-                        "available": true,
-                        "updated_at": %(strtime_or_none)s
-                    }
                 }
             },
             "zoneName": "internal",
diff --git a/nova/tests/functional/api_sample_tests/test_availability_zone.py b/nova/tests/functional/api_sample_tests/test_availability_zone.py
index 5afef1380003..6e765bef838c 100644
--- a/nova/tests/functional/api_sample_tests/test_availability_zone.py
+++ b/nova/tests/functional/api_sample_tests/test_availability_zone.py
@@ -16,7 +16,6 @@ from nova.tests.functional.api_sample_tests import test_servers
 
 
 class AvailabilityZoneJsonTest(test_servers.ServersSampleBase):
-    USE_NEUTRON = False
     ADMIN_API = True
     sample_dir = "os-availability-zone"
 
@@ -29,7 +28,6 @@ class AvailabilityZoneJsonTest(test_servers.ServersSampleBase):
         response = self._do_get('os-availability-zone')
         self._verify_response('availability-zone-list-resp', {}, response, 200)
 
-    # TODO(stephenfin): Migrate off of nova-network
     def test_availability_zone_detail(self):
         response = self._do_get('os-availability-zone/detail')
         self._verify_response('availability-zone-detail-resp', {}, response,