diff options
author | spisarski <s.pisarski@cablelabs.com> | 2018-03-09 14:42:34 -0700 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2018-03-12 08:28:45 -0600 |
commit | 9e9e09590cce321f55996c1a31370ffdf28251b0 (patch) | |
tree | a0e031d0365604f4a299ad8f748fe10d09a75a8a /snaps/openstack/create_router.py | |
parent | fb0ab37c323717ca10ac3f3bda24ae390635495e (diff) |
Closing keystone sessions after done with them.
By not closing all of the keystone sessions being created when
running all of the tests, this may be the root cause to the IOError
occasionally being observed:
IOError: [Errno 24] Too many open files
JIRA: SNAPS-285
Change-Id: I7fc7ab0c6cdd02f1ae32bb3ae4f121cb465d5693
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/create_router.py')
-rw-r--r-- | snaps/openstack/create_router.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/snaps/openstack/create_router.py b/snaps/openstack/create_router.py index 50c0b28..4395059 100644 --- a/snaps/openstack/create_router.py +++ b/snaps/openstack/create_router.py @@ -43,8 +43,6 @@ class OpenStackRouter(OpenStackNetworkObject): if not router_settings: raise RouterCreationError('router_settings is required') - self.__keystone = None - self.router_settings = router_settings # Attributes instantiated on create() @@ -63,11 +61,9 @@ class OpenStackRouter(OpenStackNetworkObject): """ super(self.__class__, self).initialize() - self.__keystone = keystone_utils.keystone_client(self._os_creds) - try: self.__router = neutron_utils.get_router( - self._neutron, self.__keystone, + self._neutron, self._keystone, router_settings=self.router_settings, project_name=self._os_creds.project_name) except Unauthorized as e: @@ -86,7 +82,7 @@ class OpenStackRouter(OpenStackNetworkObject): for port_setting in self.router_settings.port_settings: port = neutron_utils.get_port( - self._neutron, self.__keystone, port_settings=port_setting, + self._neutron, self._keystone, port_settings=port_setting, project_name=self._os_creds.project_name) if port: self.__ports.append(port) @@ -121,7 +117,7 @@ class OpenStackRouter(OpenStackNetworkObject): for port_setting in self.router_settings.port_settings: port = neutron_utils.get_port( - self._neutron, self.__keystone, port_settings=port_setting, + self._neutron, self._keystone, port_settings=port_setting, project_name=self._os_creds.project_name) logger.info( 'Retrieved port %s for router - %s', port_setting.name, @@ -184,6 +180,8 @@ class OpenStackRouter(OpenStackNetworkObject): pass self.__router = None + super(self.__class__, self).clean() + def get_router(self): """ Returns the OpenStack router object |