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 <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane
Matt Riedemann
parent
4d034b79eb
commit
ec0532269c
|
|
@ -12,7 +12,6 @@
|
|||
"metadata_items": 128,
|
||||
"ram": 51200,
|
||||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"networks": 3
|
||||
"security_groups": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
"injected_file_path_bytes": 255,
|
||||
"security_groups": 10,
|
||||
"security_group_rules": 20,
|
||||
"key_pairs": 100,
|
||||
"networks": 3
|
||||
"key_pairs": 100
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
"metadata_items": 128,
|
||||
"ram": 51200,
|
||||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"networks": 3
|
||||
"security_groups": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,11 +70,6 @@
|
|||
"in_use": 0,
|
||||
"limit": 10,
|
||||
"reserved": 0
|
||||
},
|
||||
"networks": {
|
||||
"in_use": 2,
|
||||
"limit": 3,
|
||||
"reserved": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 45,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
"metadata_items": 128,
|
||||
"ram": 51200,
|
||||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"networks": 3
|
||||
"security_groups": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
"injected_file_path_bytes": 255,
|
||||
"security_groups": 10,
|
||||
"security_group_rules": 20,
|
||||
"key_pairs": 100,
|
||||
"networks": 3
|
||||
"key_pairs": 100
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
"metadata_items": 128,
|
||||
"ram": 51200,
|
||||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"networks": 3
|
||||
"security_groups": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
"security_group_rules": -1,
|
||||
"security_groups": -1,
|
||||
"server_groups": -1,
|
||||
"server_group_members": -1,
|
||||
"networks": -1
|
||||
"server_group_members": -1
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,11 +46,6 @@
|
|||
"limit": -1,
|
||||
"reserved": -1
|
||||
},
|
||||
"networks": {
|
||||
"in_use": -1,
|
||||
"limit": -1,
|
||||
"reserved": -1
|
||||
},
|
||||
"ram": {
|
||||
"in_use": -1,
|
||||
"limit": -1,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,11 +70,6 @@
|
|||
"in_use": 0,
|
||||
"limit": 10,
|
||||
"reserved": 0
|
||||
},
|
||||
"networks": {
|
||||
"in_use": 2,
|
||||
"limit": 3,
|
||||
"reserved": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 45,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
"security_group_rules": 20,
|
||||
"security_groups": 10,
|
||||
"server_groups": 10,
|
||||
"server_group_members": 10,
|
||||
"networks": 3
|
||||
"server_group_members": 10
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue