diff --git a/releasenotes/notes/vnfd-vnf-vim-name-mandatory-in-tacker-cli-dfe802af6de5c80e.yaml b/releasenotes/notes/vnfd-vnf-vim-name-mandatory-in-tacker-cli-dfe802af6de5c80e.yaml new file mode 100644 index 00000000..55d3bec0 --- /dev/null +++ b/releasenotes/notes/vnfd-vnf-vim-name-mandatory-in-tacker-cli-dfe802af6de5c80e.yaml @@ -0,0 +1,3 @@ +--- +features: + - Made VNFD/VNF/VIM names mandatory in tacker CLI. diff --git a/tackerclient/tacker/v1_0/nfvo/vim.py b/tackerclient/tacker/v1_0/nfvo/vim.py index 59f48a0b..9d59d9cd 100644 --- a/tackerclient/tacker/v1_0/nfvo/vim.py +++ b/tackerclient/tacker/v1_0/nfvo/vim.py @@ -50,7 +50,7 @@ class CreateVIM(tackerV10.CreateCommand): group.add_argument('--config', help='Specify VIM config parameters ' 'as a direct input') parser.add_argument( - '--name', + 'name', metavar='NAME', help='Set a name for the VIM') parser.add_argument( '--description', diff --git a/tackerclient/tacker/v1_0/vm/vnf.py b/tackerclient/tacker/v1_0/vm/vnf.py index 97f7b496..b7732018 100644 --- a/tackerclient/tacker/v1_0/vm/vnf.py +++ b/tackerclient/tacker/v1_0/vm/vnf.py @@ -43,7 +43,7 @@ class CreateVNF(tackerV10.CreateCommand): def add_known_arguments(self, parser): parser.add_argument( - '--name', + 'name', metavar='NAME', help='Set a name for the VNF') vnfd_group = parser.add_mutually_exclusive_group(required=True) vnfd_group.add_argument( diff --git a/tackerclient/tacker/v1_0/vm/vnfd.py b/tackerclient/tacker/v1_0/vm/vnfd.py index 1e0a34c3..d1f11f2d 100644 --- a/tackerclient/tacker/v1_0/vm/vnfd.py +++ b/tackerclient/tacker/v1_0/vm/vnfd.py @@ -48,7 +48,7 @@ class CreateVNFD(tackerV10.CreateCommand): group.add_argument('--vnfd-file', help='Specify VNFD file') group.add_argument('--vnfd', help='Specify VNFD') parser.add_argument( - '--name', + 'name', metavar='NAME', help='Set a name for the VNFD') parser.add_argument( '--description', diff --git a/tackerclient/tests/unit/vm/test_cli10_vim.py b/tackerclient/tests/unit/vm/test_cli10_vim.py index e9b91de2..cba62816 100644 --- a/tackerclient/tests/unit/vm/test_cli10_vim.py +++ b/tackerclient/tests/unit/vm/test_cli10_vim.py @@ -41,27 +41,34 @@ class CLITestV10VIMJSON(test_cli10.CLITestV10Base): def test_register_vim_all_params(self): cmd = vim.CreateVIM(test_cli10.MyApp(sys.stdout), None) + name = 'my-name' my_id = 'my-id' - name = 'test_vim' description = 'Vim Description' vim_config = {'auth_url': 'http://1.2.3.4:5000', 'username': 'xyz', 'password': '12345', 'project_name': 'abc', 'project_domain_name': 'prj_domain_name', 'user_domain_name': 'user_domain_name'} args = [ + name, '--config', str(vim_config), - '--name', name, - '--description', description] - position_names = ['auth_cred', 'vim_project', 'auth_url'] - position_values = [self.auth_cred, self.vim_project, self.auth_url] - extra_body = {'type': 'openstack', 'name': name, 'description': - description, 'is_default': False} - self._test_create_resource(self._RESOURCE, cmd, None, my_id, + '--description', description, + ] + position_names = ['name', 'auth_cred', 'vim_project', 'auth_url'] + position_values = [ + name, + self.auth_cred, + self.vim_project, + self.auth_url + ] + extra_body = {'type': 'openstack', 'description': description, + 'is_default': False} + self._test_create_resource(self._RESOURCE, cmd, name, my_id, args, position_names, position_values, extra_body=extra_body) def test_register_vim_with_mandatory_params(self): cmd = vim.CreateVIM(test_cli10.MyApp(sys.stdout), None) + name = 'my-name' my_id = 'my-id' vim_config = {'auth_url': 'http://1.2.3.4:5000', 'username': 'xyz', @@ -69,12 +76,18 @@ class CLITestV10VIMJSON(test_cli10.CLITestV10Base): 'project_domain_name': 'prj_domain_name', 'user_domain_name': 'user_domain_name'} args = [ + name, '--config', str(vim_config), ] - position_names = ['auth_cred', 'vim_project', 'auth_url'] - position_values = [self.auth_cred, self.vim_project, self.auth_url] + position_names = ['name', 'auth_cred', 'vim_project', 'auth_url'] + position_values = [ + name, + self.auth_cred, + self.vim_project, + self.auth_url + ] extra_body = {'type': 'openstack', 'is_default': False} - self._test_create_resource(self._RESOURCE, cmd, None, my_id, args, + self._test_create_resource(self._RESOURCE, cmd, name, my_id, args, position_names, position_values, extra_body=extra_body) diff --git a/tackerclient/tests/unit/vm/test_cli10_vnf.py b/tackerclient/tests/unit/vm/test_cli10_vnf.py index 358aa6bc..6d2025c7 100644 --- a/tackerclient/tests/unit/vm/test_cli10_vnf.py +++ b/tackerclient/tests/unit/vm/test_cli10_vnf.py @@ -91,6 +91,7 @@ class CLITestV10VmVNFJSON(test_cli10.CLITestV10Base): def test_create_vnf_all_params(self): cmd = vnf.CreateVNF(test_cli10.MyApp(sys.stdout), None) + name = 'my_name' my_id = 'my-id' vnfd_id = 'vnfd' vim_id = 'vim_id' @@ -99,28 +100,31 @@ class CLITestV10VmVNFJSON(test_cli10.CLITestV10Base): value = 'value' args = [ + name, '--vnfd-id', vnfd_id, '--vim-id', vim_id, '--vim-region-name', region_name, '--%s' % key, value] - position_names = ['vnfd_id', 'vim_id', 'attributes'] - position_values = [vnfd_id, vim_id, {}] + position_names = ['name', 'vnfd_id', 'vim_id', 'attributes'] + position_values = [name, vnfd_id, vim_id, {}] extra_body = {key: value, 'placement_attr': {'region_name': region_name}} - self._test_create_resource(self._RESOURCE, cmd, None, my_id, + self._test_create_resource(self._RESOURCE, cmd, name, my_id, args, position_names, position_values, extra_body=extra_body) def test_create_vnf_with_mandatory_params(self): cmd = vnf.CreateVNF(test_cli10.MyApp(sys.stdout), None) + name = 'my_name' my_id = 'my-id' vnfd_id = 'vnfd' args = [ + name, '--vnfd-id', vnfd_id, ] - position_names = ['vnfd_id', 'attributes'] - position_values = [vnfd_id, {}] - self._test_create_resource(self._RESOURCE, cmd, None, my_id, + position_names = ['name', 'vnfd_id', 'attributes'] + position_values = [name, vnfd_id, {}] + self._test_create_resource(self._RESOURCE, cmd, name, my_id, args, position_names, position_values) def test_list_vnfs(self): diff --git a/tackerclient/tests/unit/vm/test_cli10_vnfd.py b/tackerclient/tests/unit/vm/test_cli10_vnfd.py index 06a175a2..e8fee88a 100644 --- a/tackerclient/tests/unit/vm/test_cli10_vnfd.py +++ b/tackerclient/tests/unit/vm/test_cli10_vnfd.py @@ -38,7 +38,7 @@ class CLITestV10VmVNFDJSON(test_cli10.CLITestV10Base): attr_key = 'vnfd' attr_val = 'vnfd' args = [ - '--name', name, + name, '--vnfd', 'vnfd' ] position_names = ['name', 'mgmt_driver', 'infra_driver'] @@ -54,17 +54,18 @@ class CLITestV10VmVNFDJSON(test_cli10.CLITestV10Base): def test_create_vnfd_with_mandatory_params(self): cmd = vnfd.CreateVNFD( test_cli10.MyApp(sys.stdout), None) + name = 'my_name' my_id = 'my-id' mgmt_driver = 'noop' infra_driver = 'heat' - args = ['--vnfd', 'vnfd', ] - position_names = ['mgmt_driver', 'infra_driver'] - position_values = [mgmt_driver, infra_driver] + args = [name, '--vnfd', 'vnfd', ] + position_names = ['name', 'mgmt_driver', 'infra_driver'] + position_values = [name, mgmt_driver, infra_driver] extra_body = { 'service_types': [{'service_type': 'vnfd'}], 'attributes': {'vnfd': 'vnfd'} } - self._test_create_resource(self._RESOURCE, cmd, None, my_id, + self._test_create_resource(self._RESOURCE, cmd, name, my_id, args, position_names, position_values, extra_body=extra_body)