x/vmtp
Code Issues Proposed changes

Fix the issue while running VMTP from PyPI

Browse Source 
Change-Id: I16d85b82981675ee8f2eecee3f61c819514508d3
This commit is contained in:
Yichen Wang 2015-09-24 16:06:08 -07:00
parent 819d8aeb8a
commit 995c2c0a02
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmtp/config.py
View File

@ -16,9 +16,6 @@
from attrdict import AttrDict from attrdict import AttrDict
import yaml import yaml
with open('cfg.default.yaml') as fileobj:
settings = AttrDict(yaml.safe_load(fileobj))
def config_load(file_name, from_cfg=None): def config_load(file_name, from_cfg=None):
'''Load a yaml file into a config dict, merge with from_cfg if not None '''Load a yaml file into a config dict, merge with from_cfg if not None
The config file content taking precedence in case of duplicate The config file content taking precedence in case of duplicate

5
vmtp/network.py
View File

@ -15,11 +15,10 @@
import time import time
from vmtp import VmtpException
# Module containing a helper class for operating on OpenStack networks # Module containing a helper class for operating on OpenStack networks
from neutronclient.common.exceptions import NetworkInUseClient from neutronclient.common.exceptions import NetworkInUseClient
from neutronclient.common.exceptions import NeutronException from neutronclient.common.exceptions import NeutronException
import vmtp
class Network(object): class Network(object):
@ -52,7 +51,7 @@ class Network(object):
int_net = self.lookup_network(self.config.reuse_network_name) int_net = self.lookup_network(self.config.reuse_network_name)
self.vm_int_net.append(int_net) self.vm_int_net.append(int_net)
except IndexError: except IndexError:
raise VmtpException("Unable to find the network to be reused.") raise vmtp.VmtpException("Unable to find the network to be reused.")
return return
else: else:
############################################## ##############################################