From: KIRAN KASHALKAR Date: Wed, 25 Jan 2017 15:50:30 +0000 (-0500) Subject: Merge master -> master_vca_intg X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=266adb435d7a60ae758efb28614c80d24c05fbba;p=osm%2FUI.git Merge master -> master_vca_intg Signed-off-by: KIRAN KASHALKAR --- 266adb435d7a60ae758efb28614c80d24c05fbba diff --cc skyquake/plugins/composer/src/src/libraries/model/DescriptorModelFields.js index bdbf40382,8b86b0c0b..d8d9e58ab --- a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelFields.js +++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelFields.js @@@ -27,8 -27,7 +27,8 @@@ export default nsd: common.concat(['constituent-vnfd', 'vnffgd', 'vld']), vld: common.concat([]), vnfd: common.concat(['vdu', 'internal-vld']), - 'vnfd.vdu': common.concat(['image', 'external-interface', 'vm-flavor', 'cloud-init', 'filename']), + 'vnfd.vdu': common.concat(['image', 'image-checksum', 'external-interface', 'vm-flavor', 'cloud-init', 'filename']), + 'nsd.config-parameter-map': common.concat([]), // white-list valid fields to send in the meta field meta: ['containerPositionMap'] };