x/quark
Code Issues Proposed changes

Merge pull request #23 from jkoelker/config_fix

Browse Source 
Remove using configparser
This commit is contained in:
Trey Morris
2013-03-21 14:38:10 -07:00
parent 6327cb16fa 8df9b5f630
commit 1895cc4ea2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
quark/drivers/nvp_driver.py
View File

@@ -17,7 +17,7 @@
NVP client driver for Quark
"""
import ConfigParser
from oslo.config import cfg
from oslo.config import cfg
@@ -39,9 +39,9 @@ nvp_opts = [
cfg.IntOpt('max_ports_per_switch',
default=0,
help=_('Maximum amount of NVP ports on an NVP lswitch')),
cfg.StrOpt('DEFAULT_TZ_UUID',
cfg.StrOpt('default_tz',
help=_('The default transport zone UUID')),
cfg.StrOpt('NVP_CONTROLLER_CONNECTIONS',
cfg.StrOpt('controller_connections',
help=_('NVP Controller connection string')),
]
@@ -55,15 +55,13 @@ class NVPDriver(base.BaseDriver):
self.max_ports_per_switch = 0
def load_config(self, path):
config = ConfigParser.ConfigParser()
config.read(path)
default_tz = CONF.NVP.DEFAULT_TZ_UUID
connections = CONF.NVP.NVP_CONTROLLER_CONNECTIONS
default_tz = CONF.NVP.default_tz
connections = CONF.NVP.controller_connections
self.max_ports_per_switch = CONF.NVP.max_ports_per_switch
for conn in connections.split():
(ip, port, user, pw, req_timeout,
http_timeout, retries, redirects) =\
config.get("NVP", conn).split(":")
http_timeout, retries, redirects) = conn.split(":")
self.nvp_connections.append(dict(ip_address=ip,
port=port,
username=user,