openstack/python-tackerclient
Code Issues Proposed changes

Merge "Revert "Creates details API to fetch VNF detials""

Browse Source
This commit is contained in:
Jenkins
2016-08-25 21:55:25 +00:00
committed by Gerrit Code Review
parent 7a0f627e2e cc0a66884b
commit 7f829587b0
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tackerclient/tacker/v1_0/__init__.py
View File

@@ -671,9 +671,7 @@ class ShowCommand(TackerCommand, show.ShowOne):
params = {} params = {}
if parsed_args.show_details: if parsed_args.show_details:
method_name = 'show_%s_details' % self.resource params = {'verbose': 'True'}
else:
method_name = 'show_%s' % self.resource
if parsed_args.fields: if parsed_args.fields:
params = {'fields': parsed_args.fields} params = {'fields': parsed_args.fields}
if self.allow_names: if self.allow_names:
@@ -682,10 +680,8 @@ class ShowCommand(TackerCommand, show.ShowOne):
else: else:
_id = parsed_args.id _id = parsed_args.id
obj_shower = getattr(tacker_client, method_name) obj_shower = getattr(tacker_client, "show_%s" % self.resource)
data = obj_shower(_id, **params) data = obj_shower(_id, **params)
if parsed_args.show_details:
data[self.resource] = data.pop('details')[0]
self.format_output_data(data) self.format_output_data(data)
resource = data[self.resource] resource = data[self.resource]
if self.resource in data: if self.resource in data:

5
tackerclient/v1_0/client.py
View File

@@ -339,7 +339,6 @@ class Client(ClientBase):
vnfs_path = '/vnfs' vnfs_path = '/vnfs'
vnf_path = '/vnfs/%s' vnf_path = '/vnfs/%s'
vnf_scale_path = '/vnfs/%s/actions' vnf_scale_path = '/vnfs/%s/actions'
vnf_detail = '/vnfs/%s/details'
vims_path = '/vims' vims_path = '/vims'
vim_path = '/vims/%s' vim_path = '/vims/%s'
@@ -414,10 +413,6 @@ class Client(ClientBase):
def show_vnf(self, vnf, **_params): def show_vnf(self, vnf, **_params):
return self.get(self.vnf_path % vnf, params=_params) return self.get(self.vnf_path % vnf, params=_params)
@APIParamsCall
def show_vnf_details(self, vnf, **_params):
return self.get(self.vnf_detail % vnf, params=_params)
@APIParamsCall @APIParamsCall
def create_vnf(self, body=None): def create_vnf(self, body=None):
return self.post(self.vnfs_path, body=body) return self.post(self.vnfs_path, body=body)