openstack/python-vitrageclient
Code Issues Proposed changes

template add validate fix client

Browse Source 
Change-Id: I9e78471cd2b62298742246b658632790bd0b15b0
This commit is contained in:
Idan Hefetz 2018-01-22 12:36:04 +00:00
parent c6333c448e
commit d14cdfd915
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vitrageclient/v1/cli/template.py
View File

@ -28,6 +28,10 @@ class TemplateValidate(show.ShowOne):
required=True,
help='full path for template file or templates dir'
)
parser.add_argument('--type',
choices=['standard', 'definition', 'equivalence'],
help='Template type. Valid types:'
'[standard, definition, equivalence]')
return parser
@property
@ -37,7 +41,8 @@ class TemplateValidate(show.ShowOne):
def take_action(self, parsed_args):
result = utils.get_client(self).template.validate(
path=parsed_args.path)
path=parsed_args.path,
template_type=parsed_args.type)
return self.dict2columns(result)

27
vitrageclient/v1/template.py
View File

@ -35,10 +35,11 @@ class Template(object):
url = self.url + uuid
return self.api.get(url).json()
def add(self, path, template_type):
def add(self, path, template_type=None):
"""Add a new template"""
params = dict(path=path, template_type=template_type)
files_content = self._load_yaml_files(path)
params = dict(templates=files_content, template_type=template_type)
return self.api.put(self.url, json=params).json()
def delete(self, uuid):
@ -46,7 +47,7 @@ class Template(object):
params = dict(uuid=uuid)
return self.api.delete(self.url, json=params).json()
def validate(self, path=None):
def validate(self, path, template_type=None):
"""Template validation
Make sure that the template file is correct in terms of syntax
@ -56,26 +57,30 @@ class Template(object):
directory must contain only templates)
:param path: the template file path or templates dir path
:param template_type: type of templates ('standard','definition',...)
"""
files_content = self._load_yaml_files(path)
params = dict(templates=files_content, template_type=template_type)
return self.api.post(self.url, json=params).json()
def _load_yaml_files(self, path):
if os.path.isdir(path):
templates = []
files_content = []
for file_name in os.listdir(path):
file_path = '%s/%s' % (path, file_name)
if os.path.isfile(file_path):
template = self.load_template_definition(file_path)
templates.append((file_path, template))
template = self._load_yaml_file(file_path)
files_content.append((file_path, template))
else:
templates = [(path, self.load_template_definition(path))]
files_content = [(path, self._load_yaml_file(path))]
params = dict(templates=templates)
return self.api.post(self.url, json=params).json()
return files_content
@staticmethod
def load_template_definition(path):
def _load_yaml_file(path):
with open(path, 'r') as stream:
try: