Merge branch 'alternative-sw-image-desc' into 'master'

Updated hackfest_basic_vnf for testing alternative-sw-image-desc

See merge request !119

hackfest_basic_vnf/hackfest_basic_vnfd.yaml

@@ -20,27 +20,27 @@ vnfd:
   product-name: hackfest_basic-vnf
   sw-image-desc:
   - id: ubuntu16.04
-    image: ubuntu16.04
     name: ubuntu16.04
-  - id: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+    image: ubuntu16.04
+  - id: ubuntu16.04-aws
+    name: ubuntu16.04-aws
     image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
-    name: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
     vim-type: aws
   vdu:
-  - alternative-sw-image-desc:
-    - ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
-    id: hackfest_basic-VM
+  - id: hackfest_basic-VM
+    name: hackfest_basic-VM
+    sw-image-desc: ubuntu16.04
+    alternative-sw-image-desc:
+    - ubuntu16.04-aws
+    virtual-compute-desc: hackfest_basic-VM-compute
+    virtual-storage-desc:
+    - hackfest_basic-VM-storage
     int-cpd:
     - id: vdu-eth0-int
       virtual-network-interface-requirement:
       - name: vdu-eth0
         virtual-interface:
           type: PARAVIRT
-    name: hackfest_basic-VM
-    sw-image-desc: ubuntu16.04
-    virtual-compute-desc: hackfest_basic-VM-compute
-    virtual-storage-desc:
-    - hackfest_basic-VM-storage
   version: '1.0'
   virtual-compute-desc:
   - id: hackfest_basic-VM-compute