Commit 95d67d1c authored by lavado's avatar lavado
Browse files

Merge branch 'slicing_alternative_images' into 'master' 

Azure Alternative images

See merge request !161
parents 55941785 f2d2cc9e

cirros_alarm_vnf/cirros_alarm_vnfd.yaml

+11 −0
Original line number Diff line number Diff line
@@ -23,6 +23,14 @@ vnfd: 
  - id: cirros-0.3.5-x86_64-disk.img

    image: cirros-0.3.5-x86_64-disk.img

    name: cirros-0.3.5-x86_64-disk.img

  - id: ubuntu20.04-aws

    name: ubuntu20.04-aws

    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509

    vim-type: aws

  - id: ubuntu20.04-azure

    name: ubuntu20.04-azure

    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest

    vim-type: azure

  vdu:

  - alarm:

    - actions:
@@ -55,6 +63,9 @@ vnfd: 
      performance-metric: average_memory_utilization

    name: cirros_vnfd-VM

    sw-image-desc: cirros-0.3.5-x86_64-disk.img

    alternative-sw-image-desc:

    - ubuntu20.04-aws

    - ubuntu20.04-azure

    virtual-compute-desc: cirros_vnfd-VM-compute

    virtual-storage-desc:

    - cirros_vnfd-VM-storage

epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ vnfd: 
  - id: ubuntu20.04

    image: ubuntu20.04

    name: ubuntu20.04

  - id: ubuntu20.04-aws

    name: ubuntu20.04-aws

    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509

    vim-type: aws

  - id: ubuntu20.04-azure

    name: ubuntu20.04-azure

    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest

    vim-type: azure

  vdu:

  - cloud-init-file: cloud-config.txt

    id: dataVM
@@ -44,6 +52,9 @@ vnfd: 
          type: PCI-PASSTHROUGH

    name: dataVM

    sw-image-desc: ubuntu20.04

    alternative-sw-image-desc:

    - ubuntu20.04-aws

    - ubuntu20.04-azure

    virtual-compute-desc: dataVM-compute

    virtual-storage-desc:

    - dataVM-storage

epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ vnfd: 
  - id: ubuntu20.04

    image: ubuntu20.04

    name: ubuntu20.04

  - id: ubuntu20.04-aws

    name: ubuntu20.04-aws

    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509

    vim-type: aws

  - id: ubuntu20.04-azure

    name: ubuntu20.04-azure

    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest

    vim-type: azure

  vdu:

  - cloud-init-file: cloud-config.txt

    id: dataVM
@@ -44,6 +52,9 @@ vnfd: 
          type: SR-IOV

    name: dataVM

    sw-image-desc: ubuntu20.04

    alternative-sw-image-desc:

    - ubuntu20.04-aws

    - ubuntu20.04-azure

    virtual-compute-desc: dataVM-compute

    virtual-storage-desc:

    - dataVM-storage

slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml

+11 −0
Original line number Diff line number Diff line
@@ -31,6 +31,14 @@ vnfd: 
  - id: ubuntu18.04

    image: ubuntu18.04

    name: ubuntu18.04

  - id: ubuntu18.04-aws

    name: ubuntu18.04-aws

    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509

    vim-type: aws

  - id: ubuntu18.04-azure

    name: ubuntu18.04-azure

    image: Canonical:UbuntuServer:18.04-LTS:latest

    vim-type: azure

  vdu:

  - cloud-init-file: cloud-config.txt

    description: ubuntu_slice-VM
@@ -59,6 +67,9 @@ vnfd: 
          vpci: 0000:00:0a.0

    name: ubuntu_slice-VM

    sw-image-desc: ubuntu18.04

    alternative-sw-image-desc:

    - ubuntu18.04-aws

    - ubuntu18.04-azure

    virtual-compute-desc: ubuntu_slice-VM-compute

    virtual-storage-desc:

    - ubuntu_slice-VM-storage

slice_basic_vnf/slice_basic_vnfd.yaml

+11 −0
Original line number Diff line number Diff line
@@ -27,6 +27,14 @@ vnfd: 
  - id: ubuntu18.04

    image: ubuntu18.04

    name: ubuntu18.04

  - id: ubuntu18.04-aws

    name: ubuntu18.04-aws

    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509

    vim-type: aws

  - id: ubuntu18.04-azure

    name: ubuntu18.04-azure

    image: Canonical:UbuntuServer:18.04-LTS:latest

    vim-type: azure

  vdu:

  - cloud-init-file: cloud-config.txt

    description: ubuntu_slice-VM
@@ -48,6 +56,9 @@ vnfd: 
          vpci: 0000:00:0a.0

    name: ubuntu_slice-VM

    sw-image-desc: ubuntu18.04

    alternative-sw-image-desc:

    - ubuntu18.04-aws

    - ubuntu18.04-azure

    virtual-compute-desc: ubuntu_slice-VM-compute

    virtual-storage-desc:

    - ubuntu_slice-VM-storage