From: Bryan Sullivan <bryan.sullivan@att.com>
Date: Wed, 23 Nov 2016 05:08:11 +0000 (-0800)
Subject: Replace image attribute with (verified) VNFImage attribute.
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F24731%2F1;p=models.git

Replace image attribute with (verified) VNFImage attribute.

JIRA: MODELS-23

A separate test will be created to cover these two options.

Change-Id: Idf476707bc9f42d04ff9f6176e00b65246edc8ce
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
---

diff --git a/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml b/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml
index c06c864..8e1a64f 100755
--- a/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml
+++ b/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml
@@ -9,6 +9,10 @@ topology_template:
   node_templates:
     VDU1:
       type: tosca.nodes.nfv.VDU.Tacker
+      artifacts:
+        VNFImage:
+          type: tosca.artifacts.Deployment.Image.VM
+          file: http://artifacts.opnfv.org/models/images/xenial-server-cloudimg-amd64-disk1.img
       capabilities:
         nfv_compute:
           properties:
@@ -16,7 +20,8 @@ topology_template:
             mem_size: 1024 MB
             disk_size: 4 GB
       properties:
-        image: models-xenial-server
+# commented out to test the VNFImage attribute above. These options will be covered in separate tests.
+#        image: models-xenial-server
         availability_zone: nova
         mgmt_driver: noop
         user_data_format: RAW