Merge branch 'azure-alternative-images' into 'master'

Azure alternative images

See merge request !153

charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml

@@ -65,6 +65,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
     id: mgmtVM
@@ -83,6 +91,9 @@ vnfd:
           type: PARAVIRT
     name: mgmtVM
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage

charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml

@@ -65,6 +65,10 @@ vnfd:
   - id: ubuntu18.04
     image: ubuntu18.04
     name: ubuntu18.04
+  - 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
     id: mgmtVM
@@ -83,6 +87,8 @@ vnfd:
           type: PARAVIRT
     name: mgmtVM
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage

charm-packages/native_charm_vnf/native_charm_vnfd.yaml

@@ -55,6 +55,10 @@ vnfd:
   - id: ubuntu18.04
     image: ubuntu18.04
     name: ubuntu18.04
+  - 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
     id: mgmtVM
@@ -73,6 +77,8 @@ vnfd:
           type: PARAVIRT
     name: mgmtVM
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage

charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml

@@ -63,6 +63,10 @@ vnfd:
   - id: ubuntu18.04
     image: ubuntu18.04
     name: ubuntu18.04
+  - 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
     id: mgmtVM
@@ -81,6 +85,8 @@ vnfd:
           type: PARAVIRT
     name: mgmtVM
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage

charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml

@@ -62,6 +62,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
     id: mgmtVM
@@ -80,6 +88,9 @@ vnfd:
           type: PARAVIRT
     name: mgmtVM
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage

charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml

@@ -51,6 +51,10 @@ vnfd:
   - id: ubuntu18.04
     image: ubuntu18.04
     name: ubuntu18.04
+  - 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
     id: simple_provides
@@ -63,6 +67,8 @@ vnfd:
           type: PARAVIRT
     name: simple_provides
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: simple_provides-compute
     virtual-storage-desc:
     - simple_provides-storage

charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml

@@ -51,6 +51,10 @@ vnfd:
   - id: ubuntu18.04
     image: ubuntu18.04
     name: ubuntu18.04
+  - 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
     id: simple_requires
@@ -63,6 +67,8 @@ vnfd:
           type: PARAVIRT
     name: simple_requires
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: simple_requires-compute
     virtual-storage-desc:
     - simple_requires-storage

charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml

@@ -94,6 +94,10 @@ vnfd:
   - id: ubuntu18.04
     image: ubuntu18.04
     name: ubuntu18.04
+  - 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
     id: simple_requires
@@ -106,6 +110,8 @@ vnfd:
           type: PARAVIRT
     name: simple_requires
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: simple_requires-compute
     virtual-storage-desc:
     - simple_requires-storage
@@ -120,6 +126,8 @@ vnfd:
           type: PARAVIRT
     name: simple_provides
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: simple_provides-compute
     virtual-storage-desc:
     - simple_provides-storage

epa_quota_vnf/epa_quota_vnfd.yaml

@@ -19,9 +19,17 @@ vnfd:
   mgmt-cp: vnf-cp0-ext
   product-name: epa_quota-vnf
   sw-image-desc:
-  - id: US1604
-    image: US1604
-    name: US1604
+  - 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:
   - id: epa_quota-VM
     int-cpd:
@@ -31,7 +39,10 @@ vnfd:
         virtual-interface:
           type: PARAVIRT
     name: epa_quota-VM
-    sw-image-desc: US1604
+    sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: epa_quota-VM-compute
     virtual-storage-desc:
     - epa_quota-VM-storage

hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml

@@ -42,9 +42,17 @@ vnfd:
   mgmt-cp: vnf-cp0-ext
   product-name: hackfest_basic_metrics-vnf
   sw-image-desc:
-  - id: ubuntu16.04
-    image: ubuntu16.04
-    name: ubuntu16.04
+  - 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
     id: hackfest_basic_metrics-VM
@@ -68,7 +76,10 @@ vnfd:
       name: vnf_packets_received
       performance-metric: packets_received
     name: hackfest_basic_metrics-VM
-    sw-image-desc: ubuntu16.04
+    sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: hackfest_basic_metrics-VM-compute
     virtual-storage-desc:
     - hackfest_basic_metrics-VM-storage

hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml

@@ -26,6 +26,10 @@ vnfd:
   - id: ubuntu18.04
     image: ubuntu18.04
     name: ubuntu18.04
+  - id: ubuntu18.04-azure
+    name: ubuntu18.04-azure
+    image: Canonical:UbuntuServer:18.04-LTS:latest
+    vim-type: azure
   vdu:
   - cloud-init-file: cloud.config
     id: hackfest_basic-VM
@@ -42,6 +46,8 @@ vnfd:
           type: SR-IOV
     name: hackfest_basic-VM
     sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-azure
     virtual-compute-desc: hackfest_basic-VM-compute
     virtual-storage-desc:
     - hackfest_basic-VM-storage

hackfest_basic_vnf/hackfest_basic_vnfd.yaml

@@ -19,19 +19,24 @@ vnfd:
   mgmt-cp: vnf-cp0-ext
   product-name: hackfest_basic-vnf
   sw-image-desc:
-  - id: ubuntu16.04
-    name: ubuntu16.04
-    image: ubuntu16.04
-  - id: ubuntu16.04-aws
-    name: ubuntu16.04-aws
+  - id: ubuntu18.04
+    name: ubuntu18.04
+    image: 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:
   - id: hackfest_basic-VM
     name: hackfest_basic-VM
-    sw-image-desc: ubuntu16.04
+    sw-image-desc: ubuntu18.04
     alternative-sw-image-desc:
-    - ubuntu16.04-aws
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: hackfest_basic-VM-compute
     virtual-storage-desc:
     - hackfest_basic-VM-storage

hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml

@@ -30,9 +30,17 @@ vnfd:
   mgmt-cp: vnf-mgmt-ext
   product-name: hackfest_cloudinit-vnf
   sw-image-desc:
-  - id: ubuntu16.04
-    image: ubuntu16.04
-    name: ubuntu16.04
+  - 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
     id: mgmtVM
@@ -51,7 +59,10 @@ vnfd:
         virtual-interface:
           type: PARAVIRT
     name: mgmtVM
-    sw-image-desc: ubuntu16.04
+    sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage
@@ -71,7 +82,10 @@ vnfd:
         virtual-interface:
           type: PARAVIRT
     name: dataVM
-    sw-image-desc: ubuntu16.04
+    sw-image-desc: ubuntu18.04
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: dataVM-compute
     virtual-storage-desc:
     - dataVM-storage

hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml

@@ -32,6 +32,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:
   - id: mgmtVM
     int-cpd:
@@ -50,6 +58,9 @@ vnfd:
           type: PARAVIRT
     name: mgmtVM
     sw-image-desc: ubuntu20.04
+    alternative-sw-image-desc:
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage
@@ -70,6 +81,9 @@ vnfd:
           type: PARAVIRT
     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

hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml

@@ -61,9 +61,9 @@ vnfd:
   mgmt-cp: vnf-mgmt-ext
   product-name: hackfest_proxycharm-vnf
   sw-image-desc:
-  - id: ubuntu16.04
-    image: ubuntu16.04
-    name: ubuntu16.04
+  - id: ubuntu18.04
+    image: ubuntu18.04
+    name: ubuntu18.04
   vdu:
   - cloud-init-file: cloud-config.txt
     id: mgmtVM
@@ -81,7 +81,7 @@ vnfd:
         virtual-interface:
           type: PARAVIRT
     name: mgmtVM
-    sw-image-desc: ubuntu16.04
+    sw-image-desc: ubuntu18.04
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage

ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml

@@ -35,6 +35,10 @@ vnfd:
   - id: ubuntu20.04
     image: ubuntu20.04
     name: ubuntu20.04
+  - id: ubuntu20.04-azure
+    name: ubuntu20.04-azure
+    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
+    vim-type: azure
   vdu:
   - id: mgmtVM
     int-cpd:
@@ -53,6 +57,8 @@ vnfd:
           type: PARAVIRT
     name: mgmtVM
     sw-image-desc: ubuntu20.04
+    alternative-sw-image-desc:
+    - ubuntu20.04-azure
     virtual-compute-desc: mgmtVM-compute
     virtual-storage-desc:
     - mgmtVM-storage
@@ -67,6 +73,8 @@ vnfd:
           type: PARAVIRT
     name: dataVM
     sw-image-desc: ubuntu20.04
+    alternative-sw-image-desc:
+    - ubuntu20.04-azure
     virtual-compute-desc: dataVM-compute
     virtual-storage-desc:
     - dataVM-storage

nscharm_policy_vnf/nscharm_policy_vnfd.yaml

@@ -41,9 +41,17 @@ vnfd:
   mgmt-cp: vnf-mgmt-ext
   product-name: nscharm-policy-vnf
   sw-image-desc:
-  - id: ubuntu1604
-    image: ubuntu16.04
-    name: ubuntu16.04
+  - id: ubuntu1804
+    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
     id: policyVM
@@ -62,7 +70,10 @@ vnfd:
         virtual-interface:
           type: VIRTIO
     name: policyVM
-    sw-image-desc: ubuntu1604
+    sw-image-desc: ubuntu1804
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: policyVM-compute
     virtual-storage-desc:
     - policyVM-storage

nscharm_user_vnf/nscharm_user_vnfd.yaml

@@ -41,9 +41,17 @@ vnfd:
   mgmt-cp: vnf-mgmt-ext
   product-name: nscharm-user-vnf
   sw-image-desc:
-  - id: ubuntu1604
-    image: ubuntu16.04
-    name: ubuntu16.04
+  - id: ubuntu1804
+    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
     id: userVM
@@ -62,7 +70,10 @@ vnfd:
         virtual-interface:
           type: VIRTIO
     name: userVM
-    sw-image-desc: ubuntu1604
+    sw-image-desc: ubuntu1804
+    alternative-sw-image-desc:
+    - ubuntu18.04-aws
+    - ubuntu18.04-azure
     virtual-compute-desc: userVM-compute
     virtual-storage-desc:
     - userVM-storage