diff --git a/releasenotes/notes/remove-passing-mgmt-and-infra-driver-from-client-c9135f84480b2cae.yaml b/releasenotes/notes/remove-passing-mgmt-and-infra-driver-from-client-c9135f84480b2cae.yaml new file mode 100644 index 00000000..36499942 --- /dev/null +++ b/releasenotes/notes/remove-passing-mgmt-and-infra-driver-from-client-c9135f84480b2cae.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Remove passing mgmt and infra driver from client. diff --git a/tackerclient/tacker/v1_0/vnfm/vnfd.py b/tackerclient/tacker/v1_0/vnfm/vnfd.py index 911bd975..62ac48f0 100644 --- a/tackerclient/tacker/v1_0/vnfm/vnfd.py +++ b/tackerclient/tacker/v1_0/vnfm/vnfd.py @@ -32,7 +32,7 @@ class ListVNFD(tackerV10.ListCommand): """List VNFD that belong to a given tenant.""" resource = _VNFD - list_columns = ['id', 'name', 'description', 'infra_driver', 'mgmt_driver'] + list_columns = ['id', 'name', 'description'] class ShowVNFD(tackerV10.ShowCommand): diff --git a/tackerclient/tests/unit/vm/test_cli10_vnfd.py b/tackerclient/tests/unit/vm/test_cli10_vnfd.py index 5b1069f7..45480e74 100644 --- a/tackerclient/tests/unit/vm/test_cli10_vnfd.py +++ b/tackerclient/tests/unit/vm/test_cli10_vnfd.py @@ -33,16 +33,14 @@ class CLITestV10VmVNFDJSON(test_cli10.CLITestV10Base): test_cli10.MyApp(sys.stdout), None) my_id = 'my-id' name = 'my-name' - mgmt_driver = 'noop' - infra_driver = 'heat' attr_key = 'vnfd' attr_val = 'vnfd' args = [ name, '--vnfd', 'vnfd' ] - position_names = ['name', 'mgmt_driver', 'infra_driver'] - position_values = [name, mgmt_driver, infra_driver] + position_names = ['name'] + position_values = [name] extra_body = { 'service_types': [{'service_type': 'vnfd'}], 'attributes': {attr_key: attr_val}, @@ -56,11 +54,9 @@ class CLITestV10VmVNFDJSON(test_cli10.CLITestV10Base): test_cli10.MyApp(sys.stdout), None) name = 'my_name' my_id = 'my-id' - mgmt_driver = 'noop' - infra_driver = 'heat' args = [name, '--vnfd', 'vnfd', ] - position_names = ['name', 'mgmt_driver', 'infra_driver'] - position_values = [name, mgmt_driver, infra_driver] + position_names = ['name'] + position_values = [name] extra_body = { 'service_types': [{'service_type': 'vnfd'}], 'attributes': {'vnfd': 'vnfd'} diff --git a/tackerclient/v1_0/client.py b/tackerclient/v1_0/client.py index 98ed8f3d..f28fb72b 100644 --- a/tackerclient/v1_0/client.py +++ b/tackerclient/v1_0/client.py @@ -402,13 +402,6 @@ class Client(ClientBase): _logger.warning("VNFD legacy templates are deprecated. Please " "use NFV TOSCA templates.") body[self._VNFD]['service_types'] = [{'service_type': 'vnfd'}] - _logger.warning( - "Passing infra_driver and mgmt_driver in the VNFD" - " API is deprecated. infra_driver will be automatically" - " derived from target vim type. mgmt_driver will be" - " derived from TOSCA template values.") - body[self._VNFD]['infra_driver'] = 'heat' - body[self._VNFD]['mgmt_driver'] = 'noop' return self.post(self.vnfds_path, body) @APIParamsCall