Skip to content

Commit c1d6872

Browse files
Damir SayfutdinovКалинин Михаил Андреевич
Damir Sayfutdinov
authored and
Калинин Михаил Андреевич
committed
Delete workaround for volume_gigabytes_iso
Stop using volume_gigabytes_iso quota. OPENSTACK-5362 Change-Id: Iba9cb1488950ae0d7046ca23563592350341b5b4
1 parent bf7e055 commit c1d6872

File tree

3 files changed

+2
-50
lines changed

3 files changed

+2
-50
lines changed

selvpcclient/resources/quotas.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ def optimize_project_quotas(self, project_id, return_raw=False):
9090
body = {"quotas": {}}
9191
quotas = self.get_project_quotas(project_id)._info
9292
for resource, quotas_ in quotas.items():
93-
# dynamic resource, can't be set manually
94-
# see issue for details:
95-
# https://github.com/selectel/python-selvpcclient/issues/18
96-
if resource == "volume_gigabytes_iso":
97-
continue
98-
9993
for quota in quotas_:
10094
if quota["value"] == 0 or quota["value"] == quota["used"]:
10195
continue

tests/cli/test_quota.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
def test_quota_set():
8-
COUNT_OF_QUOTAS = 7
8+
COUNT_OF_QUOTAS = 6
99
client = make_client(return_value=answers.QUOTAS_SET)
1010
args = ['quota set',
1111
'c2383dc1894748b193031ae1bccf508a',
@@ -38,7 +38,7 @@ def test_quota_optimize_nothing():
3838

3939

4040
def test_quota_list():
41-
count_of_quotas = 12
41+
count_of_quotas = 10
4242
client = make_client(return_value=answers.QUOTAS_LIST)
4343
args = ['quota list']
4444

tests/util/answers.py

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -467,20 +467,6 @@
467467
"value": 81
468468
}
469469
],
470-
"volume_gigabytes_iso": [
471-
{
472-
"region": "ru1",
473-
"used": 0,
474-
"zone": None,
475-
"value": 46
476-
},
477-
{
478-
"region": "ru2",
479-
"used": 0,
480-
"zone": None,
481-
"value": 44
482-
}
483-
],
484470
"compute_ram": [
485471
{
486472
"region": "ru1",
@@ -613,20 +599,6 @@
613599
"value": 0
614600
}
615601
],
616-
"volume_gigabytes_iso": [
617-
{
618-
"region": "ru1",
619-
"used": 0,
620-
"zone": None,
621-
"value": 13
622-
},
623-
{
624-
"region": "ru2",
625-
"used": 0,
626-
"zone": None,
627-
"value": 0
628-
}
629-
],
630602
"compute_ram": [
631603
{
632604
"region": "ru1",
@@ -745,20 +717,6 @@
745717
"value": 1
746718
}
747719
],
748-
"volume_gigabytes_iso": [
749-
{
750-
"region": "ru-1",
751-
"used": 0,
752-
"zone": None,
753-
"value": 0
754-
},
755-
{
756-
"region": "ru-2",
757-
"used": 0,
758-
"zone": None,
759-
"value": 0
760-
}
761-
],
762720
"volume_gigabytes_universal": [
763721
{
764722
"region": "ru-1",

0 commit comments

Comments
 (0)