diff --git a/vitrage_tempest_tests/tests/api/resources/test_resources.py b/vitrage_tempest_tests/tests/api/resources/test_resources.py index 507629c..27b4b1f 100644 --- a/vitrage_tempest_tests/tests/api/resources/test_resources.py +++ b/vitrage_tempest_tests/tests/api/resources/test_resources.py @@ -179,7 +179,7 @@ class TestResource(BaseVitrageTempest): sorted_cli_resources = sorted( json.loads(cli_resources), - key=lambda resource: resource["vitrage_id"]) + key=lambda resource: resource["ID"]) sorted_api_resources = sorted( api_resources, key=lambda resource: resource["vitrage_id"]) @@ -190,10 +190,19 @@ class TestResource(BaseVitrageTempest): for cli_resource, api_resource in \ zip(sorted_cli_resources, sorted_api_resources): - for item in self.properties: - self.assertEqual(cli_resource.get(item).lower(), - api_resource.get(item).lower(), - 'for item %s' % item) + + self.assertEqual( + cli_resource.get("ID").lower(), + api_resource.get(VProps.VITRAGE_ID).lower()) + self.assertEqual( + cli_resource.get("Type").lower(), + api_resource.get(VProps.VITRAGE_TYPE).lower()) + self.assertEqual( + cli_resource.get("Data Source ID").lower(), + api_resource.get(VProps.ID).lower()) + self.assertEqual( + cli_resource.get("State").lower(), + api_resource.get(VProps.VITRAGE_OPERATIONAL_STATE).lower()) def _compare_resource_show(self, api_resource_show, cli_resource_show): diff --git a/vitrage_tempest_tests/tests/utils.py b/vitrage_tempest_tests/tests/utils.py index 19de536..f42947e 100644 --- a/vitrage_tempest_tests/tests/utils.py +++ b/vitrage_tempest_tests/tests/utils.py @@ -24,7 +24,6 @@ import os import re import subprocess - LOG = logging.getLogger(__name__)