Merge branch 'hbmetrics' into 'master'

Update hackfest_basic_metrics image to Ubuntu 20

See merge request !229

hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml

@@ -42,20 +42,20 @@ vnfd:
   mgmt-cp: vnf-cp0-ext
   product-name: hackfest_basic_metrics-vnf
   sw-image-desc:
-  - id: ubuntu18.04
-    image: ubuntu18.04
-    name: ubuntu18.04
-  - id: ubuntu18.04-aws
-    name: ubuntu18.04-aws
+  - 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: ubuntu18.04-azure
-    name: ubuntu18.04-azure
-    image: Canonical:UbuntuServer:18.04-LTS:latest
+  - id: ubuntu20.04-azure
+    name: ubuntu20.04-azure
+    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
     vim-type: azure
-  - id: ubuntu18.04-gcp
-    name: ubuntu18.04-gcp
-    image: ubuntu-os-cloud:image-family:ubuntu-1804-lts
+  - id: ubuntu20.04-gcp
+    name: ubuntu2018.04-gcp
+    image: ubuntu-os-cloud:image-family:ubuntu-2004-lts
     vim-type: gcp
   vdu:
   - cloud-init-file: cloud-config
@@ -80,11 +80,11 @@ vnfd:
       name: vnf_packets_received
       performance-metric: packets_received
     name: hackfest_basic_metrics-VM
-    sw-image-desc: ubuntu18.04
+    sw-image-desc: ubuntu20.04
     alternative-sw-image-desc:
-    - ubuntu18.04-aws
-    - ubuntu18.04-azure
-    - ubuntu18.04-gcp
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
     virtual-compute-desc: hackfest_basic_metrics-VM-compute
     virtual-storage-desc:
     - hackfest_basic_metrics-VM-storage