openstack/vitrage
Code Issues Proposed changes

fixed getting path of generator file

Browse Source 
Change-Id: I8e13282d24400e3b1c3bc62a25eaec340b07dd67
This commit is contained in:
Elisha Rosensweig 2015-12-08 10:13:13 +02:00
parent 9488663c13
commit c7942a5d85
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vitrage/tests/mocks/entity_model.py
View File

@ -32,7 +32,8 @@ class CommonEntityModel(object):
for v in values: for v in values:
self.set_param(v[0], v[1]) self.set_param(v[0], v[1])
def get_params(self): @property
def params(self):
return self.current return self.current
def set_param(self, key, value=None): def set_param(self, key, value=None):

26
vitrage/tests/mocks/mock_generators.py
View File

@ -23,19 +23,35 @@ multiple instances of the same entity type.
""" """
import random from os.path import curdir
from os import walk
from random import randint
from entity_model import CommonEntityModel as cem from entity_model import CommonEntityModel as cem
def _get_filename_path(filename):
base_dir = None
for i in walk("../%s" % curdir):
if i[0].find('resources') != -1 and filename in i[2]:
base_dir = i[0]
break
if base_dir is None:
raise IOError("No file {0} in resources folder".format(filename))
else:
return '{0}/{1}'.format(base_dir, filename)
class MockEventGenerator(object): class MockEventGenerator(object):
"""Represents a single generator. """Represents a single generator.
A generator can generate events for several instances of the same type A generator can generate events for several instances of the same type
file is expected to be in the ../resources folder
""" """
def __init__(self, filename, instance_num, generator_name='generator'): def __init__(self, filename, instance_num, generator_name='generator'):
self.config_file = filename self.config_file = _get_filename_path(filename)
self.static_params = {} self.static_params = {}
self.dynamic_params = {} self.dynamic_params = {}
self.instance_num = instance_num self.instance_num = instance_num
@ -59,7 +75,7 @@ class MockEventGenerator(object):
param_type = line_params[1].lower() param_type = line_params[1].lower()
params_dict[param_type][line_params[0]] = line_params[2] params_dict[param_type][line_params[0]] = line_params[2]
except KeyError as ke: except KeyError as ke:
print("Syntax error ({0}): {1}".format(ke.errno, ke.strerror)) print("Syntax error: {0}".format(ke.message))
def prepare_instance_models(self): def prepare_instance_models(self):
"""Create the models for all the instances """ """Create the models for all the instances """
@ -81,7 +97,7 @@ class MockEventGenerator(object):
data_stream = [] data_stream = []
for _ in xrange(event_num): for _ in xrange(event_num):
model = self.models[random.randint(0, self.instance_num - 1)] model = self.models[randint(0, self.instance_num - 1)]
model.generate_dynamic_params() model.generate_dynamic_params()
data_stream.append(model.get_params()) data_stream.append(model.params)
return data_stream return data_stream

2
vitrage/tests/mocks/mock_syncronizer.py
View File

@ -20,7 +20,7 @@ of what can be returned
usage example: usage example:
test_entity_spec_list = [ test_entity_spec_list = [
{'filename': '../resources/mock_nova_instance_snapshot_config_1.txt', {'filename': '../resources/mock_nova_instance_config_1.txt',
'#instances': 10, '#instances': 10,
'name': 'Instance (vm) generator' 'name': 'Instance (vm) generator'
} }