diff --git a/rally_openstack/task/contexts/quotas/designate_quotas.py b/rally_openstack/task/contexts/quotas/designate_quotas.py index 52f3ca30..09b00aa5 100644 --- a/rally_openstack/task/contexts/quotas/designate_quotas.py +++ b/rally_openstack/task/contexts/quotas/designate_quotas.py @@ -28,11 +28,11 @@ class DesignateQuotas(object): "type": "integer", "minimum": 1 }, - "zones_recordsets": { + "zone_recordsets": { "type": "integer", "minimum": 1 }, - "zones_records": { + "zone_records": { "type": "integer", "minimum": 1 }, diff --git a/samples/tasks/scenarios/designate/create-and-delete-recordsets.json b/samples/tasks/scenarios/designate/create-and-delete-recordsets.json index ff07f567..4ea70444 100644 --- a/samples/tasks/scenarios/designate/create-and-delete-recordsets.json +++ b/samples/tasks/scenarios/designate/create-and-delete-recordsets.json @@ -13,8 +13,8 @@ "quotas": { "designate": { "zones": 100, - "zones_recordsets": 2000, - "zones_records": 2000, + "zone_recordsets": 2000, + "zone_records": 2000, "recordset_records": 2000 } }, diff --git a/samples/tasks/scenarios/designate/create-and-delete-recordsets.yaml b/samples/tasks/scenarios/designate/create-and-delete-recordsets.yaml index c60ec298..cad0b4a0 100644 --- a/samples/tasks/scenarios/designate/create-and-delete-recordsets.yaml +++ b/samples/tasks/scenarios/designate/create-and-delete-recordsets.yaml @@ -11,8 +11,8 @@ quotas: designate: zones: 100 - zones_recordsets: 2000 - zones_records: 2000 + zone_recordsets: 2000 + zone_records: 2000 recordset_records: 2000 users: tenants: 2 diff --git a/samples/tasks/scenarios/designate/create-and-delete-zone.json b/samples/tasks/scenarios/designate/create-and-delete-zone.json index e598711d..be99d2a9 100644 --- a/samples/tasks/scenarios/designate/create-and-delete-zone.json +++ b/samples/tasks/scenarios/designate/create-and-delete-zone.json @@ -10,8 +10,8 @@ "quotas": { "designate": { "zones": 100, - "zones_recordsets": 500, - "zones_records": 2000, + "zone_recordsets": 500, + "zone_records": 2000, "recordset_records": 2000 } }, diff --git a/samples/tasks/scenarios/designate/create-and-delete-zone.yaml b/samples/tasks/scenarios/designate/create-and-delete-zone.yaml index 59200d28..bd5047b0 100644 --- a/samples/tasks/scenarios/designate/create-and-delete-zone.yaml +++ b/samples/tasks/scenarios/designate/create-and-delete-zone.yaml @@ -9,8 +9,8 @@ quotas: designate: zones: 100 - zones_recordsets: 500 - zones_records: 2000 + zone_recordsets: 500 + zone_records: 2000 recordset_records: 2000 users: tenants: 2 diff --git a/samples/tasks/scenarios/designate/create-and-list-recordsets.json b/samples/tasks/scenarios/designate/create-and-list-recordsets.json index e420b42f..13f08032 100644 --- a/samples/tasks/scenarios/designate/create-and-list-recordsets.json +++ b/samples/tasks/scenarios/designate/create-and-list-recordsets.json @@ -13,8 +13,8 @@ "quotas": { "designate": { "zones": 100, - "zones_recordsets": 2000, - "zones_records": 2000, + "zone_recordsets": 2000, + "zone_records": 2000, "recordset_records": 2000 } }, diff --git a/samples/tasks/scenarios/designate/create-and-list-recordsets.yaml b/samples/tasks/scenarios/designate/create-and-list-recordsets.yaml index 4301f92e..ab0c4196 100644 --- a/samples/tasks/scenarios/designate/create-and-list-recordsets.yaml +++ b/samples/tasks/scenarios/designate/create-and-list-recordsets.yaml @@ -11,8 +11,8 @@ quotas: designate: zones: 100 - zones_recordsets: 2000 - zones_records: 2000 + zone_recordsets: 2000 + zone_records: 2000 recordset_records: 2000 users: tenants: 2 diff --git a/samples/tasks/scenarios/designate/create-and-list-zones.json b/samples/tasks/scenarios/designate/create-and-list-zones.json index eba90bda..2a518d96 100644 --- a/samples/tasks/scenarios/designate/create-and-list-zones.json +++ b/samples/tasks/scenarios/designate/create-and-list-zones.json @@ -10,8 +10,8 @@ "quotas": { "designate": { "zones": 100, - "zones_recordsets": 500, - "zones_records": 2000, + "zone_recordsets": 500, + "zone_records": 2000, "recordset_records": 2000 } }, diff --git a/samples/tasks/scenarios/designate/create-and-list-zones.yaml b/samples/tasks/scenarios/designate/create-and-list-zones.yaml index 8f052365..97437e22 100644 --- a/samples/tasks/scenarios/designate/create-and-list-zones.yaml +++ b/samples/tasks/scenarios/designate/create-and-list-zones.yaml @@ -9,8 +9,8 @@ quotas: designate: zones: 100 - zones_recordsets: 500 - zones_records: 2000 + zone_recordsets: 500 + zone_records: 2000 recordset_records: 2000 users: tenants: 2 diff --git a/tests/unit/task/contexts/quotas/test_designate_quotas.py b/tests/unit/task/contexts/quotas/test_designate_quotas.py index 481577eb..ffb00346 100644 --- a/tests/unit/task/contexts/quotas/test_designate_quotas.py +++ b/tests/unit/task/contexts/quotas/test_designate_quotas.py @@ -27,8 +27,8 @@ class DesignateQuotasTestCase(test.TestCase): quotas_values = { "api_export_size": 5, "zones": 5, - "zones_recordsets": 20, - "zones_records": 20, + "zone_recordsets": 20, + "zone_records": 20, "recordset_records": 20, } quotas.update(tenant_id, **quotas_values) @@ -45,7 +45,7 @@ class DesignateQuotasTestCase(test.TestCase): def test_get(self): tenant_id = "tenant_id" quotas = {"api_export_size": -1, "zones": -1, - "zones_recordsets": 2, "zones_records": 3, + "zone_recordsets": 2, "zone_records": 3, "recordset_records": 3} clients = mock.MagicMock() clients.designate.return_value.quotas.get.return_value = quotas