--- /dev/null
+#
+# Copyright 2019 Whitestack LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+--- /tmp/sol006_model/src/yang/etsi-nfv-ns.yang 2019-12-04 14:26:39.453144459 +0000
++++ /tmp/sol006_model/src/yang/etsi-nfv-ns_new.yang 2019-12-04 14:28:34.659419362 +0000
+@@ -159,7 +159,7 @@
+ "GS NFV IFA014: Section 6.2.3.2 Sapd information element";
+ }
+
+- choice associated-cpd-id {
++ //choice associated-cpd-id {
+ container vnf {
+ leaf vnfd-id {
+ mandatory true;
+@@ -209,7 +209,7 @@
+ }
+ }
+ }
+- }
++ //}
+ }
+ }
+