Add new example descriptors and update previous ones

[osm/IM.git] / augments / examples / vnfd_new.yaml

diff --git a/augments/examples/vnfd_new.yaml b/augments/examples/vnfd_new.yaml
index 3673bed..f4e82a9 100644 (file)
--- a/augments/examples/vnfd_new.yaml
+++ b/augments/examples/vnfd_new.yaml
@@ -17,64 +17,50 @@
 
 vnfd:
   id: vnfd
-
-  mgmt-interface:
-    cp: vnf-mgmt
+  mgmt-cp: vnf-mgmt
 
   ext-cpd:
-    - id: vnf-mgmt # Name and id are redundant. Merged into id.
-      short-name: vnf-mgmt
-      type: VPORT
-    - id: vnf-data
-      short-name: vnf-data
-      type: VPORT
+    - id: vnf-mgmt-ext
+      int-cpd:
+        vdu-id: mgmtVM
+        cpd: vnf-mgmt-int
+    - id: vnf-data-ext
+      int-cpd:
+        vdu-id: dataVM
+        cpd: vnf-data-int
 
   int-virtual-link-desc:
-    - id: internal # Name and id are redundant. Merged into id.
-      short-name: internal
-      type: ELAN # Is this used? If it is I'll include it in an augment.
+    - id: internal
 
   vdu:
     - id: mgmtVM
-
-      interface:
-        - name: mgmtVM-eth0
-          position: "1"
-          type: EXTERNAL
-          virtual-interface:
-            type: VIRTIO
-          external-connection-point-ref: vnf-mgmt
-        - name: mgmtVM-eth1
-          position: "2"
-          type: INTERNAL
-          virtual-interface:
-            type: VIRTIO
-          internal-connection-point-ref: mgmtVM-internal
-
       int-cpd:
+        - id: vnf-mgmt-int
+          virtual-network-interface-requirement:
+            - name: mgmtVM-eth0
+              position: "1"
+              virtual-interface:
+                type: VIRTIO
         - id: mgmtVM-internal
-          short-name: mgmtVM-internal
-          type: VPORT
-          int-virtual-link-desc: internal # In SOL006 the reference is from CPD to VLD
+          int-virtual-link-desc: internal
+          virtual-network-interface-requirement:
+            - name: mgmtVM-eth1
+              position: "2"
+              virtual-interface:
+                type: VIRTIO
 
     - id: dataVM
-
-      interface:
-        - name: dataVM-eth0
-          position: "1"
-          type: INTERNAL
-          virtual-interface:
-            type: VIRTIO
-          internal-connection-point-ref: dataVM-internal
-        - name: dataVM-xe0
-          position: "2"
-          type: EXTERNAL
-          virtual-interface:
-            type: VIRTIO
-          external-connection-point-ref: vnf-data
-
       int-cpd:
-        - id: dataVM-eth0
-          short-name: dataVM-internal
-          type: VPORT
-          int-virtual-link-desc: internal # In SOL006 the reference is from CPD to VLD
+        - id: dataVM-internal
+          int-virtual-link-desc: internal
+          virtual-network-interface-requirement:
+            - name: dataVM-eth0
+              position: "1"
+              virtual-interface:
+                type: VIRTIO
+        - id: vnf-data-int
+          virtual-network-interface-requirement:
+            - name: dataVM-xe0
+              position: "2"
+              virtual-interface:
+                type: VIRTIO