Adds descriptor translation logic from OSMv8 IM to SOL006 models

[osm/IM.git] / tests / examples / alternative_image_sol006.yaml

diff --git a/tests/examples/alternative_image_sol006.yaml b/tests/examples/alternative_image_sol006.yaml
index 446eae4..74ffe93 100644 (file)
--- a/tests/examples/alternative_image_sol006.yaml
+++ b/tests/examples/alternative_image_sol006.yaml
@@ -18,60 +18,57 @@ vnfd:
   product-name: hackfest_basic-vnf
   description: A basic VNF descriptor w/ one VDU
   version: "1.0"
-  mgmt-cp: vnf-cp0
+  mgmt-cp: vnf-cp0-ext
 
   virtual-compute-desc:
-    - id: cirros-compute
+    - id: hackfest_basic-VM-compute
       virtual-cpu:
         num-virtual-cpu: 1
       virtual-memory:
         size: 1 # Memory size in GB
 
   virtual-storage-desc:
-    - id: cirros-storage
+    - id: hackfest_basic-VM-storage
       size-of-storage: 10
 
   sw-image-desc:
     - id: ubuntu1604
       name: ubuntu1604
-      checksum:
-        hash: # Mandatory?
-    - id: ubuntu1604-aws
-      name: ubuntu1604-aws
+      image: ubuntu1604
+    - id: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+      name: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
       image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
       vim-type: aws
-      checksum:
-        hash: # Mandatory?
 
   vdu:
     - id: hackfest_basic-VM
       name: hackfest_basic-VM
-      virtual-compute-desc: cirros-compute
+      virtual-compute-desc: hackfest_basic-VM-compute
       virtual-storage-desc:
-        - cirros-storage
+        - hackfest_basic-VM-storage
       sw-image-desc: ubuntu1604
       alternative-sw-image-desc:
-        - ubuntu1604-aws
+        - ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
       int-cpd:
-        - id: eth0-int
+        - id: vdu-eth0-int
           virtual-network-interface-requirement:
             - name: vdu-eth0
               virtual-interface:
                 type: PARAVIRT
 
   df:
-    - id: cirros_default
+    - id: default-df
       vdu-profile:
         - id: hackfest_basic-VM
           min-number-of-instances: 1
       instantiation-level:
-        - id: default
+        - id: default-instantiation-level
           vdu-level:
             - vdu-id: hackfest_basic-VM
               number-of-instances: 1
 
   ext-cpd:
-    - id: vnf-cp0
+    - id: vnf-cp0-ext
       int-cpd: # Connection to int-cpd
         vdu-id: hackfest_basic-VM
-        cpd: eth0-int
+        cpd: vdu-eth0-int