vnfd, vnf: command options
Change-Id: I34cc7ab9b77facddb9c26f93a003f273b709e7f0
This commit is contained in:
@@ -54,15 +54,10 @@ class CreateVNF(tackerV10.CreateCommand):
|
|||||||
help='vnfd id to instantiate vnf based on')
|
help='vnfd id to instantiate vnf based on')
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'--config-file',
|
'--config-file',
|
||||||
action='append',
|
|
||||||
help='specify config yaml file')
|
help='specify config yaml file')
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'--config',
|
'--config',
|
||||||
metavar='<key>=<value>',
|
help='specify config yaml file')
|
||||||
action='append',
|
|
||||||
dest='configs',
|
|
||||||
default=[],
|
|
||||||
help='vnf config')
|
|
||||||
|
|
||||||
def args2body(self, parsed_args):
|
def args2body(self, parsed_args):
|
||||||
body = {
|
body = {
|
||||||
@@ -71,20 +66,11 @@ class CreateVNF(tackerV10.CreateCommand):
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if parsed_args.config_file:
|
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()
|
config_yaml = f.read()
|
||||||
body[self.resource]['attributes'] = {'config': config_yaml}
|
body[self.resource]['attributes'] = {'config': config_yaml}
|
||||||
if parsed_args.configs:
|
if parsed_args.config:
|
||||||
try:
|
body[self.resource]['attributes'] = {'config': parsed_args.config}
|
||||||
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)
|
|
||||||
|
|
||||||
tackerV10.update_dict(parsed_args, body[self.resource], ['tenant_id'])
|
tackerV10.update_dict(parsed_args, body[self.resource], ['tenant_id'])
|
||||||
return body
|
return body
|
||||||
|
@@ -51,11 +51,9 @@ class CreateVNFD(tackerV10.CreateCommand):
|
|||||||
help='Set a description for the vnfd')
|
help='Set a description for the vnfd')
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'--vnfd-file',
|
'--vnfd-file',
|
||||||
action='append',
|
|
||||||
help='specify vnfd file')
|
help='specify vnfd file')
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'--vnfd',
|
'--vnfd',
|
||||||
action='append',
|
|
||||||
help='specify vnfd')
|
help='specify vnfd')
|
||||||
|
|
||||||
def args2body(self, parsed_args):
|
def args2body(self, parsed_args):
|
||||||
@@ -67,7 +65,7 @@ class CreateVNFD(tackerV10.CreateCommand):
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if parsed_args.vnfd_file:
|
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()
|
vnfd = f.read()
|
||||||
if parsed_args.vnfd:
|
if parsed_args.vnfd:
|
||||||
vnfd = parsed_args.vnfd
|
vnfd = parsed_args.vnfd
|
||||||
|
Reference in New Issue
Block a user