X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=tests%2Fexamples%2Falternative_image_sol006.yaml;h=74ffe936e64a94eb11ab17f1f1112cc83aa2f896;hp=446eae4f3c2445c5d6536d65a09cc2b4bd12eae3;hb=0a517b9e7545addee365ae2622f3db035435cc63;hpb=76f6a62b4cc15bc77cf1270d2b1630524fb2879f diff --git a/tests/examples/alternative_image_sol006.yaml b/tests/examples/alternative_image_sol006.yaml index 446eae4..74ffe93 100644 --- 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