Skip to content

Commit

Permalink
fix bug 380 in autoload discovery, when leaving the region attribute …
Browse files Browse the repository at this point in the history
…empty there is no relevant error
  • Loading branch information
anthony committed Jan 20, 2017
1 parent 606b026 commit 0924304
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ def __init__(self, vm_service, network_service):
self.vm_service = vm_service
self.network_service = network_service

def _validate_region(self, region):
"""Verify Azure region
:param str region: Azure region
:return:
"""
if not region:
raise AutoloadException("Region attribute can not be empty")

def _validate_api_credentials(self, cloud_provider_model, logger):
"""Verify Azure API Credentials and return AzureClientsManager instance
Expand Down Expand Up @@ -142,6 +151,8 @@ def get_inventory(self, cloud_provider_model, logger):

azure_clients = self._validate_api_credentials(cloud_provider_model=cloud_provider_model, logger=logger)

self._validate_region(cloud_provider_model.region)

self._register_azure_providers(resource_client=azure_clients.resource_client, logger=logger)

self._validate_mgmt_resource_group(resource_client=azure_clients.resource_client,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ def test_validate_api_credentials(self, azure_clients_manager_class):
# Verify
self.assertEqual(ex.exception.message, "Failed to connect to Azure API, please check the log for more details")

def test_validate_region(self):
"""Check that method will raise AutoloadException if region is empty"""
# Act
with self.assertRaises(AutoloadException) as ex:
self.autoload_operation._validate_region(region="")

# Verify
self.assertEqual(ex.exception.message, "Region attribute can not be empty")

def test_validate_mgmt_resource_group_not_found(self):
"""Check that method will raise AutoloadException if management resource group doesn't exist on Azure"""
resource_client = mock.MagicMock()
Expand Down

0 comments on commit 0924304

Please sign in to comment.