projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Feature : Addtional changes for VNF access point support
[osm/SO.git]
/
common
/
python
/
rift
/
mano
/
config_data
/
config.py
diff --git
a/common/python/rift/mano/config_data/config.py
b/common/python/rift/mano/config_data/config.py
index
63a2e48
..
5210904
100644
(file)
--- a/
common/python/rift/mano/config_data/config.py
+++ b/
common/python/rift/mano/config_data/config.py
@@
-250,7
+250,7
@@
class ConfigPrimitiveConvertor(object):
def extract_vnfd_config(self, vnfd, format="yaml"):
config_prim = None
try:
def extract_vnfd_config(self, vnfd, format="yaml"):
config_prim = None
try:
- config_prim = vnfd.vnf_configuration.
service
_primitive
+ config_prim = vnfd.vnf_configuration.
config
_primitive
except AttributeError:
pass
except AttributeError:
pass
@@
-339,7
+339,7
@@
class ConfigPrimitiveConvertor(object):
vnfd_init_cfg_prim_msg.append(prim)
def merge_vnfd_config(self, vnfd, input_data):
vnfd_init_cfg_prim_msg.append(prim)
def merge_vnfd_config(self, vnfd, input_data):
- for config_primitive in vnfd.vnf_configuration.
service
_primitive:
+ for config_primitive in vnfd.vnf_configuration.
config
_primitive:
try:
cfg = input_data[self.CONFIG_PRIMITIVE][config_primitive.name]
except KeyError:
try:
cfg = input_data[self.CONFIG_PRIMITIVE][config_primitive.name]
except KeyError: