From 273e022e417f6fff1a7b5c7ec6a41b48e31b5eba Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <isaku.yamahata@intel.com>
Date: Sat, 2 May 2015 15:38:57 -0700
Subject: [PATCH] device, vnf: name column support

Change-Id: Idfe5dc951b0cac24e5c5a8997d5c0bf2b2b976e4
---
 tackerclient/tacker/v1_0/vm/device.py | 3 +++
 tackerclient/tacker/v1_0/vm/vnf.py    | 5 ++++-
 tackerclient/v1_0/client.py           | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tackerclient/tacker/v1_0/vm/device.py b/tackerclient/tacker/v1_0/vm/device.py
index 7f95b430..420e23b7 100644
--- a/tackerclient/tacker/v1_0/vm/device.py
+++ b/tackerclient/tacker/v1_0/vm/device.py
@@ -48,6 +48,9 @@ class CreateDevice(tackerV10.CreateCommand):
     resource = _DEVICE
 
     def add_known_arguments(self, parser):
+        parser.add_argument(
+            '--name',
+            help='Set a name for the devicef')
         parser.add_argument(
             '--device-template-id',
             required=True,
diff --git a/tackerclient/tacker/v1_0/vm/vnf.py b/tackerclient/tacker/v1_0/vm/vnf.py
index 79022cc3..dcbee57a 100644
--- a/tackerclient/tacker/v1_0/vm/vnf.py
+++ b/tackerclient/tacker/v1_0/vm/vnf.py
@@ -45,6 +45,9 @@ class CreateVNF(tackerV10.CreateCommand):
     resource = _VNF
 
     def add_known_arguments(self, parser):
+        parser.add_argument(
+            '--name',
+            help='Set a name for the vnf')
         parser.add_argument(
             '--vnfd-id',
             required=True,
@@ -66,7 +69,7 @@ class CreateVNF(tackerV10.CreateCommand):
             body[self.resource]['config'] = parsed_args.config
 
         tackerV10.update_dict(parsed_args, body[self.resource],
-                              ['tenant_id', 'vnfd_id'])
+                              ['tenant_id', 'name', 'vnfd_id'])
         return body
 
 
diff --git a/tackerclient/v1_0/client.py b/tackerclient/v1_0/client.py
index c50215d3..32614198 100644
--- a/tackerclient/v1_0/client.py
+++ b/tackerclient/v1_0/client.py
@@ -461,8 +461,9 @@ class Client(ClientBase):
         arg_ = {
             'template_id': arg['vnfd_id'],
         }
-        if 'tenant_id' in arg:
-            arg_['tenant_id'] = arg['tenant_id']
+        for key in ('tenant_id', 'name'):
+            if key in arg:
+                arg_[key] = arg[key]
         if 'config' in arg:
             arg_['attributes'] = {'config': arg['config']}
         body_ = {self._DEVICE: arg_}