Skip to content

Commit

Permalink
Merge pull request #219 from nuwang/fix_service_zones
Browse files Browse the repository at this point in the history
Fix incorrect networking zone name property in OS
  • Loading branch information
nuwang committed Sep 4, 2019
2 parents b615763 + d6a33b9 commit 200e309
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions cloudbridge/providers/openstack/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,10 @@ class OpenStackNetworkingService(BaseNetworkingService):

def __init__(self, provider):
super(OpenStackNetworkingService, self).__init__(provider)
# pylint:disable=protected-access
self.service_zone_name = self.provider._get_config_value(
'os_networking_zone_name', cb_helpers.get_env(
'OS_NETWORKING_ZONE_NAME', self.provider.zone_name))
self._network_service = OpenStackNetworkService(self.provider)
self._subnet_service = OpenStackSubnetService(self.provider)
self._router_service = OpenStackRouterService(self.provider)
Expand Down Expand Up @@ -1035,11 +1039,6 @@ class OpenStackNetworkService(BaseNetworkService):
def __init__(self, provider):
super(OpenStackNetworkService, self).__init__(provider)

# pylint:disable=protected-access
self.service_zone_name = self.provider._get_config_value(
'os_networking_zone_name', cb_helpers.get_env(
'OS_NETWORKING_ZONE_NAME', self.provider.zone_name))

@dispatch(event="provider.networking.networks.get",
priority=BaseNetworkService.STANDARD_EVENT_PRIORITY)
def get(self, network_id):
Expand Down

0 comments on commit 200e309

Please sign in to comment.