From: Rajesh Velandy <rajesh.velandy@riftio.com>
Date: Mon, 25 Sep 2017 15:15:25 +0000 (+0000)
Subject: Fixed the vnfd-model which removed Adam's changes doing merge resolution
X-Git-Tag: v3.0.0rc02~1
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=ce30ffe01241f5ffb2e7bb860dfbcfac4795902c;ds=sidebyside

Fixed the vnfd-model which removed Adam's changes doing merge resolution

Change-Id: I89c792103f3413c360069d4d8004d60acc4adb1a
---

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 5d76290..c2eae35 100644
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -160,7 +160,10 @@ module vnfd-base
         type string;
       }
 
-      uses manotypes:vca-configuration;
+
+      container vnf-configuration {
+        uses manotypes:vca-configuration;
+      }
 
       container mgmt-interface {
         description
@@ -365,6 +368,10 @@ module vnfd-base
 
         uses manotypes:image-properties;
 
+        container vdu-configuration {
+          uses manotypes:vca-configuration;
+        }
+
         choice cloud-init-input {
           description
             "Indicates how the contents of cloud-init script are provided.