Merge "Add "Description" parameter while creating VNF with CLI."

This commit is contained in:
Jenkins 2016-08-24 21:03:57 +00:00 committed by Gerrit Code Review
commit 7a0f627e2e
2 changed files with 38 additions and 3 deletions

View File

@ -45,6 +45,9 @@ class CreateVNF(tackerV10.CreateCommand):
parser.add_argument(
'name', metavar='NAME',
help='Set a name for the VNF')
parser.add_argument(
'--description',
help='Set description for the VNF')
vnfd_group = parser.add_mutually_exclusive_group(required=True)
vnfd_group.add_argument(
'--vnfd-id',
@ -108,7 +111,8 @@ class CreateVNF(tackerV10.CreateCommand):
param_yaml = f.read()
args['attributes']['param_values'] = param_yaml
tackerV10.update_dict(parsed_args, body[self.resource],
['tenant_id', 'name', 'vnfd_id', 'vim_id'])
['tenant_id', 'name', 'description',
'vnfd_id', 'vim_id'])
return body

View File

@ -95,6 +95,7 @@ class CLITestV10VmVNFJSON(test_cli10.CLITestV10Base):
my_id = 'my-id'
vnfd_id = 'vnfd'
vim_id = 'vim_id'
description = 'my-description'
region_name = 'region'
key = 'key'
value = 'value'
@ -103,10 +104,23 @@ class CLITestV10VmVNFJSON(test_cli10.CLITestV10Base):
name,
'--vnfd-id', vnfd_id,
'--vim-id', vim_id,
'--description', description,
'--vim-region-name', region_name,
'--%s' % key, value]
position_names = ['name', 'vnfd_id', 'vim_id', 'attributes']
position_values = [name, vnfd_id, vim_id, {}]
position_names = [
'name',
'vnfd_id',
'vim_id',
'description',
'attributes'
]
position_values = [
name,
vnfd_id,
vim_id,
description,
{}
]
extra_body = {key: value, 'placement_attr': {'region_name':
region_name}}
self._test_create_resource(self._RESOURCE, cmd, name, my_id,
@ -127,6 +141,23 @@ class CLITestV10VmVNFJSON(test_cli10.CLITestV10Base):
self._test_create_resource(self._RESOURCE, cmd, name, my_id,
args, position_names, position_values)
def test_create_vnf_with_description_param(self):
cmd = vnf.CreateVNF(test_cli10.MyApp(sys.stdout), None)
name = 'my_name'
my_id = 'my-id'
vnfd_id = 'vnfd'
description = 'my-description'
args = [
name,
'--vnfd-id', vnfd_id,
'--description', description,
]
position_names = ['name', 'vnfd_id', 'description',
'attributes']
position_values = [name, vnfd_id, description, {}]
self._test_create_resource(self._RESOURCE, cmd, None, my_id,
args, position_names, position_values)
def test_list_vnfs(self):
cmd = vnf.ListVNF(test_cli10.MyApp(sys.stdout), None)
self._test_list_resources(self._RESOURCES, cmd, True)