From: Rajesh <rajesh.velandy@riftio.com>
Date: Tue, 15 Nov 2016 14:44:37 +0000 (-0500)
Subject: Bug 103 -  Launchpad unable to onboard 6wind and TIDgen VNFs
X-Git-Tag: v1.0.2^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fv1.0;p=osm%2Fdescriptor-packages.git

Bug 103 -  Launchpad unable to onboard 6wind and TIDgen VNFs

Signed-off-by: Rajesh <rajesh.velandy@riftio.com>
---

diff --git a/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml b/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml
index 94e5097..3e7d129 100644
--- a/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml
+++ b/src/vnfd/6wind_vnf/6WindTR1.1.2__vnfd.yaml
@@ -186,13 +186,20 @@ vnfd:vnfd-catalog:
                     node-cnt: '1'
             host-epa:
                 om-cpu-feature:
-                - 64b
-                - iommu
-                - lps
-                - tlbps
-                - hwsv
-                - dioc
-                - ht
+                - 
+                  feature: 64b
+                - 
+                  feature: iommu
+                - 
+                  feature: lps
+                - 
+                  feature: tlbps
+                - 
+                  feature: hwsv
+                - 
+                  feature: dioc
+                - 
+                  feature: ht
                 om-cpu-model-string: Intel(R) Xeon(R) CPU E5-4620 0 @ 2.20GHz
             hypervisor-epa:
                 type: REQUIRE_KVM
diff --git a/src/vnfd/tidgen_mwc16_vnf/mwc16gen1__vnfd.yaml b/src/vnfd/tidgen_mwc16_vnf/mwc16gen1__vnfd.yaml
index 204c8c9..4142792 100644
--- a/src/vnfd/tidgen_mwc16_vnf/mwc16gen1__vnfd.yaml
+++ b/src/vnfd/tidgen_mwc16_vnf/mwc16gen1__vnfd.yaml
@@ -74,13 +74,20 @@ vnfd:vnfd-catalog:
                     node-cnt: '1'
             host-epa:
                 om-cpu-feature:
-                - 64b
-                - iommu
-                - lps
-                - tlbps
-                - hwsv
-                - dioc
-                - ht
+                - 
+                  feature: 64b
+                - 
+                  feature: iommu
+                - 
+                  feature: lps
+                - 
+                  feature: tlbps
+                - 
+                  feature: hwsv
+                - 
+                  feature: dioc
+                - 
+                  feature: ht
                 om-cpu-model-string: Intel(R) Xeon(R) CPU E5-4620 0 @ 2.20GHz
             hypervisor-epa:
                 type: REQUIRE_KVM