From 480a86f6059bd46dc53e1996d89d67afa80b866f Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <isaku.yamahata@intel.com>
Date: Fri, 1 May 2015 07:26:04 -0700
Subject: [PATCH] vnfd, vnf: command options

Change-Id: I34cc7ab9b77facddb9c26f93a003f273b709e7f0
---
 tackerclient/tacker/v1_0/vm/vnf.py  | 22 ++++------------------
 tackerclient/tacker/v1_0/vm/vnfd.py |  4 +---
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/tackerclient/tacker/v1_0/vm/vnf.py b/tackerclient/tacker/v1_0/vm/vnf.py
index 838a370d..32bb7377 100644
--- a/tackerclient/tacker/v1_0/vm/vnf.py
+++ b/tackerclient/tacker/v1_0/vm/vnf.py
@@ -54,15 +54,10 @@ class CreateVNF(tackerV10.CreateCommand):
             help='vnfd id to instantiate vnf based on')
         parser.add_argument(
             '--config-file',
-            action='append',
             help='specify config yaml file')
         parser.add_argument(
             '--config',
-            metavar='<key>=<value>',
-            action='append',
-            dest='configs',
-            default=[],
-            help='vnf config')
+            help='specify config yaml file')
 
     def args2body(self, parsed_args):
         body = {
@@ -71,20 +66,11 @@ class CreateVNF(tackerV10.CreateCommand):
             }
         }
         if parsed_args.config_file:
-            with open(parsed_args.config_file[0]) as f:
+            with open(parsed_args.config_file) as f:
                 config_yaml = f.read()
             body[self.resource]['attributes'] = {'config': config_yaml}
-        if parsed_args.configs:
-            try:
-                configs = dict(key_value.split('=', 1)
-                               for key_value in parsed_args.configs)
-            except ValueError:
-                msg = (_('invalid argument for --config %s') %
-                       parsed_args.configs)
-                raise exceptions.TackerCLIError(msg)
-            if configs:
-                body[self.resource].setdefault(
-                    'attributes', {}).update(configs)
+        if parsed_args.config:
+            body[self.resource]['attributes'] = {'config': parsed_args.config}
 
         tackerV10.update_dict(parsed_args, body[self.resource], ['tenant_id'])
         return body
diff --git a/tackerclient/tacker/v1_0/vm/vnfd.py b/tackerclient/tacker/v1_0/vm/vnfd.py
index 0eaa0e7c..d500e35b 100644
--- a/tackerclient/tacker/v1_0/vm/vnfd.py
+++ b/tackerclient/tacker/v1_0/vm/vnfd.py
@@ -51,11 +51,9 @@ class CreateVNFD(tackerV10.CreateCommand):
             help='Set a description for the vnfd')
         parser.add_argument(
             '--vnfd-file',
-            action='append',
             help='specify vnfd file')
         parser.add_argument(
             '--vnfd',
-            action='append',
             help='specify vnfd')
 
     def args2body(self, parsed_args):
@@ -67,7 +65,7 @@ class CreateVNFD(tackerV10.CreateCommand):
             }
         }
         if parsed_args.vnfd_file:
-            with open(parsed_args.vnfd_file[0]) as f:
+            with open(parsed_args.vnfd_file) as f:
                 vnfd = f.read()
         if parsed_args.vnfd:
             vnfd = parsed_args.vnfd