From ec0532269cb9f3ac469c1b91fcff4a537e1b40d6 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 19 Sep 2019 15:20:47 +0100 Subject: [PATCH] nova-net: Migrate 'test_quota_sets' functional tests This one is long because network quotas aren't a thing when using neutron, which means we need to remove them from all the samples. Change-Id: I9cb2fb1b3817797a53c1331d666750399a7f5f87 Signed-off-by: Stephen Finucane --- .../quota-classes-show-get-resp.json | 3 +-- .../quota-classes-update-post-req.json | 3 +-- .../quota-classes-update-post-resp.json | 3 +-- .../quotas-show-defaults-get-resp.json | 3 +-- .../quotas-show-detail-get-resp.json | 7 +------ .../os-quota-sets-noop/quotas-show-get-resp.json | 3 +-- .../quotas-update-force-post-resp.json | 3 +-- .../os-quota-sets-noop/quotas-update-post-resp.json | 3 +-- .../user-quotas-show-get-resp.json | 3 +-- .../user-quotas-update-post-resp.json | 3 +-- .../os-quota-sets/quotas-show-defaults-get-resp.json | 3 +-- .../os-quota-sets/quotas-show-detail-get-resp.json | 5 ----- .../os-quota-sets/quotas-show-get-resp.json | 3 +-- .../os-quota-sets/quotas-update-force-post-resp.json | 3 +-- .../os-quota-sets/quotas-update-post-resp.json | 3 +-- .../os-quota-sets/user-quotas-show-get-resp.json | 3 +-- .../os-quota-sets/user-quotas-update-post-resp.json | 3 +-- .../functional/api_sample_tests/api_sample_base.py | 12 +++++++----- .../quota-classes-show-get-resp.json.tpl | 3 +-- .../quota-classes-update-post-req.json.tpl | 3 +-- .../quota-classes-update-post-resp.json.tpl | 3 +-- .../quotas-show-defaults-get-resp.json.tpl | 3 +-- .../quotas-show-detail-get-resp.json.tpl | 5 ----- .../os-quota-sets-noop/quotas-show-get-resp.json.tpl | 3 +-- .../quotas-update-force-post-resp.json.tpl | 3 +-- .../quotas-update-post-resp.json.tpl | 3 +-- .../user-quotas-show-get-resp.json.tpl | 3 +-- .../user-quotas-update-post-resp.json.tpl | 3 +-- .../quotas-show-defaults-get-resp.json.tpl | 3 +-- .../quotas-show-detail-get-resp.json.tpl | 5 ----- .../os-quota-sets/quotas-show-get-resp.json.tpl | 3 +-- .../quotas-update-force-post-resp.json.tpl | 3 +-- .../os-quota-sets/quotas-update-post-resp.json.tpl | 3 +-- .../os-quota-sets/user-quotas-show-get-resp.json.tpl | 3 +-- .../user-quotas-update-post-resp.json.tpl | 3 +-- .../functional/api_sample_tests/test_quota_sets.py | 1 - 36 files changed, 38 insertions(+), 87 deletions(-) diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json index 2fcfa2b9dd6d..6e477722dda8 100644 --- a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json +++ b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json @@ -12,7 +12,6 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10, - "networks": 3 + "security_groups": 10 } } diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.json b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.json index 4e3af3fa86b6..483fda8c53e7 100644 --- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.json +++ b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.json @@ -11,7 +11,6 @@ "injected_file_path_bytes": 255, "security_groups": 10, "security_group_rules": 20, - "key_pairs": 100, - "networks": 3 + "key_pairs": 100 } } diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json index c58474b539bf..c86f86063b88 100644 --- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json +++ b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json @@ -11,7 +11,6 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10, - "networks": 3 + "security_groups": 10 } } diff --git a/doc/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json b/doc/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json index 620fa8ed3575..714ca5923ae5 100644 --- a/doc/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json +++ b/doc/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json @@ -10,11 +10,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json b/doc/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json index 47af14b048f8..59fd38c78120 100644 --- a/doc/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json +++ b/doc/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json @@ -46,11 +46,6 @@ "limit": -1, "reserved": -1 }, - "networks": { - "in_use": -1, - "limit": -1, - "reserved": -1 - }, "ram": { "in_use": -1, "limit": -1, @@ -77,4 +72,4 @@ "reserved": -1 } } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets-noop/quotas-show-get-resp.json b/doc/api_samples/os-quota-sets-noop/quotas-show-get-resp.json index 620fa8ed3575..714ca5923ae5 100644 --- a/doc/api_samples/os-quota-sets-noop/quotas-show-get-resp.json +++ b/doc/api_samples/os-quota-sets-noop/quotas-show-get-resp.json @@ -10,11 +10,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json b/doc/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json index 0a4c3e9008d7..370bd87ad1eb 100644 --- a/doc/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json +++ b/doc/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json @@ -9,11 +9,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets-noop/quotas-update-post-resp.json b/doc/api_samples/os-quota-sets-noop/quotas-update-post-resp.json index 0a4c3e9008d7..370bd87ad1eb 100644 --- a/doc/api_samples/os-quota-sets-noop/quotas-update-post-resp.json +++ b/doc/api_samples/os-quota-sets-noop/quotas-update-post-resp.json @@ -9,11 +9,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json b/doc/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json index 620fa8ed3575..714ca5923ae5 100644 --- a/doc/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json +++ b/doc/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json @@ -10,11 +10,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json b/doc/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json index 0a4c3e9008d7..370bd87ad1eb 100644 --- a/doc/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json +++ b/doc/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json @@ -9,11 +9,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json index e03bc651eba0..c93f809d598c 100644 --- a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json @@ -14,7 +14,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/doc/api_samples/os-quota-sets/quotas-show-detail-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-detail-get-resp.json index bca3a1e82a00..bd58c9bb63cd 100644 --- a/doc/api_samples/os-quota-sets/quotas-show-detail-get-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-show-detail-get-resp.json @@ -70,11 +70,6 @@ "in_use": 0, "limit": 10, "reserved": 0 - }, - "networks": { - "in_use": 2, - "limit": 3, - "reserved": 0 } } } diff --git a/doc/api_samples/os-quota-sets/quotas-show-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-get-resp.json index e03bc651eba0..c93f809d598c 100644 --- a/doc/api_samples/os-quota-sets/quotas-show-get-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-show-get-resp.json @@ -14,7 +14,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/doc/api_samples/os-quota-sets/quotas-update-force-post-resp.json b/doc/api_samples/os-quota-sets/quotas-update-force-post-resp.json index ab901db2c923..66bbd00f44e5 100644 --- a/doc/api_samples/os-quota-sets/quotas-update-force-post-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-update-force-post-resp.json @@ -13,7 +13,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-resp.json b/doc/api_samples/os-quota-sets/quotas-update-post-resp.json index f17ad087f175..a0f3b1a77d2f 100644 --- a/doc/api_samples/os-quota-sets/quotas-update-post-resp.json +++ b/doc/api_samples/os-quota-sets/quotas-update-post-resp.json @@ -13,7 +13,6 @@ "security_group_rules": 20, "security_groups": 45, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/doc/api_samples/os-quota-sets/user-quotas-show-get-resp.json b/doc/api_samples/os-quota-sets/user-quotas-show-get-resp.json index e03bc651eba0..c93f809d598c 100644 --- a/doc/api_samples/os-quota-sets/user-quotas-show-get-resp.json +++ b/doc/api_samples/os-quota-sets/user-quotas-show-get-resp.json @@ -14,7 +14,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/doc/api_samples/os-quota-sets/user-quotas-update-post-resp.json b/doc/api_samples/os-quota-sets/user-quotas-update-post-resp.json index 4ac251c08689..cf4e8c3d6657 100644 --- a/doc/api_samples/os-quota-sets/user-quotas-update-post-resp.json +++ b/doc/api_samples/os-quota-sets/user-quotas-update-post-resp.json @@ -13,7 +13,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_sample_base.py b/nova/tests/functional/api_sample_tests/api_sample_base.py index c082fc6db3a3..f9e51f854075 100644 --- a/nova/tests/functional/api_sample_tests/api_sample_base.py +++ b/nova/tests/functional/api_sample_tests/api_sample_base.py @@ -96,11 +96,13 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios, # NOTE(danms): Disable base automatic DB (and cells) config self.USES_DB = False self.USES_DB_SELF = True - # This is to enable the network quota which is being registered - # based on CONF.enable_network_quota. Need this to test the - # network quota in quota sample tests. - self.flags(enable_network_quota=True) - self.useFixture(fixtures.RegisterNetworkQuota()) + + if not self.USE_NEUTRON: + # This is to enable the network quota which is being registered + # based on CONF.enable_network_quota. Need this to test the + # network quota in quota sample tests. + self.flags(enable_network_quota=True) + self.useFixture(fixtures.RegisterNetworkQuota()) # super class call is delayed here so that we have the right # paste and conf before loading all the services, as we can't diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl index da6d69d66fbe..f9a94e760af7 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl @@ -12,7 +12,6 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10, - "networks": 3 + "security_groups": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl index 4e3af3fa86b6..483fda8c53e7 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl @@ -11,7 +11,6 @@ "injected_file_path_bytes": 255, "security_groups": 10, "security_group_rules": 20, - "key_pairs": 100, - "networks": 3 + "key_pairs": 100 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl index 059acfde05e1..c36783f2f0e6 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl @@ -11,7 +11,6 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10, - "networks": 3 + "security_groups": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json.tpl index a86bea6b558c..5922059a8614 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-defaults-get-resp.json.tpl @@ -14,7 +14,6 @@ "security_group_rules": -1, "security_groups": -1, "server_groups": -1, - "server_group_members": -1, - "networks": -1 + "server_group_members": -1 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json.tpl index f7c33a8d425d..59fd38c78120 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-detail-get-resp.json.tpl @@ -46,11 +46,6 @@ "limit": -1, "reserved": -1 }, - "networks": { - "in_use": -1, - "limit": -1, - "reserved": -1 - }, "ram": { "in_use": -1, "limit": -1, diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-get-resp.json.tpl index 620fa8ed3575..714ca5923ae5 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-show-get-resp.json.tpl @@ -10,11 +10,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json.tpl index 0a4c3e9008d7..370bd87ad1eb 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-force-post-resp.json.tpl @@ -9,11 +9,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-post-resp.json.tpl index 0a4c3e9008d7..370bd87ad1eb 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/quotas-update-post-resp.json.tpl @@ -9,11 +9,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json.tpl index 620fa8ed3575..714ca5923ae5 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-show-get-resp.json.tpl @@ -10,11 +10,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json.tpl index 0a4c3e9008d7..370bd87ad1eb 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets-noop/user-quotas-update-post-resp.json.tpl @@ -9,11 +9,10 @@ "instances": -1, "key_pairs": -1, "metadata_items": -1, - "networks": -1, "ram": -1, "security_group_rules": -1, "security_groups": -1, "server_group_members": -1, "server_groups": -1 } -} \ No newline at end of file +} diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl index 6a79f10758a3..f66f22cd2dfa 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json.tpl @@ -14,7 +14,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-detail-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-detail-get-resp.json.tpl index bca3a1e82a00..bd58c9bb63cd 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-detail-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-detail-get-resp.json.tpl @@ -70,11 +70,6 @@ "in_use": 0, "limit": 10, "reserved": 0 - }, - "networks": { - "in_use": 2, - "limit": 3, - "reserved": 0 } } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl index 6a79f10758a3..f66f22cd2dfa 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-show-get-resp.json.tpl @@ -14,7 +14,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl index ab901db2c923..66bbd00f44e5 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-force-post-resp.json.tpl @@ -13,7 +13,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl index 47e09bf5c0f4..605857f39ee6 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/quotas-update-post-resp.json.tpl @@ -13,7 +13,6 @@ "security_group_rules": 20, "security_groups": 45, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl index 6a79f10758a3..f66f22cd2dfa 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-show-get-resp.json.tpl @@ -14,7 +14,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl index ae309dfc97d7..34f9df9d705b 100644 --- a/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl +++ b/nova/tests/functional/api_sample_tests/api_samples/os-quota-sets/user-quotas-update-post-resp.json.tpl @@ -13,7 +13,6 @@ "security_group_rules": 20, "security_groups": 10, "server_groups": 10, - "server_group_members": 10, - "networks": 3 + "server_group_members": 10 } } diff --git a/nova/tests/functional/api_sample_tests/test_quota_sets.py b/nova/tests/functional/api_sample_tests/test_quota_sets.py index 41606a247310..43956028d4e2 100644 --- a/nova/tests/functional/api_sample_tests/test_quota_sets.py +++ b/nova/tests/functional/api_sample_tests/test_quota_sets.py @@ -18,7 +18,6 @@ from nova.tests.functional.api_sample_tests import api_sample_base class QuotaSetsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): - USE_NEUTRON = False ADMIN_API = True sample_dir = "os-quota-sets"